From f5193b82e0890b0023cd46af9bf14251c01bbdf9 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 21 Dec 2023 13:36:42 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PlanApprovalChangeFlow.vue                      |  8 ++++----
 .../EnterpriseStandardRecheckFlow.vue               | 13 ++++---------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 9999d8eb..8cd31bde 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -538,9 +538,9 @@ export default {
           }
           // 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
           const baseInfoForm = {}
-          baseInfoForm.applicationCategory = this.model.dataList[0].applicationCategory
+          baseInfoForm.applicationCategory = this.model.dataList[0] ? this.model.dataList[0].applicationCategory : undefined
           this.formInline = Object.assign({}, baseInfoForm)
-          baseInfoForm.projectType = this.model.dataList[0].projectType
+          baseInfoForm.projectType = this.model.dataList[0] ? this.model.dataList[0].projectType : undefined
           this.formInline = Object.assign({}, baseInfoForm)
           // 初始化人员信息
           if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
@@ -566,7 +566,7 @@ export default {
           }
           // 如果是草稿节点1的保存回显人员信息
           if (type === 'draft' && this.currentNode === 1) {
-            this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
+            this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
           }
           // 初始化业务基本信息中组件内容
           if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value) {
@@ -756,7 +756,7 @@ export default {
         arr: arr.map(item => {
           return { ...item, ...this.userFormModel }
         }),
-        ...personnelObj
+        personnelObj: personnelObj
       })
       // param.common = { ...processInfoForm, ...approvalInfoForm } // 流程信息和流程审批信息
       // param.common.taskId = this.$route.query.taskId || null
diff --git a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
index c9986e68..6fb42f94 100644
--- a/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
+++ b/src/views/workCenter/enterpriseStandardRecheck/EnterpriseStandardRecheckFlow.vue
@@ -309,10 +309,10 @@ export default {
               prcObj.commitText = this.model.handleText
               prcObj.commitFile = this.model.handleFile
               this.approvalInfoForm.setFieldsValue(pick(prcObj, 'commitText', 'commitFile'))
-              this.model.data = JSON.parse(this.model.infoJsonStr)
+              this.model.data = JSON.parse(this.model.infoJsonStr).baseInfo
               // 如果是节点1的保存回显人员信息
               if (this.currentNode === 1 || this.currentNode === 2) {
-                this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr))
+                this.draftInitPersonInfo(JSON.parse(this.model.infoJsonStr).personnelObj)
               }
             }
             // 初始化业务基本信息中组件内容
@@ -329,11 +329,6 @@ export default {
               // this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')'
             }
           })
-          // enStandardRecheckIsShowFirstPerson({ id: this.model.data.id }).then(res => {
-          //   if (res.success && !res.result) {
-          //
-          //   }
-          // })
         } else {
           this.$message.warning(res.message)
         }
@@ -385,8 +380,8 @@ export default {
       paramObj.basicTaskInfoDTO.taskId = this.$route.query.taskId
       // 业务基本信息和人员信息
       paramObj.infoJsonStr = JSON.stringify({
-        ...personnelObj,
-        ...baseInfo.formInline
+        personnelObj: personnelObj,
+        baseInfo: baseInfo.formInline
       })
       // paramObj.common = { ...processInfoForm, ...approvalInfoForm }
       // paramObj.common.taskId = this.$route.query.taskId || null