From 39c01388b068dcab5b310ec8cc5d2969ce06f8a6 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Fri, 27 Oct 2023 18:25:46 +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=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                | 26 +++++++------------
 .../modules/FinishTimeChangeBaseInfo.vue      |  4 +--
 .../processCenter/table/TodoList.vue          |  2 +-
 3 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
index c1ff1cd6..65683080 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/PlanApprovalChangeFlow.vue
@@ -330,6 +330,8 @@ const changePersonalInfo = [
     id: 1,
     nodeName: '主起草人发起',
     nodeRoleName: '发起人',
+    userList: Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')',
+    fieldName: 'createUser',
     canChoose: false
   },
   {
@@ -443,12 +445,6 @@ export default {
     //   }
     // }
   },
-  // watch: {
-  //   // 也只有节点1才会改变，应该在初始化数据的时候不触发才对？？
-  //   'formInline.applicationCategory' (value) {
-  //
-  //   }
-  // },
   mounted () {
     console.log(this.$route.query.taskId)
     if (this.$route.query.taskId) {
@@ -559,14 +555,6 @@ export default {
             // 初始化流程审批信息，todo：需要判断是不是草稿进来的，草稿进来的才回显审批信息
             // this.approvalInfoForm.setFieldsValue(pick(this.model[0], 'commitText', 'commitFile'))
           })
-          // 初始化业务基本信息的申请类型和项目类别
-          const baseInfoForm = {}
-          baseInfoForm.applicationCategory = this.model.dataList[0].applicationCategory
-          this.formInline = Object.assign({}, baseInfoForm)
-          this.$nextTick(() => {
-            baseInfoForm.projectType = this.model.dataList[0].projectType
-            this.formInline = Object.assign({}, baseInfoForm)
-          })
           // 初始化流程节点，此流程因为节点名称有重复，需要在此处根据applicationCatsegory做一些判断
           const taskName = this.$route.query.taskName
           if (taskName) {
@@ -596,7 +584,13 @@ export default {
           } else {
             this.disabled = true
           }
-          // 初始化人员信息 todo: 发起人还没处理
+          // 初始化业务基本信息的申请类型和项目类别,分开赋值是因为项目类别会没有下拉数据无法回显
+          const baseInfoForm = {}
+          baseInfoForm.applicationCategory = this.model.dataList[0].applicationCategory
+          this.formInline = Object.assign({}, baseInfoForm)
+          baseInfoForm.projectType = this.model.dataList[0].projectType
+          this.formInline = Object.assign({}, baseInfoForm)
+          // 初始化人员信息
           if (this.formInline.applicationCategory === ApplicationCategory.INITIATION.value && this.currentNode === 1) {
             // 立项的节点1
             this.personnelInfoData = approvalPersonalInfo.map(item => {
@@ -662,7 +656,7 @@ export default {
               this.formInline.projectType === ProjectType.WORK_TERMINATE.value)) {
             // 是完成时间变更或工作终止的变更
             this.$nextTick(() => {
-              this.$refs.changeBaseInfo.dataSource = this.model.dataList
+              this.$refs.changeBaseInfo.dataSource = JSON.parse(JSON.stringify(this.model.dataList))
             })
           } else if (this.formInline.applicationCategory === ApplicationCategory.CHANGE.value &&
             (this.formInline.projectType === ProjectType.RESPONSIBLE_DEPT_CHANGE.value ||
diff --git a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
index cae08608..7f4b4af8 100644
--- a/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardInitChange/modules/FinishTimeChangeBaseInfo.vue
@@ -17,7 +17,7 @@
         :can-drag="true"
         :scroll="{x: '100%'}"
         ref="table"
-        rowKey="enterpriseStandardPlanId"
+        rowKey="espId"
         :columns="columns"
         :dataSource="dataSource"
         :pagination="false"
@@ -211,7 +211,7 @@ export default {
     },
     // 批量删除
     batchDel () {
-      this.dataSource = this.dataSource.filter(item => !this.selectedRowKeys.includes(item.enterpriseStandardPlanId))
+      this.dataSource = this.dataSource.filter(item => !this.selectedRowKeys.includes(item.espId))
     }
   }
 }
diff --git a/src/views/workCenter/processCenter/table/TodoList.vue b/src/views/workCenter/processCenter/table/TodoList.vue
index 0c148d67..c96c8e8c 100644
--- a/src/views/workCenter/processCenter/table/TodoList.vue
+++ b/src/views/workCenter/processCenter/table/TodoList.vue
@@ -109,7 +109,7 @@ export default {
           title: this.$t('workCenter.processCenter.initiator'),
           align: 'center',
           width: 180,
-          dataIndex: 'createUserName',
+          dataIndex: 'createUserId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 接收任务时间