From ac8e8998235f247365280d1a1632115c43b10037 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 17 十一月 2023 02:24:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 7c5fdee..fb3a61b 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,6 +11,7 @@
     @opened="openDialog"
   >
     <FormTemplate
+      key="masterForm" data-key="masterForm"
       v-bind="$attrs"
       :type="type"
       :TreeValue="TreeValue"
@@ -33,12 +34,14 @@
       <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"
             ref="CodeApply"
             @getFormData="getCodeApplyFormData"
+            @attrList="attrListForm"
             @referConfigDataUpdate="referConfigDataUpdate"
           ></FormTemplate>
         </el-tab-pane>
@@ -129,6 +132,7 @@
   },
   data() {
     return {
+      attrList:[],
       eventList:[],
       //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
       codeValueApplyStatus:'',
@@ -224,6 +228,13 @@
       },
     },
   },
+  watch:{
+    codeApplyForm:{
+      handler(newval,oldval){
+        // console.log('newval',newval)
+      }
+    }
+  },
   methods: {
     openDialog() {
       this.getFormTemplate();
@@ -253,7 +264,6 @@
             } else {
               this.showResembleQuery = false;
             }
-            // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
             this.$nextTick(() => {
               this.$refs.FormTemplate.templateRender(
                 res.data.formDefineVO.items
@@ -272,8 +282,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 = [
@@ -299,19 +309,29 @@
           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) {
       this.form = form;
+      //灞炴�х爜娈佃祴鍊�
+      if (this.attrList) {
+        this.attrList.forEach(item => {
+          if (this.form.hasOwnProperty(item.referAttributeId)) {
+            this.codeApplyForm[item.oid] = this.form[item.referAttributeId];
+          }
+        })
+      }
+    },
+    //灞炴�х爜娈佃祴鍊�
+    attrListForm(attrListForm){
+      this.attrList=attrListForm;
     },
     getCodeApplyFormData(codeApplyForm) {
       this.codeApplyForm = codeApplyForm;
@@ -319,16 +339,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";
@@ -353,7 +377,7 @@
       //   }
       // }
       let resembleQueryList = [];
-      if (this.$refs.resembleQueryRef) {
+      if (this.showResembleQuery && this.$refs.resembleQueryRef) {
         // 杩涜鐩镐技椤规煡璇�
         resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
           this.form
@@ -484,8 +508,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