From f5b2a194ade98206e390d134f572b115016e52b6 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 29 Jul 2024 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/distribution/artery/AddVehicleStowage.vue | 2 +- src/views/distribution/artery/VehicleStowage.vue | 5 +++++ .../distribution/artery/truckLoadingDetails.vue | 3 ++- .../distribution/artery/zeroAdditionalRecording.vue | 13 ++++++++++--- src/views/waybill/CreateZeroOrder.vue | 12 +++++++----- src/views/waybill/TemporaryStorageList.vue | 8 +++++--- 6 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue index fca99c7d..be6c22f2 100644 --- a/src/views/distribution/artery/AddVehicleStowage.vue +++ b/src/views/distribution/artery/AddVehicleStowage.vue @@ -1754,7 +1754,7 @@ const handleRemoveWaybill = async (index: number) => { const remoteMethodDriver = async val => { // if (!val) return; - const res = await postFindDriverListByName({ driverName: val, driverType: 1 }); + const res = await postFindDriverListByName({ driverName: val, jobType: 1 }); const { code, data } = res.data; if (code !== 200) return; details.driverListByName = data; diff --git a/src/views/distribution/artery/VehicleStowage.vue b/src/views/distribution/artery/VehicleStowage.vue index e3dad21b..748b36ae 100644 --- a/src/views/distribution/artery/VehicleStowage.vue +++ b/src/views/distribution/artery/VehicleStowage.vue @@ -874,6 +874,11 @@ const inputsc = (index, row) => { details.query.loadCarsNo = index; if (!index && index !== 0) delete details.query[row.prop]; } + + if (row.prop === 'carsLineName') { + details.query.warehouseName = index; + if (!index && index !== 0) delete details.query[row.prop]; + } initOnload(); }; diff --git a/src/views/distribution/artery/truckLoadingDetails.vue b/src/views/distribution/artery/truckLoadingDetails.vue index 733818d8..9b963a0b 100644 --- a/src/views/distribution/artery/truckLoadingDetails.vue +++ b/src/views/distribution/artery/truckLoadingDetails.vue @@ -1299,7 +1299,8 @@ const printTemplate = () => { /** 批量移除 */ const handleBatchRemove = async () => { const WarehouseName = localStorage.getItem('WarehouseName'); - if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); + if (!ChecksWhetherTheWarehouseIsSelected()) + return ElMessage.warning('多仓权限无法操作，请选择仓库'); if (details.selectionList.length === 0) return ElMessage.warning('请选择需要删除的数据'); diff --git a/src/views/distribution/artery/zeroAdditionalRecording.vue b/src/views/distribution/artery/zeroAdditionalRecording.vue index 82406cb6..07b02966 100644 --- a/src/views/distribution/artery/zeroAdditionalRecording.vue +++ b/src/views/distribution/artery/zeroAdditionalRecording.vue @@ -106,7 +106,7 @@
调度池 -
+
{ const submitData = { ...details.oldPage, ...details.oldQuery, - orderCodes: details.orderCodeList, ...params, + orderCodes: details.orderCodeList, + loadId: details.loadId, }; const res = await postloadZeroSuppleList(submitData); @@ -474,7 +475,9 @@ const showdrawer = (_flag?: boolean, _type?: number) => { const searchHide = () => { details.search = !details.search; - setNodeHeight(details.listNodeList, ''); + const listNodeList = document.querySelectorAll('.maboxhi') || []; + + setNodeHeight(listNodeList, '', true); }; /** 表格表头输入框搜索 */ @@ -919,5 +922,9 @@ watch( .header_search > div { width: 50%; + + :deep(.el-textarea__inner) { + height: 2rem; + } } diff --git a/src/views/waybill/CreateZeroOrder.vue b/src/views/waybill/CreateZeroOrder.vue index a796bc17..55ba484a 100644 --- a/src/views/waybill/CreateZeroOrder.vue +++ b/src/views/waybill/CreateZeroOrder.vue @@ -578,7 +578,7 @@ :min="0" :precision="2" :step="0.1" - @change="handleComputed(item)" + @change="handleComputed(item, true)" /> @@ -1985,7 +1985,7 @@ const handleFindGoods = async (goodsName, item, isClearId = 0) => { * row -- 行数据 * onlyComputedTrunline -- 是否只计算干线的价格 */ -const handleComputed = (row: any) => { +const handleComputed = (row: any, onlyComputedTrunline = false) => { const { template, trunkLine } = details.priceTemplate; if (Boolean(isDisabled.value && template && trunkLine)) @@ -2290,7 +2290,8 @@ const handleTrunkLinePrice = (trunkLine, template) => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; - if (value.subtotalFreight) _total = computeNumber(_total, '+', value.subtotalFreight).result; + if (value.subtotalFreight) + _total = computeNumber(_total, '+', value.subtotalFreight || 0).result; } console.log('trunkLine :>> ', trunkLine); @@ -2346,7 +2347,8 @@ const handleDispatchPrice = (dispatch, template) => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; - if (value.subtotalDispatch) _total += computeNumber(_total, '+', value.subtotalDispatch).result; + if (value.subtotalDispatch) + _total += computeNumber(_total, '+', value.subtotalDispatch || 0).result; } // 是否存在最低计费 @@ -2398,7 +2400,7 @@ const handleWarehouseManagement = () => { for (let i = 0; i < details.goodsList.length; i++) { const value = details.goodsList[i]; - _total = computeNumber(_total, '+', value.subtotalWarehouseManagement).result; + _total = computeNumber(_total, '+', value.subtotalWarehouseManagement || 0).result; } details.query.warehouseManagementFee = _total; diff --git a/src/views/waybill/TemporaryStorageList.vue b/src/views/waybill/TemporaryStorageList.vue index 0a8a502a..d7a50145 100644 --- a/src/views/waybill/TemporaryStorageList.vue +++ b/src/views/waybill/TemporaryStorageList.vue @@ -90,7 +90,7 @@ @click=" () => { if (!ChecksWhetherTheWarehouseIsSelected()) - return ElMessage.warning('请选择仓库'); + return ElMessage.warning('多仓权限无法操作，请选择仓库'); details.popUpShow.UploadBatch = true; details.ouPaiChooseType = 0; } @@ -1084,7 +1084,8 @@ const handleShowPackageOrderList = ({ row }) => { /** 订单转运单 */ const handleCreateOrder = () => { - if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); + if (!ChecksWhetherTheWarehouseIsSelected()) + return ElMessage.warning('多仓权限无法操作，请选择仓库'); if (details.selectionList.length === 0) { return ElMessage({ @@ -1344,7 +1345,8 @@ const handleRefreshAddTag = (formEl: FormInstance | undefined) => { /** 开启开标签弹窗 */ const handleOpenAddTagDlog = async () => { - if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库'); + if (!ChecksWhetherTheWarehouseIsSelected()) + return ElMessage.warning('多仓权限无法操作，请选择仓库'); details.popUpShow.addTagVisited = true;