From 54f35ae7866dac5c497372b68d03309c7eae9424 Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 02 八月 2023 18:15:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index e9609f2..d74fc46 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -50,6 +50,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 +74,7 @@
border: true,
index: true,
selection: true,
+ reserveSelection:true,
dialogClickModal: false,
highlightCurrentRow: true,
column: []
@@ -81,8 +83,8 @@
},
created() {
this.getParams();
- console.log('referConfig:')
- console.log(this.referConfig)
+ // console.log('referConfig:')
+ // console.log(this.referConfig)
},
mounted() {
if(this.referConfig.options.page){
@@ -155,13 +157,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
}, {
@@ -275,11 +277,14 @@
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;
- this.page.total=res.total
+ 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