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

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

@@ -125,7 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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"
+        where 1=1
         <include refid="where_sql"></include>
         order by a.create_time desc
     </select>

ruoyi-ui/src/views/project/approval/applyList.vue

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

ruoyi-ui/src/views/project/approval/myTask.vue

@@ -119,9 +119,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -277,9 +288,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -420,11 +442,22 @@
               </template>
             </el-table-column>
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

ruoyi-ui/src/views/project/decision/applyList.vue

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

ruoyi-ui/src/views/project/decision/myTask.vue

@@ -104,9 +104,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -251,9 +262,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -386,11 +408,22 @@
               </template>
             </el-table-column>
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

ruoyi-ui/src/views/project/investOpp/applyList.vue

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

ruoyi-ui/src/views/project/investOpp/myTask.vue

@@ -186,11 +186,22 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" prop="investHead">
-              <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+            <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>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -379,11 +390,22 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -555,11 +577,22 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

ruoyi-ui/src/views/project/investigate/applyList.vue

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

ruoyi-ui/src/views/project/investigate/myTask.vue

@@ -111,9 +111,20 @@
             </el-table-column>
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -251,9 +262,20 @@
             </el-table-column>
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -379,11 +401,22 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">

ruoyi-ui/src/views/project/termination/applyList.vue

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

ruoyi-ui/src/views/project/termination/myTask.vue

@@ -102,9 +102,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -249,9 +260,20 @@
             <!-- delFlag -->
             <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">
@@ -383,11 +405,22 @@
               </template>
             </el-table-column>
             <!-- delFlag -->
-            <el-table-column label="状态" align="center" prop="investHead">
+            <el-table-column label="状态" align="center" prop="delFlag">
               <template slot-scope="scope">
-                <div :title="scope.row.delFlag === '1' ? '终止' : '正常'">
-                  {{ scope.row.delFlag === "1" ? "终止" : "正常" }}
-                </div>
+                <!-- 定义状态文本映射对象 -->
+                <el-tag
+                  :type="{
+                    0: 'success',
+                    1: 'danger',
+                    2: 'warning'
+                  }[scope.row.delFlag] || 'info'"
+                >
+                  {{ {
+                  0: '正常',
+                  1: '终止',
+                  2: '观望'
+                }[scope.row.delFlag] || '未知状态' }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="startUserName">