diff --git a/src/api/orderManagement/allocationMessQuery.js b/src/api/orderManagement/allocationMessQuery.js index 750f71fb..10668dba 100644 --- a/src/api/orderManagement/allocationMessQuery.js +++ b/src/api/orderManagement/allocationMessQuery.js @@ -1,9 +1,23 @@ import request from '@/axios'; //列表接口 -export const getList = (params) => { +export const getList = (data) => { return request({ - url: '/blade-desk/order/yieldPlan/pageAllocation', - method: 'get', - params + url: '/blade-desk/QA/PlanTest/queryAllocationMess', + method: 'post', + data:data }); }; + + +// 统计接口查询 /QA/PlanTest/queryAllocationStatistics +export const getStatistics = (current, size, params) => { + return request({ + url: '/blade-desk/QA/PlanTest/queryAllocationStatistics', + method: 'post', + data: { + ...params, + current, + size, + }, + }); +}; \ No newline at end of file diff --git a/src/views/orderManagement/components/allocation/allocationDetails.vue b/src/views/orderManagement/components/allocation/allocationDetails.vue index af9d6483..f7088e39 100644 --- a/src/views/orderManagement/components/allocation/allocationDetails.vue +++ b/src/views/orderManagement/components/allocation/allocationDetails.vue @@ -300,6 +300,9 @@ export default { searchRange: true, startPlaceholder: '开始时间', endPlaceholder: '结束时间', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + searchOrder: 20, searchRules: [ { @@ -425,14 +428,14 @@ export default { this.onLoad(this.page); }, searchChange(params, done) { - if (params.partCode && Array.isArray(params.partCode)) { + if (params.subpkdate && Array.isArray(params.subpkdate)) { // 根据后端接口要求,拆分开始时间和结束时间 // 如果后端接收 startDate 和 endDate - params.startDate = params.partCode[0]; - params.endDate = params.partCode[1]; + params.subpkdateStart = params.subpkdate[0]; + params.subpkdateEnd = params.subpkdate[1]; // 删除原始的 partCode 数组,避免传递多余参数或格式错误 - delete params.partCode; + delete params.subpkdate; } this.query = params; this.page.currentPage = 1; @@ -453,8 +456,8 @@ export default { // this.loading = true; try { const res = await getList({ - current: this.page.currentPage, - size: this.page.pageSize, + pageNum: this.page.currentPage, + pageSize: this.page.pageSize, ...this.query, }); this.data = res.data.data.records; diff --git a/src/views/orderManagement/components/allocation/statistics.vue b/src/views/orderManagement/components/allocation/statistics.vue index bbaf5c72..97dc8855 100644 --- a/src/views/orderManagement/components/allocation/statistics.vue +++ b/src/views/orderManagement/components/allocation/statistics.vue @@ -24,6 +24,7 @@