diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js index c3d8eaa4012dd665da8623030b85a82650b35f1c..817ffbba7dccd0e770e2a5dc8367e4f7607dd411 100644 --- a/src/views/pages/process/task/processdetail/detailmixin.js +++ b/src/views/pages/process/task/processdetail/detailmixin.js @@ -802,10 +802,12 @@ export default { this.retreatId = item.id; }, validItemClick(selector, tabValue) { - if (tabValue === 'report') { - this.$refs.TaskCenterDetail.clickTabValue(tabValue); + if (tabValue != this.$refs.TaskCenterDetail.tabValue) { + this.$refs.TaskCenterDetail.tabValue = tabValue || 'report'; + if (tabValue === 'report') { + this.$refs.TaskCenterDetail.clickTabValue(tabValue); + } } - this.$refs.TaskCenterDetail.tabValue = tabValue; if (this.$el.querySelector(selector)) { // document.querySelector(selector).scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'start' }); document.querySelector(selector).scrollIntoView(); diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue index 41355411e53752f27be228a58d3da5c6e41aa1b0..c456afd7fbe50374f8beb47a83cb25a800996267 100644 --- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue +++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue @@ -929,7 +929,8 @@ export default { icon: 'tsfont-close-o', iconColor: '#FF625A', msg: this.$t('message.process.complete', { target: this.$t('page.form') }), - type: 'error' + type: 'error', + tabValue: 'report' }); } this.rightsettingVue = this.rightsettingVue || getParent(this); @@ -1306,12 +1307,17 @@ export default { } }, clickTabValue(name) { - if (name === 'report' && this.tabValue != 'report') { + if (name === 'report') { if (this.hasForm) { - //重现渲染表单组件,避免表单宽度为0 + //重现渲染表单组件(重新计算),避免表单宽度为0 this.isShowForm = false; this.$nextTick(() => { this.isShowForm = true; + this.$nextTick(async() => { + if (this.$refs.formSheet) { + await this.formValid(this.processTaskConfig); + } + }); }); } } @@ -1508,9 +1514,9 @@ function getParent(node) { }