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 - }); + }); + } + + }, } };