From d8bea250152b4af57f61879682ecd7f6122fcb23 Mon Sep 17 00:00:00 2001
From: 1428594221 <1428594221@qq.com>
Date: 星期日, 25 六月 2023 16:31:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index a626aee..366f9f2 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"
@@ -45,7 +45,7 @@
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',
@@ -330,13 +330,13 @@
var query={}
if (this.query) {
for (var key in this.query) {
- query['conditionMap["' + key + '"]'] = this.query[key];
+ query['conditionMap["' + key + '"]'] = '*'+this.query[key]+'*';
+ query[key]='*'+this.query[key]+'*';
}
}
- getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
- const data = res.data;
- this.page.total = data.total;
- this.data = data.data;
+ 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();
});
--
Gitblit v1.9.3