From 205056bc17023dd44e6d262cfe78b6e146ee2f20 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 23 八月 2023 20:05:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 690e721..ab1ee06 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -16,6 +16,7 @@
                  @search-change="searchChange"
                  @search-reset="searchReset"
                  @selection-change="selectionChange"
+                 @row-click="rowClick"
                  @current-change="currentChange"
                  @size-change="sizeChange"
                  @refresh-change="refreshChange"
@@ -50,6 +51,7 @@
         label: this.referConfig.textField || this.referConfig.options.textField || "name"
       },
       url: this.referConfig.options.url || '/api/ubcs-code/mdmEngineController/defaultReferDataGrid',
+      method: this.referConfig.options.method || 'GET',
       tableDefinedUrl:'',//骞冲彴琛ㄦ牸鍦板潃
       copyParam: ['referBo', 'textField', 'valueField', 'displayTable', 'whereSql',  'queryScheme'],
       query: {},
@@ -73,6 +75,7 @@
         border: true,
         index: true,
         selection: true,
+        reserveSelection:true,
         dialogClickModal: false,
         highlightCurrentRow: true,
         column: []
@@ -81,8 +84,6 @@
   },
   created() {
     this.getParams();
-    console.log('referConfig:')
-    console.log(this.referConfig)
   },
   mounted() {
     if(this.referConfig.options.page){
@@ -155,13 +156,13 @@
         this.option.column = [{
           prop: 'id',
           label: '鑻辨枃鍚嶇О',
-          sort: true,
+          sortable: true,
           width: 150,
           search: true
         }, {
           prop: 'name',
           label: '涓枃鍚嶇О',
-          sort: true,
+          sortable: true,
           width: 150,
           search: true
         }, {
@@ -182,7 +183,9 @@
               label: item.title,
               prop: item.field,
               formatter:item.template,
-              search: true
+              search:this.options.tableConfig.queryColumns.some(qItem=>{
+                return qItem.field==item.field
+              })
             }
           }
         })
@@ -252,6 +255,11 @@
     sizeChange(pageSize){
       this.page.pageSize = pageSize;
     },
+    rowClick (row) {
+      this.$refs.referDefalutCrud.toggleSelection();
+      this.$refs.referDefalutCrud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+      this.selectionList=[row]
+    },
     selectionChange(list) {
       if (!this.isMuti && list.length > 1) {
         const nowVal = list.shift();
@@ -272,15 +280,17 @@
         var query={}
         if (this.query) {
           for (var key in this.query) {
-            query['conditionMap["' + key + '"]'] = '*'+this.query[key]+'*';
-            query[key]='*'+this.query[key]+'*';
+            query['conditionMap["' + key + '"]'] = this.query[key];
           }
         }
-        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
+        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).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