feat: 流程审批动作

src/views/flow/stFormWork/formWork.vue

@@ -1094,11 +1094,20 @@ const handleSubmit = () => {
               socketMap.message = '提交';
               WebSocketStore.send(JSON.stringify(socketMap));
               submitService().then((s) => {
-                if (s === true) {
-                  setTimeout(() => {
-                    // window.close();
-                    window.location.reload();
-                  }, 600);
+                if (s.success === true) {
+                  // window.close();
+                  const routerAfter = router.resolve({
+                    path: '/MvcSheet/formWork',
+                    query: {
+                      flowCode: s.data.flowCode,
+                      flowVersion: s.data.flowVersion,
+                      bizObjectID: s.data.bizObjectid,
+                      taskID: s.data.taskid,
+                      retrieve: '1'//只有从已办列表查看时，才显示取回
+                    }
+                  })
+                  window.open(routerAfter.href,'_self')
+                  location.reload();
                 }
               });
             },
@@ -1267,10 +1276,10 @@ const submitService = async () => {
   if (res.success) {
     message.success((tag.value == 'START' || taskObj.value.activityCode == 'Task2') ? "提交成功" : "审核通过成功",);
     afterSubmit(dynamicMethods);
-    return true;
+    return res;
   } else {
     message.error(res.message);
-    return false;
+    return res;
   }
 };
 

src/views/support/dict/index.vue

@@ -69,7 +69,8 @@
           <span style="color: #00a0e9" v-else>动态字典</span>
         </template>
         <template v-if="column.dataIndex === 'keyCode'">
-          <a @click="showValueList(record.dictKeyId)">{{ record.keyCode }}</a>
+          <a v-if="record.sourceType === '0'" @click="showValueList(record.dictKeyId)">{{ record.keyCode }}</a>
+          <span v-else >{{ record.keyCode }}</span>
         </template>
         <template v-if="column.dataIndex === 'status'">
           <a-switch @change="(checked) => handleChangeDisabled(checked, record)" v-model:checked="record.status"