From 1e8e8a7aa357e063f8b72e302b63f3cc8449bbce Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Fri, 15 Sep 2023 20:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E5=BA=93=E5=AD=98=E5=93=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deliverylist/distributionDeliveryListedt.vue | 10 +++++++---
 .../signfor/distributionSignforedt.vue           | 16 +++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
index d0805bfd..8967bf9f 100644
--- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
+++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue
@@ -2794,10 +2794,14 @@ export default {
         console.log("---------------------------->packNum",packNum);
         console.log("---------------------------->invenNum",invenNum);
         console.log("---------------------------->signNum",signNum);
+        this.handleOrder(this.packpage);
+        this.handlePackage(this.packpage);
+        console.log("--------->deliveryType",this.deliverydata);
+        if(this.deliverydata.deliveryType !=='商配'){
+          this.handleInventory(this.packpage);
+        }
       });
-      this.handleOrder(this.packpage);
-      this.handlePackage(this.packpage);
-      this.handleInventory(this.packpage);
+
       this.loading = false;
     },
   },
diff --git a/src/views/distribution/signfor/distributionSignforedt.vue b/src/views/distribution/signfor/distributionSignforedt.vue
index 84186c34..3ac24891 100644
--- a/src/views/distribution/signfor/distributionSignforedt.vue
+++ b/src/views/distribution/signfor/distributionSignforedt.vue
@@ -1578,6 +1578,7 @@ export default {
 
         // this.getListOrders(this.page)
         this.getListPackage()
+
       });
 
       this.loading = false;
@@ -1601,12 +1602,17 @@ export default {
         // this.page.total = data.total
           this.packageData =data
       });
-      signforInventoryList(signforId).then(res => {
-        const data =res.data.data
-        console.log("------------>data",data);
-        // this.page.total = data.total
+      // console.log("data",data);
+      if (this.signfordata.deliveryType !== '商配' ){
+        signforInventoryList(signforId).then(res => {
+          const data =res.data.data
+          console.log("------------>data",data);
+          // this.page.total = data.total
           this.inventoryData =data
-      });
+        });
+      }
+
+
     },
   }
 };