diff --git a/src/option/reportformsOption/CheckWaybillConfig.js b/src/option/reportformsOption/CheckWaybillConfig.js index 96f5b5e0..41b7c594 100644 --- a/src/option/reportformsOption/CheckWaybillConfig.js +++ b/src/option/reportformsOption/CheckWaybillConfig.js @@ -15,8 +15,19 @@ export const columnList = [ fixed: true, }, { - prop: 'warehouseName', - label: '仓库', + prop: 'departureWarehouseName', + label: '始发仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150', diff --git a/src/option/reportformsOption/DespatchConfig.js b/src/option/reportformsOption/DespatchConfig.js index 96f5b5e0..41b7c594 100644 --- a/src/option/reportformsOption/DespatchConfig.js +++ b/src/option/reportformsOption/DespatchConfig.js @@ -15,8 +15,19 @@ export const columnList = [ fixed: true, }, { - prop: 'warehouseName', - label: '仓库', + prop: 'departureWarehouseName', + label: '始发仓', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destinationWarehouseName', + label: '目的仓', type: 1, values: '', width: '150',