Commit 464eaa9f authored by houjn@hikoon.cn's avatar houjn@hikoon.cn

文案修改

parent 90bf2614
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<el-descriptions-item :label="$t('运输方式')"> <el-descriptions-item :label="$t('运输方式')">
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" /> <dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('出货方式')"> <el-descriptions-item :label="$t('出货渠道')">
{{channel ? channel.nameZh : '/'}} {{channel ? channel.nameZh : '/'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('订单状态')"> <el-descriptions-item :label="$t('订单状态')">
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<el-descriptions-item :label="$t('目的仓')" :span="2"> <el-descriptions-item :label="$t('目的仓')" :span="2">
{{order.logisticsInfoDto.destAddressZh}} {{order.logisticsInfoDto.destAddressZh}}
</el-descriptions-item> </el-descriptions-item>
<!-- 优惠申请 --> <!-- 优惠申请 -->
<el-descriptions-item :label="$t('申请理由')" v-if="type == 1 || type == 2" :span="4"> <el-descriptions-item :label="$t('申请理由')" v-if="type == 1 || type == 2" :span="4">
<div class="bold"> <div class="bold">
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.commissionType), newType: getDictDataLabel(DICT_TYPE.COMMISSION_TYPE, detail.commissionType),
})}} })}}
</div> </div>
<div> <div>
{{$t('原运费')}}{{detail.orgFreight}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}} {{$t('原运费')}}{{detail.orgFreight}}{{currencyMap[detail.freightCurrency]}} / {{unitMap[detail.freightVolume]}}
</div> </div>
...@@ -90,7 +90,7 @@ import {getChannel} from '@/api/ecw/channel' ...@@ -90,7 +90,7 @@ import {getChannel} from '@/api/ecw/channel'
import {getUnitList} from "@/api/ecw/unit" import {getUnitList} from "@/api/ecw/unit"
import { getCurrencyList } from '@/api/ecw/currency' import { getCurrencyList } from '@/api/ecw/currency'
import Decimal from 'decimal.js' import Decimal from 'decimal.js'
/* /*
type含义 type含义
优惠申请 1 优惠申请 1
管理优惠 2 管理优惠 2
...@@ -187,7 +187,7 @@ export default { ...@@ -187,7 +187,7 @@ export default {
getChannel(this.order.channelId).then(res => { getChannel(this.order.channelId).then(res => {
this.channel = res.data this.channel = res.data
}) })
},/* },/*
getBillOfLandingInProcessing(){ getBillOfLandingInProcessing(){
getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => { getBillOfLandingInProcessing({orderId: this.detail.orderId}).then(res => {
console.log(res) console.log(res)
...@@ -207,4 +207,4 @@ export default { ...@@ -207,4 +207,4 @@ export default {
.bold{ .bold{
font-weight: bold; font-weight: bold;
} }
</style> </style>
\ No newline at end of file
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