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

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

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 90e1442..ea31d7c 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -101,6 +101,7 @@
   },
   data() {
     return {
+      add:'',
       codeattrsecValue:'',
       ValidataValue:false,
       eventFlag:{},
@@ -159,6 +160,7 @@
       immediate: true,
       handler(newV) {
         this.$emit("getFormData", newV);
+        // console.log("getFormData", newV)
       },
     },
     TreeValue:{
@@ -188,7 +190,11 @@
       let dictKeys = [];
       let slotColumnList = [];
       formItemList.forEach((formItem) => {
+        // console.log('formItem',formItem)
         formItem = this.resetFormConfig(formItem);
+        // if(formItem.type === "datetime"){
+        //   return;
+        // }
         if (formItem.type === "line") {
           group.push({
             label: formItem.text,
@@ -232,11 +238,10 @@
 
         let columnItem = {
           change:(val)=>{
-            // console.log(val)
             if(val.column.field === "drawingno"){
               this.codeattrsecValue=val.value;
             }
-            console.log(this.codeattrsecValue)
+            // console.log(this.codeattrsecValue)
           },
           dataKey:formItem.dataKey || formItem.field,
           label: formItem.text,
@@ -252,12 +257,12 @@
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
           suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
-          valueFormat:formItem.dateFormate,
+          valueFormat:formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
           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.codeDateValue: null) || ( TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
-            (formItem.secType == "codeattrsec" ? this.codeattrsecValue : null),
+            (formItem.secType == "codeattrsec" ? this.add : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -296,7 +301,7 @@
             },
           ],
           props: {
-            label: "itemName",
+            label: "value",
             value: "key",
           },
         };
@@ -319,7 +324,6 @@
 
       this.geDictData(dictKeys);
       this.getFormDetail();
-
     },
     //淇敼绾ц仈椤�
     changeChildItem(items,TreeValue) {
@@ -328,6 +332,7 @@
       let that=this;
       items.forEach((item) => {
         let formItem = this.resetFormConfig(item);
+
         if (formItem.field == "lcstatus") {
           formItem.field = formItem.field + "_text";
           formItem.readOnly = true;
@@ -347,6 +352,9 @@
           formItem.fieldMap[formItem.field + 'id'] = 'id'
         }
         let columnItem = {
+          change:(val)=>{
+            console.log('1',val)
+          },
           label: formItem.text,
           labelslot: true,
           prop: this.$utilFunc.isValuableObj(formItem.referConfig)
@@ -360,7 +368,7 @@
           append: this.preOrSufFixShow("text", formItem.suffix),
           prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
           suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
-          valueFormat: formItem.dateFormate,
+          valueFormat: formItem.dateFormate || "yyyy-MM-dd HH:mm:ss",
           format: formItem.dateFormate,
           keyAttr: formItem.keyAttr,
           value: (formItem.dicData && formItem.dicData.length > 0 && formItem.secType == "codefixedsec" ? formItem.dicData[0].id : null) ||
@@ -453,6 +461,7 @@
               if (Object.hasOwnProperty.call(element, newAttr)) {
                 const oldAttr = element[newAttr];
                 formItem[newAttr] = formItem[oldAttr];
+
               }
             }
           } else if (configType === "directVoluation") {
@@ -503,13 +512,12 @@
     geDictData(dictKeys) {
       dictKeys.forEach((dictObj) => {
         getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
-          console.log(res)
           if (res.data && res.data.code === 200) {
             this.option.column = this.option.column.map((item) => {
               if (item.field === dictObj.field) {
                 let dictData = (res.data.data || []).map((itm) => {
-                  itm.value = itm.dictValue;
-                  itm.key = itm.dictKey;
+                  itm.value = itm.itemName;
+                  itm.key = itm.itemValue;
                   return itm;
                 });
                 item.dicData = dictData;

--
Gitblit v1.9.3