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 @@
@@ -76,6 +77,7 @@
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
}
// 用户信息