From b6a723b095b8c9cf21dff9b2932f181d1e50dcbf Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Thu, 9 Nov 2023 17:05:48 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E7=AB=8B=E9=A1=B9-=E5=8F=98=E6=9B=B4?=
 =?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                | 23 +++++++++++++++----
 .../modules/ApprovalBaseInfo.vue              | 11 ---------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index 23997bd7..da8eccf8 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -1,5 +1,5 @@
 <template>
-  <internal-detail-page :title="pageTitle" :content-padding="0">
+  <internal-detail-page :title="pageTitle" :content-padding="0" :loading="loading">
     <!--  标题右侧tab  -->
     <template v-slot:titleRightCustom>
       <div class="table-operator-tab">
@@ -260,7 +260,6 @@ import {
   enterprisePlanApprovalSave,
   enterprisePlanApproval,
   getProcessDataById,
-  getNodeList,
   getProcessNodeList
 } from '@/api/workCenter'
 import ApprovalBaseInfo from './modules/ApprovalBaseInfo'
@@ -466,10 +465,20 @@ export default {
      */
     resetPersonInfoStructure (type) {
       // 筛选出人员信息
+      const personnelData = this.$refs.personnelInfo.stepsData
       this.personnelInfoData = this.personnelInfoDataAll.filter(item => item.branchType.split(',').includes(type))
+      // 把原本有的人员再给回去
+      for (const item of this.personnelInfoData) {
+        const findObj = personnelData.find(data => data.id === item.id)
+        if (findObj) {
+          item.linkUserIds = findObj.linkUserIds
+          item.linkUserIds_dictText = findObj.linkUserIds_dictText
+        }
+      }
     },
     // 根据流程id获取数据并回显
     getProcessData (taskId) {
+      this.loading = true
       getProcessDataById(taskId).then(res => {
         if (res.success) {
           this.model = res.result
@@ -524,9 +533,11 @@ export default {
               this.currentNode = 999
             }
           }
-          if (this.currentNode !== 1) {
+          if (this.currentNode === 1) {
+            this.initPersonInfoData(true)
+          } else {
             // 不是第一个节点需要处理人员信息都不可选
-            this.initPersonInfoData()
+            this.initPersonInfoData(false)
           }
           console.log(this.currentNode)
           // 根据流程节点初始化是否可以编辑
@@ -569,6 +580,8 @@ export default {
         } else {
           this.$message.warning(res.message)
         }
+      }).finally(() => {
+        this.loading = false
       })
     },
     // 头部tab改变
@@ -597,7 +610,7 @@ export default {
           this.resetPersonInfoStructure('3')
         } else {
           // 是其他类型变更
-          this.resetPersonInfoStructure('3')
+          this.resetPersonInfoStructure('2')
         }
       }
     },
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
index 06b24aa5..56ab423e 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/ApprovalBaseInfo.vue
@@ -669,7 +669,6 @@ export default {
     return {
       StandardSource,
       ProjectType,
-      partNameOptions: [], // 零部件名称下拉框数据
       standardSystemOptions: [], // 标准体系下拉框数据
       formInline: {},
       isFormInline: true,
@@ -847,8 +846,6 @@ export default {
     }
   },
   created () {
-    // 获取零部件名称下拉框数据
-    this.initPartNameOptions()
     // 获取标准体系下拉框数据
     this.initStandardSystemOptions()
   },
@@ -912,14 +909,6 @@ export default {
         }
       }
     },
-    // 获取零部件名称下拉框数据
-    initPartNameOptions () {
-      getFormDictTreeList({ dictId: '1696821512600637441' }).then(res => {
-        if (res.success) {
-          this.partNameOptions = res.result
-        }
-      })
-    },
     // 获取标准体系下拉框数据
     initStandardSystemOptions () {
       getTreeList({ option: 1 }).then(res => {