|
|
@@ -134,7 +134,7 @@
|
|
|
<el-table-column align="left" label="收货客户" prop="orderTime" min-width="100" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
|
|
|
+ v-if="!(scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME')"
|
|
|
v-model="scope.row.receivingName"
|
|
|
size="mini"
|
|
|
@input="handleInput($event, scope.row.invoiceId, 1)"
|
|
|
@@ -145,7 +145,7 @@
|
|
|
<el-table-column align="left" label="电话" prop="orderTime" min-width="150" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
|
|
|
+ v-if="!(scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME')"
|
|
|
v-model="scope.row.phone"
|
|
|
size="mini"
|
|
|
@input="handleInput($event, scope.row.invoiceId, 2)"
|
|
|
@@ -156,7 +156,7 @@
|
|
|
<el-table-column align="left" label="收货地址" prop="orderTime" min-width="200" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
<el-input
|
|
|
- v-if="!scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME'"
|
|
|
+ v-if="!(scope.row.enginOrderType === 'TRADE' || scope.row.enginOrderType === 'HOME')"
|
|
|
v-model="scope.row.address"
|
|
|
size="mini"
|
|
|
@input="handleInput($event, scope.row.invoiceId, 3)"
|
|
|
@@ -380,10 +380,12 @@ export default {
|
|
|
this.mainForm.company = data.pickLogistics
|
|
|
this.mainForm.remark = data.remark
|
|
|
this.mainForm.logisticsId = data.logisticsId
|
|
|
- const item = this.companyList.find(k => k.id === data.logisticsId)
|
|
|
- this.logisticsNumber = item.logisticsNumber
|
|
|
+ if (this.mainForm.pickupWay == 2) {
|
|
|
+ const item = this.companyList.find(k => k.id === data.logisticsId)
|
|
|
+ this.logisticsNumber = item.logisticsNumber
|
|
|
+ }
|
|
|
+
|
|
|
this.deliverList = data.invoicePickBeans
|
|
|
- console.log(this.deliverList)
|
|
|
})
|
|
|
},
|
|
|
|
howie