From e73d1829533b68cb119f783b6f8136b97b167eba Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 08 十一月 2023 18:53:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index d3aa4cd..5a0cdc9 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -43,7 +43,7 @@
 
 <script>
 import { getFormDetail } from "@/api/formTemplate";
-import { getDictionary } from "../../api/system/dict";
+import { getEnumDictionary } from "../../api/system/dict";
 import vciWebRefer from "../refer/vciWebRefer.vue";
 export default {
   name: "FormTemplate",
@@ -62,6 +62,10 @@
       type: String,
       default: "",
     },
+    LoadingStatus:{
+      type: String,
+      default : "code"
+    },
     // 鍒楄〃鏁版嵁oid
     rowOid: {
       type: String,
@@ -70,7 +74,7 @@
     // 琛ㄥ崟绫诲瀷锛坅dd, edit, detail锛�
     type: {
       type: String,
-      default: "add",
+      default: "",
     },
     // 鑷畾涔夎〃鍗曠被鍨�
     selfColumnType: {
@@ -97,6 +101,8 @@
   },
   data() {
     return {
+      codeattrsecValue:'',
+      ValidataValue:false,
       eventFlag:{},
       TreeValueForm:'',
       updateIndex: 0,
@@ -128,8 +134,12 @@
   mounted() {
     this.handleResize();
   },
+  updated() {
+  },
   created() {
-
+    if (this.LoadingStatus === 'code') {
+      this.loading = false;
+    }
   },
   computed: {
     localTrendsSpan() {
@@ -159,7 +169,7 @@
       },
       deep:true,
       immediate:true
-    }
+    },
   },
   methods: {
     // 娓叉煋琛ㄥ崟妯℃澘
@@ -218,7 +228,16 @@
           formItem.fieldMap[fieldMapKey]='id'
           formItem.fieldMap[formItem.field+'id']='id'
         }
+
+
         let columnItem = {
+          change:(val)=>{
+            // console.log(val)
+            if(val.column.field === "drawingno"){
+              this.codeattrsecValue=val.value;
+            }
+            console.log(this.codeattrsecValue)
+          },
           dataKey:formItem.dataKey || formItem.field,
           label: formItem.text,
           labelslot: true,
@@ -237,7 +256,8 @@
           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 == "codedatesec" ? formItem.codeDateValue: null) || ( TreeValue && formItem.secType == "codelevelsec" ? TreeValue : null) ||
+            (formItem.secType == "codeattrsec" ? this.codeattrsecValue : null),
           placeholder: formItem.inputTip,
           comboxKey: formItem.comboxKey,
           tip: formItem.tooltips,
@@ -280,6 +300,8 @@
             value: "key",
           },
         };
+        // console.log('formItem',formItem)
+        // console.log('columnItem',columnItem)
         slotColumnList.push(columnItem);
         if (group.length === 0) {
           column.push(columnItem);
@@ -480,7 +502,7 @@
     // 寮傛鑾峰彇瀛楀吀鏁版嵁
     geDictData(dictKeys) {
       dictKeys.forEach((dictObj) => {
-        getDictionary({ code: dictObj.dictKey }).then((res) => {
+        getEnumDictionary({ code: dictObj.dictKey }).then((res) => {
           if (res.data && res.data.code === 200) {
             this.option.column = this.option.column.map((item) => {
               if (item.field === dictObj.field) {
@@ -504,6 +526,7 @@
           if (valid) {
             done();
             resolve(true);
+            this.ValidataValue=true;
           } else {
             resolve(false);
           }

--
Gitblit v1.9.3