Browse Source

11482-【CR】【投资系统】增加审批流程- 项目整个状态为正常、终止、观望(项目机会状态)

hxy 1 month ago
parent
commit
55da49edb3
21 changed files with 550 additions and 321 deletions
  1. 5 1
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java
  2. 2 0
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectApprovalVo.java
  3. 2 0
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectDecisionVo.java
  4. 2 0
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectInvestigateVo.java
  5. 2 0
      ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectTerminationVo.java
  6. 5 0
      ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TProjectPoolVo.java
  7. 5 4
      ruoyi-system/src/main/resources/mapper/invest/ApprovalMapper.xml
  8. 5 4
      ruoyi-system/src/main/resources/mapper/invest/DecisionMapper.xml
  9. 6 5
      ruoyi-system/src/main/resources/mapper/invest/InvestigateMapper.xml
  10. 49 11
      ruoyi-system/src/main/resources/mapper/invest/InvestmentOpportunityMapper.xml
  11. 5 4
      ruoyi-system/src/main/resources/mapper/invest/TerminationMapper.xml
  12. 28 15
      ruoyi-ui/src/views/project/approval/applyList.vue
  13. 63 45
      ruoyi-ui/src/views/project/approval/myTask.vue
  14. 28 16
      ruoyi-ui/src/views/project/decision/applyList.vue
  15. 65 43
      ruoyi-ui/src/views/project/decision/myTask.vue
  16. 28 15
      ruoyi-ui/src/views/project/investOpp/applyList.vue
  17. 66 44
      ruoyi-ui/src/views/project/investOpp/myTask.vue
  18. 28 15
      ruoyi-ui/src/views/project/investigate/applyList.vue
  19. 66 42
      ruoyi-ui/src/views/project/investigate/myTask.vue
  20. 27 15
      ruoyi-ui/src/views/project/termination/applyList.vue
  21. 63 42
      ruoyi-ui/src/views/project/termination/myTask.vue

+ 5 - 1
ruoyi-system/src/main/java/com/ruoyi/invest/domain/TProjectPool.java

@@ -229,7 +229,11 @@ public class TProjectPool extends BaseEntity
     private String taskId;//任务节点编号
     private String taskDefKey;
 
