diff --git a/src/api/warehouse/PreStoragePackage.js b/src/api/warehouse/PreStoragePackage.js new file mode 100644 index 00000000..03d12d8a --- /dev/null +++ b/src/api/warehouse/PreStoragePackage.js @@ -0,0 +1,16 @@ +import request from '@/axios'; + +/** + * 获取未入库数据 + * @param {*} current + * @param {*} size + * @param {*} params + * @returns + */ +export const getList = params => { + return request({ + url: '/api/logpm-distribution/businessPreOrder/page', + method: 'get', + params, + }); +}; diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 33ce51b5..cba0a406 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -615,7 +615,6 @@ const getSummaries = (param: any) => { return; } tji = 0; - console.log('item :>> ', item); if (item?.isshowSummary && !item.head) { for (let ite of data) { tji = computeNumber(tji, '+', Number(ite[item?.prop] || 0)).result; diff --git a/src/option/warehouse/PreStoragePackage.js b/src/option/warehouse/PreStoragePackage.js new file mode 100644 index 00000000..d5a3298e --- /dev/null +++ b/src/option/warehouse/PreStoragePackage.js @@ -0,0 +1,307 @@ +export const columnList = [ + { + prop: '', + label: '复选框', + type: 0, + values: '', + width: '55', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '240', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderPackageCode', + label: '包条码', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'reservationCode', + label: '预约编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'deliveryTrainNumber', + label: '配送车次号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'warehouse', + label: '仓库', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + }, + // { + // prop: 'materialName', + // label: '物品名称', + // type: 2, + // values: '', + // width: '180', + // checkarr: [], + // fixed: false, + // sortable: true, + // }, + + { + prop: 'sendWarehouseName', + label: '发站仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'acceptWarehouseName', + label: '目的仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + label: '物料名称', + prop: 'materialName', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'trainNumber', + label: '入库车次', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'firsts', + label: '一级品类', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'second', + label: '二级品类', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'thirdProduct', + label: '三级品类', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'materialName', + label: '物料名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseEntryTimeEnd', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'quantity', + label: '包件数量', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, + + { + prop: 'reservationNum', + label: '计划数量', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'loadingNub', + label: '装车数量', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'signingNub', + label: '签收数量', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'scanStatus', + label: '装车方式', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'driverName', + label: '计划装车人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'scanUser', + label: '实际装车人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'loadingTime', + label: '装车时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signingUser', + label: '签收人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signingTime', + label: '签收扫描时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '250', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 36c07d6e..00e4a0c5 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -174,14 +174,14 @@ }} - {{ item.nodeName }} + {{ item.nodeName }} @@ -197,7 +197,7 @@