diff --git a/src/views/userManage/customerManage.vue b/src/views/userManage/customerManage.vue index fc2c45a..0339517 100644 --- a/src/views/userManage/customerManage.vue +++ b/src/views/userManage/customerManage.vue @@ -119,8 +119,8 @@ - - + + @@ -317,6 +317,7 @@ @current-change="handleCurrentChange" layout="prev, pager, next" :total="total" + :current-page="filterQuery.page" > @@ -418,6 +419,7 @@ export default { limit: 20, }; this.getList(); + this.filterQuery.page=null; }, formSubmit() { this.formData.roleId = 1; @@ -441,13 +443,11 @@ export default { }); }, onSubmit() { + this.filterQuery.checkType=null; this.getList(); }, getList() { this.loading = true; - if (this.filterQuery.companyName != null && this.filterQuery.companyName != '') { - this.filterQuery.page = 1; - } getCustomers(this.filterQuery) .then((response) => { this.loading = false; @@ -485,6 +485,7 @@ export default { handleCurrentChange(val) { this.filterQuery.page = val; this.getList(); + this.filterQuery.page = 1; }, handleCheckedChange(val) { }, diff --git a/src/views/userManage/registerManage.vue b/src/views/userManage/registerManage.vue index bef7c7b..5a15ea4 100644 --- a/src/views/userManage/registerManage.vue +++ b/src/views/userManage/registerManage.vue @@ -335,7 +335,7 @@ return { filterQuery: { companyName: "", - checkType: "0", + checkType: "", page: 1, limit: 20, }, @@ -451,6 +451,7 @@ handleCurrentChange(val) { this.filterQuery.page = val; this.getList(); + this.filterQuery.page = 1; }, findMethod(query) { this.fromOptions = []; @@ -500,11 +501,11 @@ passRegister() { this.checkQuery.roles = this.check; - + if (this.$isBlank(this.rowData.companyName)) { return this.$message.warning("请输入企业名称"); } - + this.checkRegister(); this.centerDialogVisible = false; },