From 1ecadb892403b58bfc3d942b57f50e9c90ff88ea Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Mon, 15 Apr 2024 15:32:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=9A=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=EF=BC=8Ctab=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/task/processdetail/detailmixin.js  |  8 +++++---
 .../processdetail/workorder/CenterDetail.vue   | 18 ++++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js
index c3d8eaa4..817ffbba 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 41355411..c456afd7 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) {
 }
 </style>
 <style lang="less" scoped>
-/deep/.ivu-tabs-bar {
-  margin-bottom: 0px !important;
-}
+// /deep/.ivu-tabs-bar {
+//   margin-bottom: 0px !important;
+// }
 /deep/ .subTask-label {
   font-size: 12px;
   margin-left: 4px;
-- 
Gitee