add 添加表单配置

src/views/workflow/task/allTaskWaiting.vue

@@ -54,13 +54,13 @@
             </template>
             <template v-else>
               <el-tag type="success">
-                {{ scope.row.assigneeName }}
+                {{ scope.row.assigneeName || '无'}}
               </el-tag>
             </template>
           </template>
           <template v-else-if="tab === 'finish'" #default="scope">
             <el-tag type="success">
-              {{ scope.row.assigneeName }}
+              {{ scope.row.assigneeName || '无'}}
             </el-tag>
           </template>
         </el-table-column>
@@ -129,6 +129,8 @@ import { getPageByAllTaskWait, getPageByAllTaskFinish, updateAssignee, getInstan
 import MultiInstanceUser from '@/components/Process/multiInstanceUser.vue';
 import UserSelect from '@/components/UserSelect';
 import { TaskQuery, TaskVO, VariableVo } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
 //加签组件
 const multiInstanceUserRef = ref<InstanceType<typeof MultiInstanceUser>>();
@@ -260,18 +262,14 @@ const handleInstanceVariable  = async (row: TaskVO) => {
 };
 /** 查看按钮操作 */
 const handleView = (row) => {
-  if(row.wfFormDefinitionVo){
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'view'
-      }
-    })
-  }else{
-    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'view'
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 onMounted(() => {
   getWaitingList();

src/views/workflow/task/myDocument.vue

@@ -117,6 +117,8 @@ import { getPageByCurrent, deleteRunAndHisInstance, cancelProcessApply } from '@
 import { listCategory } from '@/api/workflow/category';
 import { CategoryVO } from '@/api/workflow/category/types';
 import { ProcessInstanceQuery, ProcessInstanceVO } from '@/api/workflow/processInstance/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const queryFormRef = ref<ElFormInstance>();
 const categoryTreeRef = ref<ElTreeInstance>();
@@ -250,17 +252,13 @@ const handleCancelProcessApply = async (processInstanceId: string) => {
 
 //办理
 const handleOpen = async (row,type) => {
-  if(row.wfFormDefinitionVo){
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: type
-      }
-    })
-  }else{
-    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: type
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 </script>

src/views/workflow/task/taskCopyList.vue

@@ -43,7 +43,7 @@
             </template>
             <template v-else>
               <el-tag type="success">
-                {{ scope.row.assigneeName }}
+                {{ scope.row.assigneeName || '无'}}
               </el-tag>
             </template>
           </template>
@@ -73,6 +73,8 @@
 <script lang="ts" setup>
 import { getPageByTaskCopy} from '@/api/workflow/task';
 import { TaskQuery } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -127,18 +129,14 @@ const getTaskCopyList = () => {
 
 /** 查看按钮操作 */
 const handleView = (row) => {
-  if(row.wfFormDefinitionVo){
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'view'
-      }
-    })
-  }else{
-    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'view'
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 
 

src/views/workflow/task/taskFinish.vue

@@ -37,7 +37,7 @@
         <el-table-column fixed align="center" prop="assigneeName" label="办理人">
           <template #default="scope">
             <el-tag type="success">
-              {{ scope.row.assigneeName }}
+              {{ scope.row.assigneeName || '无'}}
             </el-tag>
           </template>
         </el-table-column>
@@ -62,6 +62,8 @@
 <script lang="ts" setup>
 import { getPageByTaskFinish } from '@/api/workflow/task';
 import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
 //审批记录组件
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -113,19 +115,15 @@ const getFinishList = () => {
   });
 };
 /** 查看按钮操作 */
-const handleView = (row) => {
-  if(row.wfFormDefinitionVo){
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'view'
-      }
-    })
-  }else{
-    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
-  }
+const handleView = (row: TaskVO) => {
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'view'
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 
 onMounted(() => {

src/views/workflow/task/taskWaiting.vue

@@ -43,7 +43,7 @@
             </template>
             <template v-else>
               <el-tag type="success">
-                {{ scope.row.assigneeName }}
+                {{ scope.row.assigneeName || '无' }}
               </el-tag>
             </template>
           </template>
@@ -79,6 +79,9 @@
 <script lang="ts" setup>
 import { getPageByTaskWait, claim, returnTask } from '@/api/workflow/task';
 import { TaskQuery, TaskVO } from '@/api/workflow/task/types';
+import workflowCommon from '@/api/workflow/workflowCommon';
+import { RouterJumpVo } from '@/api/workflow/workflowCommon/types';
+
 //提交组件
 const queryFormRef = ref<ElFormInstance>();
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -135,29 +138,14 @@ const getWaitingList = () => {
 };
 //办理
 const handleOpen = async (row: TaskVO) => {
-  if (row.formKey != null) {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.formKey}`,
-      query: {
-        id: row.businessKey,
-        type: 'approval',
-        taskId: row.id
-      }
-    });
-  } else if (row.wfFormDefinitionVo) {
-    proxy.$tab.closePage(proxy.$route);
-    proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}`,
-      query: {
-        id: row.businessKey,
-        type: 'approval',
-        taskId: row.id
-      }
-    });
-  } else {
-    proxy?.$modal.msgError('请到流程定义菜单配置路由！');
-  }
+  const routerJumpVo = reactive<RouterJumpVo>({
+    wfDefinitionConfigVo: row.wfDefinitionConfigVo,
+    wfNodeConfigVo: row.wfNodeConfigVo,
+    businessKey: row.businessKey,
+    taskId: row.id,
+    type: 'approval'
+  });
+  workflowCommon.routerJump(routerJumpVo,proxy)
 };
 
 /** 认领任务 */