From d5bafa63b4dcc7ad6840560134dd41f38ded1390 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 30 六月 2023 18:09:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index b16a962..08ab794 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,7 +24,7 @@
</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>
@@ -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',
@@ -301,7 +301,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 +319,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