Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
lanbaoming
jiedao-app-operator-master
Commits
1d6de437
Commit
1d6de437
authored
Apr 04, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
合并订单详情国际化
parent
dfa9ad23
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
8 deletions
+9
-8
detail.vue
src/views/ecw/order/detail.vue
+9
-8
No files found.
src/views/ecw/order/detail.vue
View file @
1d6de437
...
...
@@ -51,8 +51,8 @@
</el-card>
<el-card
class=
"card"
>
<el-descriptions
border
:title=
"$t('物流信息')"
:column=
"2"
>
<el-descriptions-item
:label=
"$t('始发仓')"
>
{{
order.logisticsInfoDto.startTitleZh
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('目的仓')"
>
{{
order.logisticsInfoDto.destTitleZh
}}
</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('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
<el-descriptions-item
:label=
"$t('运输方式')"
:span=
"2"
>
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"order.transportId"
/>
...
...
@@ -184,6 +184,7 @@
</el-table-column>
<el-table-column
prop=
""
:label=
"$t('成交单价')"
width=
"220px"
>
<
template
slot-scope=
"{row}"
>
<template
v-if=
"row.charging ==1"
>
<template
v-if=
"!row.oneSeaFreight"
>
{{
$t
(
'
未报价
'
)
}}
</
template
>
<el-link
type=
"primary"
@
click=
"showFeeDetail(row, 'clearance')"
v-else
>
{{$t('全包价')}} {{row.oneSeaFreight}} {{currencyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
</el-link>
...
...
@@ -218,7 +219,7 @@
<el-tab-pane
:label=
"$t('订单动态')"
name=
"second"
>
<el-timeline
v-if=
"order.orderTimeVOList && order.orderTimeVOList.length"
:reverse=
"true"
>
<el-timeline-item
v-for=
"(activity, index) in order.orderTimeVOList"
:key=
"index"
:timestamp=
"activity.timestamp"
>
{{
activity.titleZh
}}
{{
$l(activity, 'title')
}}
<div>
{{$l(activity, 'remarks')}}
</div>
</el-timeline-item>
</el-timeline>
...
...
@@ -240,10 +241,10 @@
{{channelName}}
</el-table-column>
<el-table-column
:label=
"$t('始发地')"
prop=
"orderNo"
>
{{
departure.titleZh
|| '-'}}
{{
$l(departure, 'title')
|| '-'}}
</el-table-column>
<el-table-column
:label=
"$t('目的地')"
>
{{
objective.titleZh
|| '-'}}
{{
$l(objective, 'title')
|| '-'}}
</el-table-column>
<el-table-column
:label=
"$t('品名')"
prop=
"titleZh"
></el-table-column>
<el-table-column
:label=
"$t('箱数')"
prop=
"num"
>
...
...
@@ -443,14 +444,14 @@ export default {
currencyMap
(){
let
map
=
{
}
this
.
currencyList
.
forEach
(
item
=>
{
map
[
item
.
id
]
=
item
.
titleZh
map
[
item
.
id
]
=
this
.
$l
(
item
,
'
title
'
)
}
)
return
map
}
,
unitMap
(){
let
map
=
{
}
this
.
unitList
.
forEach
(
item
=>
{
map
[
item
.
id
]
=
item
.
titleZh
map
[
item
.
id
]
=
this
.
$l
(
item
,
'
title
'
)
}
)
return
map
}
,
...
...
@@ -485,7 +486,7 @@ export default {
console
.
log
(
'
listById
'
,
res
)
let
region
=
''
res
.
data
.
forEach
(
item
=>
{
region
+=
"
"
+
item
.
titleZh
region
+=
"
"
+
this
.
$l
(
item
,
'
title
'
)
}
)
this
.
region
=
region
}
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment