diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index 4d1d5435..d924561d 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -20,7 +20,7 @@
@@ -143,7 +143,7 @@
this.$refs.scTable.$el.querySelector('.el-table__body-wrapper').scrollTop = 0
},
//分页点击
- reload(){
+ paginationChange(){
this.getData();
},
//刷新数据
@@ -151,12 +151,22 @@
this.$refs.scTable.clearSelection();
this.getData();
},
- //更新数据
- upData(params){
- this.currentPage = 1;
+ //更新数据 合并上一次params
+ upData(params, page=1){
+ this.currentPage = page;
+ this.$refs.scTable.clearSelection();
Object.assign(this.tableParams, params || {})
this.getData()
},
+ //重载数据 替换params
+ reload(params, page=1){
+ this.currentPage = page;
+ this.tableParams = params || {}
+ this.$refs.scTable.clearSelection();
+ this.$refs.scTable.clearSort()
+ this.$refs.scTable.clearFilter()
+ this.getData()
+ },
//自定义变化事件
columnSettingChange(userColumn){
this.userColumn = userColumn;
diff --git a/src/views/setting/dic/index.vue b/src/views/setting/dic/index.vue
index 2b7eecab..55568a2f 100644
--- a/src/views/setting/dic/index.vue
+++ b/src/views/setting/dic/index.vue
@@ -147,7 +147,7 @@
},
//树点击事件
dicClick(data){
- this.$refs.table.upData({
+ this.$refs.table.reload({
code: data.code
})
},
diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue
index 4967f211..3a6a2d9e 100644
--- a/src/views/setting/user/index.vue
+++ b/src/views/setting/user/index.vue
@@ -165,7 +165,7 @@
var params = {
groupId: data.id
}
- this.$refs.table.upData(params)
+ this.$refs.table.reload(params)
},
//搜索
upsearch(){