diff --git a/src/option/distribution/DeliveryExceptionReview.js b/src/option/distribution/DeliveryExceptionReview.js index 6f4e68c6..1c393f73 100644 --- a/src/option/distribution/DeliveryExceptionReview.js +++ b/src/option/distribution/DeliveryExceptionReview.js @@ -62,8 +62,8 @@ export const AbnormalReview = [ head: false, }, { - prop: 'materialName', - label: '货物名称', + prop: 'packageCode', + label: '包条码', type: 1, values: '', width: '100', @@ -73,8 +73,8 @@ export const AbnormalReview = [ head: false, }, { - prop: 'packageCode', - label: '包条码', + prop: 'materialName', + label: '物料名称', type: 1, values: '', width: '100', @@ -84,6 +84,7 @@ export const AbnormalReview = [ head: false, }, + // { // prop: 'warehouse', // label: '仓库', @@ -216,6 +217,18 @@ export const AbnormalReview = [ sortable: false, head: false, }, + { + prop: 'loadingQuantity', + label: '异常数量', + type: 1, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: false, + head: false, + isshowSummary: true, + }, // { // prop: 'materialCode', // label: '物料编号', @@ -251,17 +264,17 @@ export const AbnormalReview = [ head: false, }, - { - prop: 'orderPackageFreezeStatusName', - label: '冻结状态', - type: 1, - values: '', - width: '100', - checkarr: [], - fixed: false, - sortable: false, - head: false, - }, + // { + // prop: 'orderPackageFreezeStatusName', + // label: '冻结状态', + // type: 1, + // values: '', + // width: '100', + // checkarr: [], + // fixed: false, + // sortable: false, + // head: false, + // }, // { // prop: 'orderPackageGroundingStatusName', @@ -383,7 +396,7 @@ export const AbnormalReview = [ { prop: 'auditingStatusName', - label: '审核状态', + label: '异常状态', type: 1, values: '', width: '100', @@ -405,7 +418,7 @@ export const AbnormalReview = [ }, { prop: 'auditingTime', - label: '审核时间', + label: '操作时间', type: 1, values: '', width: '100', @@ -418,7 +431,7 @@ export const AbnormalReview = [ { prop: 'auditingUser', - label: '审核人', + label: '操作人', type: 1, values: '', width: '100', diff --git a/src/views/Pricesystem/ListOfPriceSystems.vue b/src/views/Pricesystem/ListOfPriceSystems.vue index f3edec42..3f8626d8 100644 --- a/src/views/Pricesystem/ListOfPriceSystems.vue +++ b/src/views/Pricesystem/ListOfPriceSystems.vue @@ -724,11 +724,12 @@ const handleSubmitBasic = () => { const res = await postBasicdataPrice(submitData); const { code, msg } = res.data; - if (code !== 200) return; + if (code !== 200) { + return; + } ElMessage.success(msg); onLoad(); - Historicalversion(HistoriBt.value); } catch (error) { console.log('error :>> ', error); } finally { diff --git a/src/views/cost/storagecost/Warehouserentalmanagement.vue b/src/views/cost/storagecost/Warehouserentalmanagement.vue index e42b69d7..9aac5056 100644 --- a/src/views/cost/storagecost/Warehouserentalmanagement.vue +++ b/src/views/cost/storagecost/Warehouserentalmanagement.vue @@ -534,13 +534,13 @@ const changetype = () => { form.value.storageLocationCount = null; //客户租用库位数 form.value.leasedArea = null; //客户租用库位数 }; -form.value.residualArea = null; //剩余库位面积 -form.value.singleStorageArea = null; //单库位面积 + const changewarehouse = async () => { let data = { warehouseId: form.value.warehouseId, }; - + form.value.residualArea = null; //剩余库位面积 + form.value.singleStorageArea = null; //单库位面积 formloading.value = true; await $_residualArea(data) .then(res => { @@ -600,7 +600,10 @@ const changestorageLocationCount = () => { const Customeradded = () => { ruleFormRef.value.validate(valid => { if (valid) { - if (form.value.storageLocationCount == null || form.value.leasedArea == null) { + const { type, storageLocationCount, leasedArea } = form.value; + + + if ((type === 1 && leasedArea == null) || (type === 2 && storageLocationCount == null)) { ElMessage({ message: '请维护仓库基础资料', type: 'warning', diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index d9144185..0c802165 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -124,7 +124,9 @@ - {{ item.dictValue }}  + {{ item.dictValue }}  + @@ -297,7 +299,7 @@ - +

@@ -307,64 +309,27 @@ - 修改(零担订单) - 提交(零担订单) @@ -1922,7 +1887,7 @@ export default { }, // 表单数据 form: { - isInstall:'1',//安装 + isInstall: '1', //安装 }, // 选择行 selectionList: [], @@ -2106,15 +2071,13 @@ export default { async handleAddOrder() { this.loading = true; this.orderList = [...this.orderData]; - this.query={} - this.stockArtcolumnList.forEach(item=>{ - item.values='' - }) + this.query = {}; + this.stockArtcolumnList.forEach(item => { + item.values = ''; + }); //这里只需要对订单进行正常的搜索即可 await this.onLoadOrder(this.page); - - this.loading = false; this.orderShow = true; this.$nextTick(() => { @@ -2324,24 +2287,12 @@ export default { //查询零担计划数量详情 console.log('order------------>', row.id); getReservationZeroOrderDetail(this.reservationId, row.id).then(res => { - let a = res.data.data; - a.forEach(item => { - item.zeroOrderMax = - item.handQuantity - - item.deliveryQuantity - - item.outboundQuantity + - item.reservationNum; - }); this.zeroOrderData = res.data.data; // console.log(res.data.data); }); } else { getZeroOrderDetail(row.id).then(res => { if (res.data.data != null) { - let a = res.data.data; - a.forEach(item => { - item.zeroOrderMax = item.handQuantity - item.deliveryQuantity - item.outboundQuantity; - }); this.zeroOrderData = res.data.data; } }); @@ -2661,27 +2612,22 @@ export default { // this.form.stockArticleList = this.packageList; console.log('>>>>>>>>', this.form); if (this.reservationId) { - console.log(this.reservationId,'this.reservationId'); + console.log(this.reservationId, 'this.reservationId'); // 判断是否都没有选择包件 - console.log(this.form.stockArticleList,'this.form.stockArticleList'); + console.log(this.form.stockArticleList, 'this.form.stockArticleList'); const checkInfoValues = this.form.stockArticleList.every( item => !item.reservationNum ); - console.log(this.renderInventoryData,'renderInventoryData'); - console.log(this.renderOrderData,'renderOrderData'); - console.log(checkInfoValues,'checkInfoValues'); - if (!this.renderInventoryData.length && !this.renderOrderData.length) { - - await ElMessageBox.prompt( - '当前计划为空是否"取消本次计划"?', - '请填写取消原因', - { - confirmButtonText: '确认', - cancelButtonText: '关闭', - inputPattern: /^\S+$/, - inputErrorMessage: '请填写取消原因', - } - ) + console.log(this.renderInventoryData, 'renderInventoryData'); + console.log(this.renderOrderData, 'renderOrderData'); + console.log(checkInfoValues, 'checkInfoValues'); + if (!this.renderInventoryData.length && !this.renderOrderData.length) { + await ElMessageBox.prompt('当前计划为空是否"取消本次计划"?', '请填写取消原因', { + confirmButtonText: '确认', + cancelButtonText: '关闭', + inputPattern: /^\S+$/, + inputErrorMessage: '请填写取消原因', + }) .then(value => { let data = { cancelReason: value.value, @@ -2708,14 +2654,11 @@ export default { }) .catch(() => { console.log('关闭弹窗'); - }); - return + return; } else { for (let i = 0; i < this.form.stockArticleList.length; i++) { - if ( - !this.form.stockArticleList[i].reservationNum - ) { + if (!this.form.stockArticleList[i].reservationNum) { ElMessageBox.confirm( `订单自编号:${this.form.stockArticleList[i].orderCode}没有选择包件是否移除!`, '提示', @@ -2729,19 +2672,17 @@ export default { this.renderOrderData.splice(i, 1); this.form.stockArticleList.splice(i, 1); }) - .catch(() => { - - }); + .catch(() => {}); return; } } } - + // 开启提交按钮loading this.loadingObj.submitBtnLoading = true; this.reservationloading = true; //开启全屏加载 this.form.id = this.reservationId; - console.log(this.form,'this.form'); + console.log(this.form, 'this.form'); const res = await update(this.form); console.log('res :>> ', res); if (res.data.code !== 200) return; @@ -2751,10 +2692,10 @@ export default { }); this.back(); } else { - if (!this.renderInventoryData.length && !this.renderOrderData.length) { + if (!this.renderInventoryData.length && !this.renderOrderData.length) { this.$message.warning('无效计划'); - return - } + return; + } // 开启提交按钮loading this.loadingObj.submitBtnLoading = true; this.reservationloading = true; //开启全屏加载 @@ -3062,64 +3003,18 @@ export default { this.zeroOrderShow = false; console.log('-------------->', this.zeroOrderData); }, + // 提交零担数量 onSubmitZeroOrder() { - if (this.isrReservationEntry) { - //零担预约数量录入 - this.orderData.forEach(item => { - if (this.obj.id === item.id) { - item.parcelNumberVOS = this.zeroOrderData; - } - }); - } else { - //在库数量录入 - let a = this.zeroOrderData; - if (a.length > 0) { - let n = 0; - a.forEach(item => { - n += item.number; - }); - if (n > this.obj.handQuantity) { - this.$message({ - type: 'error', - message: '录入数量超过订单在库数量!', - }); - return; - } - let b = a.every(item => { - console.log( - '最大数量-------------->', - item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number - ); - if ( - item.handQuantity + item.outboundQuantity + item.deliveryQuantity + item.number > - item.quantity - ) { - return false; - } - return true; - }); - console.log('----------------->', b); - if (!b) { - this.$message({ - type: 'error', - message: '请输入正确数量!', - }); - return; - } - } - entryNum(this.zeroOrderData).then(res => { - if (res) { - this.$message({ - type: 'success', - message: '操作成功', - }); - } - }); - console.log('this.zeroOrderData------------->', this.zeroOrderData); - } - - this.zeroOrderShow = false; + let _renderOrderData = this.renderOrderData.find(item => item.id === this.obj.id); + _renderOrderData.parcelNumberVOS = this.zeroOrderData; + // 操作数量求和 + let totalReservationNum = this.zeroOrderData.reduce((sum, item) => { + return sum + (item.reservationNum || 0); // 确保 reservationNum 存在 + }, 0); + _renderOrderData.reservationNum = totalReservationNum; + this.zeroOrderShow = false; //关闭弹窗 }, + // 增加库存品 onSubmitInventory() { if (this.inventoryList.length === 0) { @@ -3600,6 +3495,5 @@ input[type='number'] { span { width: 100px; } - } diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index ecd8248d..5bc2a16f 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -299,6 +299,16 @@ :headers="headers" multiple > + + @@ -321,6 +331,15 @@ :headers="headers" multiple > + @@ -343,6 +362,15 @@ :headers="headers" multiple > + @@ -365,6 +393,15 @@ :headers="headers" multiple > + @@ -387,6 +424,15 @@ :headers="headers" multiple > + @@ -2146,6 +2192,10 @@ export default { this.signform = row; this.signBox = true; getDetail(row.id).then(res => { + if (res.data.code !== 200) { + return; + } + console.log(res, '点击复核的返回值=='); this.form = res.data.data; this.TcForm = res.data.data; @@ -2155,24 +2205,64 @@ export default { this.FragilePhotos = []; this.HomePhotos = []; this.SignForPhotos = []; - if (res.data.data.printVOList.length) { - res.data.data.printVOList.forEach(item => { - if (item.type == 'photo_1') { - this.DoorstepPhoto.push({ name: item.name, url: item.urlRoute }); - } - if (item.type == 'photo_2') { - this.StackingPhoto.push({ name: item.name, url: item.urlRoute }); - } - if (item.type == 'photo_3') { - this.FragilePhotos.push({ name: item.name, url: item.urlRoute }); - } - if (item.type == 'photo_4') { - this.HomePhotos.push({ name: item.name, url: item.urlRoute }); - } - if (item.type == 'photo_5') { - this.SignForPhotos.push({ name: item.name, url: item.urlRoute }); - } - }); + if (res.data.data?.printVOList.length) { + const { printVOList } = res.data.data; + const photoTypeMap = { + photo_1: 'DoorstepPhoto', + photo_2: 'StackingPhoto', + photo_3: 'FragilePhotos', + photo_4: 'HomePhotos', + photo_5: 'SignForPhotos', + }; + if (printVOList.length) { + printVOList.forEach(item => { + const listName = photoTypeMap[item.type]; + if (listName) { + this[listName].push({ + name: item.name, + url: item.urlRoute, + driverName: item.driverName, + }); + } + }); + } + // res.data.data.printVOList.forEach(item => { + // if (item.type == 'photo_1') { + // this.DoorstepPhoto.push({ + // name: item.name, + // url: item.urlRoute, + // driverName: item.driverName, + // }); + // } + // if (item.type == 'photo_2') { + // this.StackingPhoto.push({ + // name: item.name, + // url: item.urlRoute, + // driverName: item.driverName, + // }); + // } + // if (item.type == 'photo_3') { + // this.FragilePhotos.push({ + // name: item.name, + // url: item.urlRoute, + // driverName: item.driverName, + // }); + // } + // if (item.type == 'photo_4') { + // this.HomePhotos.push({ + // name: item.name, + // url: item.urlRoute, + // driverName: item.driverName, + // }); + // } + // if (item.type == 'photo_5') { + // this.SignForPhotos.push({ + // name: item.name, + // url: item.urlRoute, + // driverName: item.driverName, + // }); + // } + // }); } }); }, @@ -2245,6 +2335,10 @@ export default { }, }); }, + getTooltipContent(file) { + console.log(file, 'file'); + return `该图片由${file.driverName || '文员'}上传`; + }, btnsc(index, row) { console.log(index, row); }, diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index bff34b1a..c2e6336a 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -534,49 +534,25 @@ > - + - - - +
- 修改(零担订单) - 提交(零担订单) + 提交(零担订单)
@@ -1377,9 +1353,9 @@ const submit = () => { // 展示的信息 dataInfo.value = removeDuplicates(dataInfo.value); - dataInfo.value.forEach(item=>{ - item.Plannedquantity = item.reservationNum - }) + dataInfo.value.forEach(item => { + item.Plannedquantity = item.reservationNum; + }); console.log(dataInfo.value, ' dataInfo.value'); // 计算总数 @@ -1791,79 +1767,13 @@ const ModifyLCL = () => { }; // 零担提交 const SubmitLoad = () => { - // 新增订单 - // QuantityEntryStatus为真表示此时此刻操作的是数量录入提交 - - let sum = 0; //最大值 - let Numberoperations = 0; - isZeroTable.value.forEach(item => { - sum += item.deliveryQuantity; - Numberoperations += item.reservationNum; - }); - let max = dataInfo.value[dataId.value].handQuantity - sum; - console.log(dataInfo.value, ' dataInfo.value['); - - if (Numberoperations > max) { - ElMessage({ - message: '操作数量总和不能大于冻结数量总和', - type: 'warning', - }); - - return; - } - - if (QuantityEntryStatus.value) { - // if (RouteId.value) { - // for (let item of isZeroTable.value) { - // if ( - // item.reservationNum > - // item.handQuantity - item.deliveryQuantity - item.outboundQuantity - // ) { - // ElMessage({ - // message: item.firsts + item.reservationNum + ':最大值:不能超过（可用数量）', - // type: 'warning', - // }); - // return; - // } - // } - // } - // console.log(dataInfo.value[dataId.value], '当前零担信息'); - } else { - // 操作数量最小值校验 冻结数量+出库数量 - // for (const item of isZeroTable.value) { - // if (item.number < item.deliveryQuantity + item.outboundQuantity) { - // ElMessage({ - // message: item.firsts + ':最小值:不能低于（冻结数量+在库数量）', - // type: 'warning', - // }); - // return; - // } - // } - // 操作数量最大值校验 - - // for (const item of isZeroTable.value) { - // if (item.handQuantity + item.number > item.quantity) { - // ElMessage({ - // message: item.firsts + ':最大值:不能超过(在库数量+输入的数量)>数量', - // type: 'warning', - // }); - // return; - // } - // } - entryNum(isZeroTable.value).then(res => { - console.log(res, '提交零担'); - console.log(isZeroTable.value, '提交零担的值'); - }); - } + // 计划数量 + let totalReservationNum = isZeroTable.value.reduce((sum, item) => { + return sum + (item.reservationNum || 0); + }, 0); + dataInfo.value[dataId.value].reservationNum = totalReservationNum; dataInfo.value[dataId.value].parcelNumberVOS = isZeroTable.value; - // 零担计划数量 - let _summation = 0; - dataInfo.value[0].parcelNumberVOS.forEach(item => { - _summation += item.reservationNum; - }); - dataInfo.value[dataId.value].reservationNum = _summation; - comprehensive.value = false; //关闭弹窗 EnteringLibrary.value = false; //关闭零担 QuantityEntryStatus.value = false; //此时开启零担录入