From a3a14ed32b70d4dc873978bb97842e80cccc56ad Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Tue, 28 Nov 2023 14:37:01 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E5=A4=84=E7=90=86-=E6=97=B6=E9=97=B4=E7=BA=BF=EF=BC=9A?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E9=9C=80=E8=A6=81=E4=B8=8E=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=20=20-?=
 =?UTF-8?q?=20[=E5=85=B3=E8=81=94]=20#[1033891366797312]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5-=E4=B8=8A=E6=8A=A5=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E7=9A=84=E5=9C=BA=E6=99=AF=E5=88=A0=E4=BA=86=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=BB=84=E4=BB=B6=E6=9C=89=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E4=BF=9D=E5=AD=98=E4=BA=86=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=20http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947?=
 =?UTF-8?q?543040/939050947543057/1033891366797312?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workorder/activity/activity-overview.vue  |  2 ++
 .../workorder/activity/item/form-handler.vue  | 28 +++++++++++++++++--
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/process/task/processdetail/workorder/activity/activity-overview.vue b/src/views/pages/process/task/processdetail/workorder/activity/activity-overview.vue
index 95aaacc1..9ddf633f 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/activity-overview.vue
+++ b/src/views/pages/process/task/processdetail/workorder/activity/activity-overview.vue
@@ -46,6 +46,8 @@
                   :key="jindex"
                   :config="jitem"
                   :formConfig="formConfigData"
+                  :processTaskStepId="item.processTaskStepId"
+                  :formSceneUuid="item.formSceneUuid"
                   class="mb-sm"
                 ></component>
               </template>
diff --git a/src/views/pages/process/task/processdetail/workorder/activity/item/form-handler.vue b/src/views/pages/process/task/processdetail/workorder/activity/item/form-handler.vue
index bdaa7daf..5c0079b3 100644
--- a/src/views/pages/process/task/processdetail/workorder/activity/item/form-handler.vue
+++ b/src/views/pages/process/task/processdetail/workorder/activity/item/form-handler.vue
@@ -9,19 +9,21 @@
       class="mt-xs"
       style="margin-left: 88px"
       :readonly="true"
-      :value="formConfig"
+      :value="currentFormConfig"
       :data="formData"
       :formHighlightData="formHighlightData"
     ></TsSheet>
   </div>
 </template>
 <script>
+import dealFormMix from '@/views/pages/process/task/taskcommon/dealNewFormData.js';
 export default {
   name: '',
   components: {
     TsSheet: resolve => require(['@/resources/plugins/TsSheet/TsSheet.vue'], resolve)
   },
   filters: {},
+  mixins: [dealFormMix],
   props: {
     config: Object,
     formConfig: {
@@ -29,19 +31,30 @@ export default {
       default: function() {
         return {};
       }
+    },
+    processTaskStepId: {
+      type: Number,
+      default: null
+    },
+    formSceneUuid: {
+      type: String,
+      default: null
     }
   },
   data() {
     return {
       isShow: false,
       formData: {},
-      formHighlightData: {}
+      formHighlightData: {},
+      currentFormConfig: {}
     };
   },
   beforeCreate() {},
   created() {},
   beforeMount() {},
-  mounted() {},
+  mounted() {
+    this.init();
+  },
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -49,6 +62,15 @@ export default {
   beforeDestroy() {},
   destroyed() {},
   methods: {
+    init() {
+      if (!this.$utils.isEmpty(this.formConfig)) {
+        if (this.processTaskStepId) { //流转时，表单展示需要与节点场景保持一致
+          this.currentFormConfig = this.initNewFormConfig(this.formSceneUuid, this.formConfig);
+        } else {
+          this.currentFormConfig = this.formConfig;
+        }
+      }
+    },
     handleData() {
       this.formData = {};
       let oldContent = JSON.parse(this.config.oldContent);
-- 
Gitee