From 5a95bf0689c056a9cab274132088981e34e117d7 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Tue, 26 Dec 2023 17:17:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E6=94=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E5=AD=97=E6=9F=A5=E8=AF=A2=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionReservation.js | 4 +- .../distribution/distributionStockArticle.js | 4 +- .../signfor/distributionSignfortreat.vue | 114 ++++++++++++------ 3 files changed, 79 insertions(+), 43 deletions(-) diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js index f9ffb5e7..c2b1ebfb 100644 --- a/src/api/distribution/distributionReservation.js +++ b/src/api/distribution/distributionReservation.js @@ -319,11 +319,11 @@ export const $_getDeliveryZeroOrderDetail = params => { * @param ids * @returns {AxiosPromise} */ -export const getReservationPackageListByOrderId = (reservationId,orderId,current, size) => { +export const getReservationPackageListByOrderId = (current, size,params) => { return request({ url: '/api/logpm-distribution/reservation/getReservationPackageListByOrderId', method: 'get', - params: { reservationId,orderId,current, size } + params: { current, size,...params } }); } diff --git a/src/api/distribution/distributionStockArticle.js b/src/api/distribution/distributionStockArticle.js index 960addcc..5bfd4963 100644 --- a/src/api/distribution/distributionStockArticle.js +++ b/src/api/distribution/distributionStockArticle.js @@ -300,14 +300,14 @@ export const selectUpdateAvailableStockArticle = (current, size, params) => { }); }; -export const getPackageListByStockArticleId = (current, size, orderId) => { +export const getPackageListByStockArticleId = (current, size,params) => { return request({ url: '/api/logpm-distribution/distributionStockArticle/getPackageListByStockArticleId', method: 'get', params: { - ...orderId, current, size, + ...params, }, }); }; diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index d0da2930..3ae8f765 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -162,22 +162,28 @@ '装车件数' || '签收数' || '未签收数' || - '未装车件数' + '未装车件数'|| + '异常装车件数'|| + '异常签收件数' " > {{ - slotProps.scope.column.label === '配送件数' + slotProps.scope.column.label === '计划配送件数' ? slotProps.scope.row.reservationNum - : slotProps.scope.column.label === '装车件数' + : slotProps.scope.column.label === '计划装车件数' ? slotProps.scope.row.loadedNumber - : slotProps.scope.column.label === '签收件数' + : slotProps.scope.column.label === '计划签收件数' ? slotProps.scope.row.receivedQuantity - : slotProps.scope.column.label === '未签收件数' + : slotProps.scope.column.label === '计划未签收件数' ? slotProps.scope.row.unreceivedQuantity - : slotProps.scope.column.label === '未装车件数' + : slotProps.scope.column.label === '计划未装车件数' ? slotProps.scope.row.unloadedNumber + : slotProps.scope.column.label === '异常装车件数' + ? slotProps.scope.row.abnormalLoadedNumber + : slotProps.scope.column.label === '异常签收件数' + ? slotProps.scope.row.abnormalReceivedQuantity : '' }} @@ -857,7 +863,7 @@ export default { // }, { prop: 'reservationNum', - label: '配送件数', + label: '计划配送件数', type: 6, values: '', width: '150', @@ -869,7 +875,7 @@ export default { }, { prop: 'loadedNumber', - label: '装车件数', + label: '计划装车件数', type: 6, values: '', width: '130', @@ -880,7 +886,18 @@ export default { }, { prop: 'unloadedNumber', - label: '未装车件数', + label: '计划未装车件数', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: true, + sortable: true, + }, + { + prop: 'abnormalLoadedNumber', + label: '异常装车件数', type: 6, values: '', width: '130', @@ -891,7 +908,7 @@ export default { }, { prop: 'receivedQuantity', - label: '签收件数', + label: '计划签收件数', type: 6, values: '', width: '130', @@ -902,7 +919,18 @@ export default { }, { prop: 'unreceivedQuantity', - label: '未签收件数', + label: '计划未签收件数', + type: 6, + values: '', + width: '130', + checkarr: [], + isshowSummary: true, + fixed: false, + sortable: true, + }, + { + prop: 'abnormalReceivedQuantity', + label: '异常签收件数', type: 6, values: '', width: '130', @@ -986,7 +1014,7 @@ export default { { prop: 'waybillNumber', label: '运单号', - type: 2, + type: 1, values: '', width: '160', checkarr: [], @@ -997,7 +1025,7 @@ export default { { prop: 'serviceNumber', label: '服务号', - type: 2, + type: 1, values: '', width: '160', checkarr: [], @@ -1008,7 +1036,7 @@ export default { { prop: 'orderCode', label: '订单自编码', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1030,7 +1058,7 @@ export default { { prop: 'cargoNumber', label: '物料编码', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1041,7 +1069,7 @@ export default { { prop: 'marketName', label: '商场名称', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1052,7 +1080,7 @@ export default { { prop: 'descriptionGoods', label: '产品名称', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1063,7 +1091,7 @@ export default { { prop: 'stockupStatusName', label: '备货状态', - type: 4, + type: 1, values: '', width: '130', checkarr: [], @@ -1074,7 +1102,7 @@ export default { { prop: 'stockupTime', label: '备货时间', - type: 4, + type: 1, values: '', width: '130', checkarr: [], @@ -1085,7 +1113,7 @@ export default { { prop: 'conditionsName', label: '货物类型', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1096,7 +1124,7 @@ export default { { prop: 'loadingStatusName', label: '装车状态', - type: 4, + type: 1, values: '', width: '130', checkarr: [], @@ -1107,7 +1135,7 @@ export default { { prop: 'loadingTime', label: '装车时间', - type: 2, + type: 1, values: '', width: '200', checkarr: [], @@ -1118,7 +1146,7 @@ export default { { prop: 'signingStatusName', label: '签收状态', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1129,7 +1157,7 @@ export default { { prop: 'signingTime', label: '签收时间', - type: 2, + type: 1, values: '', width: '130', checkarr: [], @@ -1138,16 +1166,16 @@ export default { head: false, }, - { - prop: '', - label: '操作', - type: 6, - values: '', - width: '200', - checkarr: [], - fixed: 'right', - hide: true, - }, + // { + // prop: '', + // label: '操作', + // type: 6, + // values: '', + // width: '200', + // checkarr: [], + // fixed: 'right', + // hide: true, + // }, // 更多列的配置... ], numberDetailData: [], @@ -1807,27 +1835,35 @@ export default { let type = 0; switch (row.column.label) { - case '配送件数': + case '计划配送件数': this.numberTitle = '配送包件详情列表'; type = 1; console.log('查看配送件数'); break; - case '装车件数': + case '计划装车件数': type = 2; this.numberTitle = '装车详情列表'; break; - case '未装车件数': + case '计划未装车件数': type = 3; this.numberTitle = '未装车详情列表'; break; - case '签收件数': + case '计划签收件数': type = 4; this.numberTitle = '签收详情列表'; break; - case '未签收件数': + case '计划未签收件数': type = 5; this.numberTitle = '未签收详情列表'; break; + case '异常装车件数': + type = 6; + this.numberTitle = '异常装车详情列表'; + break; + case '异常签收件数': + type = 7; + this.numberTitle = '异常签收详情列表'; + break; } numberDetail(row.row.id, type).then(res => {