From 88edc5fe09fba7e2e309c65bb0c625b106e53d61 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 7 Aug 2024 15:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Deliverymaintenancecosts.vue              |  3 +-
 src/views/mail/order/add.vue                  | 47 ++++++++++++++-----
 src/views/mail/order/list.vue                 | 20 ++++----
 3 files changed, 46 insertions(+), 24 deletions(-)

diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 49b5cb53..c7db93c8 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -531,7 +531,8 @@ const Pricingrules = () => {
     carModel:form.value.carModel,//车型
   }
   $_expenseDispatchPricesave(data).then(res=>{
-    console.log(res,'res');
+    console.log(res,'提交成功');
+    
   })
 
 
diff --git a/src/views/mail/order/add.vue b/src/views/mail/order/add.vue
index 14825508..d16db279 100644
--- a/src/views/mail/order/add.vue
+++ b/src/views/mail/order/add.vue
@@ -214,6 +214,7 @@
                   @selection="selectionChange"
           >
             <template #default="slotProps">
+
               <!--              <el-text-->
               <!--                      v-if="inventoryShow"-->
               <!--                      type="primary"-->
@@ -2461,21 +2462,41 @@
         let inventoryIds = [];
         let inventoryList = [];
         let stockArticleList = [];
+        // let operation = true;
+        // this.inventoryData.forEach(item => {
+        //   if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
+        //     this.$message({
+        //       type: 'warning',
+        //       message: '存在无效的预约数量',
+        //     });
+        //     operation = false;
+        //     return;
+        //   }
+        //   item.reservationNum = item.reservationNum;
+        //   inventoryIds.push(item.id);
+        //   inventoryList.push(item);
+        // });
+        // if(!operation){
+        //   return
+        // }
         let operation = true;
-        this.inventoryData.forEach(item => {
-          if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
-            this.$message({
-              type: 'warning',
-              message: '存在无效的预约数量',
-            });
-            operation = false;
-            return;
-          }
-          item.reservationNum = item.reservationNum;
-          inventoryIds.push(item.id);
-          inventoryList.push(item);
-        });
+        for (let i = 0; i < this.inventoryData.length; i++) {
+        const item = this.inventoryData[i];
+        if (Number(item.reservationNum) === 0 || item.reservationNum > item.quantityStock) {
+         this.$message({
+           type: 'warning',
+            message: '存在无效的预约数量',
+          });
+          operation = false;
+          break; // 立即跳出循环
+       }
+      inventoryIds.push(item.id);
+        inventoryList.push(item);
+      }
 
+      if (!operation) {
+        return;
+      }
         orderIds.join(',');
         inventoryIds.join(',');
         this.form.stockArticleIds = orderIds.toString();
diff --git a/src/views/mail/order/list.vue b/src/views/mail/order/list.vue
index 6e6122ff..7587d5ba 100644
--- a/src/views/mail/order/list.vue
+++ b/src/views/mail/order/list.vue
@@ -507,16 +507,16 @@ export default {
           fixed: false,
           sortable: true,
         },
-        {
-          prop: 'availableQuantity',
-          label: '可用数量',
-          type: 2,
-          values: '',
-          width: '140',
-          checkarr: [],
-          fixed: false,
-          sortable: true,
-        },
+        // {
+        //   prop: 'availableQuantity',
+        //   label: '可用数量',
+        //   type: 2,
+        //   values: '',
+        //   width: '140',
+        //   checkarr: [],
+        //   fixed: false,
+        //   sortable: true,
+        // },
         {
           prop: 'notReceived',
           label: '未入库数量',