From 0dd7262daa23d64da25f8fbfb96b0ea5717c9f64 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 27 Feb 2025 18:01:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsCkeditor/TsCkeditor.vue               | 4 ----
 .../task/processdetail/workorder/change/change-dispatch.vue   | 1 -
 .../processdetail/workorder/change/changecreate-dispatch.vue  | 1 -
 .../process/task/processdispatch/dispatch-changecreate.vue    | 1 -
 .../process/task/processdispatch/dispatch-omnipotent.vue      | 1 -
 5 files changed, 8 deletions(-)

diff --git a/src/resources/plugins/TsCkeditor/TsCkeditor.vue b/src/resources/plugins/TsCkeditor/TsCkeditor.vue
index 2e7c5949..3b38d5bb 100644
--- a/src/resources/plugins/TsCkeditor/TsCkeditor.vue
+++ b/src/resources/plugins/TsCkeditor/TsCkeditor.vue
@@ -61,10 +61,6 @@ export default {
       type: Boolean,
       default: false
     },
-    editorDataS: {
-      type: String,
-      default: ''
-    }, //初始数据
     placeholder: {
       type: String,
       default() {
diff --git a/src/views/pages/process/task/processdetail/workorder/change/change-dispatch.vue b/src/views/pages/process/task/processdetail/workorder/change/change-dispatch.vue
index 240ce029..b47dca1b 100644
--- a/src/views/pages/process/task/processdetail/workorder/change/change-dispatch.vue
+++ b/src/views/pages/process/task/processdetail/workorder/change/change-dispatch.vue
@@ -84,7 +84,6 @@
           ref="taskContent"
           v-model="newTaskContent"
           :showIconToggle="true"
-          :editorDataS="defaultTaskContent"
           width="100%"
         ></TsCkeditor>
       </div>
diff --git a/src/views/pages/process/task/processdetail/workorder/change/changecreate-dispatch.vue b/src/views/pages/process/task/processdetail/workorder/change/changecreate-dispatch.vue
index caf0d7b3..da2bae1e 100644
--- a/src/views/pages/process/task/processdetail/workorder/change/changecreate-dispatch.vue
+++ b/src/views/pages/process/task/processdetail/workorder/change/changecreate-dispatch.vue
@@ -88,7 +88,6 @@
           <TsCkeditor
             ref="taskContent"
             v-model="newTaskContent"
-            :editorDataS="defaultTaskContent"
             width="100%"
             :showIconToggle="true"
           ></TsCkeditor>
diff --git a/src/views/pages/process/task/processdispatch/dispatch-changecreate.vue b/src/views/pages/process/task/processdispatch/dispatch-changecreate.vue
index b57b36b8..8a749715 100644
--- a/src/views/pages/process/task/processdispatch/dispatch-changecreate.vue
+++ b/src/views/pages/process/task/processdispatch/dispatch-changecreate.vue
@@ -116,7 +116,6 @@
         <TsCkeditor
           ref="TsCkeditor"
           v-model="changeReport.content"
-          :editorDataS="changeReport.content"
           :showIconToggle="true"
           width="100%"
           :placeholder="ckeditorPlaceholder"
diff --git a/src/views/pages/process/task/processdispatch/dispatch-omnipotent.vue b/src/views/pages/process/task/processdispatch/dispatch-omnipotent.vue
index 86e7417d..b46b5b7d 100644
--- a/src/views/pages/process/task/processdispatch/dispatch-omnipotent.vue
+++ b/src/views/pages/process/task/processdispatch/dispatch-omnipotent.vue
@@ -24,7 +24,6 @@
           ref="TsCkeditor"
           v-model="workData.content"
           :showIconToggle="true"
-          :editorDataS="workData.content"
           width="100%"
           class="editor"
           :placeholder="ckeditorPlaceholder"
-- 
Gitee


From 4a51448053c2a7e27b928e60804f6dfca7154aa4 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 27 Feb 2025 18:05:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsSheet/TsSheet.vue            |  2 +-
 .../task/processdetail/workorder/CenterDetail.vue    | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue
index 1bc5cdb3..0935d656 100644
--- a/src/resources/plugins/TsSheet/TsSheet.vue
+++ b/src/resources/plugins/TsSheet/TsSheet.vue
@@ -397,7 +397,7 @@
         </Dropdown>
       </div>
       <!-- 底部添加的隐藏组件 -->
-      <div class="form-footer mt-nm">
+      <div class="form-footer" :class="mode === 'edit'?'mt-nm':''">
         <span v-for="(item, index) in hideComponentList" :key="index">
           <Tag
             v-if="mode === 'edit'"
diff --git a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
index afbd512a..4fffda6f 100644
--- a/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
+++ b/src/views/pages/process/task/processdetail/workorder/CenterDetail.vue
@@ -1494,13 +1494,6 @@ export default {
         });
       }
     },
-    updateFormSheetCalc() {
-      if (this.$refs.formSheet) {
-        this.$nextTick(() => {
-          this.$refs.formSheet.calcContainerHeight && this.$refs.formSheet.calcContainerHeight();
-        });
-      }
-    },
     changeTabValue(val) {
       // 更新当前tabValue
       this.$nextTick(() => {
@@ -1517,7 +1510,10 @@ export default {
         }
         if (val === 'report') {
         //流转校验，更新表单布局
-          this.updateFormSheetCalc();
+          this.$set(this.resizeStatusConfig, 'isReady', false);
+          this.$nextTick(() => {
+            this.$set(this.resizeStatusConfig, 'isReady', true);
+          });
         } 
       });
     }
-- 
Gitee