-
+    /**
+     * 项目状态(0正常、1终止、2观望)
+     */
+    @ApiModelProperty("项目机会状态")
+    private int projectStatus;
 
     public void setId(String id) 
     {

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectApprovalVo.java

@@ -77,6 +77,8 @@ public class ProjectApprovalVo extends BaseEntity
     /** 投资负责人 */
     @Excel(name = "投资负责人")
     private String investHead;
+    @Excel(name = "项目机会状态")
+    private String projectStatus;
 
 
     //流程信息

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectDecisionVo.java

@@ -83,6 +83,8 @@ public class ProjectDecisionVo extends BaseEntity
     /** 投资负责人 */
     @Excel(name = "投资负责人")
     private String investHead;
+    @Excel(name = "项目机会状态")
+    private String projectStatus;
 
 
     //流程信息

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectInvestigateVo.java

@@ -113,6 +113,8 @@ public class ProjectInvestigateVo extends BaseEntity
     /** 投资负责人 */
     @Excel(name = "投资负责人")
     private String investHead;
+    @Excel(name = "项目机会状态")
+    private String projectStatus;
 
 
     //流程信息

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/invest/domain/vo/ProjectTerminationVo.java

@@ -53,6 +53,8 @@ public class ProjectTerminationVo extends BaseEntity
     /** 投资负责人 */
     @Excel(name = "投资负责人")
     private String investHead;
+    @Excel(name = "项目机会状态")
+    private String projectStatus;
 
 
     //流程信息

+ 5 - 0
ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TProjectPoolVo.java

@@ -223,6 +223,11 @@ public class TProjectPoolVo extends BaseEntity
      * 流程状态
      */
     private Integer status;
+    /**
+     * 项目状态(0正常、1终止、2观望)
+     */
+    @ApiModelProperty("项目机会状态")
+    private int projectStatus;
 
     //流程信息
     @ApiModelProperty("流程实例ID")

+ 5 - 4
ruoyi-system/src/main/resources/mapper/invest/ApprovalMapper.xml

@@ -42,6 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="investHead"    column="invest_head"    />
         <result property="projectStage"    column="project_stage"    />
         <result property="projectState"    column="project_state"    />
+        <result property="projectStatus"    column="project_status"    />
 
         <result property="taskName" column="taskName"/>
         <result property="taskId" column="taskId"/>
@@ -70,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="selectAllApprovalList" resultMap="ProjectApprovalVoResult">
         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.project_overview, a.project_sparkle, a.participants_id,
+        tp.project_state,tp.invest_head,tp.project_status, a.project_overview, a.project_sparkle, a.participants_id,
         a.participants, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time , a.status,a.need_meeting,
         p.PROC_INST_ID_ as 'procInsId',
         p.PROC_DEF_ID_ as 'procDefId',
@@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyTaskList" resultMap="ProjectApprovalVoResult">
         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.project_overview, a.project_sparkle, a.participants_id,
+        tp.project_state,tp.invest_head, tp.project_status, a.project_overview, a.project_sparkle, a.participants_id,
         a.participants, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time , a.status,a.need_meeting,
         p.PROC_INST_ID_ as 'procInsId',
         p.PROC_DEF_ID_ as 'procDefId',
@@ -143,7 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyDoneTaskList" resultMap="ProjectApprovalVoResult">
         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.project_overview, a.project_sparkle, a.participants_id,
+        tp.project_state,tp.invest_head, tp.project_status, a.project_overview, a.project_sparkle, a.participants_id,
         a.participants, a.remark, 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',
@@ -174,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyList" resultMap="ProjectApprovalVoResult">
         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.project_overview, a.project_sparkle, a.participants_id,
+        tp.project_state,tp.invest_head,tp.project_status, a.project_overview, a.project_sparkle, a.participants_id,
         a.participants, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time , a.status,
         u.nick_name as 'applyUserName',
         p.PROC_INST_ID_ as 'procInsId',

+ 5 - 4
ruoyi-system/src/main/resources/mapper/invest/DecisionMapper.xml

@@ -38,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="investHead"    column="invest_head"    />
         <result property="projectStage"    column="project_stage"    />
         <result property="projectState"    column="project_state"    />
+        <result property="projectStatus"    column="project_status"    />
 
         <result property="taskName" column="taskName"/>
         <result property="taskId" column="taskId"/>
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
     <select id="selectAllDecisionList" resultMap="ProjectDecisionVoResult">
         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.participants_id,a.participants,
+        tp.project_state,tp.invest_head,tp.project_status, a.participants_id,a.participants,
         a.provision, a.remark, 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',
@@ -95,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyTaskList" resultMap="ProjectDecisionVoResult">
         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.participants_id,a.participants,
+        tp.project_state,tp.invest_head, tp.project_status, a.participants_id,a.participants,
         a.provision, a.remark, 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',
@@ -138,7 +139,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyDoneTaskList" resultMap="ProjectDecisionVoResult">
         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.participants_id,a.participants,
+        tp.project_state,tp.invest_head,tp.project_status, a.participants_id,a.participants,
         a.provision, a.remark, 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',
@@ -169,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyList" resultMap="ProjectDecisionVoResult">
         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.participants_id, a.participants,
+        tp.project_state,tp.invest_head,tp.project_status, a.participants_id, a.participants,
         a.provision, a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
         u.nick_name as 'applyUserName',
         p.PROC_INST_ID_ as 'procInsId',

+ 6 - 5
ruoyi-system/src/main/resources/mapper/invest/InvestigateMapper.xml

@@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="investHead"    column="invest_head"    />
         <result property="projectStage"    column="project_stage"    />
         <result property="projectState"    column="project_state"    />
+        <result property="projectStatus"    column="project_status"    />
 
         <result property="taskName" column="taskName"/>
         <result property="taskId" column="taskId"/>
@@ -84,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="projectInvestigate.investigatePlace != null  and projectInvestigate.investigatePlace != ''"> and a.investigate_place like concat('%', #{projectInvestigate.investigatePlace}, '%')</if>
     </sql>
     <select id="selectAllInvestigateList" resultMap="ProjectInvestigateVoResult">
-        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,
+        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,tp.project_status,
         a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
         a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
         a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
@@ -117,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.create_time desc
     </select>
     <select id="getMyTaskList" resultMap="ProjectInvestigateVoResult">
-        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,
+        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,tp.project_status,
         a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
         a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
         a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
@@ -161,7 +162,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.create_time desc
     </select>
     <select id="getMyDoneTaskList" resultMap="ProjectInvestigateVoResult">
-        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,
+        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,tp.project_status,
         a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
         a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
         a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
@@ -193,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.create_time desc
     </select>
     <select id="getMyList" resultMap="ProjectInvestigateVoResult">
-        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,
+        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,tp.project_status,
         a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
         a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
         a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
@@ -238,7 +239,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id,a.proc_inst_id, a.project_pool_id, a.investigate_name, a.investigate_code,a.investigate_place, a.start_time, a.end_time, a.readiness, a.third_party, a.dead_date,
                a.investigate_person, a.investigate_person_id, a.investigate_cost, a.describe_,
                a.remark, a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
-               tp.project_name,t.TASK_DEF_KEY_ as 'taskDefKey'
+               tp.project_name,tp.project_status, t.TASK_DEF_KEY_ as 'taskDefKey'
         from t_project_investigate a
         left join t_project_pool tp on tp.id=a.project_pool_id
         left join ACT_RU_TASK t on a.proc_inst_id = t.PROC_INST_ID_

File diff suppressed because it is too large
+ 49 - 11
ruoyi-system/src/main/resources/mapper/invest/InvestmentOpportunityMapper.xml


+ 5 - 4
ruoyi-system/src/main/resources/mapper/invest/TerminationMapper.xml

@@ -32,6 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="investHead"    column="invest_head"    />
         <result property="projectStage"    column="project_stage"    />
         <result property="projectState"    column="project_state"    />
+        <result property="projectStatus"    column="project_status"    />
 
         <result property="taskName" column="taskName"/>
         <result property="taskId" column="taskId"/>
@@ -99,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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,
+        tp.project_state,tp.invest_head,tp.project_status,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',
@@ -131,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </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,
+        tp.project_state,tp.invest_head,tp.project_status,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',
@@ -174,7 +175,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyDoneTaskList" 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,
+        tp.project_state,tp.invest_head,tp.project_status,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',
@@ -205,7 +206,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getMyList" 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,
+        tp.project_state,tp.invest_head,tp.project_status,a.reason,
         a.del_flag, a.create_by, a.create_time, a.update_by, a.update_time ,a.status,
         u.nick_name as 'applyUserName',
         p.PROC_INST_ID_ as 'procInsId',

+ 28 - 15
ruoyi-ui/src/views/project/approval/applyList.vue

@@ -146,6 +146,24 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+        <template slot-scope="scope">
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         label="已发起立项申请"
         align="center"
@@ -178,22 +196,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="delFlag">
+      <!-- delFlag -->
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="investHead"
+        width="50px"
+      >
         <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.delFlag] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.delFlag] || '未知状态' }}
