diff --git a/src/api/waybill/orderPackageListDetails.js b/src/api/waybill/orderPackageListDetails.js index 5f136022..65fcdf58 100644 --- a/src/api/waybill/orderPackageListDetails.js +++ b/src/api/waybill/orderPackageListDetails.js @@ -43,3 +43,14 @@ export const getShowAdvancePackgeCode = params => { params, }); }; + +/** + * 批量删除 + */ +export const postDeleteAdvanceDetail = params => { + return request({ + url: '/api/logpm-trunkline/advanceDetail/deleteAdvanceDetail', + method: 'post', + params, + }); +}; diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js index f04f0925..f7fc8fe0 100644 --- a/src/option/distribution/VehicleArrivalManagement.js +++ b/src/option/distribution/VehicleArrivalManagement.js @@ -17,7 +17,7 @@ export const columnList = [ { prop: 'carsNo', label: '批次号', - type: 6, + type: 13, values: '', width: '150', checkarr: [], @@ -28,11 +28,11 @@ export const columnList = [ { prop: 'carsLineName', label: '路线', - type: 6, + type: 13, values: '', width: '200', checkarr: [], - fixed: false, + fixed: true, sortable: true, }, { @@ -57,6 +57,17 @@ export const columnList = [ sortable: true, isshowSummary: true, }, + { + prop: 'NumberOfPiecesInTheCar', + label: '在车件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'unloadNumber', label: '卸车件数', diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js index dfbd1c22..4fb505cb 100644 --- a/src/option/distribution/VehicleStowage.js +++ b/src/option/distribution/VehicleStowage.js @@ -57,17 +57,17 @@ export const columnList = [ sortable: true, isshowSummary: true, }, - // { - // prop: 'warehouseName', - // label: '在车件数', - // type: 1, - // values: '', - // width: '130', - // checkarr: [], - // fixed: false, - // sortable: true, - // isshowSummary: true, - // }, + { + prop: 'NumberOfPiecesInTheCar', + label: '在车件数', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + isshowSummary: true, + }, { prop: 'unloadNumber', label: '卸车件数', diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index 06596ac7..bf710e24 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -123,18 +123,12 @@ @@ -448,6 +442,7 @@ const details = reactive({ customerTypeOptions: [ { value: 1, label: '商城' }, { value: 2, label: 'C端客户' }, + { value: '1,2', label: '商城,C端客户' }, ], /** 送货方式 */ deliveryTypeOptions: [ @@ -500,8 +495,10 @@ console.log('permission :>> ', permission); /** 转换码值 */ const handleConversionCodeValue = (item, label, Arr) => { const codes = Arr.map(item => item.value); + console.log('codes :>> ', codes); - const _index = codes.indexOf(Number(item[label])); + let _index = codes.indexOf(Number(item[label])); + if (_index === -1) _index = codes.indexOf(item[label]); item[label + 'Name'] = _index !== -1 ? Arr[_index].label : '未知'; }; @@ -522,6 +519,85 @@ onMounted(() => { handleSetOption('isSettlement', details.isSettlementOptions); handleSetOption('customerType', details.customerTypeOptions); handleSetOption('deliveryType', details.deliveryTypeOptions); + + /** + * 初始化获取本地缓存的编辑隐藏的列表 + * 固定搭配，不能更改 + */ + let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList'); + let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList'); + let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist'); + if (checkListnewarr) { + details.columnList.map(item => { + item.head = false; + }); + for (const iterator of checkListnewarr) { + for (const item of details.columnList) { + if (iterator == item.label) { + item.head = true; + } + } + } + // checkListnewarr.map(ite => { + // details.columnList.map(item => { + // if (ite == item.label) { + // item.head = true; + // } + // }); + // }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.head) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'checkList', arr); + } + if (flexListnewarr) { + details.columnList.map(item => { + item.fixed = false; + }); + flexListnewarr.map(ite => { + details.columnList.map(item => { + if (ite == item.label) { + if (item.type == 6) { + item.fixed = 'right'; + } else { + item.fixed = true; + } + } + }); + }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.fixed) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'flexList', arr); + } + if (sortlistnewarr) { + details.columnList.map(item => { + item.sortable = false; + }); + sortlistnewarr.map(ite => { + details.columnList.map(item => { + if (ite == item.label) { + item.sortable = true; + } + }); + }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.sortable) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'sortlist', arr); + } }); /** 请求页面数据 */ diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index e06ded88..26010965 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -70,7 +70,7 @@
发车 - 网点取消发车 {{ item.nodeName }}
- 运单总件数: - {{ item.nodeName }} + 计划总件数: + {{ item.planLoadingNumber || 0 }}
实际装车件数: - {{ item.nodeName }} + {{ item.realLoadingNumber || 0 }} +
+
+ 卸车件数: + {{ item.unloadNumber || 0 }}
操作人: - {{ item.nodeName }} + {{ item.arriveUserName || item.startUserName || '暂无数据' }}
状态: - {{ item.nodeName }} + {{ + (details.nodeStatus.find(val => val.value === Number(item.nodeStatus)) || {}) + .label + }}
{{ item.nodeName }} @@ -184,14 +191,13 @@ @@ -362,6 +368,7 @@ import { postFindNextNodeList, postUpdateLoadScanFinalNodeIdById, postRemoveCarsLoadScan, + postCancelStartCarByLoadId, } from '@/api/distribution/VehicleStowage'; import { useRouter } from 'vue-router'; import { ElMessage, ElMessageBox } from 'element-plus'; @@ -459,6 +466,12 @@ const details = reactive({ { value: 40, label: '终点到车' }, { value: 100, label: '取消配载' }, ], + /** 节点状态 */ + nodeStatus: [ + { label: '未到达', value: 0 }, + { label: '已到车', value: 10 }, + { label: '已发车', value: 20 }, + ], packageColumnList: deepClone(packageColumnList), /** 配置装车目的地数据 */ packageData: [], @@ -485,12 +498,84 @@ const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'] console.log('permission :>> ', permission); onMounted(() => { - // const timer = setTimeout(() => { - // details.listNode = document.querySelector('.maboxhi') as any; - // details.listNode.style.transition = 'all .5s ease-out'; - // console.log('details.listNode :>> ', details.listNode); - // clearTimeout(timer); - // }, 100); + /** + * 初始化获取本地缓存的编辑隐藏的列表 + * 固定搭配，不能更改 + */ + let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList'); + let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList'); + let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist'); + if (checkListnewarr) { + details.columnList.map(item => { + item.head = false; + }); + for (const iterator of checkListnewarr) { + for (const item of details.columnList) { + if (iterator == item.label) { + item.head = true; + } + } + } + // checkListnewarr.map(ite => { + // details.columnList.map(item => { + // if (ite == item.label) { + // item.head = true; + // } + // }); + // }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.head) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'checkList', arr); + } + if (flexListnewarr) { + details.columnList.map(item => { + item.fixed = false; + }); + flexListnewarr.map(ite => { + details.columnList.map(item => { + if (ite == item.label) { + if (item.type == 6) { + item.fixed = 'right'; + } else { + item.fixed = true; + } + } + }); + }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.fixed) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'flexList', arr); + } + if (sortlistnewarr) { + details.columnList.map(item => { + item.sortable = false; + }); + sortlistnewarr.map(ite => { + details.columnList.map(item => { + if (ite == item.label) { + item.sortable = true; + } + }); + }); + } else { + let arr = []; + details.columnList.map(item => { + if (item.sortable) { + arr.push(item.label); + } + }); + functions.setStorage(window.location.pathname + 'sortlist', arr); + } }); /** 请求页面数据 */ @@ -509,6 +594,7 @@ const onLoad = async (params = {}) => { for (let item of details.data) { const _index = codes.indexOf(Number(item.loadStatus)); item.loadStatusName = _index !== -1 ? details.carsStatus[_index].label : '未知'; + item.NumberOfPiecesInTheCar = item.realLoadingNumber - item.unloadNumber; } details.page.total = data.total; } catch (error) { @@ -598,6 +684,7 @@ const currentChange = () => {}; * 固定搭配，只需要更换 columnList * */ const setnewcolum = (newarr, headarr, type) => { + console.log('type :>> ', type); if (type == 1) { details.columnList = newarr; functions.setStorage(window.location.pathname + 'checkList', headarr); @@ -798,7 +885,7 @@ const handleStartCar = async () => { }).then(async () => { const submitData = { loadId: details.selectionList.map(val => val.id).join(','), - startCarType: '1', + startCarType: '2', }; const res = await postStartCarByLoadId(submitData); @@ -816,6 +903,44 @@ const handleStartCar = async () => { } }; +/** 取消发车 */ +const handleEndCar = async () => { + if (details.selectionList.length === 0) { + return ElMessage({ + message: '请选择发车数据', + type: 'warning', + }); + } else if (details.selectionList.length !== 1) { + return ElMessage({ + message: '仅支持单条数据操作', + type: 'warning', + }); + } + + ElMessageBox.confirm('确认取消发车吗?', '', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(async () => { + const submitData = { + loadId: details.selectionList.map(val => val.id).join(','), + startCarType: '2', + }; + + const res = await postCancelStartCarByLoadId(submitData); + const { code } = res.data; + if (code !== 200) { + return; + } + ElMessage({ + type: 'success', + message: '取消成功', + }); + + onLoad(); + }); +}; + /** 开启弹窗 */ const handleOpenConfiguration = (type: 'one' | 'batch', data) => { if (type === 'batch' && details.packageSelectedData.length === 0) diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 0667d10f..f4fa9309 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -122,10 +122,18 @@ 网点: {{ item.nodeName }} +
+ 计划装车件数: + {{ item.planLoadingNumber || 0 }} +
装车件数: {{ item.realLoadingNumber || 0 }}
+
+ 卸车件数: + {{ item.unloadNumber || 0 }} +
操作人: {{ item.arriveUserName || item.startUserName || '暂无数据' }} @@ -605,12 +613,15 @@ const onLoad = async (params = {}) => { const res = await postloadCarsPageList(details.page, { ...details.query, ...params }); const { code, data } = res.data; if (code !== 200) return; - details.data = data.records.map(val => { - val.loadStatusName = carStateDictionaries.find( - item => Number(val.loadStatus) === item.code + details.data = data; + + for (let item of details.data) { + item.loadStatusName = item.loadStatusName = carStateDictionaries.find( + val => Number(item.loadStatus) === val.code ).label; - return val; - }); + item.NumberOfPiecesInTheCar = item.realLoadingNumber - item.unloadNumber; + } + details.page.total = data.total; } catch (error) { console.log('error :>> ', error); diff --git a/src/views/distribution/inventory/BookingNote.vue b/src/views/distribution/inventory/BookingNote.vue index 5578ff3d..f5ed3cde 100644 --- a/src/views/distribution/inventory/BookingNote.vue +++ b/src/views/distribution/inventory/BookingNote.vue @@ -950,7 +950,7 @@ 审 核 - 修 改 + 修 改 打 印 @@ -1733,6 +1733,34 @@ const back = () => { $store.commit('DEL_TAG_CURRENT'); $router.back(); }; + +const handleEdit = () => { + if (Number($route.query.waybillType) === 1) { + // 暂存单转运单的数据 + + $router.push({ + path: '/distribution/inventory/CreateOrder', + query: { + name: '改单', + id: $route.query.id, + type: 'edit', + backPath: '/waybill/WaybillOrderList', + }, + }); + } else if (Number($route.query.waybillType) === 2) { + // 零担开单的数据 + + $router.push({ + path: '/waybill/CreateZeroOrder', + query: { + name: '改单', + id: $route.query.id, + type: 'edit', + backPath: '/waybill/WaybillOrderList', + }, + }); + } +}; diff --git a/src/views/waybill/WaybillOrderList.vue b/src/views/waybill/WaybillOrderList.vue index 00049354..62c9bcea 100644 --- a/src/views/waybill/WaybillOrderList.vue +++ b/src/views/waybill/WaybillOrderList.vue @@ -117,15 +117,11 @@ @@ -564,7 +560,12 @@ const handleGoWaybillDetails = ({ row }) => { console.log('row :>> ', row); $router.push({ path: '/distribution/inventory/BookingNote', - query: { name: `查看 -- 【${row.waybillNo}】`, waybillNo: row.waybillNo, id: row.id }, + query: { + name: `查看 -- 【${row.waybillNo}】`, + waybillNo: row.waybillNo, + id: row.id, + waybillType: row.waybillType, + }, }); }; diff --git a/src/views/waybill/orderPackageListDetails.vue b/src/views/waybill/orderPackageListDetails.vue index 73db8bbf..05ea0722 100644 --- a/src/views/waybill/orderPackageListDetails.vue +++ b/src/views/waybill/orderPackageListDetails.vue @@ -108,9 +108,10 @@
批量打印 - 批量入库 + + 批量入库 + + 批量删除
@@ -136,20 +137,15 @@ > @@ -339,6 +335,7 @@ import { getopenOrderFindAdvanceDetailList, getopenOrderIncomingPackage, getShowAdvancePackgeCode, + postDeleteAdvanceDetail, } from '@/api/waybill/orderPackageListDetails'; import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle'; import { downloadXls, setNodeHeight, getHtmls } from '@/utils/util'; @@ -782,6 +779,29 @@ const handleShowFlowNode = ({ row }) => { console.log('_node :>> ', _node); }); }; + +/** 批量删除 */ +const handleBatchDelete = () => { + if (details.selectionList.length === 0) return ElMessage.error('请选择要删除的数据'); + + ElMessageBox.confirm('确认删除吗?', '警告', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(async () => { + const submitData = { advanceDetailIds: details.selectionList.map(item => item.id) }; + + const res = await postDeleteAdvanceDetail(submitData); + const { code } = res.data; + + if (code !== 200) return; + initPage(); + ElMessage({ + type: 'success', + message: '删除成功', + }); + }); +};