From 2be0ef348c881796d66e112463f62be5ef374527 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 14 十一月 2023 11:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   36 ++++++++++++++++++++++++------------
 1 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 04ea8ba..d129e12 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,10 +11,12 @@
     @opened="openDialog"
   >
     <FormTemplate
+      key="masterForm" data-key="masterForm"
       v-bind="$attrs"
       :type="type"
       :TreeValue="TreeValue"
       :rowOid="rowOid"
+      :eventList="eventList"
       :templateOid="templateOid"
       v-if="dialogVisible"
       ref="FormTemplate"
@@ -32,7 +34,8 @@
       <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
         <el-tab-pane label="鐮佸�肩敵璇�" name="codeApply" v-if="showCodeApply">
           <FormTemplate
-            v-bind="$attrs"
+            key="codeApplyForm" data-key="codeApplyForm"
+            secDTOListv-bind="$attrs"
             :type="type"
             :selfColumnType="selfColumnType"
             :selfColumnConfig="selfColumnConfig"
@@ -128,6 +131,7 @@
   },
   data() {
     return {
+      eventList:[],
       //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
       codeValueApplyStatus:'',
       loading: false,
@@ -222,6 +226,13 @@
       },
     },
   },
+  watch:{
+    codeApplyForm:{
+      handler(newval,oldval){
+        // console.log('newval',newval)
+      }
+    }
+  },
   methods: {
     openDialog() {
       this.getFormTemplate();
@@ -251,11 +262,12 @@
             } else {
               this.showResembleQuery = false;
             }
-            // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
             this.$nextTick(() => {
               this.$refs.FormTemplate.templateRender(
                 res.data.formDefineVO.items
               );
+              this.eventList=res.data.templateVO.attributes
+              // this.$refs.FormTemplate.$emit('eventList',  res.data.templateVO.attributes);
               if (Object.keys(this.setForm).length > 0) {
                 this.$refs.FormTemplate.form = this.setForm;
               }
@@ -268,8 +280,8 @@
     },
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     getCodeRule() {
-      let  that = this;
-      getCodeRule({ codeClassifyOid: that.codeClassifyOid }).then((res) => {
+      let that = this;
+      getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
         if (res.data && res.data.code === 200) {
           that.codeRuleOid = res.data.data.oid;
           const typeList = [
@@ -295,15 +307,13 @@
           if (that.secVOList.length > 0 && that.type === "add") {
             that.showCodeApply = true;
             that.activeName = "codeApply";
-            that.$nextTick(() => {
-              that.$refs.CodeApply.templateRender(that.secVOList,this.TreeValue);
+            this.$nextTick(() => {
+              that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
             });
           } else {
             that.showCodeApply = false;
           }
         }
-        // console.log(' this.secVOList',that.secVOList)
-        // console.log(' res.data.data.secVOList',res.data.data.secVOList)
       });
     },
     getFormData(form) {
@@ -315,16 +325,20 @@
     // 鍙傜収缁勪欢鏁版嵁鍙樻洿
     referConfigDataUpdate(data) {
       const { field } = data;
+      let childItems=[];
       this.secVOList = this.secVOList.map((item) => {
         if (item.parentClassifySecOid === field) {
           this.$refs.CodeApply.form[item.oid] = undefined;
           this.$refs.CodeApply.form[item.name] = undefined;
           item.readOnly=false;
           item.referConfig.extraParams.parentClassifyValueOid=data.value;
+          item.referConfig.reloadData = true;
+          childItems.push(item)
         }
         return item;
       });
-      this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+      //this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+      this.$refs.CodeApply.changeChildItem(childItems);
     },
     resembleQuerySubmit() {
       this.activeName = "resembleQuery";
@@ -349,7 +363,7 @@
       //   }
       // }
       let resembleQueryList = [];
-      if (this.$refs.resembleQueryRef) {
+      if (this.showResembleQuery && this.$refs.resembleQueryRef) {
         // 杩涜鐩镐技椤规煡璇�
         resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
           this.form
@@ -480,8 +494,6 @@
       } else if (item.secType == "coderefersec") {
         //寮曠敤鐮佹
         params = JSON.parse(item.referValueInfo);
-        // console.log('item',item)
-        console.log('params',params)
       }
       return params;
     },

--
Gitblit v1.9.3