Browse Source

11482-【CR】【投资系统】增加审批流程- 投资机会、项目终止

hxy 1 month ago
parent
commit
c8f6e061ef

+ 25 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/InvestmentOpportunityController.java

@@ -60,6 +60,31 @@ public class InvestmentOpportunityController extends BaseController
     @Autowired
     private ITProjectPoolService tProjectPoolService;
 
+    /**
+     * 查询所有投资机会流程
+     */
+    @ApiOperation("查询所有投资机会流程")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPoolVo> list=investmentOpportunityService.selectAllInvestmentOpportunityList(tProjectPool);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询所有审批通过投资机会流程
+     */
+    @ApiOperation("查询所有审批通过的投资机会流程")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAllApproved")
+    public TableDataInfo listAllApproved(TProjectPool tProjectPool)
+    {
+        startPage();
+        List<TProjectPoolVo> list=investmentOpportunityService.selectAllApprovedList(tProjectPool);
+        return getDataTable(list);
+    }
 
     //我的待办任务
     @ApiOperation("我的待办任务列表")

+ 10 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/TerminationController.java

@@ -41,6 +41,16 @@ public class TerminationController extends BaseController {
     private ITProjectPoolService tProjectPoolService;
     @Autowired
     private IInvestmentOpportunityService investmentOpportunityService;
+    //所有项目终止流程列表
+    @ApiOperation("所有项目终止流程列表")
+    @PreAuthorize("@ss.hasPermi('invest:pool:list')")
+    @GetMapping("/listAll")
+    public TableDataInfo listAll(TProjectTermination tProjectTermination)
+    {
+        startPage();
+        List<ProjectTerminationVo> list=terminationService.selectAllTerminationList(tProjectTermination);
+        return getDataTable(list);
+    }
 
     /**
      * 查询项目终止列表

+ 2 - 0
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/IInvestmentOpportunityService.java

@@ -19,6 +19,8 @@ import java.util.Map;
 public interface IInvestmentOpportunityService
 {
     List<TProjectPool> selectTProjectList(TProjectPool tProjectPool);
+    List<TProjectPoolVo> selectAllInvestmentOpportunityList(TProjectPool tProjectPool);
+    List<TProjectPoolVo> selectAllApprovedList(TProjectPool tProjectPool);
     List<TProjectPoolVo> getMyTaskList(String userId, TProjectPool tProjectPool);
     List<TProjectPoolVo> getMyDoneTaskList(String userId, TProjectPool tProjectPool);
     List<TProjectPoolVo> getMyList(String userId,TProjectPool tProjectPool);

+ 1 - 0
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/ITerminationService.java

@@ -16,6 +16,7 @@ import java.util.Map;
  */
 public interface ITerminationService
 {
+    List<ProjectTerminationVo> selectAllTerminationList(TProjectTermination tProjectTermination);
     List<ProjectTerminationVo> getMyTaskList(String userId, TProjectTermination tProjectTermination);
     List<ProjectTerminationVo> getMyDoneTaskList(String userId, TProjectTermination tProjectTermination);
     List<ProjectTerminationVo> getMyList(String userId,TProjectTermination tProjectTermination);

+ 8 - 0
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/InvestmentOpportunityServiceImpl.java

@@ -85,6 +85,14 @@ public class InvestmentOpportunityServiceImpl extends FlowServiceFactory impleme
         return investmentOpportunityMapper.selectTProjectList(tProjectPool);
     }
     @Override
+    public List<TProjectPoolVo> selectAllInvestmentOpportunityList(TProjectPool tProjectPool){
+        return investmentOpportunityMapper.selectAllInvestmentOpportunityList(tProjectPool);
+    }
+    @Override
+    public List<TProjectPoolVo> selectAllApprovedList(TProjectPool tProjectPool){
+        return investmentOpportunityMapper.selectAllApprovedList(tProjectPool);
+    }
+    @Override
     public List<TProjectPoolVo> getMyTaskList(String userId, TProjectPool tProjectPool){
         return investmentOpportunityMapper.getMyTaskList(userId, tProjectPool);
     }

+ 4 - 0
ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/TerminationServiceImpl.java

@@ -65,6 +65,10 @@ public class TerminationServiceImpl extends FlowServiceFactory implements ITermi
     @Autowired
     private TProjectScoringMapper tProjectScoringMapper;
     @Override
+    public List<ProjectTerminationVo> selectAllTerminationList(TProjectTermination tProjectTermination){
+        return terminationMapper.selectAllTerminationList(tProjectTermination);
+    }
+    @Override
     public List<ProjectTerminationVo> getMyTaskList(String userId, TProjectTermination tProjectTermination){
         return terminationMapper.getMyTaskList(userId, tProjectTermination);
     }

+ 4 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/mapper/InvestmentOpportunityMapper.java

@@ -15,6 +15,10 @@ import java.util.List;
 public interface InvestmentOpportunityMapper {
     /*查询任务终止列表*/
     List<TProjectPool> selectTProjectList(TProjectPool tProjectPool);
+    /*查询所有投资机会流程*/
+    List<TProjectPoolVo> selectAllInvestmentOpportunityList(@Param("projectPool")TProjectPool tProjectPool);
+    /*查询所有额审批通过投资机会*/
+    List<TProjectPoolVo> selectAllApprovedList(@Param("projectPool")TProjectPool tProjectPool);
     /*待办任务*/
     List<TProjectPoolVo> getMyTaskList(@Param("userId") String userId,@Param("projectPool")TProjectPool tProjectPool);
     /*已办任务*/

+ 2 - 1
ruoyi-system/src/main/java/com/ruoyi/invest/mapper/TerminationMapper.java

@@ -29,7 +29,8 @@ public interface TerminationMapper {
      * @return 结果
      */
     public int updateTProjectTermination(TProjectTermination tProjectTermination);
-
+    /*已办任务*/
+    List<ProjectTerminationVo> selectAllTerminationList(@Param("projectTermination") TProjectTermination tProjectTermination);
     /*待办任务*/
     List<ProjectTerminationVo> getMyTaskList(@Param("userId") String userId, @Param("projectTermination") TProjectTermination tProjectTermination);
     /*已办任务*/

+ 72 - 1
ruoyi-system/src/main/resources/mapper/invest/InvestmentOpportunityMapper.xml

@@ -243,7 +243,78 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null  and delFlag != ''"> and a.del_flag = #{delFlag}</if>
         </where>
     </select>
-
+    <select id="selectAllInvestmentOpportunityList" resultMap="TProjectPoolVoResult">
+        select a.id,a.proc_inst_id,a.project_name, d.channel_group project_group, a.record_date, a.project_code, a.channel, a.contact_date, a.project_date, a.decision_date, a.industry, a.company, a.description, a.project_contacts,
+        a.invest_head, a.previous_financing, a.financing_stage, a.financing_condition, a.financing_money, a.financing_date, a.invest_sparkle, a.invest_valuation, a.invest_money, a.invest_type, a.invest_ploy, a.invest_worth, a.shareholding,
+        a.project_stage, a.project_state, a.mark, a.approval_flag, a.investigate_flag, a.decision_flag, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.status,
+        b.id companyId, b.company_name, b.project_pool_id, b.filing_time, b.company_code, b.start_time, b.end_time, b.registered_capital, b.registered_address, b.paid_capital, b.business_address, b.actual_bod, b.phone, b.type,
+        c.id, c.name, c.position, c.contact,
+        d.channel_name, d.channel_code, d.channel_type, d.channel_group, d.channel_blurb, d.contacts, d.telephone, d.address, d.channel_head,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_pool a
+        left join t_project_company b ON a.id = b.project_pool_id
+        left join t_project_contacts c ON a.project_contacts = c.id
+        left join t_project_channel d ON a.channel = d.id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0"
+        <include refid="where_sql"></include>
+    </select>
+    <select id="selectAllApprovedList" resultMap="TProjectPoolVoResult">
+        select a.id,a.proc_inst_id,a.project_name, d.channel_group project_group, a.record_date, a.project_code, a.channel, a.contact_date, a.project_date, a.decision_date, a.industry, a.company, a.description, a.project_contacts,
+        a.invest_head, a.previous_financing, a.financing_stage, a.financing_condition, a.financing_money, a.financing_date, a.invest_sparkle, a.invest_valuation, a.invest_money, a.invest_type, a.invest_ploy, a.invest_worth, a.shareholding,
+        a.project_stage, a.project_state, a.mark, a.approval_flag, a.investigate_flag, a.decision_flag, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time, a.status,
+        b.id companyId, b.company_name, b.project_pool_id, b.filing_time, b.company_code, b.start_time, b.end_time, b.registered_capital, b.registered_address, b.paid_capital, b.business_address, b.actual_bod, b.phone, b.type,
+        c.id, c.name, c.position, c.contact,
+        d.channel_name, d.channel_code, d.channel_type, d.channel_group, d.channel_blurb, d.contacts, d.telephone, d.address, d.channel_head,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_pool a
+        left join t_project_company b ON a.id = b.project_pool_id
+        left join t_project_contacts c ON a.project_contacts = c.id
+        left join t_project_channel d ON a.channel = d.id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0" and a.status=3
+        <include refid="where_sql"></include>
+    </select>
     <select id="getMyTaskList" resultMap="TProjectPoolVoResult">
         select a.id,a.proc_inst_id,a.project_name, d.channel_group project_group, a.record_date, a.project_code, a.channel, a.contact_date, a.project_date, a.decision_date, a.industry, a.company, a.description, a.project_contacts,
         a.invest_head, a.previous_financing, a.financing_stage, a.financing_condition, a.financing_money, a.financing_date, a.invest_sparkle, a.invest_valuation, a.invest_money, a.invest_type, a.invest_ploy, a.invest_worth, a.shareholding,

+ 32 - 0
ruoyi-system/src/main/resources/mapper/invest/TerminationMapper.xml

@@ -97,6 +97,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         where id = #{id}
     </update>
+    <select id="selectAllTerminationList" resultMap="ProjectTerminationVoResult">
+        select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
+        tp.project_state,tp.invest_head,a.reason,
+        a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
+        p.PROC_INST_ID_ as 'procInsId',
+        p.PROC_DEF_ID_ as 'procDefId',
+        date_format(p.START_TIME_, '%Y-%m-%d %H:%i:%s') as 'applyTime',
+        date_format(p.END_TIME_, '%Y-%m-%d %H:%i:%s') as 'endTime',
+        p.START_USER_ID_ AS 'startUserId',
+        uu.nick_name AS 'startUserName',
+        dd.dept_name AS 'startDeptName',
+        t.NAME_ as 'taskName',
+        t.TASK_DEF_KEY_ as 'taskDefKey',
+        DATE_FORMAT(t.CREATE_TIME_ ,'%Y-%m-%d %H:%i') as 'taskCreateTiem',
+        t.ASSIGNEE_ AS 'assignee',
+        ui.nick_name AS 'assigneeName',
+        t.ID_ as 'taskId',
+        t.EXECUTION_ID_ AS 'executionId',
+        rp.DEPLOYMENT_ID_ AS 'deployId'
+        from t_project_termination a
+        left join t_project_pool tp on tp.id=a.project_pool_id
+        left join ACT_HI_PROCINST p on a.proc_inst_id = p.PROC_INST_ID_
+        LEFT JOIN (SELECT * FROM sys_user LIMIT 100000) uu ON p.START_USER_ID_ = uu.user_id
+        LEFT JOIN (SELECT * FROM sys_dept LIMIT 100000) dd ON uu.dept_id = dd.dept_id
+        left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_
+        left join (select * from sys_user limit 100000) ui on t.ASSIGNEE_ = ui.user_id
+        left join ACT_RU_IDENTITYLINK ru on ru.TASK_ID_ = t.ID_
+        LEFT JOIN act_re_procdef rp ON t.PROC_DEF_ID_ = rp.ID_
+        where a.del_flag="0"
+        <include refid="where_sql"></include>
+        order by a.create_time desc
+    </select>
     <select id="getMyTaskList" resultMap="ProjectTerminationVoResult">
         select a.id,a.proc_inst_id, a.project_pool_id,tp.project_name, tp.industry,tp.project_stage,
         tp.project_state,tp.invest_head,a.reason,

+ 8 - 0
ruoyi-ui/src/api/project/investOpp/pool.js

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有投资机会列表
+export function getAllInvestOppList(query) {
+  return request({
+    url: '/project/investmentOpportunity/listAll',
+    method: 'get',
+    params: query
+  })
+}
 // 我的待办任务列表
 export function getMyTaskList(query) {
   return request({

+ 8 - 0
ruoyi-ui/src/api/project/termination/pool.js

@@ -1,4 +1,12 @@
 import request from '@/utils/request'
+// 所有项目终止列表
+export function getAllTerminationList(query) {
+  return request({
+    url: '/project/termination/listAll',
+    method: 'get',
+    params: query
+  })
+}
 // 我的待办任务列表
 export function getMyTaskList(query) {
   return request({

+ 6 - 0
ruoyi-ui/src/router/index.js

@@ -74,6 +74,12 @@ export const constantRoutes = [
     // redirect: 'noredirect',
     children: [
       //投资机会
+      {
+        path: 'investOpp/apply',
+        name: 'investOppApply',
+        component: () => import('@/views/project/investOpp/apply'),
+        meta: { title: '申请投资机会' }
+      },
       {
         path: 'investOpp/edit',
         name: 'investOppEdit',

+ 37 - 19
ruoyi-ui/src/views/project/investOpp/applyList.vue

@@ -140,7 +140,17 @@
           </div>
         </template>
       </el-table-column>
-
+      <el-table-column
+        label="项目所属城市"
+        align="center"
+        prop="tProjectCompany.registeredAddress"
+      >
+        <template slot-scope="scope">
+          <div :title="scope.row.tProjectCompany.registeredAddress">
+            {{ scope.row.tProjectCompany.registeredAddress }}
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
           <dict-tag
@@ -181,22 +191,6 @@
           }}</span>
         </template>
       </el-table-column>
-<!--      <el-table-column label="立项通过日期" align="center" prop="projectDate">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>-->
-      <el-table-column
-        label="已发起立项申请"
-        align="center"
-        prop="approvalFlag"
-      >
-        <template slot-scope="scope">
-          <div>
-            {{ scope.row.approvalFlag === "1" ? "是" : "否" }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="项目负责人" align="center" prop="investHead">
         <template slot-scope="scope">
           <div :title="scope.row.investHead">
@@ -232,6 +226,29 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="申请人" align="center" prop="startUserName">
+        <template slot-scope="scope">
+          <div :title="scope.row.startUserName">
+            {{ scope.row.startUserName }}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column label="申请日期" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="流程状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <div :title="scope.row.status">
+            <span v-if="scope.row.status === 0">暂存</span>
+            <span v-else-if="scope.row.status === 1">已提交</span>
+            <span v-else-if="scope.row.status === 2">审批中</span>
+            <span v-else-if="scope.row.status === 3">审批完成</span>
+            <span v-else-if="scope.row.status === 4">关闭</span>
+          </div>
+        </template>
+      </el-table-column>
     </el-table>
 
     <pagination
@@ -255,6 +272,7 @@
 
 <script>
 import { listApprovalList, delPool, } from "@/api/invest/pool";
+import { getAllInvestOppList } from "@/api/project/investOpp/pool";
 import { listChannel } from "@/api/invest/channel";
 import meetingList from "../meetingList";
 import businessUpdate from "../../invest/components/businessUpdate";
@@ -338,10 +356,10 @@ export default {
     });
   },
   methods: {
-    /** 查询项目池列表 */
+    /** 查询所有投资机会流程列表 */
     getList() {
       this.loading = true;
-      listApprovalList(this.queryParams).then((response) => {
+      getAllInvestOppList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;

+ 27 - 67
ruoyi-ui/src/views/project/termination/applyList.vue

@@ -128,17 +128,6 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="公司名称"
-        align="center"
-        prop="tProjectCompany.companyName"
-      >
-        <template slot-scope="scope">
-          <div :title="scope.row.tProjectCompany.companyName">
-            {{ scope.row.tProjectCompany.companyName }}
-          </div>
-        </template>
-      </el-table-column>
       <el-table-column label="所属行业" align="center" prop="industry"
         ><template slot-scope="scope">
           <dict-tag
@@ -155,78 +144,48 @@
           />
         </template>
       </el-table-column>
-<!--      <el-table-column
-        label="项目状态"
-        align="center"
-        prop="projectState"
-        width="120"
-      >
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.project_state"
-            :value="scope.row.projectState"
-          />
-        </template>
-      </el-table-column>-->
-       <el-table-column label="备案时间" align="center" prop="tProjectCompany.filingTime">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.tProjectCompany.filingTime, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="立项通过日期" align="center" prop="projectDate">
+      <el-table-column label="项目负责人" align="center" prop="investHead">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.projectDate, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.investHead">
+            {{ scope.row.investHead }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="投决通过日期" align="center" prop="decisionDate">
+      <el-table-column label="终止原因" align="center" prop="reason">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.decisionDate, "{y}-{m}-{d}") }}</span>
+          <div :title="scope.row.reason">
+            {{ scope.row.reason }}
+          </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="已发起投决申请"
-        align="center"
-        prop="decisionFlag"
-      >
+      <!-- delFlag -->
+      <el-table-column label="状态" align="center" prop="investHead">
         <template slot-scope="scope">
-          <div>
-            {{ scope.row.decisionFlag === "1" ? "是" : "否" }}
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
           </div>
         </template>
       </el-table-column>
-
-      <el-table-column label="项目负责人" align="center" prop="investHead">
+      <el-table-column label="申请人" align="center" prop="startUserName">
         <template slot-scope="scope">
-          <div :title="scope.row.investHead">
-            {{ scope.row.investHead }}
+          <div :title="scope.row.startUserName">
+            {{ scope.row.startUserName }}
           </div>
         </template>
       </el-table-column>
-      <el-table-column
-        label="渠道"
-        align="center"
-        prop="tProjectChannel.channelName"
-      >
+      <el-table-column label="申请日期" align="center" prop="createTime">
         <template slot-scope="scope">
-          <div
-            v-if="
-              scope.row.tProjectChannel && scope.row.tProjectChannel.channelName
-            "
-            :title="scope.row.tProjectChannel.channelName"
-          >
-            {{ scope.row.tProjectChannel.channelName }}
-          </div>
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        label="状态"
-        align="center"
-        prop="investHead"
-        width="70px"
-      >
+      <el-table-column label="流程状态" align="center" prop="status">
         <template slot-scope="scope">
-          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          <div :title="scope.row.status">
+            <span v-if="scope.row.status === 0">暂存</span>
+            <span v-else-if="scope.row.status === 1">已提交</span>
+            <span v-else-if="scope.row.status === 2">审批中</span>
+            <span v-else-if="scope.row.status === 3">审批完成</span>
+            <span v-else-if="scope.row.status === 4">关闭</span>
           </div>
         </template>
       </el-table-column>
@@ -259,6 +218,7 @@ import {
   addDecision,
 } from "@/api/invest/pool";
 import {
+  getAllTerminationList,
   listTerminationList,
 } from "@/api/project/termination/pool";
 import { listChannel } from "@/api/invest/channel";
@@ -342,10 +302,10 @@ export default {
     });
   },
   methods: {
-    /** 查询项目池列表 */
+    /** 查询所有项目终止列表 */
     getList() {
       this.loading = true;
-      listTerminationList(this.queryParams).then((response) => {
+      getAllTerminationList(this.queryParams).then((response) => {
         this.poolList = response.rows;
         this.total = response.total;
         this.loading = false;