From dc216ea35a0ae0ed73ddcb3107cdf6025d8fdcb9 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 15 Dec 2023 17:28:56 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/commonEnums.js                            |  4 ++--
 .../RevisionPlanStandardizationInitFlow.vue         |  1 +
 .../modules/LeaderApproveSentBaseInfo.vue           | 13 +++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index a85a70ad..7ecec49f 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -441,11 +441,11 @@ export const EsRevisionPlanStandardizationInitNodes = new EsEnums({
   standardizationStart: { text: '标准化工程师发起', value: 'sid-880237E7-1735-49AE-B9EC-D7DA5D28E17D' },
   contactSelectApprover: { text: '部所联络人选取审批人', value: 'sid-C3F65D96-76B0-4901-8C8A-D6B390099381' },
   standardizationUpdate: { text: '标准化工程师修改调整', value: 'sid-3CB0E6B1-9918-4A21-9C62-9344FF1B7269' },
-  mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' },
+  mainDrafterLeaderSend: { text: '主起草单位主管级领导审批下发', value: 'sid-050827D6-AA12-4561-8B37-4D2023AF6D7F' },
   contactUpdate: { text: '部所联络人修改调整', value: 'sid-3AF454B3-1D93-4BF6-B925-98F1A7E125B8' },
   mainDrafterEnterInfo: { text: '主起草人填写信息', value: 'sid-E2015AB3-9C52-4E49-A261-DA11CB4BAA7E' },
   contactsApproval: { text: '部所联络人汇总', value: 'sid-158523C5-7D8F-4433-B2DB-8A6C09DFDB1B' },
-  mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-050827D6-AA12-4561-8B37-4D2023AF6D7F' },
+  mainDrafterLeaderApproval: { text: '主起草单位主管级领导批准', value: 'sid-57656F2E-0AE1-45D8-85D0-CE3E37D9E926' },
   standardizationSumUp: { text: '标准化归档', value: 'sid-86610E08-1DDB-467A-A32E-C661FE889A57' }
 })
 
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
index 10defa7b..f5501bb4 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/RevisionPlanStandardizationInitFlow.vue
@@ -209,6 +209,7 @@ export default {
         this.currentNode = 999
       }
     }
+    console.log(this.currentNode)
     // 获取人员信息结构
     this.getPersonInfoStructure(ProcessKey.ES_ANNUAL_INIT.value, () => {
       if (this.$route.query.processInstanceId) {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
index 651e7d48..c341d13e 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
@@ -50,10 +50,11 @@
 import JTable from '@/components/jero/JTable'
 // 选人弹框
 import UserSelectModal from '@/components/selection/UserSelectModal'
+import UserSelection from '@/components/selection/UserSelection'
 
 export default {
   name: 'LeaderApproveSentBaseInfo',
-  components: { JTable, UserSelectModal },
+  components: { JTable, UserSelectModal, UserSelection },
   props: {
     disabled: {
       type: Boolean,
@@ -193,8 +194,8 @@ export default {
           width: 300,
           dataIndex: 'drafter',
           customRender: (value, row, index) => {
-            return <user-select-by-contact v-model={this.dataSource[index].drafter}
-              nameStr={this.dataSource[index].drafter_dictText}
+            return <user-selection v-model={this.dataSource[index].prcMainDraftUser}
+              nameStr={this.dataSource[index].prcMainDraftUser_dictText}
               disabled={this.disabled} type={'radio'} placeholder={this.$t('pleaseSelect')} />
           }
         }
@@ -212,7 +213,7 @@ export default {
     // 拿到外面传进来的数据初始化，因为套了几层就不在外层初始化数据了
     initData (data) {
       // 给表格赋值
-      this.dataSource = data.dataList
+      this.dataSource = data
     },
     // 外层要获取数据
     getData () {
@@ -276,8 +277,8 @@ export default {
     // 批量设置主起草人选择人后的回调
     userSelectModalChange (value) {
       for (const item of this.selectedRowKeys) {
-        this.dataSource[item].draft = value
-        this.dataSource[item].draft_dictText = this.selectNames
+        this.dataSource[item].prcMainDraftUser = value
+        this.dataSource[item].prcMainDraftUser_dictText = this.selectNames
       }
       this.dataSource = JSON.parse(JSON.stringify(this.dataSource))
     },