Skip to content

J
jiedao-web-master
Commit 6669ae67 authored by 我在何方's avatar 我在何方
Browse files
Options

订单详情修改

parent 79ebf587
Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 62 deletions
.env.dev
View file @ 6669ae67
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://apitest.groupage.cn'
VUE_APP_BASE_API = 'http://127.0.0.1:48080' VUE_APP_BASE_API = 'http://apitest.groupage.cn'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://apitest.groupage.cn'
\ No newline at end of file
.env.development
View file @ 6669ae67
...@@ -3,7 +3,7 @@ ENV = 'development' ...@@ -3,7 +3,7 @@ ENV = 'development'
NODE_ENV = 'development' NODE_ENV = 'development'
# base api # base api
#VUE_APP_BASE_API = 'https://api.jd.jdshangmen.com' #VUE_APP_BASE_API = 'https://apitest.groupage.cn'
VUE_APP_BASE_API = 'http://127.0.0.1:48080' VUE_APP_BASE_API = 'http://apitest.groupage.cn'
VUE_APP_HOME_API = 'https://www.groupage.cn' VUE_APP_HOME_API = 'https://apitest.groupage.cn'
src/api/data.js
View file @ 6669ae67
...@@ -135,3 +135,11 @@ export function checkKycStatus(query) { ...@@ -135,3 +135,11 @@ export function checkKycStatus(query) {
params: query params: query
}) })
} }
// 获取城市
export function getCityData(query) {
return request({
url: '/app-api/ecw/region/get',
method: 'get',
params: query
})
}
src/lang/en.js
View file @ 6669ae67
...@@ -409,8 +409,29 @@ export default { ...@@ -409,8 +409,29 @@ export default {
showLadingBill: 'showLadingBill', showLadingBill: 'showLadingBill',
hiddenText: 'Show', hiddenText: 'Show',
showText: 'Hide', showText: 'Hide',
transInfo: 'Transportation information' transInfo: 'Transportation information',
own: "selp pickup",
toRoom: "to door",
typeName:"value-added services",
service: "Gether transpotation",
oversears: "overseas cargo",
consignor: "consignor",
consignee: "consignee",
objectport:'Destination port customs clearance',
ourUndertakes:'Our company undertakes',
customerUndertakes:'Customer Undertaking',
tiedanPrice:"Does the bill of lading display the price",
warehouseName:"Warehouse",
externalWarehouse:'External warehouse',
estLoading:"Loading time",
loadingAddress:"Loading address",
creator:'creator',
customerManage:"Customer Manager",
prodTitle:"item name",
inWarehouseInfo:"Warehouse entry information",
packing:"packing",
tiandanExpressNO:"prefill express tracking number",
feeData:'Fee data'
}, },
customer: { customer: {
none: 'none', none: 'none',
......
src/lang/zh.js
View file @ 6669ae67
...@@ -424,8 +424,29 @@ export default { ...@@ -424,8 +424,29 @@ export default {
showLadingBill: '查看提货单', showLadingBill: '查看提货单',
hiddenText: '隐藏', hiddenText: '隐藏',
showText: '展示', showText: '展示',
transInfo: '运输信息' transInfo: '运输信息',
own: "自提",
toRoom: "送货上门",
typeName:"增值服务",
service: "集运",
oversears: "海外仓",
consignor: "发货人",
consignee: "收货人",
objectport:'目的港清关',
ourUndertakes:'我司承接',
customerUndertakes:'客户承接',
tiedanPrice:"提单是否显示价格",
warehouseName:"仓库",
externalWarehouse:'外部仓',
estLoading:"装柜时间",
loadingAddress:"装柜地址",
creator:'创建人',
customerManage:"客户经理",
prodTitle:"品名",
inWarehouseInfo:"入仓信息",
packing:"包装",
tiandanExpressNO:"填单快递单号",
feeData:'收费数据'
}, },
customer: { customer: {
none: '无', none: '无',
......
src/views/jiedao/profile/orderdetail.vue
View file @ 6669ae67
...@@ -15,17 +15,17 @@ ...@@ -15,17 +15,17 @@
<el-col> <el-col>
<el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}"> <el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}">
<el-descriptions-item :label="$t('orderdetail.consignorName')" label-style="width:150px">{{ order.consignorVO.name }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorName')" label-style="width:150px">{{ order.consignorVO.name }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorNameEn')" label-style="width:150px">{{ order.consignorVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorPhone')" label-style="width:150px">+{{ order.consignorVO.countryCode }} {{ order.consignorVO.phone }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorPhone')" label-style="width:150px">+{{ order.consignorVO.countryCode }} {{ order.consignorVO.phone }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :class="showMore?'showInfo':'hiddenInfo'" border :column="3" :content-style="{width:'130px'}"> <el-descriptions :class="showMore?'showInfo':'hiddenInfo'" border :column="3" :content-style="{width:'130px'}">
<el-descriptions-item :label="$t('orderdetail.consignorEmail')" label-style="width:150px">{{ order.consignorVO.email }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consignorNameEn')" label-style="width:150px">{{ order.consignorVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorCompany')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consignorCompany')" label-style="width:150px">
{{ order.consignorVO.company }} {{ order.consignorVO.company }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorCompanyEn')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consignorCompanyEn')" label-style="width:150px">
{{ order.consignorVO.companyEn }} {{ order.consignorVO.companyEn }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consignorEmail')" label-style="width:150px">{{ order.consignorVO.email }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
</el-row> </el-row>
...@@ -37,17 +37,20 @@ ...@@ -37,17 +37,20 @@
<el-col> <el-col>
<el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}"> <el-descriptions class="margin-top" border :column="3" :content-style="{width:'130px'}">
<el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:150px">{{ order.consigneeVO.name }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneeName')" label-style="width:150px">{{ order.consigneeVO.name }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ order.consigneeVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:150px">+{{ order.consigneeVO.countryCode }} {{ order.consigneeVO.phone }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneePhone')" label-style="width:150px">+{{ order.consigneeVO.countryCode }} {{ order.consigneeVO.phone }}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.harvestMethod')" label-style="width:150px">{{order.consigneeVO?(order.consigneeVO.harvestMethod==1?$t('orderdetail.own'):$t('orderdetail.toRoom')):''}}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.deliveryaddress')" label-style="width:150px">{{ addressName }}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.addressdetail')" label-style="width:150px">{{order.consigneeVO?order.consigneeVO.address:''}}</el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :class="showMore?'showInfo':'hiddenInfo'" border :column="3" :content-style="{width:'130px'}"> <el-descriptions :class="showMore?'showInfo':'hiddenInfo'" border :column="3" :content-style="{width:'130px'}">
<el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ order.consigneeVO.email }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.consigneeNameEn')" label-style="width:150px">{{ order.consigneeVO.nameEn }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consigneeCompany')" label-style="width:150px">
{{ order.consigneeVO.company }} {{ order.consigneeVO.company }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px"> <el-descriptions-item :label="$t('orderdetail.consigneeCompanyEn')" label-style="width:150px">
{{ order.consigneeVO.companyEn }} {{ order.consigneeVO.companyEn }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.consigneeEmail')" label-style="width:150px">{{ order.consigneeVO.email }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
</el-row> </el-row>
...@@ -61,12 +64,13 @@ ...@@ -61,12 +64,13 @@
<el-col> <el-col>
<el-descriptions class="margin-top" border :column="2"> <el-descriptions class="margin-top" border :column="2">
<el-descriptions-item :label="$t('orderdetail.startTitle')">{{ $l(order.initialLogisticsInfoDto, 'startTitle') }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.startTitle')">{{ $l(order.initialLogisticsInfoDto, 'startTitle') }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.destTitle')">{{ $l(order.initialLogisticsInfoDto, 'destTitle') }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.destTitle')">{{ $l(order.initialLogisticsInfoDto, 'destCountryTitle') }}-{{ $l(objectCity, 'title') }}-{{ $l(order.initialLogisticsInfoDto, 'destTitle') }}</el-descriptions-item>
<el-descriptions-item v-if="false" :label="$t('orderdetail.startAddress')" :span="2">{{ order.logisticsInfoDto.startAddressZh }}</el-descriptions-item> <el-descriptions-item v-if="false" :label="$t('orderdetail.startAddress')" :span="2">{{ order.logisticsInfoDto.startAddressZh }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.transport')" :span="1"> <el-descriptions-item :label="$t('orderdetail.transport')" :span="1">
<dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /> <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'" :label="$t('orderdetail.channel')" :span="1">{{ getChannelNameById(order.channelId) }}</el-descriptions-item> <el-descriptions-item v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, order.transportId).cssClass == 'channel'" :label="$t('orderdetail.channel')" :span="1">{{ getChannelNameById(order.channelId) }}</el-descriptions-item>
<el-descriptions-item v-if="order.type" :label="$t('orderdetail.typeName')">{{ typeName }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
</el-row> </el-row>
...@@ -78,8 +82,6 @@ ...@@ -78,8 +82,6 @@
<el-col> <el-col>
<el-descriptions class="margin-top" border :column="2"> <el-descriptions class="margin-top" border :column="2">
<el-descriptions-item :label="$t('orderdetail.marks')">{{ order.marks }}</el-descriptions-item> <el-descriptions-item :label="$t('orderdetail.marks')">{{ order.marks }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.deliveryDate')">{{ order.deliveryDate }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.isCargoControl')">{{ order.isCargoControl?this.$t('orderdetail.is'):this.$t('orderdetail.no') }}</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.costVO')"> <el-descriptions-item :label="$t('orderdetail.costVO')">
{{ order.costVO.totalNum }}{{ $t('orderdetail.box') }} {{ order.costVO.totalWeight }}Kg {{ order.costVO.totalVolume }}m³ {{ order.costVO.totalQuantity }}{{ $t('price.one') }} {{ order.costVO.totalNum }}{{ $t('orderdetail.box') }} {{ order.costVO.totalWeight }}Kg {{ order.costVO.totalVolume }}m³ {{ order.costVO.totalQuantity }}{{ $t('price.one') }}
</el-descriptions-item> </el-descriptions-item>
...@@ -89,22 +91,32 @@ ...@@ -89,22 +91,32 @@
<el-descriptions-item :label="$t('orderdetail.entry')"> <el-descriptions-item :label="$t('orderdetail.entry')">
{{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.wvolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }} {{ order.sumNum }}{{ $t('orderdetail.box') }} {{ order.vweight }}Kg {{ order.wvolume }}m³ {{ order.sumQuantity }}{{ $t('price.one') }}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.warehouseType')"> <el-descriptions-item :label="$t('prepayDeal.drawee')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" /> <span v-if="order.drawee==1">{{ $t('orderdetail.consignor') }}</span>
<span v-else-if="order.drawee==2">{{ $t('orderdetail.consignee') }}</span>
<span v-else>{{order.customDraweeVOList?order.customDraweeVOList[0].name:''}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.customsType')"> <el-descriptions-item v-if="[3, 4].indexOf(+order.transportId) > -1" :label="$t('orderdetail.customsType')">
<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-item :label="$t('delivery.issuingMethod')"> <el-descriptions-item :label="$t('orderdetail.isCargoControl')">{{ order.isCargoControl?$t('orderdetail.is'):$t('orderdetail.no') }}</el-descriptions-item>
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" /> <el-descriptions-item :label="$t('orderdetail.objectport')">{{ order.productRecord==1? $t('orderdetail.ourUndertakes'):$t('orderdetail.customerUndertakes')}}</el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求')">
<template v-if="order.packageType">
<dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" :key="packageType" class="mr-10" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
</template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.isCollection')"> <el-descriptions-item :label="$t('特殊要求备注')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" /> {{ order.packageRemarks }}
<span v-if="order.isCollection">({{ order.collectionProxy }} {{ currencyMap[order.collectionProxyCurrency] }})</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('关联报价单')">
<!-- <el-descriptions-item :label="$t('delivery.issuingMethod')">
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
</el-descriptions-item> -->
<!-- <el-descriptions-item :label="$t('关联报价单')">
{{ offerNumber }} {{ offerNumber }}
</el-descriptions-item> </el-descriptions-item> -->
</el-descriptions> </el-descriptions>
</el-col> </el-col>
</el-row> </el-row>
...@@ -115,28 +127,48 @@ ...@@ -115,28 +127,48 @@
<el-row> <el-row>
<el-col> <el-col>
<el-descriptions class="margin-top" border :column="2"> <el-descriptions class="margin-top" border :column="2">
<el-descriptions-item :label="$t('delivery.doubleClear')"> <el-descriptions-item :label="$t('orderdetail.deliveryDate')">{{ order.deliveryDate }}</el-descriptions-item>
<dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" /> <el-descriptions-item :label="$t('orderdetail.warehouseType')">
</el-descriptions-item> <dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
<el-descriptions-item :label="$t('delivery.airlineCompany')">{{ order.airlineCompany }}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.customsClearCert')">{{ order.isSingleTicketTransport?this.$t('orderdetail.is'):this.$t('orderdetail.no') }}</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.clearCertRemark')">
{{ order.clearCertRemark }}
</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.isUnpack')">
{{ order.isUnpack?this.$t('orderdetail.is'):this.$t('orderdetail.no') }}
</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.isSingleTicketTransport')">
{{ order.isSingleTicketTransport?this.$t('orderdetail.is'):this.$t('orderdetail.no') }}
</el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求')">
<template v-if="order.packageType">
<dict-tag v-for="packageType in order.packageType.split(',').filter(item => !!item)" :key="packageType" class="mr-10" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" :value="packageType" />
</template>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('特殊要求备注')"> <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>
{{ order.packageRemarks }} <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('orderdetail.isCollection')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
<span v-if="order.isCollection">({{ order.collectionProxy }} {{ currencyMap[order.collectionProxyCurrency] }})</span>
</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.tiedanPrice')">
{{ order.displayBillLadingPrice?$t('orderdetail.is'):$t('orderdetail.no') }}
</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.warehouseName')" v-if="order.isExternalWarehouse&&order.externalWarehousedtolist.length>0">
<div>{{$t('orderdetail.externalWarehouse')}}</div>
<div>{{$t('orderdetail.estLoading')}}:{{orderData.externalWarehousedtolist[0].estLoadingtime}}</div>
<div>{{$t('orderdetail.loadingAddress')}}:{{orderData.externalWarehousedtolist[0].loadingAddress}}</div>
</el-descriptions-item>
<el-descriptions-item :label="$t('delivery.number')">
{{ order.number }}
</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.creator')">
{{order.creator}}
</el-descriptions-item>
<el-descriptions-item :label="$t('bannerdetail.time')">
{{ order.createTime }}
</el-descriptions-item>
<el-descriptions-item :label="$t('orderdetail.customerManage')">
{{ order.salesmanName }}
</el-descriptions-item>
<!-- <el-descriptions-item :label="$t('delivery.doubleClear')">
<dict-tag :type="DICT_TYPE.ECW_DOUBLE_CLEAR" :value="order.doubleClear" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('delivery.airlineCompany')">{{ order.airlineCompany }}</el-descriptions-item> -->
</el-descriptions> </el-descriptions>
</el-col> </el-col>
</el-row> </el-row>
...@@ -145,43 +177,57 @@ ...@@ -145,43 +177,57 @@
<el-tabs v-model="activeName"> <el-tabs v-model="activeName">
<el-tab-pane :label="$t('orderdetail.activeFirst')" name="first"> <el-tab-pane :label="$t('orderdetail.activeFirst')" name="first">
<el-table :data="order.orderItemVOList" border style="width: 100%"> <el-table :data="order.orderItemVOList" border style="width: 100%">
<el-table-column prop="prodTitleZh" :label="$t('orderdetail.prodTitleZh')" /> <el-table-column prop="prodTitle" :label="$t('orderdetail.prodTitle')">
<el-table-column prop="prodTitleEn" :label="$t('orderdetail.prodTitleEn')" /> <template slot-scope="{row}">
<template >{{ row.prodTitleZh }}/{{row.prodTitleEn}}</template>
</template>
</el-table-column>
<el-table-column prop="brand" :label="$t('orderdetail.brand')"> <el-table-column prop="brand" :label="$t('orderdetail.brand')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<template v-if="row.brandName">{{ row.brandName }}</template> <template v-if="row.brandName">{{ row.brandName }}</template>
<dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" /> <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="num" :label="$t('orderdetail.num')" /> <el-table-column prop="prodTitle" :label="$t('orderdetail.inWarehouseInfo')">
<el-table-column prop="sumNum" :label="$t('orderdetail.sumNum')">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.cartonsNum : 0 }} <template >{{row.warehouseInInfoVO?row.warehouseInInfoVO.cartonsNum:0}}{{$t('prepayDeal.box')}}
{{row.warehouseInInfoVO?row.warehouseInInfoVO.weight:0}}KG
{{row.warehouseInInfoVO?row.warehouseInInfoVO.volume:0}}m³
{{row.warehouseInInfoVO?row.warehouseInInfoVO.quantityAll:0}}{{$t('price.one')}}</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unit" :label="$t('orderdetail.unit')"> <el-table-column prop="warehouseType" :label="$t('complaint.type')" />
<el-table-column prop="unit" :label="$t('orderdetail.packing')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" /> <dict-tag :type="DICT_TYPE.ECW_PACKAGING_TYPE" :value="row.unit" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="worth" :label="$t('orderdetail.worth')" /> <el-table-column prop="worth" :label="$t('orderdetail.worth')" />
<el-table-column prop="" :label="$t('orderdetail.material')"> <el-table-column prop="sumNum" :label="$t('delivery.number')">
<template slot-scope="{row}"> <template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" /> {{ row.warehouseInInfoVO ? row.warehouseInInfoVO.expressNo : '' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="volume" :label="$t('orderdetail.volume')"> <el-table-column prop="" :label="$t('orderdetail.material')">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.volume : row.volume }} <dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="weight" :label="$t('orderdetail.weight')"> <el-table-column prop="link" :label="$t('delivery.link')" />
<el-table-column prop="prodTitle" :label="$t('orderdetail.costVO')">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{ row.warehouseInInfoVO ? row.warehouseInInfoVO.weight : row.weight }} <template >{{row.num}}{{$t('prepayDeal.box')}}{{row.weight}}KG{{row.volume}}m³{{row.quantity}}{{$t('price.one')}}</template>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="expressNo" :label="$t('orderdetail.tiandanExpressNO')" />
</el-table> </el-table>
<div style="padding: 20px 0;display: flex; align-items: center;justify-content: space-evenly;">
<div>{{$t('delivery.sum')}}：</div>
<div>{{$t('orderdetail.inWarehouseInfo')}}:{{getProSum.washouseNum}}{{$t('prepayDeal.box')}}{{getProSum.washouseWeight}}KG {{getProSum.washouseVolume}}m³{{getProSum.washouseQuantity}}{{$t('price.one')}}</div>
<div>{{$t('delivery.worth')}}:{{getProSum.worth}}</div>
<div>{{$t('orderdetail.feeData')}}:{{getProSum.num}}{{$t('prepayDeal.box')}}{{getProSum.weight}}KG {{getProSum.volume}}m³{{getProSum.quantity}}{{$t('price.one')}}</div>
</div>
</el-tab-pane> </el-tab-pane>
<el-tab-pane :label="$t('orderdetail.activeSecond')" name="second"> <el-tab-pane :label="$t('orderdetail.activeSecond')" name="second">
<el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true" style="padding-top: 10px;"> <el-timeline v-if="order.orderTimeVOList && order.orderTimeVOList.length" :reverse="true" style="padding-top: 10px;">
...@@ -214,7 +260,7 @@ import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict' ...@@ -214,7 +260,7 @@ import { getDictDatas, DICT_TYPE, getDictData } from '@/utils/dict'
import PrintWarehouseReceipt from './components/PrintWarehouseReceipt' import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
import PrintLadingBill from './components/PrintLadingBill' import PrintLadingBill from './components/PrintLadingBill'
import DictTag from '@/components/DictTag' import DictTag from '@/components/DictTag'
import { getCurrencyList, getChannelList } from '@/api/data' import { getCurrencyList, getChannelList, getListTree, getCityData } from '@/api/data'
import DeclarationDocuments from './components/DeclarationDocuments' import DeclarationDocuments from './components/DeclarationDocuments'
import { parseTime } from '@/utils/index' import { parseTime } from '@/utils/index'
export default { export default {
...@@ -252,7 +298,9 @@ export default { ...@@ -252,7 +298,9 @@ export default {
showMore: false, showMore: false,
declarationOrderId: null, declarationOrderId: null,
documentsDidables: true, documentsDidables: true,
offerNumber: ''// 关联报价单 offerNumber: '',// 关联报价单
address:'',
objectCity:''
} }
}, },
computed: { computed: {
...@@ -263,11 +311,104 @@ export default { ...@@ -263,11 +311,104 @@ export default {
}) })
return map return map
}, },
addressName() {
let that = this
var orderAdderss = ''
if(that.order&&that.order.consigneeVO&&that.order.consigneeVO.country){
var country = that.address.find(item=>item.id == that.order.consigneeVO.country)||''
if(country){
if(that.$lang.locale=='zh'){
orderAdderss = country.titleZh
}else{
orderAdderss = country.titleEn
}
if(that.order.consigneeVO.province){
var province = country.children.find(item=>item.id == that.order.consigneeVO.province)||''
if(province){
if(that.$lang.locale=='zh'){
orderAdderss += province.titleZh
}else{
orderAdderss += province.titleEn
}
if(that.order.consigneeVO.city){
var city = province.children.find(item=>item.id == that.order.consigneeVO.city)||''
if(city){
if(that.$lang.locale=='zh'){
orderAdderss += city.titleZh
}else{
orderAdderss += city.titleEn
}
}
}
}
}
}
}
return orderAdderss
},
typeName(){
let typeName = ''
if(order.type){
if(order.type.includes(1)){
typeName += this.$t('orderdetail.service')
}
if(order.type.includes(2)){
typeName += this.$t('orderdetail.oversears')
}
}
return typeName
},
getDictData() { getDictData() {
return (type, value) => getDictData(type, value) || {} return (type, value) => getDictData(type, value) || {}
}, },
getTime() { getTime() {
return (value) => parseTime(value) || '' return (value) => parseTime(value) || ''
},
getProSum(){
let data = {
num:0,
volume:0,
weight:0,
quantity:0,
worth:0,
washouseNum:0,
washouseVolume:0,
washouseWeight:0,
washouseQuantity:0
}
if(this.order&&this.order.orderItemVOList.length>0){
this.order.orderItemVOList.forEach(item=>{
if(item.num){
data.num += item.num
}
if(item.volume){
data.volume += item.volume
}
if(item.weight){
data.weight += item.weight
}
if(item.quantity){
data.quantity += item.quantity
}
if(item.worth){
data.worth += item.worth
}
if(item.warehouseInInfoVO&&item.warehouseInInfoVO.cartonsNum){
data.washouseNum += item.washouseNum
}
if(item.warehouseInInfoVO&&item.warehouseInInfoVO.volume){
data.washouseVolume += item.washouseVolume
}
if(item.warehouseInInfoVO&&item.warehouseInInfoVO.weight){
data.washouseWeight += item.washouseWeight
}
if(item.warehouseInInfoVO&&item.warehouseInInfoVO.quantityAll){
data.washouseQuantity += item.washouseQuantity
}
})
}
return data
} }
}, },
created() { created() {
...@@ -283,6 +424,7 @@ export default { ...@@ -283,6 +424,7 @@ export default {
// }) // })
this.getOrder() this.getOrder()
this.getOfferNumber() this.getOfferNumber()
this.getAddress()
} }
}, },
methods: { methods: {
...@@ -295,6 +437,12 @@ export default { ...@@ -295,6 +437,12 @@ export default {
that.order = response.data that.order = response.data
that.documentsDidables = (that.order.customsType == 2) that.documentsDidables = (that.order.customsType == 2)
this.show = true this.show = true
that.getObjectCity(that.order.initialLogisticsInfoDto.destCityId)
})
},
getAddress(){
getListTree({ treeType: 1 }).then(response => {
this.address = response.data
}) })
}, },
// 显示更多 // 显示更多
...@@ -302,6 +450,12 @@ export default { ...@@ -302,6 +450,12 @@ export default {
this.showMore = !this.showMore this.showMore = !this.showMore
this.consigneeText = this.showMore ? this.$t('orderdetail.hiddenText') : this.$t('orderdetail.showText') this.consigneeText = this.showMore ? this.$t('orderdetail.hiddenText') : this.$t('orderdetail.showText')
}, },
//获取城市
getObjectCity(id){
getCityData({id:id}).then(res => {
this.objectCity = res.data
})
},
// 根据渠道id显示渠道名 // 根据渠道id显示渠道名
getChannelNameById(id) { getChannelNameById(id) {
const cc = this.channelList.find((item) => item.channelId == id) const cc = this.channelList.find((item) => item.channelId == id)
......
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