diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js index 9177f069..a0f623ec 100644 --- a/src/option/distribution/TripartiteTransfer.js +++ b/src/option/distribution/TripartiteTransfer.js @@ -468,16 +468,46 @@ export const detailsColumnList = [ fixed: false, sortable: true, }, - // { - // prop: 'billladingStatus', - // label: '装车类型', - // type: 2, - // values: '', - // width: '130', - // checkarr: [], - // fixed: false, - // sortable: true, - // }, + { + prop: 'firsts', + label: '一级品', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'senconds', + label: '二级品', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'thirds', + label: '三级品', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'materialName', + label: '物料名称', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'typeName', label: '类型', diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js index 603f6e96..d3d772bc 100644 --- a/src/option/distribution/addVehicleStowage.js +++ b/src/option/distribution/addVehicleStowage.js @@ -859,6 +859,52 @@ export const detailsColumnList = [ // isshowSummary: true, sortable: true, }, + // { + // prop: 'costPiece', + // label: '开单单价', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // isColumnMerge: true, + // // isshowSummary: true, + // sortable: true, + // }, + // { + // prop: 'costPiece', + // label: '开单名称', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // isColumnMerge: true, + // // isshowSummary: true, + // sortable: true, + // }, + // { + // prop: 'costPiece', + // label: '订单开单名称', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // // isshowSummary: true, + // sortable: true, + // }, + // { + // prop: 'costPiece', + // label: '品类名称', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // // isshowSummary: true, + // sortable: true, + // }, { prop: 'costZhang', label: '按比例成本', diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index eb60493f..5123d8e9 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -1510,6 +1510,12 @@ const handleShowListOfLoadedWagons = async () => { if (code !== 200) return; details.popUpShow.listOfLoadedWagons = true; + + for (let i = 0; i < data.length; i++) { + const val = data[i]; + val.waybillNo += ''; + } + details.listOfLoadedWagonsData = data; } catch (error) { console.log('error :>> ', error);