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/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/PackageStartTimePageReport.js b/src/option/reportforms/PackageStartTimePageReport.js index d6ae17c6..f9d5ff71 100644 --- a/src/option/reportforms/PackageStartTimePageReport.js +++ b/src/option/reportforms/PackageStartTimePageReport.js @@ -119,7 +119,7 @@ export const columnList = [ }, { prop: 'avgTime', - label: '平均发运时效', + label: '平均发运时效(小时)', type: 1, values: '', width: '150', diff --git a/src/option/reportforms/PackageTransferTimePageReport.js b/src/option/reportforms/PackageTransferTimePageReport.js index 33cdefad..4eb82c03 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: '中转准时出库率', @@ -107,7 +142,7 @@ export const columnList = [ }, { prop: 'avgTime', - label: '平均中转时效', + label: '平均中转时效(小时)', type: 1, values: '', width: '150', 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/utils/exportData.js b/src/utils/exportData.js index 6ebf6135..f9f1fd30 100644 --- a/src/utils/exportData.js +++ b/src/utils/exportData.js @@ -7,7 +7,7 @@ export function exportExcel(columnList = [], listData = [], name = 'excel') { const headers = []; - const blackArr = ['序号', '复选框', '操作']; + const blackArr = ['序号', '复选框', '操作', '全选']; const data = []; diff --git a/src/views/basicdata/brand/ThreePartyMallManagement.vue b/src/views/basicdata/brand/ThreePartyMallManagement.vue index 2f6577c9..dda8b15a 100644 --- a/src/views/basicdata/brand/ThreePartyMallManagement.vue +++ b/src/views/basicdata/brand/ThreePartyMallManagement.vue @@ -21,6 +21,7 @@