From cd129aa949dff285cda41080523eb89b1f7b68be Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Sun, 24 Mar 2024 15:13:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                          |  2 +-
 src/views/workflow/leave/index.vue           | 22 ++++++++++-
 src/views/workflow/leave/leaveEdit.vue       | 41 ++++++++++----------
 src/views/workflow/processInstance/index.vue |  6 ++-
 src/views/workflow/task/allTaskWaiting.vue   |  6 ++-
 src/views/workflow/task/myDocument.vue       |  6 ++-
 src/views/workflow/task/taskCopyList.vue     |  6 ++-
 src/views/workflow/task/taskFinish.vue       |  6 ++-
 src/views/workflow/task/taskWaiting.vue      |  4 +-
 9 files changed, 69 insertions(+), 30 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index e028834..45bb1e6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -170,7 +170,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [
     permissions: ['demo:leave:edit'],
     children: [
       {
-        path: 'index/:id/:type',
+        path: 'index',
         component: () => import('@/views/workflow/leave/leaveEdit.vue'),
         name: 'leaveEdit',
         meta: { title: '请假申请', activeMenu: '/demo/leave',noCache:true },
diff --git a/src/views/workflow/leave/index.vue b/src/views/workflow/leave/index.vue
index c7baae2..4f7c8e1 100644
--- a/src/views/workflow/leave/index.vue
+++ b/src/views/workflow/leave/index.vue
@@ -175,18 +175,36 @@ const handleSelectionChange = (selection: LeaveVO[]) => {
 const handleAdd = () => {
   proxy.$tab.closePage(proxy.$route);
   proxy.$router.push(`/demo/leaveEdit/index/add/add`);
+  proxy.$router.push({
+      path: `/demo/leaveEdit/index`,
+      query: {
+        type: 'add'
+      }
+  })
 };
 
 /** 修改按钮操作 */
 const handleUpdate = (row?: LeaveVO) => {
   proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push(`/demo/leaveEdit/index/${row.id}/update`);;
+  proxy.$router.push({
+      path: `/demo/leaveEdit/index`,
+      query: {
+        id: row.id,
+        type: 'update'
+      }
+  })
 };
 
 /** 查看按钮操作 */
 const handleView = (row?: LeaveVO) => {
   proxy.$tab.closePage(proxy.$route);
-  proxy.$router.push(`/demo/leaveEdit/index/${row.id}/view`);
+  proxy.$router.push({
+      path: `/demo/leaveEdit/index`,
+      query: {
+        id: row.id,
+        type: 'view'
+      }
+  })
 };
 
 /** 删除按钮操作 */
diff --git a/src/views/workflow/leave/leaveEdit.vue b/src/views/workflow/leave/leaveEdit.vue
index 6569e93..58934a4 100644
--- a/src/views/workflow/leave/leaveEdit.vue
+++ b/src/views/workflow/leave/leaveEdit.vue
@@ -1,25 +1,23 @@
 <template>
   <div class="p-2">
-    <el-affix target=".p-2" :offset="80">
-      <el-card shadow="never">
-          <div style="display: flex;justify-content: space-between;">
-            <div>
-              <el-button :loading="buttonLoading" 
-              v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && form.processInstanceVo.businessStatus && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
-              type="info" @click="submitForm('draft')">暂存</el-button>
-              <el-button :loading="buttonLoading" v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
-              type="primary" @click="submitForm('submit')">提 交</el-button>
-              <el-button :loading="buttonLoading" v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
-              type="primary" @click="approvalVerifyOpen">审批</el-button>
-              <el-button @click="handleApprovalRecord" type="primary" v-if="processInstanceId">流程进度</el-button>
-            </div>
-            <div>
-              <el-button style="float: right" @click="goBack()">返回</el-button>
-            </div>
-          </div>
-      </el-card>
-    </el-affix>
     <el-card shadow="never">
+        <div style="display: flex;justify-content: space-between;">
+          <div>
+            <el-button :loading="buttonLoading" 
+            v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && form.processInstanceVo.businessStatus && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
+            type="info" @click="submitForm('draft')">暂存</el-button>
+            <el-button :loading="buttonLoading" v-if="routeParams.type === 'add' || (routeParams.type === 'update' && form.processInstanceVo && (form.processInstanceVo.businessStatus === 'draft' || form.processInstanceVo.businessStatus === 'cancel' || form.processInstanceVo.businessStatus === 'back'))"
+            type="primary" @click="submitForm('submit')">提 交</el-button>
+            <el-button :loading="buttonLoading" v-if="routeParams.type === 'approval' && form.processInstanceVo && form.processInstanceVo.businessStatus === 'waiting'"
+            type="primary" @click="approvalVerifyOpen">审批</el-button>
+            <el-button @click="handleApprovalRecord" type="primary" v-if="processInstanceId">流程进度</el-button>
+          </div>
+          <div>
+            <el-button style="float: right" @click="goBack()">返回</el-button>
+          </div>
+        </div>
+    </el-card>
+    <el-card shadow="never" style="height: 78vh;overflow-y: auto;">
       <el-form ref="leaveFormRef" :disabled="routeParams.type ==='view'" v-loading="loading" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="请假类型" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择请假类型" style="width: 100%">
@@ -225,12 +223,13 @@ const goBack = () => {
 }
 //审批
 const approvalVerifyOpen = async () => {
-  submitVerifyRef.value.openDialog(proxy.$route.query.taskId);
+  submitVerifyRef.value.openDialog(routeParams.value.taskId);
 };
 onMounted(() => {
   nextTick(async () => {
-      routeParams.value = proxy?.$route.params
+      routeParams.value = proxy.$route.query
       reset();
+      loading.value = false
       if (routeParams.value.type === 'update' || routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
         getInfo()
       }
diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue
index 8a4ba4a..88746c7 100644
--- a/src/views/workflow/processInstance/index.vue
+++ b/src/views/workflow/processInstance/index.vue
@@ -350,7 +350,11 @@ const handleView = (row) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+      path: `${row.wfFormDefinitionVo.path}`,
+      query: {
+        id: row.businessKey,
+        type: 'view'
+      }
     })
   }else{
     proxy?.$modal.msgError('请到流程定义菜单配置路由！');
diff --git a/src/views/workflow/task/allTaskWaiting.vue b/src/views/workflow/task/allTaskWaiting.vue
index 009c797..eee6263 100644
--- a/src/views/workflow/task/allTaskWaiting.vue
+++ b/src/views/workflow/task/allTaskWaiting.vue
@@ -263,7 +263,11 @@ const handleView = (row) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+      path: `${row.wfFormDefinitionVo.path}`,
+      query: {
+        id: row.businessKey,
+        type: 'view'
+      }
     })
   }else{
     proxy?.$modal.msgError('请到流程定义菜单配置路由！');
diff --git a/src/views/workflow/task/myDocument.vue b/src/views/workflow/task/myDocument.vue
index 4a4300b..9328934 100644
--- a/src/views/workflow/task/myDocument.vue
+++ b/src/views/workflow/task/myDocument.vue
@@ -253,7 +253,11 @@ const handleOpen = async (row,type) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/${type}`
+      path: `${row.wfFormDefinitionVo.path}`,
+      query: {
+        id: row.businessKey,
+        type: type
+      }
     })
   }else{
     proxy?.$modal.msgError('请到流程定义菜单配置路由！');
diff --git a/src/views/workflow/task/taskCopyList.vue b/src/views/workflow/task/taskCopyList.vue
index 0902294..54e8f1e 100644
--- a/src/views/workflow/task/taskCopyList.vue
+++ b/src/views/workflow/task/taskCopyList.vue
@@ -130,7 +130,11 @@ const handleView = (row) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+      path: `${row.wfFormDefinitionVo.path}`,
+      query: {
+        id: row.businessKey,
+        type: 'view'
+      }
     })
   }else{
     proxy?.$modal.msgError('请到流程定义菜单配置路由！');
diff --git a/src/views/workflow/task/taskFinish.vue b/src/views/workflow/task/taskFinish.vue
index 8be09d1..a1315b2 100644
--- a/src/views/workflow/task/taskFinish.vue
+++ b/src/views/workflow/task/taskFinish.vue
@@ -117,7 +117,11 @@ const handleView = (row) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/view`
+      path: `${row.wfFormDefinitionVo.path}`,
+      query: {
+        id: row.businessKey,
+        type: 'view'
+      }
     })
   }else{
     proxy?.$modal.msgError('请到流程定义菜单配置路由！');
diff --git a/src/views/workflow/task/taskWaiting.vue b/src/views/workflow/task/taskWaiting.vue
index 8ef3c03..99a1a64 100644
--- a/src/views/workflow/task/taskWaiting.vue
+++ b/src/views/workflow/task/taskWaiting.vue
@@ -138,8 +138,10 @@ const handleOpen = async (row: TaskVO) => {
   if(row.wfFormDefinitionVo){
     proxy.$tab.closePage(proxy.$route);
     proxy.$router.push({
-      path: `${row.wfFormDefinitionVo.path}/${row.businessKey}/approval`,
+      path: `${row.wfFormDefinitionVo.path}`,
       query: {
+        id: row.businessKey,
+        type: 'approval',
         taskId: row.id
       }
     })