|
@@ -24,21 +24,21 @@
|
|
|
</a-form-model-item>
|
|
|
<div v-if="!receiverDisabled">
|
|
|
<a-form-model-item label="收货客户名称" extra="如果收货客户和下单客户相同,则不需要选择收货客户名称">
|
|
|
- <dealerSubareaScopeList ref="dealerSubareaScopeList" :disabled="receiverDisabled" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
|
|
|
+ <dealerSubareaScopeList ref="dealerSubareaScopeList" defValKey="buyerSn" @change="custChange" v-model="form.receiverSn" />
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="收货地址" prop="dealerRecevieAddressSn" v-if="form.receiverSn">
|
|
|
<div style="display:flex;padding-top:6px;">
|
|
|
<div style="width:80%;flex-grow:1;line-height: 24px;">{{ chooseAddr }}</div>
|
|
|
- <a-button size="small" type="link" v-if="receiverDisabled" @click="openAddrModal = true">{{ addressVal }} >></a-button>
|
|
|
+ <a-button size="small" type="link" @click="openAddrModal = true">{{ addressVal }} >></a-button>
|
|
|
</div>
|
|
|
</a-form-model-item>
|
|
|
</div>
|
|
|
- <div v-if="receiverDisabled && detailData.salesBillExtEntity">
|
|
|
- <a-form-model-item label="收货客户名称">
|
|
|
+ <div v-else>
|
|
|
+ <a-form-model-item label="收货客户名称" v-if="detailData.salesBillExtEntity">
|
|
|
{{ detailData.salesBillExtEntity.consigneeName?detailData.salesBillExtEntity.consigneeName:'--' }}
|
|
|
</a-form-model-item>
|
|
|
<a-form-model-item label="收货地址">
|
|
|
- {{ detailData.salesBillExtEntity.consigneeName+'('+detailData.salesBillExtEntity.consigneeTel+')' +detailData.salesBillExtEntity.shippingAddrProvinceName||undefined+detailData.salesBillExtEntity.shippingAddrCityName||undefined+ detailData.salesBillExtEntity.shippingAddrCountyName||undefined +detailData.salesBillExtEntity.shippingAddr||undefined }}
|
|
|
+ {{ chooseAddr }}
|
|
|
</a-form-model-item>
|
|
|
</div>
|
|
|
<a-form-model-item label="发货编号" prop="sendNo">
|
|
@@ -202,8 +202,12 @@ export default {
|
|
|
// 获取详情
|
|
|
setDetail (data) {
|
|
|
this.detailData = data
|
|
|
- if (data && data.dispatchBillCount && data.dispatchBillCount == 1) {
|
|
|
+ if (data && data.dispatchBillCount == 0) {
|
|
|
this.receiverDisabled = true
|
|
|
+ if (data.salesBillExtEntity) {
|
|
|
+ const address = (data.salesBillExtEntity.shippingAddrProvinceName ? (data.salesBillExtEntity.shippingAddrProvinceName + '-') : '') + (data.salesBillExtEntity.shippingAddrCityName ? (data.salesBillExtEntity.shippingAddrCityName + '-') : '') + (data.salesBillExtEntity.shippingAddrCountyName ? (data.salesBillExtEntity.shippingAddrCountyName + '-') : '') + data.salesBillExtEntity.shippingAddr
|
|
|
+ this.chooseAddr = (data.salesBillExtEntity.consigneeName || '') + '(' + (data.salesBillExtEntity.consigneeTel || '-') + ')' + ' ' + (address || '')
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
// 重置表单
|