diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 86969b8d..6e058574 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -4120,7 +4120,6 @@ export default { this.loading = true; $_getReservationZeroPackageList(data) .then(res => { - console.log(res, '零担数据'); const data = res.data.data; this.LessThantruckloadListData = data.records; this.zeroPg.total = data.total; @@ -5695,12 +5694,15 @@ export default { }, // 零担 zeroChange(pageSize) { + console.log(pageSize,'pageSize') this.zeroPg.pageSize = pageSize; this.truckload(this.zeroPg); }, // 零担 zerocurrentChange(currentPage) { - this.zeroPg.currentPag = currentPage; + console.log(currentPage,'currentPage') + this.zeroPg.currentPage = currentPage; + console.log(this.zeroPg.currentPag); this.truckload(this.zeroPg); }, winputsc(index, row) { diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue index e7090a89..7da0b9cf 100644 --- a/src/views/distribution/turndelivery/deliveryDiscuss.vue +++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue @@ -2644,16 +2644,24 @@ const QuantityEntry = val => { console.log(dataInfo.value, 'dataInfo.value'); dataId.value = findIndexById(val.id); //记录当前点击的订单 - comprehensive.value = true; //开启弹窗 - QuantityEntryStatus.value = true; //此时开启零担录入 - EnteringLibrary.value = true; //显示零担 - SjTc.value = false; //关闭司机弹窗 + // 编辑状态 if (RouteId.value) { $_getDeliveryZeroOrderDetail({ deliveryId: RouteId.value, orderId: val.id, }).then(res => { + if(res.data.data.code ==400){ + ElMessage({ + message: res.data.data.msg, + type: 'warning', + }) + return + } + comprehensive.value = true; //开启弹窗 + QuantityEntryStatus.value = true; //此时开启零担录入 + EnteringLibrary.value = true; //显示零担 + SjTc.value = false; //关闭司机弹窗 console.log(res, '编辑状态在库录入'); // 冻结数量-数量操作 =冻结数量 for (let item of res.data.data) {