From 6a9605d7e333d4af8ba89f9b3b1c2f8332289587 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 10:33:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d8657d0..14f0c2d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,6 +26,7 @@
       </template>
       <template :slot="item.prop + ''" v-for="item in slotColumnList">
         <vciWebRefer
+          :key="item.prop" :data-key="item.prop"
           v-if="item.type == 'refer'"
           :referConfig="item.referConfig || {}"
           :value="form[item.referConfig.field] || item.value"
@@ -84,10 +85,15 @@
     trendsSpan: {
       type: Number,
       default: 8,
-    }
+    },
+    TreeValue:{
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
+      TreeValueForm:'',
       updateIndex: 0,
       form: {},
       option: {
@@ -114,7 +120,7 @@
       slotColumnList: [],
     };
   },
-  mounted() {
+    mounted() {
     this.handleResize();
   },
   computed: {
@@ -126,10 +132,31 @@
         return 24 / Math.floor(windowWidth / 500);
       }
     },
+
+  },
+  watch: {
+    // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
+    form: {
+      deep: true,
+      immediate: true,
+      handler(newV) {
+        this.$emit("getFormData", newV);
+      },
+    },
+    TreeValue:{
+      handler(newval,oldval){
+        if(newval){
+          this.TreeValueForm=newval;
+          // console.log(this.TreeValueForm)
+        }
+      },
+      deep:true,
+      immediate:true
+    }
   },
   methods: {
     // 娓叉煋琛ㄥ崟妯℃澘
-    templateRender(formItemList) {
+    templateRender(formItemList,TreeValue) {
       // 鏃犻渶鍒嗙粍鏁版嵁
       let column = [];
       let group = [];
@@ -138,7 +165,6 @@
       let value=''
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
-        // console.log('formItem',formItem)
         // console.log('formItem.dicData.value',formItem.dicData)
         if (formItem.type === "line") {
           group.push({
@@ -196,7 +222,7 @@
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
-            (formItem.secType == "codedatesec"?formItem.codeDateFormatStr: null),
+            (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -263,6 +289,7 @@
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
+      // console.log(this.selfColumnConfig)
       for (const configType in this.selfColumnConfig) {
         if (Object.hasOwnProperty.call(this.selfColumnConfig, configType)) {
           const element = this.selfColumnConfig[configType];
@@ -416,16 +443,6 @@
       }
     },
   },
-  watch: {
-    // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
-    form: {
-      deep: true,
-      immediate: true,
-      handler(newV) {
-        this.$emit("getFormData", newV);
-      },
-    },
-  },
 };
 </script>
 

--
Gitblit v1.10.0