From 2bb6e58dc7d658246d91cfaaa422a902d04fc2e2 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 27 Oct 2023 09:26:14 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E3=80=81=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlanApprovalChangeFlow.vue                | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 8fffff00..15220bb8 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -581,7 +581,7 @@ export default {
           this.model = res.result
           this.$nextTick(() => {
             // 初始化流程信息
-            this.processInfoForm.setFieldsValue(pick(this.model.commonVO, 'prcName', 'dueTime', 'prcMes'))
+            this.processInfoForm.setFieldsValue(pick(this.model.common, 'prcName', 'dueTime', 'prcMes'))
             // 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
             // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
           })
@@ -592,7 +592,7 @@ export default {
           if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
             this.personnelInfoData = approvalPersonalInfo.map(item => {
               if (item.fieldName) {
-                return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
+                return { ...item, user: this.model.flowUser [item.fieldName], userList: this.model.flowUser [item.fieldName + '_dictText'], canChoose: false }
               } else {
                 return item
               }
@@ -601,7 +601,7 @@ export default {
             this.personnelInfoData = changePersonalInfo.map(item => {
               console.log(item)
               if (item.fieldName) {
-                return { ...item, user: this.model.flowUserInfoVO[item.fieldName], userList: this.model.flowUserInfoVO[item.fieldName + '_dictText'], canChoose: false }
+                return { ...item, user: this.model.flowUser [item.fieldName], userList: this.model.flowUser [item.fieldName + '_dictText'], canChoose: false }
               } else {
                 return item
               }
@@ -747,9 +747,9 @@ export default {
       }
       this.loading = true
       const param = {} // 传给后端的参数
-      param.commonVO = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
+      param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
       param.dataList = arr // 业务基础信息数组
-      param.flowUserInfoVO = personnelObj // 人员信息
+      param.flowUser  = personnelObj // 人员信息
       // 保存到草稿
       enterprisePlanApprovalSave(param).then(res => {
         if (res.success) {
@@ -862,9 +862,9 @@ export default {
               return
             }
             const param = {} // 需要传给后端的数据
-            param.commonVO = { ...values, ...approvalValues } // 流程信息和流程审批信息
+            param.common = { ...values, ...approvalValues } // 流程信息和流程审批信息
             param.dataList = arr
-            param.flowUserInfoVO = personnelObj
+            param.flowUser  = personnelObj
             let func
             if (this.$route.query.taskId) {
               // 有taskId说明是驳回的提交
@@ -941,8 +941,8 @@ export default {
         if (!err) {
           this.loading = true
           const param = {}
-          param.commonVO = Object.assign({}, values)
-          param.commonVO.taskId = this.$route.query.taskId
+          param.common = Object.assign({}, values)
+          param.common.taskId = this.$route.query.taskId
           enterprisePlanApprovalAgree(param).then(res => {
             if (res.success) {
               this.$message.success(res.message)
@@ -967,8 +967,8 @@ export default {
           if (!err) {
             this.loading = true
             const param = {}
-            param.commonVO = Object.assign({}, values)
-            param.commonVO.taskId = this.$route.query.taskId
+            param.common = Object.assign({}, values)
+            param.common.taskId = this.$route.query.taskId
             enterprisePlanApprovalReject(param).then(res => {
               if (res.success) {
                 this.$message.success(res.message)