From 680b27d380017818e145d256e4e79d0030af30e6 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: Sat, 22 Jan 2022 17:51:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20--=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2xml=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=8A=A0=E8=BD=BD=E6=B5=81=E7=A8=8B=E5=9B=BE=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/workflow/task/process/index.vue   | 15 ++++++++-------
 .../src/views/workflow/task/record/index.vue    | 17 ++++++++---------
 ruoyi-ui/src/views/workflow/task/todo/index.vue |  9 ++++++---
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/ruoyi-ui/src/views/workflow/task/process/index.vue b/ruoyi-ui/src/views/workflow/task/process/index.vue
index ccef4c3e..29e55f7b 100644
--- a/ruoyi-ui/src/views/workflow/task/process/index.vue
+++ b/ruoyi-ui/src/views/workflow/task/process/index.vue
@@ -117,13 +117,13 @@
     <!-- 发起流程 -->
     <el-dialog :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-table v-loading="processLoading" fit :data="definitionList" border >
-        <el-table-column label="流程名称" align="center" prop="name" />
+        <el-table-column label="流程名称" align="center" prop="processName" />
         <el-table-column label="流程版本" align="center">
           <template slot-scope="scope">
             <el-tag size="medium" >v{{ scope.row.version }}</el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="流程分类" align="center" prop="category" />
+        <el-table-column label="流程分类" align="center" prop="categoryCode" />
         <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
           <template slot-scope="scope">
             <el-button
@@ -265,19 +265,20 @@ export default {
     },
     listDefinition(){
       listDefinition(this.queryParams).then(response => {
-        this.definitionList = response.data.records;
-        this.processTotal = response.data.total;
+        this.definitionList = response.rows;
+        this.processTotal = response.total;
         this.processLoading = false;
       });
     },
     /**  发起流程申请 */
     handleStartProcess(row){
-      this.$router.push({ path: '/task/record/index',
+      this.$router.push({
+        path: '/task/record/index',
         query: {
+          definitionId: row.definitionId,
           deployId: row.deploymentId,
-          procDefId:row.id,
           finished: true
-          }
+        }
       })
     },
     /**  取消流程申请 */
diff --git a/ruoyi-ui/src/views/workflow/task/record/index.vue b/ruoyi-ui/src/views/workflow/task/record/index.vue
index cc1e69ce..98fff4bb 100644
--- a/ruoyi-ui/src/views/workflow/task/record/index.vue
+++ b/ruoyi-ui/src/views/workflow/task/record/index.vue
@@ -227,7 +227,7 @@ export default {
         instanceId: "", // 流程实例编号
         deployId: "",  // 流程定义编号
         taskId: "" ,// 流程任务编号
-        procDefId: "",  // 流程编号
+        definitionId: "",  // 流程编号
         vars: "",
         targetKey:""
       },
@@ -251,14 +251,13 @@ export default {
   },
   created() {
     this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
+    this.taskForm.definitionId = this.$route.query && this.$route.query.definitionId;
     this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
     this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
     this.taskForm.instanceId = this.$route.query && this.$route.query.procInsId;
-    // 初始化表单
-    this.taskForm.procDefId  = this.$route.query && this.$route.query.procDefId;
     // 回显流程记录
     this.getFlowViewer(this.taskForm.procInsId);
-    this.getModelDetail(this.taskForm.deployId);
+    this.getModelDetail(this.taskForm.definitionId);
     // 流程任务重获取变量表单
     if (this.taskForm.taskId){
       this.processVariables( this.taskForm.taskId)
@@ -307,11 +306,11 @@ export default {
       this.getList();
     },
     /** xml 文件 */
-    getModelDetail(deployId) {
+    getModelDetail(definitionId) {
       // 发送请求，获取xml
-      readXml(deployId).then(res => {
+      readXml(definitionId).then(res => {
         this.xmlData = res.data
-        this.loadIndex = deployId
+        this.loadIndex = definitionId
       })
     },
     getFlowViewer(procInsId) {
@@ -491,10 +490,10 @@ export default {
         const formData = data.formData;
         formData.disabled = true;
         formData.formBtns = false;
-        if (this.taskForm.procDefId) {
+        if (this.taskForm.definitionId) {
           variables.variables = formData;
            // 启动流程并将表单数据加入流程变量
-          definitionStart(this.taskForm.procDefId, JSON.stringify(variables)).then(res => {
+          definitionStart(this.taskForm.definitionId, JSON.stringify(variables)).then(res => {
             this.$modal.msgSuccess(res.msg);
             this.goBack();
           })
diff --git a/ruoyi-ui/src/views/workflow/task/todo/index.vue b/ruoyi-ui/src/views/workflow/task/todo/index.vue
index cee5dbd3..66a2f7af 100644
--- a/ruoyi-ui/src/views/workflow/task/todo/index.vue
+++ b/ruoyi-ui/src/views/workflow/task/todo/index.vue
@@ -141,14 +141,17 @@ export default {
       });
     },
     // 跳转到处理页面
-    handleProcess(row){
-      this.$router.push({ path: '/task/record/index',
+    handleProcess(row) {
+      this.$router.push({
+        path: '/task/record/index',
         query: {
+          definitionId: row.procDefId,
           procInsId: row.procInsId,
           deployId: row.deployId,
           taskId: row.taskId,
           finished: true
-        }})
+        }
+      })
     },
     // 取消按钮
     cancel() {