From e9a590e862148092027510b15d33cdd32691a6f5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 06 十二月 2023 09:43:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 561cb91..6d01849 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -14,6 +14,7 @@
       v-if="dialogVisible" key="masterForm"
       ref="FormTemplate"
       v-bind="$attrs"
+      :selectRow="selectRow"
       :TreeValue="TreeValue"
       :eventList="eventList"
       :rowOid="rowOid"
@@ -41,6 +42,8 @@
             :selfColumnConfig="selfColumnConfig"
             :selfColumnType="selfColumnType"
             :type="type"
+            :status="status"
+            :selectRow="selectRow"
             data-key="codeApplyForm"
             secDTOListv-bind="$attrs"
             @attrList="attrListForm"
@@ -139,6 +142,10 @@
       type: Object,
       default: () => ({}),
     },
+    selectRow:{
+      type:Array,
+      default:[]
+    }
   },
   data() {
     return {
@@ -242,15 +249,11 @@
     },
   },
   watch: {
-    codeApplyForm: {
-      handler(newval, oldval) {
-        // console.log('newval',newval)
-      }
-    }
+
   },
   methods: {
     openDialog() {
-      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�
+      //鏂板鍜屼慨鏀瑰叡鍚岃皟鐢�(鏈夋敼鍔� 涓嶉渶瑕佸湪浣跨敤edit锛屾柟娉曟病浠�涔堝奖鍝�)
       this.getFormTemplate();
       if (this.type === "add" || (this.type !== "add" && this.status === "amend")) {
         this.getCodeRule();
@@ -473,7 +476,7 @@
             secValue: this.codeApplyForm[item.oid],
           };
         });
-        //鏍囧噯鐗瑰畾
+        //鏍囧噯鐗瑰畾瀛楁鏄犲皠
         const mappings = {
           codeStandardEditType: 'operationType',
           reviseSeries: 'series',

--
Gitblit v1.9.3