From b4c7c6a738f44afadbc388bb774ac044e7fafe38 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 12 十月 2023 11:24:21 +0800
Subject: [PATCH] 修改列显隐

---
 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index d108a8e..28fad1b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -30,8 +30,6 @@
     </el-dialog>
 
     <avue-input v-model="text" :disabled="disabled" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
-    <!--<avue-input-table ref="referTable"  :props="props"  :column="column" :on-load="onLoad" v-model="value"  :placeholder="title" ></avue-input-table>
-  -->
   </div>
 </template>
 
@@ -65,6 +63,7 @@
       selectionList: [],
       option: {
         addBtn: false,
+        columnBtn:false,
         //height: this.referConfig.options.height ? this.referConfig.options.height : 475,
         calcHeight: 30,
         tip: false,
@@ -91,6 +90,8 @@
       this.page.currentPage=this.referConfig.options.tableConfig.page.page || this.referConfig.options.tableConfig.page.currentPage;
     }else if(!validatenull(this.referConfig.options.limit)){
       this.page.pageSize=this.referConfig.options.limit
+    }else if(!validatenull(this.referConfig.options.tableConfig.limit)){
+      this.page.pageSize=this.referConfig.options.tableConfig.limit
     }
   },
   computed:{
@@ -122,7 +123,7 @@
         queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
       }
       queryParams['referType'] = queryParams['referBo']
-      if (this.options.remoteSort && this.options.initSort) {
+      if (this.options.initSort) {
         queryParams['order'] = this.options.initSort.type;//鏂规硶
         queryParams['sort'] = this.options.initSort.field;//瀛楁
       }
@@ -286,11 +287,14 @@
           text.push(itemText);
         }
       })
-      let mapFields;
-      if (this.options.mapFields === "") {
-        mapFields = this.referConfig.fieldMap;
-      } else {
-        mapFields = Object.assign(this.referConfig.fieldMap, this.options.mapFields);
+
+      let mapFields =this.referConfig.fieldMap || {};
+      try {
+        if(!validatenull(this.options.mapFields)){
+          mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(this.options.mapFields)) ;
+        }
+      }catch (e) {
+
       }
       this.value=value.join(',');
       this.text=text.join(',')

--
Gitblit v1.9.3