Skip to content

J
jiedao-app-operator-master
Commit 8f8a7027 authored by 我在何方's avatar 我在何方
Browse files
Options

订单详情优化

parent ef3aa6a1
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 46 deletions
src/views/ecw/order/detail.vue
View file @ 8f8a7027
...@@ -7,8 +7,7 @@ ...@@ -7,8 +7,7 @@
<template v-else-if="order.containerNumber"> - {{order.containerNumber}}</template> <template v-else-if="order.containerNumber"> - {{order.containerNumber}}</template>
</div> </div>
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12" v-if="order.consignorVO" style="position: relative;"> <el-col :span="12" v-if="order.consignorVO" >
<span style="color:#409EFF;position: absolute;left:160px;top:0;font-size:16px" @click="consigneeChange">{{consigneeText}}</span>
<el-descriptions class="margin-top" border :title="$t('发货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}"> <el-descriptions class="margin-top" border :title="$t('发货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-descriptions-item :label="$t('中文名称')">{{order.consignorVO.name}}</el-descriptions-item> <el-descriptions-item :label="$t('中文名称')">{{order.consignorVO.name}}</el-descriptions-item>
<!-- v1.7新增 --> <!-- v1.7新增 -->
...@@ -32,7 +31,8 @@ ...@@ -32,7 +31,8 @@
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
<el-col :span="12" v-if="order.consigneeVO"> <el-col :span="12" v-if="order.consigneeVO" style="position: relative;">
<span style="color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;" @click="consigneeChange">{{consigneeText}}</span>
<el-descriptions class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}"> <el-descriptions class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-descriptions-item :label="$t('中文名称')">{{order.consigneeVO.name}}</el-descriptions-item> <el-descriptions-item :label="$t('中文名称')">{{order.consigneeVO.name}}</el-descriptions-item>
<!-- v1.7新增 --> <!-- v1.7新增 -->
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
</el-row> </el-row>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-descriptions border :title="$t('物流信息')" :column="4"> <el-descriptions border :title="$t('物流信息')" :column="4" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item> <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item> <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> --> <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
<el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2"> <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item> <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
<el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{order.deliveryDate}}</el-descriptions-item> <el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{order.deliveryDate}}</el-descriptions-item>
<el-descriptions-item :label="$t('是否控货')"> <el-descriptions-item :label="$t('是否控货')">
...@@ -107,46 +107,42 @@ ...@@ -107,46 +107,42 @@
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-collapse v-model="activeNames" @change="handleChange" > <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
<el-collapse-item :title="showText" name="1"> <el-descriptions-item :label="$t('出单方式')">
<el-descriptions class="mr-10" border :column="2"> <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
<el-descriptions-item :label="$t('出单方式')"> </el-descriptions-item>
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" /> <el-descriptions-item :label="$t('代收货款')">
</el-descriptions-item> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<el-descriptions-item :label="$t('代收货款')"> <template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template>
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" /> </el-descriptions-item>
<template v-if="order.isCollection == 1">({{order.collectionProxy}}{{currencyMap[order.collectionProxyCurrency]}})</template> <el-descriptions-item :label="$t('集运仓库')">
</el-descriptions-item> {{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }}
<el-descriptions-item :label="$t('集运仓库')"> <template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" >
{{order.isExternalWarehouse ? $t('外部仓') : $t('自有仓') }} <div v-if="item.estLoadingTime || item.loadingAddress" :key="index">
<template v-if="order.isExternalWarehouse" v-for="(item, index) in order.externalWarehouseDtoList" > {{$t('装柜时间')}}： {{item.estLoadingTime}}
<div v-if="item.estLoadingTime || item.loadingAddress" :key="index"> {{$t('装柜地址')}}：{{item.loadingAddress}}
{{$t('装柜时间')}}： {{item.estLoadingTime}} </div>
{{$t('装柜地址')}}：{{item.loadingAddress}} </template>
</div>
</template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('订单类型')"> <el-descriptions-item :label="$t('订单类型')">
<el-tag v-if="order.type.indexOf('1') > -1"> <el-tag v-if="order.type.indexOf('1') > -1">
{{ $t('集运服务') }} {{ $t('集运服务') }}
</el-tag> </el-tag>
<el-tag v-if="order.type.indexOf('2') > -1"> <el-tag v-if="order.type.indexOf('2') > -1">
{{ $t('海外仓') }} {{ $t('海外仓') }}
</el-tag> </el-tag>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('快递单号')"> <el-descriptions-item :label="$t('快递单号')">
{{order.number}} {{order.number}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('创建人')"> <el-descriptions-item :label="$t('创建人')">
{{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}） {{order.creatorName}} （{{order.userType == 1 ? $t('会员') : $t('后台用户')}}）
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('创建时间')"> <el-descriptions-item :label="$t('创建时间')">
{{order.createTime|parseTime}} {{order.createTime|parseTime}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-collapse-item>
</el-collapse>
</el-card> </el-card>
<el-card class="card"> <el-card class="card">
...@@ -467,7 +463,7 @@ export default { ...@@ -467,7 +463,7 @@ export default {
activeNames: [],//显示隐藏订单基本信息 activeNames: [],//显示隐藏订单基本信息
showText:this.$t('显示更多'), showText:this.$t('显示更多'),
showMore:false, showMore:false,
consigneeText:this.$t('展示'), consigneeText:this.$t('更多'),
} }
}, },
computed:{ computed:{
...@@ -552,7 +548,7 @@ export default { ...@@ -552,7 +548,7 @@ export default {
//订单信息显示更多 //订单信息显示更多
consigneeChange(){ consigneeChange(){
this.showMore = !this.showMore; this.showMore = !this.showMore;
this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('展示') this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多')
}, },
// 显示费用详情 // 显示费用详情
showFeeDetail(row, type){ showFeeDetail(row, type){
......
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