diff --git a/src/api/process/workReport.js b/src/api/process/workReport.js index 3444dc6..4921329 100644 --- a/src/api/process/workReport.js +++ b/src/api/process/workReport.js @@ -13,7 +13,7 @@ export function listWorkReport(query) { export function getDetailsList(data) { return request({ url: '/system/workReport/getDetailsList', - method: 'post', + method: 'get', params: data }) } diff --git a/src/views/process/workReport/index.vue b/src/views/process/workReport/index.vue index 78c5daf..33f283c 100644 --- a/src/views/process/workReport/index.vue +++ b/src/views/process/workReport/index.vue @@ -136,6 +136,7 @@ :total="totalDialog" :page.sync="queryParams2.pageNum" :limit.sync="queryParams2.pageSize" + @pagination="getDetailsList2" /> @@ -600,7 +601,9 @@ export default { this.searchConditions={ type:type, orgId:row.orgId, - month:row.month + month:row.month, + pageNum: this.queryParams2.pageNum, + pageSize: this.queryParams2.pageSize, } getDetailsList(this.searchConditions).then(response => { this.tableDialogList = response.rows; @@ -609,6 +612,20 @@ export default { }) }, + getDetailsList2(){ + const queryData = { + ...this.searchConditions, // 拷贝存储的条件 + userName: this.form.userName, // 添加用户输入的搜索条件 + examineStatus:this.form.examineStatus, + pageNum: this.queryParams2.pageNum, + pageSize: this.queryParams2.pageSize + }; + getDetailsList(queryData).then(response => { + this.tableDialogList = response.rows; + this.totalDialog = response.total; + this.loading = false; + }); + }, /** 搜索按钮操作 */ handleQuerys() { const queryData = {