-          </el-tag>
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">

+ 63 - 45
ruoyi-ui/src/views/project/approval/myTask.vue

@@ -94,7 +94,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -119,20 +136,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -262,7 +268,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -288,20 +311,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -419,7 +431,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -444,20 +473,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

+ 28 - 16
ruoyi-ui/src/views/project/decision/applyList.vue

@@ -145,7 +145,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column
+<!--      <el-table-column
         label="项目状态"
         align="center"
         prop="projectState"
@@ -157,6 +157,24 @@
             :value="scope.row.projectState"
           />
         </template>
+      </el-table-column>-->
+      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+        <template slot-scope="scope">
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
+        </template>
       </el-table-column>
       <el-table-column
         label="已发起投决申请"
@@ -185,22 +203,16 @@
         </template>
       </el-table-column>
       <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="delFlag">
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="investHead"
+        width="50px"
+      >
         <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.delFlag] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.delFlag] || '未知状态' }}
-          </el-tag>
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">

+ 65 - 43
ruoyi-ui/src/views/project/decision/myTask.vue

@@ -86,7 +86,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -104,20 +121,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -245,6 +251,25 @@
                 />
               </template>
             </el-table-column>-->
+            <!-- projectStatus -->
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -262,20 +287,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -393,6 +407,25 @@
                 />
               </template>
             </el-table-column>-->
+            <!-- projectStatus -->
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -410,20 +443,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

+ 28 - 15
ruoyi-ui/src/views/project/investOpp/applyList.vue

