From 1dafc95dd46b7aece87d98b08b593af9f371eb2e Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 5 Feb 2024 14:25:36 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9bug81785=E5=92=8C8?=
 =?UTF-8?q?1768?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/ContactEnterSendTaskModal.vue        |  5 +++--
 .../modules/OnlyTableForm.vue                    | 16 +++++++++-------
 .../modules/BaseInfoTableModal.vue               |  5 +++--
 .../modules/EngineerInitBaseInfo.vue             |  2 ++
 .../modules/TableBaseInfo.vue                    |  1 +
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
index 536da889..67e82cd6 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/ContactEnterSendTaskModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="$t('standardSelect.standardSelection')"
+    :title="title"
     :maskClosable="false"
     :width="1000"
     placement="right"
@@ -557,6 +557,7 @@ export default {
       visible: false,
       confirmLoading: false,
       disabled: false,
+      title: '',
       model: {},
       formInline: {},
       rules: {
@@ -841,7 +842,7 @@ export default {
       const formInline = {}
       // 初始化主起草人信息
       formInline.mainDraftingUser = userInfo.id
-      formInline.mainDraftingUser_dictText = userInfo.realname
+      formInline.mainDraftingUser_dictText = userInfo.realname + '(' + userInfo.username + ')'
       // 初始化主起草单位信息,需要翻译当前登录用户的部门，因为表格回显
       formInline.mainDraftingUnit = userInfo.departIds
       formInline.mainDraftingUnit_dictText = userInfo.departIds_dictText
diff --git a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
index 79ffc734..468048b0 100644
--- a/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
+++ b/src/views/workCenter/annualRevisionPlanActivelyReport/modules/OnlyTableForm.vue
@@ -222,13 +222,13 @@ export default {
           dataIndex: 'cooperationUnit_dictText',
           scopedSlots: { customRender: 'text' }
         },
-        // { // 主起草人
-        //   title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'),
-        //   align: 'center',
-        //   width: 180,
-        //   dataIndex: 'mainDraftingUser_dictText',
-        //   scopedSlots: { customRender: 'text' }
-        // },
+        { // 主起草人
+          title: this.$t('enterpriseStandardLibrary.plan.principalDrafter'),
+          align: 'center',
+          width: 180,
+          dataIndex: 'mainDraftingUser_dictText',
+          scopedSlots: { customRender: 'text' }
+        },
         { // 主起草单位
           title: this.$t('enterpriseStandardLibrary.plan.mainDraftingUnit'),
           align: 'center',
@@ -375,6 +375,7 @@ export default {
     handleAdd () {
       this.modalType = 'add'
       this.$refs.contactEnterSendTaskModal.add()
+      this.$refs.contactEnterSendTaskModal.title = this.$t('newlyAdded')
     },
     // 导入
     handleImportExcel (info) {
@@ -467,6 +468,7 @@ export default {
     handleEdit (record) {
       this.modalType = 'edit' + ',' + record.uid
       this.$refs.contactEnterSendTaskModal.edit(record)
+      this.$refs.contactEnterSendTaskModal.title = this.$t('edit')
     },
     // 查看
     handleLook (record) {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
index 8a6b43e4..a14e0cb1 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/BaseInfoTableModal.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="$t('standardSelect.standardSelection')"
+    :title="title"
     :maskClosable="false"
     :width="1000"
     placement="right"
@@ -560,6 +560,7 @@ export default {
       standardSystemOptions: [], // 企标体系下拉框数据
       visible: false,
       confirmLoading: false,
+      title: '',
       disabled: false,
       draftPlanFinishDateDisabled: false, // 草稿计划完成日期是否不可修改
       exposureDraftPlanFinishDateDisabled: false, // 征求意见稿计划完成日期是否不可修改
@@ -857,7 +858,7 @@ export default {
       const formInline = {}
       // 初始化主起草人信息
       formInline.mainDraftingUser = userInfo.id
-      formInline.mainDraftingUser_dictText = userInfo.realname
+      formInline.mainDraftingUser_dictText = userInfo.realname + '(' + userInfo.username + ')'
       // 初始化主起草单位信息
       formInline.mainDraftingUnit = userInfo.departIds
       // 初始化起草单位负责人 todo： 看怎么获取当前登录人的上级
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
index 912964fa..f2af0056 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
@@ -390,6 +390,7 @@ export default {
     handleAdd () {
       this.modalType = 'add'
       this.$refs.baseInfoTableModal.add()
+      this.$refs.baseInfoTableModal.title = this.$t('newlyAdded')
     },
     // 导入
     handleImportExcel (info) {
@@ -482,6 +483,7 @@ export default {
     handleEdit (record) {
       this.modalType = 'edit' + ',' + record.uid
       this.$refs.baseInfoTableModal.edit(record)
+      this.$refs.baseInfoTableModal.title = this.$t('edit')
     },
     // 查看
     handleLook (record) {
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
index 98a89fc4..13cf2e3f 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/TableBaseInfo.vue
@@ -297,6 +297,7 @@ export default {
     handleEdit (record, index) {
       this.editId = record.id
       this.$refs.baseInfoTableModal.edit(record)
+      this.$refs.baseInfoTableModal.title = this.$t('edit')
     },
     // 删除
     handleDelete (id, index) {