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

---
 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 9f69e9b..c2181d5 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,13 +26,14 @@
       </template>
       <template :slot="item.prop + ''" v-for="item in slotColumnList">
         <vciWebRefer
-          :key="item.prop" :data-key="item.prop"
+          :key="item.dataKey" :data-key="item.dataKey"
           v-if="item.type == 'refer'"
           :referConfig="item.referConfig || {}"
           :value="form[item.referConfig.field] || item.value"
           :text="form[item.referConfig.showField]"
           :disabled="item.disabled"
           :display="item.display"
+          :reloadData="item.referConfig.reloadData || false"
           @setReferValue="setReferValue"
         ></vciWebRefer>
       </template>
@@ -61,6 +62,10 @@
       type: String,
       default: "",
     },
+    LoadingStatus:{
+      type: String,
+      default : "code"
+    },
     // 鍒楄〃鏁版嵁oid
     rowOid: {
       type: String,
@@ -69,7 +74,7 @@
     // 琛ㄥ崟绫诲瀷锛坅dd, edit, detail锛�
     type: {
       type: String,
-      default: "add",
+      default: "",
     },
     // 鑷畾涔夎〃鍗曠被鍨�
     selfColumnType: {
@@ -128,7 +133,9 @@
     this.handleResize();
   },
   created() {
-
+    if (this.LoadingStatus === 'code') {
+      this.loading = false;
+    }
   },
   computed: {
     localTrendsSpan() {
@@ -218,6 +225,7 @@
           formItem.fieldMap[formItem.field+'id']='id'
         }
         let columnItem = {
+          dataKey:formItem.dataKey || formItem.field,
           label: formItem.text,
           labelslot: true,
           prop: this.$utilFunc.isValuableObj(formItem.referConfig)
@@ -301,6 +309,7 @@
     changeChildItem(items,TreeValue) {
       let column = this.option.column;
       let group = this.option.group;
+      let that=this;
       items.forEach((item) => {
         let formItem = this.resetFormConfig(item);
         if (formItem.field == "lcstatus") {
@@ -384,22 +393,22 @@
         };
 
         if (group.length === 0) {
-          this.slotColumnList.forEach((index, colItem) => {
+          that.slotColumnList.forEach((colItem,index) => {
             if (colItem.field == columnItem.field) {
-              this.slotColumnList[index] = columnItem;
+              that.slotColumnList[index] = columnItem;
               column[index] = columnItem;
               return;
             }
           })
         } else {
-          this.slotColumnList.forEach((index, colItem) => {
+          that.slotColumnList.forEach((colItem,index) => {
             if (colItem.field == columnItem.field) {
-              this.slotColumnList[index] = columnItem;
+              that.slotColumnList[index] = columnItem;
               return;
             }
           })
-          group.forEach((index, groupItem) => {
-            groupItem.column.forEach((colIndex, colItem) => {
+          group.forEach((groupItem,index) => {
+            groupItem.column.forEach((colItem,colIndex) => {
               if (colItem.field == columnItem.field) {
                 group[index].column[colIndex] = columnItem;
                 return;
@@ -408,8 +417,8 @@
           });
         }
       });
-      this.$set(this.option, "column", column);
-      this.$set(this.option, "group", group);
+      that.$set(that.option, "column", column);
+      that.$set(that.option, "group", group);
     },
     // 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
     resetFormConfig(formItem) {

--
Gitblit v1.9.3