From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 09:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 9f31ce4..0f09a76 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -13,6 +13,7 @@
     <FormTemplate
       v-bind="$attrs"
       :type="type"
+      :TreeValue="TreeValue"
       :rowOid="rowOid"
       :templateOid="templateOid"
       v-if="dialogVisible"
@@ -91,6 +92,10 @@
       type: Boolean,
       default: false,
     },
+    TreeValue:{
+      type: String,
+      default: "",
+    },
     type: {
       type: String,
       default: "add",
@@ -123,6 +128,8 @@
   },
   data() {
     return {
+      //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+      codeValueApplyStatus:'',
       loading: false,
       submitBtnLoading: false,
       hasResemble: false,
@@ -140,7 +147,7 @@
         coderefersec: "refer",//寮曠敤鐮佹
         codeattrsec: "text",
         codelevelsec: "text",
-        codedatesec: "date"
+        codedatesec: "text"
       },
       selfColumnConfig: {
         function: {
@@ -244,7 +251,7 @@
             } else {
               this.showResembleQuery = false;
             }
-            console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
+            // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
             this.$nextTick(() => {
               this.$refs.FormTemplate.templateRender(
                 res.data.formDefineVO.items
@@ -261,38 +268,42 @@
     },
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     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",
+            //鍙彉鐮佹
+            "codevariablesec",
             //鍥哄畾鐮佹
             "codefixedsec",
             //鍒嗙被鐮佹
             "codeclassifysec",
-            //鍙彉鐮佹
-            "codevariablesec",
+            //鏃ユ湡鐮佹 鍙
+            "codedatesec",
             //寮曠敤鐮佹
             "coderefersec",
-            //灞炴�х爜娈�
-            "codeattrsec",
-            //鏃ユ湡鐮佹
-            "codedatesec",
+            //灞傜骇鐮佹 鍙
+            "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";
-            this.$nextTick(() => {
-              this.$refs.CodeApply.templateRender(this.secVOList);
+          if (that.secVOList.length > 0 && that.type === "add") {
+            that.showCodeApply = true;
+            that.activeName = "codeApply";
+            that.$nextTick(() => {
+              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)
+        // console.log(' this.secVOList',that.secVOList)
+        // console.log(' res.data.data.secVOList',res.data.data.secVOList)
       });
     },
     getFormData(form) {
@@ -313,7 +324,7 @@
         }
         return item;
       });
-      this.$refs.CodeApply.templateRender(this.secVOList);
+      this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
     },
     resembleQuerySubmit() {
       this.activeName = "resembleQuery";
@@ -377,7 +388,6 @@
         this.$delete(formValue, item);
       });
       const keys = Object.keys(formValue);
-      debugger
       keys.forEach((item, index) => {
         keys.forEach((itm, idx) => {
           if ((item === ('$' + itm)) && idx !== index) {
@@ -470,6 +480,8 @@
       } else if (item.secType == "coderefersec") {
         //寮曠敤鐮佹
         params = JSON.parse(item.referValueInfo);
+        // console.log('item',item)
+        console.log('params',params)
       }
       return params;
     },
@@ -487,6 +499,7 @@
     isRequired(item) {
       return item.nullableFlag != "true";
     },
+    //榛樿鍊�
     getOptionList(item) {
       if (
         Array.isArray(item.fixedValueVOList) &&

--
Gitblit v1.9.3