Showing
1 changed file
with
9 additions
and
2 deletions
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | '-' }}</text></view> | 28 | '-' }}</text></view> |
| 29 | <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' | 29 | <view class="row"><text class="label">运输方式</text><text class="value">{{ detail.transportMode || '-' |
| 30 | }}</text></view> | 30 | }}</text></view> |
| 31 | - <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationId || '-' | 31 | + <view class="row"><text class="label">目的地</text><text class="value">{{ detail.destinationLabel || '-' |
| 32 | }}</text></view> | 32 | }}</text></view> |
| 33 | <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ | 33 | <view class="row"><text class="label">单价中是否已包含包装费</text><text class="value">{{ |
| 34 | detail.includesPackagingFeeName || '-' }}</text></view> | 34 | detail.includesPackagingFeeName || '-' }}</text></view> |
| @@ -109,6 +109,7 @@ export default { | @@ -109,6 +109,7 @@ export default { | ||
| 109 | paymentTerms: '', | 109 | paymentTerms: '', |
| 110 | transportMode: '', | 110 | transportMode: '', |
| 111 | destinationId: '', | 111 | destinationId: '', |
| 112 | + destinationLabel: '', | ||
| 112 | specialInstructions: '', | 113 | specialInstructions: '', |
| 113 | remarks: '', | 114 | remarks: '', |
| 114 | pieceWeightHead: '', | 115 | pieceWeightHead: '', |
| @@ -134,7 +135,13 @@ export default { | @@ -134,7 +135,13 @@ export default { | ||
| 134 | const data = res && res.data ? res.data : {} | 135 | const data = res && res.data ? res.data : {} |
| 135 | const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否') | 136 | const includesPackagingFeeName = data.includesPackagingFeeName || (data.includesPackagingFee ? '是' : '否') |
| 136 | const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否') | 137 | const includesTransportFeeName = data.includesTransportFeeName || (data.includesTransportFee ? '是' : '否') |
| 137 | - this.detail = { ...this.detail, ...data, includesPackagingFeeName, includesTransportFeeName } | 138 | + this.detail = { |
| 139 | + ...this.detail, | ||
| 140 | + ...data, | ||
| 141 | + includesPackagingFeeName, includesTransportFeeName, | ||
| 142 | + destinationId: data.provinceId && data.cityId && data.districtId ? [data.provinceId, data.cityId, data.districtId] : '', | ||
| 143 | + destinationLabel: data.provinceName && data.cityName && data.districtName ? `${data.provinceName} / ${data.cityName} / ${data.districtName}` : '', | ||
| 144 | + } | ||
| 138 | const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] | 145 | const lines = Array.isArray(data.contractDistributorLineList) ? data.contractDistributorLineList : [] |
| 139 | this.productList = lines | 146 | this.productList = lines |
| 140 | } catch (e) { | 147 | } catch (e) { |