From 0c68b446cc11c62a34afe382058ec5630e684750 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 十二月 2023 15:36:40 +0800
Subject: [PATCH] 参照对话框关闭后,选中状态未取消

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index f3044e6..fc86c35 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -6,7 +6,8 @@
                top="0"
                class="avue-dialog avue-dialog--top"
                :width="options.width|| '80%'"
-               :height="options.height|| 'auto'">
+               :height="options.height|| 'auto'"
+               @close="dialogClose"	>
       <avue-crud :option="option"
                  :table-loading="loading"
                  :data="data"
@@ -27,14 +28,12 @@
       </avue-crud>
       <div class="avue-dialog__footer">
         <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }} </div>
-        <el-button @click="visible=false">鍙� 娑�</el-button>
+        <el-button @click="escHandler">鍙� 娑�</el-button>
         <el-button @click="setValue" type="primary">纭� 瀹�</el-button>
       </div>
     </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>
-  -->
+    <avue-input v-model="text" :disabled="disabled" :readonly="true" :placeholder="title" @click="!disabled && (visible=true)"></avue-input>
   </div>
 </template>
 
@@ -43,7 +42,7 @@
 import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
 export default {
   name: "vciWebReferTable",
-  props:["referConfig","value","text","title","disabled"],
+  props:["referConfig","value","text","title","disabled","referType"],
   data() {
     return {
       visible: false,
@@ -59,6 +58,7 @@
       query: {},
       loading: false,
       page: {
+        layout: this.referType === "master" ? "total,pager,prev, next,jumper" : "total,pager,prev, next,jumper,sizes",
         pageSize: 10,
         currentPage: 1,
         total: this.referConfig.options.data?this.referConfig.options.data.length :0
@@ -67,6 +67,7 @@
       selectionList: [],
       option: {
         addBtn: false,
+        columnBtn:false,
         height: this.referConfig.options.height ? this.referConfig.options.height : 475,
         calcHeight: 30,
         tip: false,
@@ -90,11 +91,13 @@
     this.getParams();
   },
   mounted() {
-    if(this.referConfig.options.page){
-      this.page.pageSize=this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
-      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
+    if (this.referConfig.options.tableConfig && this.referConfig.options.tableConfig.page) {
+      this.page.pageSize = this.referConfig.options.tableConfig.page.limit || this.referConfig.options.tableConfig.page.pageSize;
+      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 (this.referConfig.options.tableConfig && !validatenull(this.referConfig.options.tableConfig.limit)) {
+      this.page.pageSize = this.referConfig.options.tableConfig.limit;
     }
     this.$nextTick(() => {
       this.$refs.referCrud.doLayout()
@@ -107,6 +110,14 @@
     }
   },
   methods: {
+    escHandler(){
+      this.visible = false;
+      this.$refs.referDefalutCrud.refreshTable()
+    },
+    dialogClose(){
+      this.visible = false;
+      this.$refs.referDefalutCrud.refreshTable()
+    },
     getParams:function (){
       var queryParams = {};
       if(this.options.extraParams){
@@ -130,7 +141,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;//瀛楁
       }
@@ -340,7 +351,14 @@
           text.push(itemText);
         }
       })
-      let mapFields =Object.assign(this.referConfig.fieldMap,JSON.parse(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(',')
       this.$emit("setValue", {field:this.referConfig.field,showField:this.referConfig.showField,value:this.value,text:this.text,rawData:this.selectionList,fieldMap:mapFields});

--
Gitblit v1.9.3