From 7ce592bb5a5b9e0dc78786e727f042b95ebc81c8 Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 13 七月 2023 16:00:59 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue |   37 +++++++++++++++++++++++--------------
 1 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index f71cc78..49c1779 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,7 @@
                :visible.sync="visible"
                top="0"
                class="avue-dialog avue-dialog--top"
-               :width="referConfig.options.width|| '80%'">
+               :width="options.width|| '80%'">
       <avue-crud :option="option"
                  :table-loading="loading"
                  :data="data"
@@ -24,13 +24,13 @@
         </template>
       </avue-crud>
       <div class="avue-dialog__footer">
-        <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
+        <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }} </div>
         <el-button @click="visible=false">鍙� 娑�</el-button>
         <el-button @click="setValue" type="primary">纭� 瀹�</el-button>
       </div>
     </el-dialog>
 
-    <avue-input v-model="text" :placeholder="title" @click="visible=true"></avue-input>
+    <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>
@@ -41,11 +41,11 @@
 import {getList,getLazyList,getTableDefinedUrl} from "@/api/refer/table";
 export default {
   name: "vciWebReferTable",
-  props:["referConfig","value","text","title"],
+  props:["referConfig","value","text","title","disabled"],
   data() {
     return {
       visible: false,
-      options: this.referConfig.options,
+      options: this.referConfig.options || {},
       isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
       props: {
         value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -75,6 +75,7 @@
         border: true,
         index: true,
         selection: true,
+        reserveSelection:true,
         dialogClickModal: false,
         highlightCurrentRow: true,
         rowKey:'oid',
@@ -85,8 +86,8 @@
   },
   created() {
     this.getParams();
-    console.log('referConfig:')
-    console.log(this.referConfig)
+    // console.log('referConfig:')
+    // console.log(this.referConfig)
   },
   mounted() {
     if(this.referConfig.options.page){
@@ -301,7 +302,7 @@
     searchChange(params, done) {
       this.query = params;
       this.page.currentPage = 1;
-      this.onLoad(this.page, params);
+      this.onLoad(this.page);
       done();
     },
     currentChange(currentPage){
@@ -319,20 +320,28 @@
     },
     selectionClear() {
       this.selectionList = [];
-      this.$refs.referCrud.clearSelection();
+      this.$refs.referCrud.toggleSelection();
     },
     refreshChange() {
       this.onLoad(this.page, this.query);
     },
-    onLoad(page, params = this.params) {
+    onLoad(page, params={}) {
       if(this.url){
         this.loading = true;
-        getList(Object.assign(params, this.query),page.currentPage, page.pageSize, this.url).then(res => {
-          debugger;
-          this.page.total = res.total;
-          this.data = res.data;
+        var query={}
+        if (this.query) {
+          for (var key in this.query) {
+            query['conditionMap["' + key + '"]'] = this.query[key];
+          }
+        }
+        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+          this.data = res.data.records;
+          this.page.total=res.data.total
           this.loading = false;
           this.selectionClear();
+        }).catch(error=>{
+          this.$message.error(error);
+          this.loading = false;
         });
       }
 

--
Gitblit v1.9.3