From 6668c99dcc3febeba8ce8af6fa7b415843cd81a2 Mon Sep 17 00:00:00 2001 From: bibi <541660090@qq.com> Date: Thu, 24 Feb 2022 11:34:22 +0800 Subject: [PATCH] 1 --- src/views/Basic/Employee/index.vue | 4 +--- src/views/Basic/EstateInfo/_buildingManage/index.vue | 2 +- src/views/Basic/EstateInfo/_houseHoldAudit/index.vue | 3 +-- src/views/Basic/EstateInfo/_houseHoldInfo/index.vue | 3 +-- src/views/Basic/EstateInfo/_houseManage/index.vue | 4 +--- .../Operation/Activity/_activityManage/index.vue | 11 +---------- src/views/Operation/Activity/_organizers/index.vue | 8 +------- src/views/Operation/BBS/_dynamic/index.vue | 4 +--- src/views/Operation/BBS/_topic/index.vue | 5 +---- src/views/Operation/TaskManage/_taskList/index.vue | 5 +---- src/views/Shop/OrderManage/index.vue | 4 +--- 11 files changed, 11 insertions(+), 42 deletions(-) diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index 27e4fa8..8ecd668 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -286,9 +286,7 @@ export default { findToUser({ pageNum: this.pagination.current, size: this.pagination.pageSize, - keyword:this.searchForm.keyword, - departmentId:this.searchForm.departmentId, - positionId:this.searchForm.positionId, + ...this.searchForm }).then((res) => { this.tableData = res.data.rows; this.pagination.total = res.data.total diff --git a/src/views/Basic/EstateInfo/_buildingManage/index.vue b/src/views/Basic/EstateInfo/_buildingManage/index.vue index bb94944..331b8e2 100644 --- a/src/views/Basic/EstateInfo/_buildingManage/index.vue +++ b/src/views/Basic/EstateInfo/_buildingManage/index.vue @@ -67,7 +67,7 @@ export default { { pageNum:this.pagination.current, size:this.pagination.pageSize, - name:this.searchForm.name + ...this.searchForm } ) this.tableData = res.data.rows diff --git a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue index 3d453be..c6c3a1a 100644 --- a/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldAudit/index.vue @@ -171,8 +171,7 @@ export default { const res = await reviewList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - status: this.activeName, - identity: this.searchForm.identity, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue index 7f5e296..c535883 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue @@ -206,8 +206,7 @@ export default { const res = await residentList({ pageNum: this.pagination.current, size :this.pagination.pageSize, - sex:this.searchForm.sex, - keyword:this.searchForm.keyword, + ...this.searchForm }) this.tableData = res.data.rows this.pagination.total = res.data.total diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue index 7a3b4ae..d95e93a 100644 --- a/src/views/Basic/EstateInfo/_houseManage/index.vue +++ b/src/views/Basic/EstateInfo/_houseManage/index.vue @@ -237,9 +237,7 @@ export default { const res = await houseList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - name: this.searchForm.name, - isEnableLease: this.searchForm.isEnableLease, - manageEstateTypeId: this.searchForm.manageEstateTypeId, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total diff --git a/src/views/Operation/Activity/_activityManage/index.vue b/src/views/Operation/Activity/_activityManage/index.vue index c8d9f2f..3555eca 100644 --- a/src/views/Operation/Activity/_activityManage/index.vue +++ b/src/views/Operation/Activity/_activityManage/index.vue @@ -112,16 +112,7 @@ export default { let res = await activityList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - activityAddress: this.searchForm.activityAddress, - organizerName: this.searchForm.organizerName, - activityContact: this.searchForm.activityContact, - activityTel: this.searchForm.activityTel, - title: this.searchForm.title, - status: this.searchForm.status, - registrationStartTime: this.searchForm.registrationStartTime, - registrationEndTime: this.searchForm.registrationEndTime, - activityStartTime: this.searchForm.activityStartTime, - activityEndTime: this.searchForm.activityEndTime, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total; diff --git a/src/views/Operation/Activity/_organizers/index.vue b/src/views/Operation/Activity/_organizers/index.vue index 68689c9..a6d6544 100644 --- a/src/views/Operation/Activity/_organizers/index.vue +++ b/src/views/Operation/Activity/_organizers/index.vue @@ -94,13 +94,7 @@ export default { let res = await organizerList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - unit: this.searchForm.unit, - contact: this.searchForm.contact, - tel: this.searchForm.tel, - holdNumType: this.searchForm.holdNumType, - holdNum: this.searchForm.holdNum, - createStartDate: this.searchForm.createStartDate, - createEndDate: this.searchForm.createEndDate, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total; diff --git a/src/views/Operation/BBS/_dynamic/index.vue b/src/views/Operation/BBS/_dynamic/index.vue index 82e81ca..6f6159c 100644 --- a/src/views/Operation/BBS/_dynamic/index.vue +++ b/src/views/Operation/BBS/_dynamic/index.vue @@ -140,9 +140,7 @@ export default { methods: { async getData() { let res = await dynamicList({ - content: this.searchForm.content, - isPublic: this.searchForm.isPublic, - isComment: this.searchForm.isComment, + ...this.searchForm, pageNum: this.pagination.current, size: this.pagination.pageSize, }); diff --git a/src/views/Operation/BBS/_topic/index.vue b/src/views/Operation/BBS/_topic/index.vue index 16578ac..2c3ff76 100644 --- a/src/views/Operation/BBS/_topic/index.vue +++ b/src/views/Operation/BBS/_topic/index.vue @@ -94,10 +94,7 @@ export default { let res = await topicList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - title:this.searchForm.title, - status:this.searchForm.status, - isPublic:this.searchForm.isPublic, - isRating:this.searchForm.isRating, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total; diff --git a/src/views/Operation/TaskManage/_taskList/index.vue b/src/views/Operation/TaskManage/_taskList/index.vue index 1cf5597..6723a55 100644 --- a/src/views/Operation/TaskManage/_taskList/index.vue +++ b/src/views/Operation/TaskManage/_taskList/index.vue @@ -124,10 +124,7 @@ export default { let res = await taskList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - status: this.searchForm.status, - rewardType: this.searchForm.rewardType, - type: this.searchForm.type, - keyword: this.searchForm.keyword, + ...this.searchForm }); this.tableData = res.data.rows; this.pagination.total = res.data.total; diff --git a/src/views/Shop/OrderManage/index.vue b/src/views/Shop/OrderManage/index.vue index 151cf8b..5503c1d 100644 --- a/src/views/Shop/OrderManage/index.vue +++ b/src/views/Shop/OrderManage/index.vue @@ -173,9 +173,7 @@ export default { const res = await orderList({ pageNum: this.pagination.current, size: this.pagination.pageSize, - code:this.searchForm.code, - jcookCode:this.searchForm.jcookCode, - tradeStatus:this.searchForm.tradeStatus, + ...this.searchForm }) this.tableData = res.data.rows this.pagination.total = res.data.total