From fea8f7893b2b811b87ab24bf63ac221b188d489b Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Mon, 24 Apr 2023 11:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E7=94=B3=E8=AF=B7=E6=B5=81=E7=A8=8B=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/modules/process.js                    |  2 +-
 src/views/permissionApplication/examine.vue   |  7 ++-
 .../processCenter/finishProcess.vue           | 11 +++--
 .../userCenter/processCenter/gencyProcess.vue | 43 ++++++++++++++-----
 .../processCenter/monitorProcesses.vue        | 18 ++++++--
 .../userCenter/processCenter/sentProcess.vue  | 15 ++++++-
 6 files changed, 74 insertions(+), 22 deletions(-)

diff --git a/src/api/modules/process.js b/src/api/modules/process.js
index c43a2fa..ca0a8f7 100644
--- a/src/api/modules/process.js
+++ b/src/api/modules/process.js
@@ -12,7 +12,7 @@ export default {
   // 获取审批历史
   getHistory (data) {
     return request({
-      url: '/api/lawss/activiti/get_list_by_instance',
+      url: '/api/get_list_by_instance',
       method: 'get',
       params: data
     })
diff --git a/src/views/permissionApplication/examine.vue b/src/views/permissionApplication/examine.vue
index 4454e2d..cd02f1b 100644
--- a/src/views/permissionApplication/examine.vue
+++ b/src/views/permissionApplication/examine.vue
@@ -193,8 +193,11 @@ export default {
     },
     handleSubmit () {
       if (this.$refs.operationRef.submit()) {
-        // 通过了校验  需要整合参数
-        console.log('斤斤计较')
+        // 通过了校验  需要整合参数 拿到原来的dataJson 再把新添加的增进去 在拼成dataJson
+        let submit= JSON.parse(this.processOld.submitJson)
+        let dataJson= JSON.parse(this.processOld.dataJson)
+        let submitJson= {...data , ...this.$refs.operationRef.examineForm}
+        this.completeProcess(dataJson,submitJson)
       }
     }
   }
diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue
index 37c14ed..9a6172a 100644
--- a/src/views/userCenter/processCenter/finishProcess.vue
+++ b/src/views/userCenter/processCenter/finishProcess.vue
@@ -7,11 +7,16 @@
               {{ rowIndex + (q.current - 1) * q.size + 1 }}
             </template>
           </vxe-column>
-          <vxe-column show-overflow show-header-overflow field="prcNum"
-                      title="流程编号"></vxe-column>
+          <vxe-column show-overflow show-header-overflow field="prcType"
+                      title="流程类型">
+              <template #default="{ row,index }">
+                <div>{{getPrcName(row.prcType)}}</div>
+              </template>
+          </vxe-column>
+
           <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
             <template #default="{ row,index }">
-              <div>{{getPrcName(row.prcName)}}</div>
+              <div>{{row.prcName}}</div>
             </template>
           </vxe-column>
           <vxe-column show-overflow show-header-overflow field="creatUser"
diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue
index 8716bc1..f24a202 100644
--- a/src/views/userCenter/processCenter/gencyProcess.vue
+++ b/src/views/userCenter/processCenter/gencyProcess.vue
@@ -8,10 +8,20 @@
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcNum"
-                    title="流程编号"></vxe-column>
-        <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+                    title="流程编号">
+          <template #default="{ row,index }" >
+            <div @click.native.prevent="handle(row)">{{row.prcNum}}</div>
+          </template>
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="prcType"
+                    title="流程类型">
           <template #default="{ row,index }">
-            <div>{{getPrcName(row.prcName)}}</div>
+            <div>{{getPrcName(row.prcType)}}</div>
+          </template>
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+          <template #default="{ row,index }" >
+            <div @click.native.prevent="handle(row)">{{row.prcName}}</div>
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatUserName"
@@ -19,7 +29,7 @@
         <vxe-column show-overflow show-header-overflow field="creatTime" title="创建时间"></vxe-column>
         <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
           <template #default="{ row }">
-            <el-button @click.native.prevent="handle(scope.$index, tableData)" type="text" size="small">
+            <el-button @click.native.prevent="handle(row)" type="text" size="small">
               办理
             </el-button>
           </template>
@@ -85,13 +95,26 @@ export default {
       this.q.current = val;
       this.loadData();
     },
-    handle(type) {
-        switch (type) {
+    handle(row) {
+        switch (row.prcType) {
           case '1' :
-            this.$router.push({
-              path:'',
-              query:''
-            })
+            if (row.taskDefinitionKey == 'aid3') {
+              this.$router.push({
+                path: '/permission/launch',
+                query: {
+                  id: 'AEHJB8YNJ3',
+                  taskIds:row.taskIds
+                }
+              })
+            }else{
+              this.$router.push({
+                path: '/permission/examine',
+                query: {
+                  id: 'AEHJB8YNJ3',
+                  taskIds:row.taskIds
+                }
+              })
+            }
         }
     },
   },
diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue
index 7095465..80bc601 100644
--- a/src/views/userCenter/processCenter/monitorProcesses.vue
+++ b/src/views/userCenter/processCenter/monitorProcesses.vue
@@ -8,10 +8,20 @@
             </template>
           </vxe-column>
           <vxe-column show-overflow show-header-overflow field="prcNum"
-                      title="流程编号"></vxe-column>
-          <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+                      title="流程编号">
+            <template #default="{ row,index }" @click.native.prevent="view(row)">
+              <div>{{row.prcNum}}</div>
+            </template>
+          </vxe-column>
+          <vxe-column show-overflow show-header-overflow field="prcType"
+                      title="流程类型">
             <template #default="{ row,index }">
-              <div>{{getPrcName(row.prcName)}}</div>
+              <div>{{getPrcName(row.prcType)}}</div>
+            </template>
+          </vxe-column>
+          <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
+            <template #default="{ row,index }" @click.native.prevent="view(row)">
+              <div>{{row.prcName}}</div>
             </template>
           </vxe-column>
           <vxe-column show-overflow show-header-overflow field="labelOneName"
@@ -25,7 +35,7 @@
           <vxe-column show-overflow show-header-overflow field="status" title="状态"></vxe-column>
           <vxe-column show-overflow show-header-overflow title="操作" width="200" fixed="right">
             <template #default="{ row }">
-              <el-button @click.native.prevent="view(row, tableData)" type="text" size="small">
+              <el-button @click.native.prevent="view(row)" type="text" size="small">
                 查看
               </el-button>
             </template>
diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue
index dce3d5f..cb56b3f 100644
--- a/src/views/userCenter/processCenter/sentProcess.vue
+++ b/src/views/userCenter/processCenter/sentProcess.vue
@@ -9,10 +9,21 @@
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="prcNum"
-                    title="流程编号"></vxe-column>
+                    title="流程编号">
+          <template #default="{ row,index }">
+            <div @click="view(row)">{{row.prcNum}}</div>
+          </template>
+        </vxe-column>
+        <vxe-column show-overflow show-header-overflow field="prcType"
+                    title="流程类型">
+          <template #default="{ row,index }">
+            <div>{{getPrcName(row.prcType)}}</div>
+          </template>
+        </vxe-column>
+
         <vxe-column show-overflow show-header-overflow field="prcName" title="流程名称">
           <template #default="{ row,index }">
-            <div @click="viewDetails(row)">{{getPrcName(row.prcName)}}</div>
+            <div @click="view(row)">{{row.prcName}}</div>
           </template>
         </vxe-column>
         <vxe-column show-overflow show-header-overflow field="creatUserName"