From b893118d8deae1c916f5eec004bdef3099d1f684 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Sun, 28 Apr 2024 21:28:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B2=E7=BA=BF=E9=83=A8?= =?UTF-8?q?=E5=88=86bug,=20=E6=96=B0=E5=A2=9E=E4=BB=B7=E6=A0=BC=E5=B8=A6?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/VehicleStowage.js | 11 + src/api/waybill/TemporaryStorageList.js | 2 +- src/option/distribution/abnormalList.js | 4 +- .../artery/VehicleArrivalManagement.vue | 99 +- .../distribution/artery/VehicleStowage.vue | 3 - .../distribution/inventory/CreateOrder.vue | 818 +++++++++++---- ...ateOrder - 副本.vue => CreateOrder2.vue} | 657 ++---------- .../distributionStockArticleDetails.vue | 2 +- src/views/waybill/CreateZeroOrder.vue | 951 +++++++++++++----- src/views/waybill/TemporaryStorageList.vue | 20 +- 10 files changed, 1608 insertions(+), 959 deletions(-) rename src/views/distribution/inventory/{CreateOrder - 副本.vue => CreateOrder2.vue} (83%) diff --git a/src/api/distribution/VehicleStowage.js b/src/api/distribution/VehicleStowage.js index 423e027c..b31df026 100644 --- a/src/api/distribution/VehicleStowage.js +++ b/src/api/distribution/VehicleStowage.js @@ -147,3 +147,14 @@ export const postFindLoadingListData = data => { data, }); }; + +/** + * 查看配载清单 + */ +export const postFindWarehouseUnloadReport = data => { + return request({ + url: '/api/logpm-trunkline/carsLoad/findWarehouseUnloadReport', + method: 'post', + data, + }); +}; diff --git a/src/api/waybill/TemporaryStorageList.js b/src/api/waybill/TemporaryStorageList.js index 9850f50b..4e00628f 100644 --- a/src/api/waybill/TemporaryStorageList.js +++ b/src/api/waybill/TemporaryStorageList.js @@ -87,7 +87,7 @@ export const postImportStandardOuPai = data => { /** * 查询品牌 */ -export const postFindBrandList = data => { +export const postFindBrandList = (data = {}) => { return request({ url: '/api/logpm-trunkline/openOrder/findBrandList', method: 'post', diff --git a/src/option/distribution/abnormalList.js b/src/option/distribution/abnormalList.js index 436bf496..d9bfaa01 100644 --- a/src/option/distribution/abnormalList.js +++ b/src/option/distribution/abnormalList.js @@ -38,8 +38,8 @@ export const columnList = [ checkarr: [ { value: 1, label: '无系统编码' }, { value: 2, label: '无装车计划' }, - { value: 2, label: '无装车记录' }, - { value: 2, label: '无卸车记录' }, + { value: 3, label: '无装车记录' }, + { value: 4, label: '无卸车记录' }, ], fixed: false, sortable: true, diff --git a/src/views/distribution/artery/VehicleArrivalManagement.vue b/src/views/distribution/artery/VehicleArrivalManagement.vue index 135c53ac..6a8c85c1 100644 --- a/src/views/distribution/artery/VehicleArrivalManagement.vue +++ b/src/views/distribution/artery/VehicleArrivalManagement.vue @@ -89,7 +89,7 @@ 终点到达卸车 - + 卸车报告 + +
+ +
装车卸车信息
+ +
+ {{ details.unloadReportInfo.one }} +
+ + +
卸车异常
+ +
+ {{ details.unloadReportInfo.two }} +
+ + +
待处理和已处理信息
+ +
+ {{ details.unloadReportInfo.three }} +
+ +
+ + 关 闭 + +
+
+ + { - const black = [80, 100]; + const black = [100]; if (black.includes(Number(row.loadStatus))) return false; return true; @@ -1276,6 +1316,28 @@ const handleManualLoading = ({ row }) => { // catch error }); }; + +/** 显示卸车报告 */ +const handleShowUnloadReport = async () => { + if (details.selectionList.length === 0) return ElMessage.warning('请选择装载清单'); + if (details.selectionList.length > 1) return ElMessage.warning('只能选择一个装载清单'); + try { + details.loadingObj.pageLoading = true; + + const { id } = details.selectionList[0]; + + const res = await postFindWarehouseUnloadReport({ loadId: id }); + const { code, data } = res.data; + + if (code !== 200) return; + details.popUpShow.unloadReport = true; + details.unloadReportInfo = data; + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.pageLoading = false; + } +}; diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index 4d534084..c0e33ad2 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -77,9 +77,6 @@ 对比报表 - 卸车报告
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue index 14cf3724..f80d6235 100644 --- a/src/views/distribution/inventory/CreateOrder.vue +++ b/src/views/distribution/inventory/CreateOrder.vue @@ -14,17 +14,18 @@
-
+
- 品牌: + 品牌： {{ query.brand }}
- 车次号: + 车次号： {{ query.trainNumber }}
+
@@ -34,18 +35,33 @@
-
-
- - {{ query.openOrderUserName }} +
+
+
+ + 商场名称： + {{ query.dealerName || '暂无数据' }} +
+
+ + 商场编码： + {{ query.dealerCode || '暂无数据' }} +
+
+ +
+
+ + {{ query.openOrderUserName }} +
+
-
@@ -59,6 +75,28 @@ > + +
+ + + +
+ +
@@ -277,7 +320,6 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); - handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" @@ -307,7 +349,6 @@ @row-click=" (column, prop, order) => { handleChooseConsigner(column, prop, order); - handleFindPrice(); } " v-loading="details.loadingObj.consignerLoading" @@ -334,6 +375,109 @@
+
+
提 货
+ + + 是 + 否 + + + + + + 是 + 否 + + + + + + + + + +
干 线
+ + + + 是 + 否 + + + + + + + + +
+
-
+
@@ -484,7 +635,7 @@
-
合计
+
合计
{{ details.goodsList.length }}
@@ -516,11 +667,21 @@ - + > --> + + @@ -537,8 +698,8 @@ > ', 111); - // 获取vue实例 const instance = getCurrentInstance(); @@ -1068,8 +1227,6 @@ let $store = useStore(); const tableNode = ref(); -console.log('$store :>> ', $store); - const details = reactive({ /** 页面数据 */ pageInfo: {}, @@ -1170,6 +1327,20 @@ const details = reactive({ remark: '', /** 运单类型 */ waybillType: 1, + /** 是否提货 */ + isPickUp: 0, + /** 是否整车 -- 提货 */ + pickupCompleteOrNot: 0, + /** 提货整车车型 */ + pickupVehicleType: '', + /** 是否整车 -- 干线 */ + trunklineCompleteOrNot: 0, + /** 干线整车车型 */ + trunklineVehicleType: '', + /** 商场编码 */ + dealerCode: '', + /** 商场名称 */ + dealerName: '', }, /** 合计 */ totalObj: { @@ -1254,9 +1425,15 @@ const details = reactive({ price: 0, /** 运费小计 */ subtotalFreight: 0, + /** 货物名称list */ + goodsListOptions: [], }, ], options: [], + /** 价格模板数据 */ + priceTemplate: {} as any, + /** 车型 */ + vehicleTypeArr: [], /** 到站地区数组 */ regionOptione: [], /** 支付字典 */ @@ -1451,6 +1628,14 @@ const details = reactive({ trigger: ['change', 'blur'], }, ], + /** 发站 */ + departure: [ + { + required: true, + message: '请填写或选择发站地', + trigger: ['change', 'blur'], + }, + ], /** 到站 */ destination: [ { @@ -1665,7 +1850,7 @@ const goodsNameRef = ref(); // 合计费用 const totalCost = computed(() => { - const _num = computeNumber(0, '+', details.totalObj.totalFreight || 0) + const _num = computeNumber(0, '+', details.query.totalFreight || 0) .next('+', details.query.deliveryFee || 0) .next('+', details.query.pickupFee || 0) .next('+', details.query.warehouseManagementFee || 0) @@ -1686,9 +1871,9 @@ const permission = computed(() => mapGetters(['permission', 'tagWel', 'tagList'] onMounted(() => {}); // 改单时, 对数据库内到站值进行转译 -const handleTranslationLocation = () => { +const handleTranslationLocation = key => { // 获取数据库中地址值 - const _location = details.query.destination; + const _location = details.query[key]; let _arr = []; @@ -1721,16 +1906,15 @@ const handleTranslationLocation = () => { if (isBreak) break; } - details.query.destination = _arr; + details.query[key] = _arr; }; -// 获取省市区信息 -getLazyTreeAll().then(res => { - if (res.data.success) { - details.regionOptione = res.data.data; +/** 获取车型 */ +getDictionaryBiz('price_vehicle_type').then(res => { + const { code, data } = res.data; + if (code !== 200) return; - if (details.query.destination) handleTranslationLocation(); - } + details.vehicleTypeArr = data || []; }); /** 初始化获取暂存单转运单信息 */ @@ -1757,6 +1941,16 @@ const onLoad = async (idsArr = []) => { details.query.destination = data.destinationArray; details.query.queryDestinationWarehouseName = data.destinationWarehouseName || ''; + // 是否提货 + details.query.isPickUp = details.query.isPickUp ? details.query.isPickUp : 0; + // 是否整车 -- 提货 + details.query.pickupCompleteOrNot = details.query.pickupCompleteOrNot + ? details.query.pickupCompleteOrNot + : 0; + // 是否整车 -- 干线 + details.query.trunklineCompleteOrNot = details.query.trunklineCompleteOrNot + ? details.query.trunklineCompleteOrNot + : 0; if (data.goodsList.length === 0) { details.goodsList = [ @@ -1820,6 +2014,15 @@ const initPageInfo = async (idsArr = []) => { try { details.loadingObj.submitLoadingBtn = true; + // 获取省市区信息 + await getLazyTreeAll().then(res => { + if (res.data.success) { + details.regionOptione = res.data.data; + + // if (details.query.destination) handleTranslationLocation(); + } + }); + details.pageInfo = { ...$route.query }; if (details.pageInfo.type !== 'edit') await onLoad(idsArr); else { @@ -1829,12 +2032,24 @@ const initPageInfo = async (idsArr = []) => { details.query = { ...data, ...data.warehouseWaybill }; delete details.query.warehouseWaybill; - console.log('details.query :>> ', details.query); + + // 是否提货 + details.query.isPickUp = + details.query.pickupFee && Number(details.query.pickupFee) > 0 ? 1 : 0; + // 是否整车 -- 提货 + details.query.pickupCompleteOrNot = details.query.pickupCompleteOrNot + ? details.query.pickupCompleteOrNot + : 0; + // 是否整车 -- 干线 + details.query.trunklineCompleteOrNot = details.query.trunklineCompleteOrNot + ? details.query.trunklineCompleteOrNot + : 0; + details.query.openOrderUserName = details.query.agent; details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName; details.query.openOrderDate = data.warehouseWaybill.createTime; details.query.orderCode = data.warehouseWaybill.orderNo; - details.query.transportType = '1'; + details.query.transportType = details.query.transportType ? details.query.transportType : '1'; details.query.receipt = data.warehouseWaybill.receipt ? data.warehouseWaybill.receipt.split(',') : []; @@ -1852,7 +2067,10 @@ const initPageInfo = async (idsArr = []) => { ? Number(data.warehouseWaybill.dpay) : data.warehouseWaybill.dpay; // 转译到站 - if (details.regionOptione.length !== 0) handleTranslationLocation(); + if (details.regionOptione.length !== 0) { + handleTranslationLocation('departure'); + handleTranslationLocation('destination'); + } // 初始化goodsList if (data.warehouseWaybill.detailList.length === 0) @@ -1902,6 +2120,8 @@ const initPageInfo = async (idsArr = []) => { return val; }); } + + handleFindPrice(false); } const { shipper, shipperName, shipperMobile, consignee, consigneeName, consigneeMobile } = @@ -1968,16 +2188,16 @@ const handleAdd = () => { }); return false; } - if (val.chargeType === 2 && val.weight === 0) { + if (val.chargeType === 2 && val.volume === 0) { ElMessage({ - message: '请填写重量', + message: '请填写方数', type: 'warning', }); return false; } - if (val.chargeType === 3 && val.price === 0) { + if (val.chargeType === 3 && val.weight === 0) { ElMessage({ - message: '请填写价格', + message: '请填写重量', type: 'warning', }); return false; @@ -2006,6 +2226,7 @@ const handleAdd = () => { price: 0, /** 运费小计 */ subtotalFreight: 0, + goodsListOptions: [], }); }; @@ -2202,7 +2423,12 @@ const handleComputed = (row: any) => { row.subtotalFreight = computeNumber(row.volume, '*', row.price).result; else if (row.chargeType === 3) row.subtotalFreight = computeNumber(row.weight, '*', row.price).result; - // row.subtotalFreight = 1; + + row.totalPickupPrice = computeNumber(row.num, '*', row.pickupPrice || 0).result; + + console.log('row :>> ', row); + + handleTrunkLinePrice(details.priceTemplate.trunkLine, details.priceTemplate.template); }; /** 查询客户信息 */ @@ -2314,6 +2540,7 @@ const handleDetectionPayWay = () => { return content; }; +/** 处理付款方式对应费用 */ const handlePayWay = (number?: number) => { const payType = Number(details.query.payWay); const enumPayType = { @@ -2335,6 +2562,137 @@ const handlePayWay = (number?: number) => { } }; +/** 处理提货费用 */ +const handlePickUpPrice = (pickup, template) => { + // 是否存在提货费用 + if (!details.query.isPickUp) return (details.query.pickupFee = 0); + + // 是否存在模板和维护价格 + if (!pickup || !template) return; + + // 是否整车 + if (details.query.pickupCompleteOrNot) { + // 是否存在模板和维护价格 + if (!pickup || !template) return (details.query.pickupFee = 0); + + const { fullVehicle } = pickup; + + if (getObjType(fullVehicle) !== 'array') return; + + let item = {}; + + for (let i = 0; i < fullVehicle.length; i++) { + const value = fullVehicle[i]; + + if (Number(value.vehicleType) !== Number(details.query.pickupVehicleType)) continue; + item = value; + break; + } + + details.query.pickupFee = details.query.pickupFee ? details.query.pickupFee : item.price || 0; + } else { + // 非整车 + let _total = 0; + + for (let i = 0; i < details.goodsList.length; i++) { + _total += computeNumber(_total, '+', details.goodsList[i].totalPickupPrice || 0).result; + } + + details.query.pickupFee = _total; + } +}; + +/** 处理干线费用 */ +const handleTrunkLinePrice = (trunkLine, template) => { + // 是否整车 + if (details.query.trunklineCompleteOrNot) { + // 是否存在模板和维护价格 + if (!trunkLine || !template) return; + + const { fullVehicle } = trunkLine; + + if (getObjType(fullVehicle) !== 'array') return; + + let item: any = {}; + + for (let i = 0; i < fullVehicle.length; i++) { + const value = fullVehicle[i]; + + if (Number(value.vehicleType) !== Number(details.query.trunklineVehicleType)) continue; + item = value; + break; + } + + details.query.totalFreight = details.query.totalFreight + ? details.query.totalFreight + : item.price || 0; + } else { + // 非整车 + let _total = 0; + + for (let i = 0; i < details.goodsList.length; i++) { + const value = details.goodsList[i]; + if (value.subtotalFreight) _total += computeNumber(_total, '+', value.subtotalFreight).result; + } + + // 是否存在最低计费 + if ((trunkLine || template) && template.trunklineIsMinCost) { + switch (Number(template.trunklineMinCostType)) { + // 价格 + case 1: + details.query.totalFreight = template.minCost > _total ? template.minCost : _total; + break; + + // 件 + case 2: + details.query.totalFreight = + template.minCost > details.totalObj.totalCount + ? _total + (template.additionalCost || 0) + : _total; + break; + + // 方 + case 3: + details.query.totalFreight = + template.minCost > details.totalObj.totalVolume + ? _total + (template.additionalCost || 0) + : _total; + break; + + // 重量 + case 4: + details.query.totalFreight = + template.minCost > details.totalObj.totalFreight + ? _total + (template.additionalCost || 0) + : _total; + break; + + default: + break; + } + } else details.query.totalFreight = _total; + } +}; + +/** 处理配送费 */ +const handleDispatchPrice = (dispatch, template) => { + // 是否存在模板和维护价格 + if (!dispatch || !template) return; +}; + +/** 处理模板费用 */ +const handlePrice = () => { + const { dispatch, pickup, template, trunkLine } = details.priceTemplate; + + /** 处理提货费用 */ + handlePickUpPrice(pickup, template); + /** 处理干线费用 */ + handleTrunkLinePrice(trunkLine, template); + /** 处理配送费 */ + handleDispatchPrice(dispatch, template); +}; + +/** 重置值 */ const handleRefreshText = (key, value, refreshValue?: string | number) => { if (value) return; query.value[key] = refreshValue ? refreshValue : ''; @@ -2392,10 +2750,10 @@ const handleSubmit = (formEl: FormInstance | undefined) => { } const submitData = { + ...details.totalObj, ...details.query, waybillDetailList: details.goodsList, advanceIds: info.value.advanceIds, - ...details.totalObj, huilaiPay: 1, addList: [], removeList: [], @@ -2403,11 +2761,13 @@ const handleSubmit = (formEl: FormInstance | undefined) => { submitData.customerTrain = details.query.trainNumber; - const { destination } = submitData; + const { destination, departure } = submitData; if (destination.length === 1) { return ElMessage({ message: '请选择正确到站地址', type: 'warning' }); } + if (departure.length === 1) + return ElMessage({ message: '请选择正确发站地址', type: 'warning' }); // 筛选到站 const _findeLocation = details.regionOptione @@ -2420,20 +2780,36 @@ const handleSubmit = (formEl: FormInstance | undefined) => { } else { _item = _findeLocation.children.find(val => val.value === destination[2]); } - submitData.destination = _item.label; submitData.destinationCode = _item.value; - let numFlag = false; + // 筛选发站 + const _findeDeparture = details.regionOptione + .find(val => val.value === departure[0]) + .children.find(val => val.value === departure[1]); - for (const iterator of details.goodsList) { - if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) { - numFlag = true; - break; - } + let _itemDeparture: any = {}; + if (_findeDeparture.length === 2) { + _itemDeparture = _findeDeparture; + } else { + _itemDeparture = _findeDeparture.children.find(val => val.value === destination[2]); } - if (numFlag) return ElMessage.warning('小计费用存在异常'); + submitData.departure = _findeDeparture.label; + submitData.departureCode = _findeDeparture.value; + + console.log('submitData :>> ', submitData); + + // let numFlag = false; + + // for (const iterator of details.goodsList) { + // if (iterator.subtotalFreight <= 0 || !iterator.subtotalFreight) { + // numFlag = true; + // break; + // } + // } + + // if (numFlag) return ElMessage.warning('小计费用存在异常'); const _content = handleDetectionPayWay(); if (_content) return ElMessage.warning(_content); @@ -2461,6 +2837,12 @@ const handleSubmit = (formEl: FormInstance | undefined) => { res = await postOpenOrderOpenZeroWaybill(submitData); } + const { code, msg } = res.data; + if (code !== 200) return; + if (msg) ElMessage.success(msg); + + // 开启提示框, 是否继续开单 + if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true; } else { submitData.waybillId = details.pageInfo.id; @@ -2513,34 +2895,7 @@ const handleSubmit = (formEl: FormInstance | undefined) => { await nextTick(); setNodeHeight(tableNode.value.$el, '40vh'); - - // ElMessageBox.alert(response.data.data.replaceAll(';', '
'), '被更改数据', { - // dangerouslyUseHTMLString: true, - // confirmButtonText: '确认', - // callback: async (action: Action) => { - // try { - // details.loadingObj.submitLoadingBtn = true; - - // const res = await postUpdateWaybill(submitData); - // const { code, msg } = res.data; - // if (code !== 200) return; - // if (msg) ElMessage.success(msg); - - // back(); - // } catch (error) { - // console.log('error :>> ', error); - // } finally { - // details.loadingObj.submitLoadingBtn = false; - // } - // }, - // }); } - const { code, msg } = res.data; - if (code !== 200) return; - if (msg) ElMessage.success(msg); - - // 开启提示框, 是否继续开单 - if (details.pageInfo.type === 'add') details.popUpShow.titleVisited = true; } catch (error) { console.log('error :>> ', error); } finally { @@ -2576,113 +2931,223 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => { } }; -/** 获取价格 */ -const handleFindPrice = async (condition?: any) => { - try { - // item.loading = true; +/** 转译始发地和目的地 + * @param {Array} 循环数组 + * @param {String} province 省 + * @param {String} city 市 + * @param {String} region 区 + */ +const handleTranslation = (province, city, region) => { + let name = []; - const { destination } = details.query; + for (let i = 0; i < details.regionOptione.length; i++) { + const value = details.regionOptione[i]; - if (!destination || destination.length <= 1) return; - if (!details.query.consigneeId) return; - if (!details.query.departureWarehouseId) return; - if (!details.query.destinationWarehouseId) return; + if (value.value !== province + '') continue; + name.push(value.value); - const submitData = { - consigneeId: details.query.consigneeId, - departureWarehouseId: details.query.departureWarehouseId, - destinationWarehouseId: details.query.destinationWarehouseId, - destinationCode: '', - goodsIds: [] as any[], - }; + if (!value.children || value.children.length === 0) return name; - // 货物id - if (condition) { - const { goodsId } = condition; - if (!goodsId) return; - submitData.goodsIds = [goodsId]; - } else { - const _goodsIdsArr = []; + for (let index = 0; index < value.children.length; index++) { + const element = value.children[index]; - // 筛选有goodsId的货物信息 - for (let index = 0; index < details.goodsList.length; index++) { - const { goodsId } = details.goodsList[index]; - if (goodsId) _goodsIdsArr.push(goodsId); - } + if (element.value !== city + '') continue; + name.push(element.value); - if (_goodsIdsArr.length === 0) return; - submitData.goodsIds = _goodsIdsArr; - } + if (!element.children || element.children.length === 0) return name; - // 筛选到站 - const _findeLocation = details.regionOptione - .find(val => val.value === destination[0]) - .children.find(val => val.value === destination[1]); + for (let j = 0; j < element.children.length; j++) { + const item = element.children[j]; - let _item: any = {}; - if (destination.length === 2) { - _item = _findeLocation; - } else { - _item = _findeLocation.children.find(val => val.value === destination[2]); + if (item.value === region + '') { + name.push(item.value); + break; + } + } + break; } + break; + } - submitData.destinationCode = _item.value; + return name; +}; - const res = await postFindArrPrice(submitData); - // const { code, data } = res.data; - const { code, data } = res.data; +/** 价格赋值 + * isOnload 是否为初始化价格赋值, 初始化不赋值干线单价以及计算价格 + */ +const handleAssignmentItemPrice = (value, isOnload = false) => { + // 处理品类费用 + const { pickup, template, trunkLine } = details.priceTemplate; + + // 干线 + if (trunkLine && template && !isOnload) { + const { pieceCategory, cubeCategory, weightCategory } = trunkLine; + + // 是否区分品类 + if (template.trunklineIsByCategory) { + // 品类是否存在id + if (!value.goodsId) value.price = 0; + else { + let _item: any = {}; + // 件 + if (getObjType(pieceCategory) === 'array') { + for (let j = 0; j < pieceCategory.length; j++) { + const item = pieceCategory[j]; + + if (item.categoryId !== value.goodsId) continue; + _item = item; - if (code !== 200 || data.length === 0) return; + _item.chargeType = 1; + break; + } + } - if (condition) { - // 循环赋值 - for (let i = 0; i < details.priceArr.length; i++) { - const value = details.priceArr[i]; - condition[value.key] = 0; + // 方 + if (getObjType(cubeCategory) === 'array' && !_item.chargeType) { + for (let j = 0; j < cubeCategory.length; j++) { + const item = cubeCategory[j]; - for (let index = 0; index < data[0].arrPrice.length; index++) { - const element = data[0].arrPrice[index]; + if (item.categoryId !== value.goodsId) continue; + _item = item; - if (element.itemName === value.name) - condition[value.key] = isNumber(element.cost) ? Number(element.cost) : 0; + _item.chargeType = 2; + break; + } } - } - handleComputed(condition); - } else { - for (let idx = 0; idx < details.goodsList.length; idx++) { - const val = details.goodsList[idx]; - if (!val.goodsId) continue; + // 重量 + if (getObjType(weightCategory) === 'array' && !_item.chargeType) { + for (let j = 0; j < weightCategory.length; j++) { + const item = weightCategory[j]; - let _data = null; + if (item.categoryId !== value.goodsId) continue; + _item = item; - for (let index = 0; index < data.length; index++) { - const element = data[index]; - if (element.goodsId === val.goodsId) { - _data = element; + _item.chargeType = 3; break; } } - // 循环赋值 - for (let i = 0; i < details.priceArr.length; i++) { - const value = details.priceArr[i]; - val[value.key] = 0; + if (!_item.chargeType) value.price = 0; + else { + value.chargeType = _item.chargeType; + value.price = _item.price; + } + } + } else { + // 不区分品类 + switch (value.chargeType) { + // 件 + case 1: + value.price = + getObjType(pieceCategory) === 'array' && pieceCategory.length > 0 + ? pieceCategory[0].price || 0 + : 0; + break; + + // 方 + case 2: + value.price = + getObjType(cubeCategory) === 'array' && cubeCategory.length > 0 + ? cubeCategory[0].price || 0 + : 0; + break; + + // 公斤 + case 3: + value.price = + getObjType(weightCategory) === 'array' && weightCategory.length > 0 + ? weightCategory[0].price || 0 + : 0; + break; - for (let index = 0; index < _data.arrPrice.length; index++) { - const element = _data.arrPrice[index]; + default: + break; + } + } + // 是否为区分品类 + } else value.price = 0; + + // 提货 + if (pickup && template) { + const { pieceCategory } = pickup; + // 是否区分品类 + if (template.pickupIsByCategory) { + // 品类是否存在id + if (!value.goodsId) value.pickupPrice = 0; + else { + let _item: any = {}; + // 件 + if (getObjType(pieceCategory) === 'array') { + for (let j = 0; j < pieceCategory.length; j++) { + const item = pieceCategory[j]; - if (element.itemName === value.name) - val[value.key] = isNumber(element.cost) ? Number(element.cost) : 0; + if (item.categoryId !== value.goodsId) continue; + _item = item; + + _item.chargeType = 1; + break; } } - handleComputed(val); + + value.pickupPrice = _item.chargeType ? _item.price : 0; } + } else { + value.pickupPrice = + getObjType(pieceCategory) === 'array' && pieceCategory.length > 0 + ? pieceCategory[0].price || 0 + : 0; + } + } else value.pickupPrice = 0; + + // 计算每行价格 + if (!isOnload) handleComputed(value); +}; + +/** 获取价格 + * isOnload -- 是否是初始化获取价格, 初始化不赋值干线单价和计算价格 + */ +const handleFindPrice = async (isOnload = false) => { + try { + if (!details.query.brandId || !details.query.consigneeId) return; + let startArea = []; + let endArea = []; + + details.query.departure && (startArea = handleTranslation(...details.query.departure)); + details.query.destination && (endArea = handleTranslation(...details.query.destination)); + + const submitData = { + // 品牌 + brandId: details.query.brandId, + // 收货方 + clientId: details.query.consigneeId, + // 发货方 + sendOrgId: details.query.shipperId, + // 发站 + startProvinceId: startArea[0], + startCityId: startArea[1], + startCountyId: startArea[2], + // 到站 + endProvinceId: endArea[0], + endCityId: endArea[1], + endCountyId: endArea[2], + }; + + console.log('submitData :>> ', submitData); + + const res = await postFindArrPrice(submitData); + const { code, data } = res.data; + + if (code !== 200) return; + + details.priceTemplate = data || {}; + + // 赋值 + for (let i = 0; i < details.goodsList.length; i++) { + handleAssignmentItemPrice(details.goodsList[i], isOnload); } } catch (error) { console.log('error :>> ', error); - } finally { - // item.loading = false; } }; @@ -2706,7 +3171,7 @@ const handleChooseGoods = (item, val) => { item.goodsName = val.goodsName; item.goodsId = val.goodsId; - handleFindPrice(item); + handleAssignmentItemPrice(item); handleCloseSelcet(); }; @@ -2767,6 +3232,8 @@ const handleSubmitCause = () => { diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index f912aa77..61c4e33f 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -918,10 +918,10 @@ const onLoad = async (params = {} as any, isRefresh?: boolean) => { } }; -const initOnLoad = (params = {}, isRefresh = false) => { +const initOnLoad = async (params = {}, isRefresh = false) => { details.page.pageNum = 1; details.page.total = 0; - onLoad(params, isRefresh); + await onLoad(params, isRefresh); }; initOnLoad(); @@ -1098,11 +1098,19 @@ const editClientInfo = () => { }; /** 切换tabBar */ -const handleClickAll = e => { +const handleClickAll = async e => { console.log('e :>> ', e); - const _name = e.props.name; - details.orderStatus = _name; - initOnLoad(); + try { + details.loadingObj.pageLoading = true; + + const _name = e.props.name; + details.orderStatus = _name; + await initOnLoad(); + } catch (error) { + console.log('error :>> ', error); + } finally { + details.loadingObj.pageLoading = false; + } }; /** 批量删除 */