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
7be276de
Commit
7be276de
authored
Jul 24, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复订单费用汇总bug
parent
04b891e8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
App.vue
src/App.vue
+1
-1
FeeDetail.vue
src/views/ecw/order/components/FeeDetail.vue
+6
-3
No files found.
src/App.vue
View file @
7be276de
...
@@ -59,7 +59,7 @@ export default {
...
@@ -59,7 +59,7 @@ export default {
padding-right
:
30px
;
padding-right
:
30px
;
padding-left
:
5px
;
padding-left
:
5px
;
}
}
$sizes
:
0
,
10
,
20
,
30
,
50
,
75
,
100
,
150
,
200
,
300
,
500
,
800
,
1000
;
$sizes
:
0
,
5
,
10
,
20
,
30
,
50
,
75
,
100
,
150
,
200
,
300
,
500
,
800
,
1000
;
@for
$i
from
1
through
length
(
$sizes
){
@for
$i
from
1
through
length
(
$sizes
){
$item
:
nth
(
$sizes
,
$i
);
$item
:
nth
(
$sizes
,
$i
);
.ml-
#{
$item
}
{
.ml-
#{
$item
}
{
...
...
src/views/ecw/order/components/FeeDetail.vue
View file @
7be276de
<
template
>
<
template
>
<el-dialog
visible
width=
"1500px"
title=
"NG23022222L费用汇总
"
:before-close=
"close"
>
<el-dialog
visible
width=
"1500px"
:title=
"title
"
:before-close=
"close"
>
<el-card
v-if=
"orderSummary"
>
<el-card
v-if=
"orderSummary"
>
<span
slot=
"header"
class=
"header-title"
>
{{
$t
(
'
订单收费汇总
'
)
}}
</span>
<span
slot=
"header"
class=
"header-title"
>
{{
$t
(
'
订单收费汇总
'
)
}}
</span>
<el-descriptions
:column=
"4"
>
<el-descriptions
:column=
"4"
>
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
{{
orderSummary
.
writeOffAmount
}}{{
currencyMap
[
orderSummary
.
writeOffCurrencyId
]
}}
{{
orderSummary
.
writeOffAmount
}}{{
currencyMap
[
orderSummary
.
writeOffCurrencyId
]
}}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('已核销比例')"
>
<el-descriptions-item
:label=
"$t('已核销比例')"
>
{{
orderSummary
.
writeOffRatio
}}
%
{{
orderSummary
.
writeOffRatio
}}
</el-descriptions-item>
</el-descriptions-item>
</el-descriptions>
</el-descriptions>
</el-card>
</el-card>
...
@@ -60,7 +60,7 @@
...
@@ -60,7 +60,7 @@
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('是否重货')"
>
<el-descriptions-item
:label=
"$t('是否重货')"
>
<!--1 普货 2 重货 3 泡货-->
<!--1 普货 2 重货 3 泡货-->
<dict-tag
:type=
"DICT_TYPE.ECW_YESNO"
:value=
"orderSummary.
item
Type != 1 ? '1' : '0'"
></dict-tag>
<dict-tag
:type=
"DICT_TYPE.ECW_YESNO"
:value=
"orderSummary.
order
Type != 1 ? '1' : '0'"
></dict-tag>
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('原重货标准')"
v-if=
"[1,2].indexOf(orderSummary.transportId) > -1"
>
<el-descriptions-item
:label=
"$t('原重货标准')"
v-if=
"[1,2].indexOf(orderSummary.transportId) > -1"
>
{{
orderSummary
.
orgWeightUnit
}}
KG/m³
{{
orderSummary
.
orgWeightUnit
}}
KG/m³
...
@@ -429,6 +429,9 @@ export default {
...
@@ -429,6 +429,9 @@ export default {
}
}
},
},
computed
:{
computed
:{
title
(){
return
this
.
orderSummary
?.
orderNo
+
this
.
$t
(
'
费用汇总
'
)
},
// 保费
// 保费
insuranceFeeDto
(){
insuranceFeeDto
(){
return
this
.
orderDetailSummary
?.
insuranceFeeDto
return
this
.
orderDetailSummary
?.
insuranceFeeDto
...
...
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