From 8e20385ac0712b1a27420970c183482763cf4f6c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 14 六月 2023 14:27:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
index 8b3ec00..9558693 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -56,7 +56,7 @@
page: {
pageSize: 10,
currentPage: 1,
- total: 0
+ total: this.referConfig.options.data?this.referConfig.options.data.length :0
},
data:this.referConfig.options.data || [],
selectionList: [],
@@ -84,6 +84,10 @@
console.log(this.referConfig)
},
mounted() {
+ if(this.referConfig.options.page){
+ this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
+ this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
+ }
},
computed:{
valueInfo:function (){
@@ -194,10 +198,10 @@
},
setValue(){
if(this.selectionList.length==0){
- this.$message.error( '娌℃湁閫夋嫨鏁版嵁');
+ this.$message.warning( '娌℃湁閫夋嫨鏁版嵁');
return false;
}else if(this.selectionList.length>1 && !this.isMuti){
- this.$message.error( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
+ this.$message.warning( '姣忔鍙兘閫夋嫨涓�鏉℃暟鎹�');
return false;
}
@@ -255,7 +259,7 @@
},
selectionClear() {
this.selectionList = [];
- this.$refs.referCrud.toggleSelection();
+ this.$refs.referCrud.clearSelection();
},
refreshChange() {
this.onLoad(this.page, this.query);
--
Gitblit v1.9.3