Commit ab1e2f90 authored by dragondean@qq.com's avatar dragondean@qq.com

云效上的bug

parent d51f2f51
......@@ -2055,13 +2055,18 @@ export default {
if (this.$route.query.id) {
await getOrderDetail(this.$route.query.id).then(async (res) => {
this.form = Object.assign({}, res.data, { orderItemVOList: [], destCountryId: null })
this.form = Object.assign({}, res.data, {
orderItemVOList: [],
destCountryId: null,
consigneeName: '',
consigneePhone: ''
})
this.form.deliveryDate = res.data.deliveryDate
if(res.data.consigneeVO){
this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company)
this.$set(this.form,'consigneeCompanyEn', res.data.consigneeVO.companyEn)
this.$set(this.form, 'consigneeCompanyEn', res.data.consigneeVO.companyEn)
this.$set(this.form, 'consigneeEmail', res.data.consigneeVO.email)
this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
......
......@@ -128,58 +128,59 @@
<el-descriptions-item :label="$t('特殊要求备注')">
{{ order.packageRemarks }}
</el-descriptions-item>
<template v-if="showMore">
<el-descriptions-item :label="$t('送货时间')">
{{ order.deliveryDate }}
</el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
</el-descriptions-item>
<el-descriptions-item :label="$t('送货时间')">
{{ order.deliveryDate }}
</el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
</el-descriptions-item>
<!--下面几个是空运特有字段-->
<!--清关证书-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
<!--清关证书备注-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')">
{{ order.clearCertRemark }}
</el-descriptions-item>
<!--是否拆包-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')">
{{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--单票立刻转运-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')">
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--下面几个是空运特有字段-->
<!--清关证书-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
<!--清关证书备注-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.clearCertRemark')">
{{ order.clearCertRemark }}
</el-descriptions-item>
<!--是否拆包-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isUnpack')">
{{ order.isUnpack?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<!--单票立刻转运-->
<el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('delivery.isSingleTicketTransport')">
{{ order.isSingleTicketTransport?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<el-descriptions-item :label="$t('代收货款')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
</el-descriptions-item>
<el-descriptions-item :label="$t('提单是否显示价格')">
{{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('仓库')">
{{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
<template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
<div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
{{$t('装柜时间')}}{{item.estLoadingTime}}
{{$t('装柜地址')}}{{item.loadingAddress}}
</div>
</template>
</el-descriptions-item>
<el-descriptions-item :label="$t('快递单号')">
{{order.number}}
</el-descriptions-item>
<el-descriptions-item :label="$t('创建人')">
{{order.creatorName}} ({{order.userType == 1 ? $t('会员') : $t('后台用户')}})
</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">
{{order.salesmanName}}
</el-descriptions-item>
<el-descriptions-item :label="$t('代收货款')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
</el-descriptions-item>
<el-descriptions-item :label="$t('提单是否显示价格')">
{{order.displayBillLadingPrice ? $t('是') : $t('否')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('仓库')">
{{order.isExternalWarehouse ? $t('外部仓库') : $t('自有仓') }}
<template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
<div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
{{$t('装柜时间')}}{{item.estLoadingTime}}
{{$t('装柜地址')}}{{item.loadingAddress}}
</div>
</template>
</el-descriptions-item>
<el-descriptions-item :label="$t('快递单号')">
{{order.number}}
</el-descriptions-item>
<el-descriptions-item :label="$t('创建人')">
{{order.creatorName}} ({{order.userType == 1 ? $t('会员') : $t('后台用户')}})
</el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')">
{{order.createTime|parseTime}}
</el-descriptions-item>
<el-descriptions-item :label="$t('客户经理')">
{{order.salesmanName}}
</el-descriptions-item>
</template>
</el-descriptions>
<!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment