From ca420bd9c09b51a404ade3e0106257725df727be Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 01 十一月 2023 11:32:28 +0800
Subject: [PATCH] 整合代码

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   43 ++++++++++++++++++++++++++++---------------
 1 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index cefd61a..6e36920 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -11,9 +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"
@@ -31,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"
@@ -91,6 +95,10 @@
       type: Boolean,
       default: false,
     },
+    TreeValue:{
+      type: String,
+      default: "",
+    },
     type: {
       type: String,
       default: "add",
@@ -123,6 +131,7 @@
   },
   data() {
     return {
+      eventList:[],
       //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
       codeValueApplyStatus:'',
       loading: false,
@@ -246,11 +255,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;
               }
@@ -263,9 +273,10 @@
     },
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     getCodeRule() {
-      getCodeRule({ codeClassifyOid: this.codeClassifyOid }).then((res) => {
+      let that = this;
+      getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
         if (res.data && res.data.code === 200) {
-          this.codeRuleOid = res.data.data.oid;
+          that.codeRuleOid = res.data.data.oid;
           const typeList = [
             //灞炴�х爜娈� 鍙
             "codeattrsec",
@@ -283,21 +294,19 @@
             "codelevelsec",
             //娴佹按鐮佹 闅愯棌
           ];
-          this.secVOList = (res.data.data.secVOList || []).filter((item) =>
+          that.secVOList = (res.data.data.secVOList || []).filter((item) =>
             typeList.includes(item.secType)
           );
-          if (this.secVOList.length > 0 && this.type === "add") {
-            this.showCodeApply = true;
-            this.activeName = "codeApply";
+          if (that.secVOList.length > 0 && that.type === "add") {
+            that.showCodeApply = true;
+            that.activeName = "codeApply";
             this.$nextTick(() => {
-              this.$refs.CodeApply.templateRender(this.secVOList);
+              that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
             });
           } else {
-            this.showCodeApply = false;
+            that.showCodeApply = false;
           }
         }
-        // console.log(' this.secVOList',this.secVOList)
-        // console.log(' res.data.data.secVOList',res.data.data.secVOList)
       });
     },
     getFormData(form) {
@@ -309,16 +318,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.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
+      this.$refs.CodeApply.changeChildItem(childItems);
     },
     resembleQuerySubmit() {
       this.activeName = "resembleQuery";
@@ -343,7 +356,7 @@
       //   }
       // }
       let resembleQueryList = [];
-      if (this.$refs.resembleQueryRef) {
+      if (this.showResembleQuery && this.$refs.resembleQueryRef) {
         // 杩涜鐩镐技椤规煡璇�
         resembleQueryList = await this.$refs.resembleQueryRef.resembleQuery(
           this.form
@@ -382,7 +395,6 @@
         this.$delete(formValue, item);
       });
       const keys = Object.keys(formValue);
-      debugger
       keys.forEach((item, index) => {
         keys.forEach((itm, idx) => {
           if ((item === ('$' + itm)) && idx !== index) {
@@ -492,6 +504,7 @@
     isRequired(item) {
       return item.nullableFlag != "true";
     },
+    //榛樿鍊�
     getOptionList(item) {
       if (
         Array.isArray(item.fixedValueVOList) &&

--
Gitblit v1.9.3