diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js index 8ace0887..5ecb0c18 100644 --- a/src/option/distribution/arteryDistrilbutionBillLadingList.js +++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js @@ -222,6 +222,16 @@ export const columnList = [ fixed: false, sortable: true, }, + { + prop: 'planNum', + label: '预计件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'totalWeight', label: '重量', @@ -232,6 +242,17 @@ export const columnList = [ fixed: false, sortable: true, }, + { + prop: 'planWeight', + label: '计划重量', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'totalVolume', label: '体积', @@ -242,6 +263,17 @@ export const columnList = [ fixed: false, sortable: false, }, + { + prop: 'planVolume', + label: '计划体积', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'createUserName', label: '创建人', diff --git a/src/option/distribution/directGoMarketDetails.js b/src/option/distribution/directGoMarketDetails.js index 22391da9..36120c72 100644 --- a/src/option/distribution/directGoMarketDetails.js +++ b/src/option/distribution/directGoMarketDetails.js @@ -245,7 +245,7 @@ export const detailsColumnList = [ }, { prop: 'scanStatusName', - label: '装卸状态', + label: '签收状态', type: 3, values: '', width: '130', @@ -273,16 +273,16 @@ export const detailsColumnList = [ fixed: false, sortable: true, }, - { - prop: 'unLoadNum', - label: '卸车数', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'unLoadNum', + // label: '卸车数', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'signUserName', label: '签收人', @@ -303,16 +303,16 @@ export const detailsColumnList = [ fixed: false, sortable: true, }, - { - prop: 'unloadTime', - label: '卸车时间', - type: 1, - values: '', - width: '130', - checkarr: [], - fixed: false, - sortable: true, - }, + // { + // prop: 'unloadTime', + // label: '卸车时间', + // type: 1, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, { prop: 'remark', label: '备注', diff --git a/src/option/waybill/orderPackageListDetails.js b/src/option/waybill/orderPackageListDetails.js index 99b60792..f8953143 100644 --- a/src/option/waybill/orderPackageListDetails.js +++ b/src/option/waybill/orderPackageListDetails.js @@ -57,6 +57,16 @@ export const packageListColumnList = [ fixed: true, sortable: true, }, + { + prop: 'nowWarehouseName', + label: '当前所在仓库', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + }, { prop: 'trainNumber', label: '客户车次号', diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 1a834f93..5877b44c 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -431,7 +431,10 @@ fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp, }" > - +
diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index fe14ebf5..138341be 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -440,7 +440,10 @@ fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp, }" > - +
diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 73ed30c4..ceb45bf1 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -415,7 +415,10 @@ fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp, }" > - +