diff --git a/src/view/shipping/NormalSendGoods.vue b/src/view/shipping/NormalSendGoods.vue index 96f5194..8a1f7fa 100644 --- a/src/view/shipping/NormalSendGoods.vue +++ b/src/view/shipping/NormalSendGoods.vue @@ -324,6 +324,8 @@ warningText: '', robDlgShow: false, + + addressList: [] } }, @@ -341,6 +343,7 @@ created () { this.$dict.load('rob_frequency'); + this.getAddressInfo(); }, methods: { @@ -364,6 +367,26 @@ console.log(err) }) }, + getAddressInfo() { + this.mallList.map(item => { + sendChromeAPIMessage({ + url: 'bgSongbird-api/supplier/address/queryDeliveryAddressInfo', + needMallId: true, + mallId: item.mallId, + data: {}}).then((res) => { + if (res.errorCode == 1000000) { + let addressArr = res.result.deliveryAddressInfoList.filter(i => { + return i.isDefault + }) + this.addressList.push({ + mallId: item.mallId, + addressId: addressArr[0].id + }) + } + }) + }) + + }, onConfirm () { if (this.arr.length == 0) { Message.error("请选择备货单") @@ -624,10 +647,14 @@ packageInfos.push({packageDetailSaveInfos: packageDetailSaveInfos}) }) + let addressInfo = this.addressList.filter(k => { + return k.mallId == mallId + }) let deliveryOrderCreateInfos = [] deliveryOrderCreateInfos.push({ deliverOrderDetailInfos: deliverOrderDetailInfos, subPurchaseOrderSn: data.subPurchaseOrderBasicVO.subPurchaseOrderSn, + deliveryAddressId: addressInfo[0].addressId, packageInfos: packageInfos }) diff --git a/src/view/shipping/ShippingDesk.vue b/src/view/shipping/ShippingDesk.vue index ad0a304..0121c02 100644 --- a/src/view/shipping/ShippingDesk.vue +++ b/src/view/shipping/ShippingDesk.vue @@ -226,12 +226,17 @@ isDlgLoading: false, createDlgShow: false, + + addressList: [] } }, computed: { ...mapState(['mallList']) }, + created () { + this.getAddressInfo(); + }, methods: { onChooseChange (e) { @@ -254,6 +259,26 @@ console.log(err) }) }, + getAddressInfo() { + this.mallList.map(item => { + sendChromeAPIMessage({ + url: 'bgSongbird-api/supplier/address/queryDeliveryAddressInfo', + needMallId: true, + mallId: item.mallId, + data: {}}).then((res) => { + if (res.errorCode == 1000000) { + let addressArr = res.result.deliveryAddressInfoList.filter(i => { + return i.isDefault + }) + this.addressList.push({ + mallId: item.mallId, + addressId: addressArr[0].id + }) + } + }) + }) + + }, onConfirm () { if (this.arr.length == 0) { Message.error("请选择备货单") @@ -397,10 +422,15 @@ packageInfos.push({packageDetailSaveInfos: packageDetailSaveInfos}) }) + let addressInfo = this.addressList.filter(k => { + return k.mallId == data.mallId + }) + let deliveryOrderCreateInfos = [] deliveryOrderCreateInfos.push({ deliverOrderDetailInfos: deliverOrderDetailInfos, subPurchaseOrderSn: data.subPurchaseOrderBasicVO.subPurchaseOrderSn, + deliveryAddressId: addressInfo[0].addressId, packageInfos: packageInfos })