From 7efb8071c023f808faa8b7b455beac5a0e7abf5c Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Thu, 11 Jul 2024 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Categorypricingunit.vue | 53 ++++ .../Deliverymaintenancecosts.vue | 287 +++++++++++++++++- .../WarehouseTemplate.vue | 38 +++ .../reservation/reservationAddFrom.vue | 39 ++- 4 files changed, 400 insertions(+), 17 deletions(-) diff --git a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue index fa387f6d..31cbe4d6 100644 --- a/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue +++ b/src/views/cost/Deliverycostmanagement/Categorypricingunit.vue @@ -69,6 +69,29 @@ + + + + + + + + + + + + + {}; // 编辑 const handleEdit = row => { console.log(row); + dialogedit.value = true; }; @@ -293,4 +337,13 @@ const handleEdit = row => { display: flex; flex-direction: column; } +.elform { + display: flex; + flex-wrap: wrap; + :deep(.el-form-item) { + width: 29%; + display: flex; + flex-direction: column; + } +} diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue index 17d0431e..458562b6 100644 --- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue +++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue @@ -27,7 +27,7 @@ 新增 - + 编辑 @@ -151,6 +151,111 @@ + + + +
+
+ 品类按件计费 + + + +
+ +
+ 品类按方计费 + + + +
+ +
+ 品类按方计费 + + + +
+ +
+ 品类按方计费 + + + +
+
+
+
+ 是否附加费 + + 否 + 是 + +
+ +
+ 品类按方计费 + + + +
+
+
+
+ 公里数单价 + +
+
+ 公里数单价 + +
+
+ 公里数单价 + +
+
+ + + diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue index 41a3ef82..9e15ff1d 100644 --- a/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue +++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplate.vue @@ -78,7 +78,33 @@ + + + + + + + + + + + + + + + + + + + + + {}; // 编辑 const handleEdit = row => { + dialogedit.value = true; console.log(row); }; @@ -302,4 +331,13 @@ const handleEdit = row => { display: flex; flex-direction: column; } +.elform{ + display: flex; + flex-wrap: wrap; + :deep(.el-form-item ){ + width: 29%; + display: flex; + flex-direction: column; + } +} diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index d03e1d7c..20ef4dbe 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -2648,27 +2648,32 @@ export default { this.form.stockArticleList ); - if (this.form.inventoryList.length === 0 && this.form.stockArticleList.length === 0) { - this.$message({ - type: 'warning', - message: '无效的预约计划!', - }); - operation = false; - return; - } - if (!operation) return; + // if (this.form.inventoryList.length === 0 && this.form.stockArticleList.length === 0) { + // this.$message({ + // type: 'warning', + // message: '无效的预约计划!', + // }); + // operation = false; + // return; + // } + // if (!operation) return; // this.form.stockArticleList = this.packageList; console.log('>>>>>>>>', this.form); if (this.reservationId) { + console.log(this.reservationId,'this.reservationId'); // 判断是否都没有选择包件 + console.log(this.form.stockArticleList,'this.form.stockArticleList'); const checkInfoValues = this.form.stockArticleList.every( item => !item.reservationNum ); - if (checkInfoValues) { + 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: '确认', @@ -2746,6 +2751,10 @@ export default { }); this.back(); } else { + if (!this.renderInventoryData.length && !this.renderOrderData.length) { + this.$message.warning('无效计划'); + return + } // 开启提交按钮loading this.loadingObj.submitBtnLoading = true; this.reservationloading = true; //开启全屏加载 @@ -2845,10 +2854,10 @@ export default { console.log('>>>>>>>>>>>>>>>row', row); }, removeStockList(row) { - if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) { - this.$message.warning('如需移除请取消该预约计划!!'); - return; - } + // if (this.inventoryData.length == 1 && this.orderData.length == 0 && this.reservationId) { + // this.$message.warning('如需移除请取消该预约计划!!'); + // return; + // } this.inventoryData.forEach((item, index) => { if (item.id === row.id) { this.inventoryData.splice(index, 1);