From be1abfb614840ba9f74b693b21fe0ca12bdf18ea Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 08 九月 2023 20:07:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/index.vue |   44 +++++++++++++++++++++++++-------------------
 1 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 8597543..2f714ce 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -123,6 +123,8 @@
   },
   data() {
     return {
+      //鐮佸�肩殑绗簩绉嶅彧璇婚殣钘忔儏鍐�
+      codeValueApplyStatus:'',
       loading: false,
       submitBtnLoading: false,
       hasResemble: false,
@@ -140,7 +142,7 @@
         coderefersec: "refer",//寮曠敤鐮佹
         codeattrsec: "text",
         codelevelsec: "text",
-        codedatesec: "date"
+        codedatesec: "text"
       },
       selfColumnConfig: {
         function: {
@@ -261,39 +263,41 @@
     },
     // 鑾峰彇鐮佸�肩敵璇锋暟鎹�
     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);
             });
           } else {
-            this.showCodeApply = false;
+            that.showCodeApply = false;
           }
         }
-        // console.log(' this.secVOList',this.secVOList)
+        // console.log(' this.secVOList',that.secVOList)
         // console.log(' res.data.data.secVOList',res.data.data.secVOList)
       });
     },
@@ -379,7 +383,6 @@
         this.$delete(formValue, item);
       });
       const keys = Object.keys(formValue);
-      debugger
       keys.forEach((item, index) => {
         keys.forEach((itm, idx) => {
           if ((item === ('$' + itm)) && idx !== index) {
@@ -472,6 +475,8 @@
       } else if (item.secType == "coderefersec") {
         //寮曠敤鐮佹
         params = JSON.parse(item.referValueInfo);
+        // console.log('item',item)
+        console.log('params',params)
       }
       return params;
     },
@@ -489,6 +494,7 @@
     isRequired(item) {
       return item.nullableFlag != "true";
     },
+    //榛樿鍊�
     getOptionList(item) {
       if (
         Array.isArray(item.fixedValueVOList) &&

--
Gitblit v1.9.3