From 0fe113a6060bed9204c80725554d828da53f4735 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 14 Jan 2025 09:32:30 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=97=E8=A1=A8=E9=85=8D=E9=80=81=E5=8F=B8?= =?UTF-8?q?=E6=9C=BA=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverylist/distributionDeliveryList.vue | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index b3b0608e..3083e6c2 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -716,17 +716,16 @@ export default { getDriverList(1, 10, '').then(res => { const data = res.data.data; let po = []; - if (data.records?.length) { - data.records.forEach(item => { - let a = { - dictKey: item.id, - dictValue: item.name, - }; - po.push(a); - }); - this.driverData = po; - rv(res.data.data.records); - } + + data.forEach(item => { + let a = { + dictKey: item.id, + dictValue: item.name, + }; + po.push(a); + }); + this.driverData = po; + rv(res.data.data.records); }); }); }, From e4e9e7702f3bf183d1ca84caa9b5fbcef2fb05f5 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Tue, 14 Jan 2025 10:12:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/deliverylist/distributionDeliveryList.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 3083e6c2..4a641cdb 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -699,7 +699,7 @@ export default { getVehicleList(1, 10, '').then(res => { const data = res.data.data; let po = []; - data.records.forEach(item => { + data.forEach(item => { let a = { dictKey: item.id, dictValue: item.vehicleNub, @@ -707,7 +707,7 @@ export default { po.push(a); }); this.vehicleData = po; - rv(res.data.data.records); + rv(res.data.data); }); }); }, @@ -725,7 +725,7 @@ export default { po.push(a); }); this.driverData = po; - rv(res.data.data.records); + rv(res.data.data); }); }); }, From 4d0e7ac4f932605e178cb3bf092f9f2bdd48841f Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 15 Jan 2025 09:32:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/reportforms/OrderAllTime.js | 12 +++++++ .../PackageAllTrunklineTimePageReport.js | 11 ++++++ .../PackageTransferTimePageReport.js | 35 +++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/src/option/reportforms/OrderAllTime.js b/src/option/reportforms/OrderAllTime.js index ab4321a4..df04620c 100644 --- a/src/option/reportforms/OrderAllTime.js +++ b/src/option/reportforms/OrderAllTime.js @@ -324,4 +324,16 @@ export const columnList = [ head: false, isshowSummary: true, //开启统计 }, + { + prop: 'dayTime', + label: '标准时效(天)', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, ]; diff --git a/src/option/reportforms/PackageAllTrunklineTimePageReport.js b/src/option/reportforms/PackageAllTrunklineTimePageReport.js index a3b967a0..159c0074 100644 --- a/src/option/reportforms/PackageAllTrunklineTimePageReport.js +++ b/src/option/reportforms/PackageAllTrunklineTimePageReport.js @@ -356,4 +356,15 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'hoursTime', + label: '标准时效(小时)', + type: 6, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, ]; diff --git a/src/option/reportforms/PackageTransferTimePageReport.js b/src/option/reportforms/PackageTransferTimePageReport.js index 33cdefad..ba7f4a09 100644 --- a/src/option/reportforms/PackageTransferTimePageReport.js +++ b/src/option/reportforms/PackageTransferTimePageReport.js @@ -47,6 +47,17 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'warehouseName', + label: '中转仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'brand', label: '品牌', @@ -82,6 +93,18 @@ export const columnList = [ head: false, isshowSummary: true, //开启统计 }, + { + prop: 'noOutNum', + label: '未出库件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, { prop: 'outOnTimeNum', label: '中转准时出库件数', @@ -94,6 +117,18 @@ export const columnList = [ head: false, isshowSummary: true, //开启统计 }, + { + prop: 'noOutOverNum', + label: '未出库超时件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + isshowSummary: true, //开启统计 + }, { prop: 'outOnTimeRate', label: '中转准时出库率', From 581024a33db2d4b8e819e5256774addc4993a1bd Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Wed, 15 Jan 2025 14:55:01 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B9=B2=E7=BA=BF=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/waybill/ChangeOrder.js | 13 ++++++ src/option/finance/WaybillAudit.js | 46 ++++++++------------- src/option/waybill/WaybillOrderList.js | 21 +++++----- src/views/waybill/ChangeOrder.vue | 56 ++++++++++++++++++++++++-- 4 files changed, 94 insertions(+), 42 deletions(-) diff --git a/src/api/waybill/ChangeOrder.js b/src/api/waybill/ChangeOrder.js index 07e1d96a..47252080 100644 --- a/src/api/waybill/ChangeOrder.js +++ b/src/api/waybill/ChangeOrder.js @@ -12,3 +12,16 @@ export const postFindUpdateWaybillList = data => { data, }); }; + +/** + * 导出 + * @param {Object} data + * @returns + */ +export const postUpdateWaybillQualityExport = data => { + return request({ + url: '/api/logpm-trunkline/openOrder/updateWaybillQualityExport', + method: 'post', + data, + }); +}; diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js index e7f45e6e..886d11b3 100644 --- a/src/option/finance/WaybillAudit.js +++ b/src/option/finance/WaybillAudit.js @@ -289,7 +289,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'freightFee', @@ -302,7 +301,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, // { // prop: 'templateType', @@ -337,7 +335,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'warehouseFee', @@ -350,7 +347,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'warehouseManagementFee', @@ -363,7 +359,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'warehouseSortingFee', @@ -376,7 +371,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'warehouseOprationFee', @@ -389,7 +383,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryServiceFee', @@ -402,7 +395,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryFee', @@ -415,7 +407,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryHandlingFee', @@ -428,7 +419,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliverySortingFee', @@ -441,7 +431,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryUpfloorFee', @@ -454,7 +443,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryMoveFee', @@ -467,7 +455,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, // { // prop: 'deliveryLine', @@ -491,7 +478,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryLineFee', @@ -504,7 +490,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'installFee', @@ -517,7 +502,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'insuranceFee', @@ -530,7 +514,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'claimingValue', @@ -543,7 +526,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'otherFee', @@ -556,7 +538,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'rebate', @@ -569,7 +550,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'thirdOperationFee', @@ -582,7 +562,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'shipperName', @@ -788,7 +767,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'dpay', @@ -801,7 +779,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'hpay', @@ -814,7 +791,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'ypay', @@ -827,7 +803,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { @@ -841,7 +816,6 @@ export const columnList = [ sortable: true, head: false, isshowSummary: true, - }, { prop: 'deliveryTime', @@ -856,7 +830,7 @@ export const columnList = [ }, { prop: 'signTime', - label: "签收时间", + label: '签收时间', type: 1, values: '', width: '150', @@ -868,7 +842,7 @@ export const columnList = [ { prop: 'signUserName', - label: "签收人", + label: '签收人', type: 1, values: '', width: '150', @@ -880,7 +854,7 @@ export const columnList = [ { prop: 'deliveryDriverName', - label: "配送司机", + label: '配送司机', type: 1, values: '', width: '150', @@ -912,6 +886,20 @@ export const columnList = [ // sortable: true, // head: false, // }, + { + prop: 'updateStatusName', + label: '改单状态', + type: 1, + values: '', + width: '130', + checkarr: [ + { label: '未改单', value: '0' }, + { label: '已改单', value: '1' }, + ], + fixed: false, + isshowSummary: false, + sortable: true, + }, { prop: 'checkStatusName', label: '审核状态', diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js index d5b92628..f1f8fbe9 100644 --- a/src/option/waybill/WaybillOrderList.js +++ b/src/option/waybill/WaybillOrderList.js @@ -389,9 +389,9 @@ export const columnList = [ isshowSummary: true, sortable: true, }, */ - /* { - prop: 'carrierName', - label: '总费用', + { + prop: 'installFee', + label: '安装费', type: 1, values: '', width: '130', @@ -399,7 +399,7 @@ export const columnList = [ fixed: false, isshowSummary: true, sortable: true, - }, */ + }, { prop: 'claimingValue', label: '申明价值', @@ -876,17 +876,20 @@ export const columnList = [ isshowSummary: false, sortable: true, }, */ - /* { - prop: 'carrierName', - label: '冻结状态', + { + prop: 'updateStatusName', + label: '改单状态', type: 1, values: '', width: '130', - checkarr: [], + checkarr: [ + { label: '未改单', value: '0' }, + { label: '已改单', value: '1' }, + ], fixed: false, isshowSummary: false, sortable: true, - }, */ + }, { prop: 'checkStatusName', label: '审核状态', diff --git a/src/views/waybill/ChangeOrder.vue b/src/views/waybill/ChangeOrder.vue index 7c9e3b30..421237bc 100644 --- a/src/views/waybill/ChangeOrder.vue +++ b/src/views/waybill/ChangeOrder.vue @@ -1,6 +1,6 @@