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

云效上的bug

parent d51f2f51
...@@ -2055,13 +2055,18 @@ export default { ...@@ -2055,13 +2055,18 @@ export default {
if (this.$route.query.id) { if (this.$route.query.id) {
await getOrderDetail(this.$route.query.id).then(async (res) => { 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 this.form.deliveryDate = res.data.deliveryDate
if(res.data.consigneeVO){ if(res.data.consigneeVO){
this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone) this.$set(this.form, 'consigneePhone', res.data.consigneeVO.phone)
this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode) this.$set(this.form, 'countryCode', res.data.consigneeVO.countryCode)
this.$set(this.form, 'consigneeCompany', res.data.consigneeVO.company) 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, 'consigneeEmail', res.data.consigneeVO.email)
this.$set(this.form, 'consigneeName', res.data.consigneeVO.name) this.$set(this.form, 'consigneeName', res.data.consigneeVO.name)
this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn) this.$set(this.form, 'consigneeNameEn', res.data.consigneeVO.nameEn)
......
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<el-descriptions-item :label="$t('特殊要求备注')"> <el-descriptions-item :label="$t('特殊要求备注')">
{{ order.packageRemarks }} {{ order.packageRemarks }}
</el-descriptions-item> </el-descriptions-item>
<template v-if="showMore">
<el-descriptions-item :label="$t('送货时间')"> <el-descriptions-item :label="$t('送货时间')">
{{ order.deliveryDate }} {{ order.deliveryDate }}
</el-descriptions-item> </el-descriptions-item>
...@@ -180,6 +180,7 @@ ...@@ -180,6 +180,7 @@
<el-descriptions-item :label="$t('客户经理')"> <el-descriptions-item :label="$t('客户经理')">
{{order.salesmanName}} {{order.salesmanName}}
</el-descriptions-item> </el-descriptions-item>
</template>
</el-descriptions> </el-descriptions>
<!--<div v-if="[3, 4].indexOf(+order.transportId) > -1" style="display: flex;margin-top: 20px;"> <!--<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