From 8861a496e8c566d87c0b4d36a05dec36e38d1ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Tue, 28 Nov 2023 14:50:39 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E3=80=81=E5=B1=95=E5=BC=80=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BCupload=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JExpandTable.vue                          | 2 ++
 .../StandardConsultationProcess.vue                      | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/JExpandTable.vue b/src/components/JExpandTable.vue
index d8e0db3f..6e95a6ba 100644
--- a/src/components/JExpandTable.vue
+++ b/src/components/JExpandTable.vue
@@ -37,6 +37,7 @@
                 </template>
                 <template v-else-if="form.fieldShowType === 2">
                   <j-upload
+                    return-id
                     v-model="record[form.dbFieldName]"
                     :disabled="allDisabled || form.isDisabled || false"
                     :file-type="form.fileType || canUploadType">
@@ -76,6 +77,7 @@
             </template>
             <template v-else-if="form.fieldShowType === 2">
               <j-upload
+                return-id
                 v-model="record[form.dbFieldName]"
                 :disabled="allDisabled || form.isDisabled || false"
                 :file-type="form.fileType || canUploadType">
diff --git a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
index f50c7296..dbe3ee9c 100644
--- a/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
+++ b/src/views/workCenter/standardConsultationProcess/StandardConsultationProcess.vue
@@ -541,7 +541,7 @@ export default {
           title: this.$t('workCenter.standardConsultationProcess.designEngineer'),
           width: 180,
           align: 'center',
-          dataIndex: 'designEngineerId_dictText',
+          dataIndex: 'designEngineerName',
           scopedSlots: { customRender: 'text' }
         },
         { // 意见
@@ -703,7 +703,7 @@ export default {
           title: this.$t('workCenter.standardConsultationProcess.designEngineer'),
           width: 180,
           align: 'center',
-          dataIndex: 'designEngineerId_dictText',
+          dataIndex: 'designEngineerName',
           scopedSlots: { customRender: 'text' }
         },
         { // 意见
@@ -718,7 +718,8 @@ export default {
   },
   computed: {
     pageTitle () {
-      return `${this.$t('flowCenter')}${this.$route.meta.title}`
+      const subTitle = this.$route.query.taskName || ConsultationProcess.initiate.text
+      return `${this.$t('flowCenter')}${this.$route.meta.title}（${subTitle}）`
     },
     // 是否展示业务分派信息，各部所主管级领导分发、模块负责人分发显示
     showDispatchInformation () {
@@ -970,7 +971,7 @@ export default {
           dispatchInfo = Object.assign({}, this.dispatchInfo)
         }
         // 征求意见列表
-        if (this.showConsultationList && this.currentNode === ConsultationProcess.moduleOwnerSummary.value && !this.$refs.expandTable.submit()) {
+        if (this.showConsultationList && (this.currentNode.indexOf(ConsultationProcess.moduleOwnerSummary.value) !== -1 || this.currentNode.indexOf(ConsultationProcess.leaderSummary.value) !== -1) && !this.$refs.expandTable.submit()) {
           flag = false
         }
         // 用户信息