|
@@ -271,15 +271,15 @@ export default {
|
|
|
storeList: [
|
|
|
{
|
|
|
label: '前置仓',
|
|
|
- value: '0'
|
|
|
+ value: 0
|
|
|
},
|
|
|
{
|
|
|
label: '工程机',
|
|
|
- value: '1'
|
|
|
+ value: 1
|
|
|
},
|
|
|
{
|
|
|
label: '商家仓',
|
|
|
- value: '2'
|
|
|
+ value: 2
|
|
|
}
|
|
|
|
|
|
]
|
|
@@ -412,8 +412,34 @@ export default {
|
|
|
const item = this.companyList.find(k => k.id === data.logisticsId)
|
|
|
this.logisticsNumber = item.logisticsNumber
|
|
|
}
|
|
|
+ data.invoicePickBeans.forEach(k=>{
|
|
|
+ if (k.warehouseFlag == 0) {
|
|
|
+ if (!(k.orderType === 'TRADE' || k.orderType === 'HOME')) {
|
|
|
+ if ((k.receivingName && k.phone && k.address)) {
|
|
|
+ k.copyReceivingName = k.receivingName
|
|
|
+ k.copyPhone = k.phone
|
|
|
+ k.copyAddress = k.address
|
|
|
+ k.receivingName = ''
|
|
|
+ k.phone = ''
|
|
|
+ k.address = ''
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ if ((k.refLinkman && k.refPhone && k.refInstallAddress)) {
|
|
|
+ k.copyRefLinkman = k.refLinkman
|
|
|
+ k.copyRefPhone = k.refPhone
|
|
|
+ k.copyRefInstallAddress = k.refInstallAddress
|
|
|
+ k.refLinkman = ''
|
|
|
+ k.refPhone = ''
|
|
|
+ k.refInstallAddress = ''
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
+ }
|
|
|
+ })
|
|
|
this.deliverList = data.invoicePickBeans
|
|
|
+
|
|
|
+
|
|
|
})
|
|
|
},
|
|
|
|
|
@@ -519,8 +545,9 @@ export default {
|
|
|
getDeliverList({ correspondId: this.mainForm.warehouse }).then(res => {
|
|
|
this.deliverList = res.data
|
|
|
this.deliverList.forEach(k => {
|
|
|
+ this.$set(k,'warehouseFlag',null)
|
|
|
if (k.refLinkman || k.refPhone || k.refInstallAddress) {
|
|
|
- this.$set(k, 'warehouseFlag', '1')
|
|
|
+ this.$set(k, 'warehouseFlag', 1)
|
|
|
}
|
|
|
})
|
|
|
this.listLoading = false
|
|
@@ -606,6 +633,7 @@ export default {
|
|
|
let orderList = []
|
|
|
this.tableSelection.forEach(item => {
|
|
|
orderList.push({
|
|
|
+ warehouseFlag:item.warehouseFlag,
|
|
|
address: item.address,
|
|
|
id: this.listItem ? item.id : '',
|
|
|
invoiceOrderId: item.invoiceOrderId,
|