From 7db3ee6e84714a868e0b57a61a033d050b1a61fc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 21:06:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 092ab2d..a5cb7ef 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,19 @@
     trendsSpan: {
       type: Number,
       default: 8,
+    },
+    TreeValue:{
+      type: String,
+      default: "",
+    },
+    eventList:{
+      type:Array
     }
   },
   data() {
     return {
+      eventFlag:{},
+      TreeValueForm:'',
       updateIndex: 0,
       form: {},
       option: {
@@ -117,6 +127,9 @@
   mounted() {
     this.handleResize();
   },
+  created() {
+
+    },
   computed: {
     localTrendsSpan() {
       if (this.trendsSpan) {
@@ -126,10 +139,41 @@
         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) {
+      if (this.eventList) {
+        this.eventFlag= this.eventList.some(item => {
+          if (item.classifyInvokeEditFlag === 'true') {
+            console.log('even', item);
+            this.eventObject = item;
+            return true;
+          }
+        });
+        // console.log('add',add)
+      }
       // 鏃犻渶鍒嗙粍鏁版嵁
       let column = [];
       let group = [];
@@ -138,7 +182,7 @@
       let value=''
       formItemList.forEach((formItem) => {
         formItem = this.resetFormConfig(formItem);
-        // console.log('formItem',formItem)
+        console.log(formItem)
         // console.log('formItem.dicData.value',formItem.dicData)
         if (formItem.type === "line") {
           group.push({
@@ -187,7 +231,7 @@
           field: formItem.field,
           type: this.columnType[formItem.type],
           dicData: this.getDataList(formItem.type, formItem.data),
-          disabled: this.type === "detail" ? true : formItem.readOnly,
+          disabled: this.type === "detail" ? true : formItem.readOnly || (formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ?true : false) ,
           prepend: this.preOrSufFixShow("text", formItem.prefix),
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
@@ -195,11 +239,13 @@
           valueFormat:formItem.dateFormate,
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
-          value: formItem.dicData && formItem.dicData.length > 0 && formItem.type == 'combox' ? formItem.dicData[0].id : null,
+          value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
+            (formItem.secType == "codedatesec"?formItem.codeDateValue: null) || ( TreeValue&& formItem.secType == "codelevelsec" ? TreeValue : null) ,
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
-          // readonly:true,
+          // hidden:formItem.secType && formItem.codeValueApplyStatus == 3 ? true : false,
+          // readonly:formItem.codeValueApplyStatus && formItem.codeValueApplyStatus == 2 ?true : false ,
           display: !formItem.hidden,
           maxlength: formItem.maxlength,
           filterable: true,
@@ -239,6 +285,7 @@
         };
         // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
+        // console.log('slotColumnList',slotColumnList)
         if (group.length === 0) {
           column.push(columnItem);
         } else {
@@ -255,10 +302,12 @@
 
       this.geDictData(dictKeys);
       this.getFormDetail();
+      // console.log('selfColumnConfig',this.selfColumnConfig)
 
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {
+      // console.log(this.selfColumnConfig)
       for (const configType in this.selfColumnConfig) {
         if (Object.hasOwnProperty.call(this.selfColumnConfig, configType)) {
           const element = this.selfColumnConfig[configType];
@@ -274,6 +323,9 @@
               if (Object.hasOwnProperty.call(element, newAttr)) {
                 const oldAttr = element[newAttr];
                 formItem[newAttr] = formItem[oldAttr];
+                // console.log(formItem)
+                // console.log(newAttr,oldAttr)
+                // console.log(formItem[newAttr],formItem[oldAttr])
               }
             }
           } else if (configType === "directVoluation") {
@@ -364,6 +416,7 @@
       );
     },
     setReferValue(data) {
+      // console.log(data)
       if (data.field) {
         this.form[data.field] = data.value || "";
         this.form[data.showField] = data.text || "";
@@ -406,16 +459,6 @@
         this.$emit("getFormData", this.form);
         this.$emit("referConfigDataUpdate", data);
       }
-    },
-  },
-  watch: {
-    // 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
-    form: {
-      deep: true,
-      immediate: true,
-      handler(newV) {
-        this.$emit("getFormData", newV);
-      },
     },
   },
 };

--
Gitblit v1.9.3