修改流程显示

src/views/dataAdmin/dataAdmin/flowStep/index.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-30 17:25:03
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-02-05 14:45:26
+ * @LastEditTime: 2024-02-06 13:57:59
  * @FilePath: \xld-gis-admin\src\views\dataAdmin\dataAdmin\flowStep\index.vue
  * @Description: 流程图表
 -->
@@ -10,8 +10,8 @@
   <div class="flow-chart">
     <div class="flow-title">{{ flowTitle }}流程信息</div>
     <div class="flow-code">
-      <span>流程编号：</span>
-      <span>{{ flowCode2 }}</span>
+      <!-- <span>流程编号：</span>
+      <span>{{ flowCode2 }}</span> -->
     </div>
     <div class="legend">
       <template v-for="legend in legends" :key="legend.key">
@@ -101,15 +101,15 @@ export default defineComponent({
       formData: props.formData,
       sysUserInfo: {},
       legends: [
+        { key: 0, name: '未开始', color: '#989898' },
         { key: 1, name: '已完成', color: '#67C23A' },
         { key: 2, name: '进行中', color: '#2D74E7' },
-        // { key: 3, name: '驳回', color: '#E6A23C' },
-        { key: 4, name: '未开始', color: '#989898' },
+        { key: 3, name: '不通过', color: '#FF0000' },
       ],
-      colors: ['#989898', '#67C23A', '#2D74E7', '#E6A23C'],
-      status: ['wait', 'finish', 'process', 'back'],
+      colors: ['#989898', '#67C23A', '#2D74E7', '#FF0000', '#E6A23C'],
+      status: ['wait', 'finish', 'process', 'error'],
       steps: [
-        //status 1:已完成，2：进行中，3：驳回，0：未开始
+        //status 1:已完成，2：进行中，3：不通过，0：未开始,
         // {
         //   xh: 1,
         //   stepName: '地图资源上传',
@@ -179,7 +179,7 @@ export default defineComponent({
           handlers: [
             { handler: user['EMPLOYEE']['NAME'], id: user['EMPLOYEE']['EMPLOYEE_ID'], status: '1' },
           ],
-          status: '1', //status 1:已完成，2：进行中，3：驳回，0：未开始
+          status: '1', //status 1:已完成，2：进行中，3：不通过，0：未开始
           model: '1',
         },
       ];
@@ -283,7 +283,7 @@ export default defineComponent({
           var num = 0;
           var allType = true;
           if (res.resp_code == 0 && res?.datas?.pageData?.length) {
-            console.log('记录信息',res.datas.pageData)
+            console.log('记录信息', res.datas.pageData);
             res.datas.pageData.map((i, index) => {
               if (!i.NODEDISCRIPTION) {
                 i.NODEDISCRIPTION =
@@ -298,7 +298,9 @@ export default defineComponent({
                 data.steps[index].handlers.map((j) => (j.handler = i.CHECKUSERNAEM));
               }
 
-              var type = i.ISPASS === '1' ? '1' : '0';
+              // var type = i.ISPASS === '1' ? '1' : '0';
+              var type = i.ISPASS === '1' ? '1' : i.ISPASS === '0' ? '3' : '0';
+
               data.steps.map((sp, s) => {
                 //跳过第一步默认步骤
                 if (s !== 0 && sp.stepName === i.NODENAME) {
@@ -313,21 +315,25 @@ export default defineComponent({
             });
             let preStatus = '1'; //前一个状态默认为1=已完成
             let currNodeFinish = false;
+            let isPassNode = false;
             //更具步骤更新状态
             data.steps.map((sp, s) => {
               //跳过第一步默认步骤
               if (s !== 0) {
                 data.steps[s].handlers.map((sh, h) => {
-                  //status 1:已完成，2：进行中，3：驳回，0：未开始
+                  //status 1:已完成，2：进行中，3：不通过，0：未开始
                   if (sh.status === '0') {
                     //如果当前状态未开始0，并且上一个状态是1=已完成,此时当前状态要改为2=进行中
                     if (preStatus === '1') {
-                      data.steps[s].handlers[h].status = '2';
-                      //逐级的话要改变当前状态标记
-                      if (sp.model === '1') preStatus = '0';
+                      if (isPassNode) data.steps[s].handlers[h].status = '0';
                       else {
-                        //并行的话到最后一个改变当前状态标记
-                        if (data.steps[s].handlers.length - 1 <= h) preStatus = '0';
+                        data.steps[s].handlers[h].status = '2';
+                        //逐级的话要改变当前状态标记
+                        if (sp.model === '1') preStatus = '0';
+                        else {
+                          //并行的话到最后一个改变当前状态标记
+                          if (data.steps[s].handlers.length - 1 <= h) preStatus = '0';
+                        }
                       }
                     }
                   }
@@ -336,10 +342,16 @@ export default defineComponent({
                 let exList = data.steps[s].handlers.filter((shd) => shd.status === '1');
                 currNodeFinish = exList.length === data.steps[s].handlers.length;
                 if (currNodeFinish) data.steps[s].status = '1';
+                //当前结点是否存在审核不通过的
+                let passList = data.steps[s].handlers.filter((shd) => shd.status === '3');
+                if (passList.length > 0) {
+                  data.steps[s].status = '3';
+                  isPassNode = true;
+                }
               }
 
               //判断是否所有的已完成
-              if (data.steps.length - 1 === s && data.steps[s - 1].status !== '1'){
+              if (data.steps.length - 1 === s && data.steps[s - 1].status !== '1') {
                 data.steps[s].status = '0';
               }
             });
@@ -352,8 +364,7 @@ export default defineComponent({
               });
             });
 
-            console.log('步骤信息',data.steps)
-            
+            console.log('步骤信息', data.steps);
           }
         });
       }

src/views/interface/item/InterfaceModal.vue

@@ -2,7 +2,7 @@
  * @Author: tengmingxue 1473375109@qq.com
  * @Date: 2023-08-15 16:19:10
  * @LastEditors: tengmingxue 1473375109@qq.com
- * @LastEditTime: 2024-01-26 18:02:46
+ * @LastEditTime: 2024-02-06 10:33:54
  * @FilePath: \xld-gis-admin\src\views\resource\map\MapSourceModal.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -62,7 +62,10 @@ export default defineComponent({
       setModalProps({ confirmLoading: false });
       isUpdate.value = !!data?.isUpdate;
       isView.value = !!data?.isView;
-      if (isUpdate.value || isView.value) formData.value = data.record;
+      if (isUpdate.value || isView.value){
+        data.record.id = data.record.SERVICEID
+        formData.value = data.record
+      };
       if (!isUpdate.value) formData.value = null;
       activeKey.value = '1';
     });

src/views/interface/item/child/Details.vue

@@ -158,7 +158,6 @@ export default defineComponent({
         ]
 
         onMounted(() => {
-            // console.log(props.action);
             props.action && getActionData(props.action.id)
         })
         watch(
@@ -168,7 +167,6 @@ export default defineComponent({
             }
         )
         const getActionData = (id) => {
-            debugger
             getInterfaceDetail(id).then(res => {
                 if (JSON.stringify(res) == '{}') {
                     actionData.value = '';