@@ -167,6 +167,24 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+        <template slot-scope="scope">
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
+        </template>
+      </el-table-column>
 <!--      <el-table-column
         label="项目状态"
         align="center"
@@ -214,22 +232,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="delFlag">
+      <!-- delFlag -->
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="investHead"
+        width="50px"
+      >
         <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.delFlag] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-            }[scope.row.delFlag] || '未知状态' }}
-          </el-tag>
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">

+ 66 - 44
ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -162,6 +162,24 @@
             }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -186,22 +204,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -355,7 +363,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               label="备案时间"
               align="center"
@@ -390,22 +415,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -542,7 +557,24 @@
                 />
               </template>
             </el-table-column>-->
-
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column
               label="备案时间"
               align="center"
@@ -577,22 +609,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

+ 28 - 15
ruoyi-ui/src/views/project/investigate/applyList.vue

@@ -146,6 +146,24 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+        <template slot-scope="scope">
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column
         label="已发起尽调申请"
         align="center"
@@ -185,22 +203,17 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="delFlag">
+      <!-- delFlag -->
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="investHead"
+        width="50px"
+      >
         <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.delFlag] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.delFlag] || '未知状态' }}
-          </el-tag>
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">

+ 66 - 42
ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -88,6 +88,24 @@
                 />
               </template>
             </el-table-column>
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -109,22 +127,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -239,6 +247,24 @@
                 />
               </template>
             </el-table-column>
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -260,22 +286,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -380,6 +396,24 @@
                 />
               </template>
             </el-table-column>
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -401,22 +435,12 @@
                 </div>
               </template>
             </el-table-column>
+            <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

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

@@ -144,6 +144,24 @@
           />
         </template>
       </el-table-column>
+      <el-table-column label=项目机会状态" align="center" prop="projectStatus">
+        <template slot-scope="scope">
+          <!-- 定义状态文本映射对象 -->
+          <el-tag
+            :type="{
+              0: 'success',
+              1: 'danger',
+              2: 'warning'
+            }[scope.row.projectStatus] || 'info'"
+          >
+            {{ {
+            0: '正常',
+            1: '终止',
+            2: '观望'
+          }[scope.row.projectStatus] || '未知状态' }}
+          </el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="项目负责人" align="center" prop="investHead">
         <template slot-scope="scope">
           <div :title="scope.row.investHead">
@@ -159,22 +177,16 @@
         </template>
       </el-table-column>
       <!-- delFlag -->
-      <el-table-column label="状态" align="center" prop="delFlag">
+      <el-table-column
+        label="状态"
+        align="center"
+        prop="investHead"
+        width="50px"
+      >
         <template slot-scope="scope">
-          <!-- 定义状态文本映射对象 -->
-          <el-tag
-            :type="{
-              0: 'success',
-              1: 'danger',
-              2: 'warning'
-            }[scope.row.delFlag] || 'info'"
-          >
-            {{ {
-            0: '正常',
-            1: '终止',
-            2: '观望'
-          }[scope.row.delFlag] || '未知状态' }}
-          </el-tag>
+          <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+            {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="申请人" align="center" prop="startUserName">

+ 63 - 42
ruoyi-ui/src/views/project/termination/myTask.vue

@@ -85,6 +85,24 @@
                 />
               </template>
             </el-table-column>-->
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -102,20 +120,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -243,6 +250,24 @@
                 />
               </template>
             </el-table-column>-->
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -260,20 +285,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -390,6 +404,24 @@
                 />
               </template>
             </el-table-column>-->
+            <el-table-column label="项目机会状态" align="center" prop="projectStatus">
+              <template slot-scope="scope">
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.projectStatus] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.projectStatus] || '未知状态' }}
+                </el-tag>
+              </template>
+            </el-table-column>
             <el-table-column label="项目负责人" align="center" prop="investHead">
               <template slot-scope="scope">
                 <div :title="scope.row.investHead">
@@ -407,20 +439,9 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <!-- 定义状态文本映射对象 -->
-                <el-tag
-                  :type="{
-                    0: 'success',
-                    1: 'danger',
-                    2: 'warning'
-                  }[scope.row.delFlag] || 'info'"
-                >
-                  {{ {
-                  0: '正常',
-                  1: '终止',
-                  2: '观望'
-                }[scope.row.delFlag] || '未知状态' }}
-                </el-tag>
+                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
+                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
+                </div>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">