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
1098d6b3
Commit
1098d6b3
authored
Dec 16, 2022
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复订单详情特价的费用详情显示异常
parent
2318b664
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
55 additions
and
55 deletions
+55
-55
detail.vue
src/views/ecw/order/detail.vue
+55
-55
No files found.
src/views/ecw/order/detail.vue
View file @
1098d6b3
...
...
@@ -418,66 +418,66 @@ export default {
const
brandType
=
row
.
warehouseInInfoVO
?
row
.
feeType
:
row
.
brandType
// 不是特价则显示其他字段
if
(
!
row
.
specialPriceType
){
freightFields
=
[
// {field: 'oneSeaFreight', label: '成交单价'},
{
field
:
'
originalSeaFreight
'
,
label
:
this
.
$t
(
'
默认单价(无牌无液无电)
'
)},
// {field: 'brandFreightPrice', label: this.$t('品牌加价')},
{
field
:
'
liquidFreightPrice
'
,
label
:
this
.
$t
(
'
液体加价
'
)},
{
field
:
'
electrifiedFreightPrice
'
,
label
:
this
.
$t
(
'
带电加价
'
)},
{
field
:
'
discountFreightPrice
'
,
label
:
this
.
$t
(
'
优惠活动减免
'
)},
{
field
:
'
plainCommission
'
,
label
:
this
.
$t
(
'
明佣
'
)}
]
freightFields
=
[
// {field: 'oneSeaFreight', label: '成交单价'},
{
field
:
'
originalSeaFreight
'
,
label
:
this
.
$t
(
'
默认单价(无牌无液无电)
'
)},
// {field: 'brandFreightPrice', label: this.$t('品牌加价')},
{
field
:
'
liquidFreightPrice
'
,
label
:
this
.
$t
(
'
液体加价
'
)},
{
field
:
'
electrifiedFreightPrice
'
,
label
:
this
.
$t
(
'
带电加价
'
)},
{
field
:
'
discountFreightPrice
'
,
label
:
this
.
$t
(
'
优惠活动减免
'
)},
{
field
:
'
plainCommission
'
,
label
:
this
.
$t
(
'
明佣
'
)}
]
// 品牌加价
if
(
row
[
'
brandFreightPrice
'
]
&&
row
[
'
brandFreightPrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
brandFreightPrice
'
,
label
:
brandType
==
1
?
this
.
$t
(
'
有品牌加价
'
)
:
this
.
$t
(
'
中性品牌加价
'
)})
}
// 品牌加价
if
(
row
[
'
brandFreightPrice
'
]
&&
row
[
'
brandFreightPrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
brandFreightPrice
'
,
label
:
brandType
==
1
?
this
.
$t
(
'
有品牌加价
'
)
:
this
.
$t
(
'
中性品牌加价
'
)})
}
// 有减免金额才显示优惠后单价
if
(
row
[
'
discountFreightPrice
'
]
&&
row
[
'
discountFreightPrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
afterDiscountSeaFreight
'
,
label
:
this
.
$t
(
'
优惠后单价
'
)})
// 有减免金额才显示优惠后单价
if
(
row
[
'
discountFreightPrice
'
]
&&
row
[
'
discountFreightPrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
afterDiscountSeaFreight
'
,
label
:
this
.
$t
(
'
优惠后单价
'
)})
}
freightFields
.
push
({
field
:
'
oneSeaFreight
'
,
label
:
this
.
$t
(
'
成交单价
'
)})
console
.
log
({
freightFields
})
freightFields
.
forEach
(
item
=>
{
if
(
row
[
item
.
field
]){
freight
.
push
({
label
:
item
.
label
,
value
:
row
[
item
.
field
],
currency
:
row
.
seaFreightCurrency
,
volume
:
row
.
seaFreightVolume
,
remark
:
row
.
specialPriceType
&&
item
.
field
==
'
oneSeaFreight
'
?
this
.
$t
(
'
特价
'
)
:
null
})
}
freightFields
.
push
({
field
:
'
oneSeaFreight
'
,
label
:
this
.
$t
(
'
成交单价
'
)})
freightFields
.
forEach
(
item
=>
{
if
(
row
[
item
.
field
]){
freight
.
push
({
label
:
item
.
label
,
value
:
row
[
item
.
field
],
currency
:
row
.
seaFreightCurrency
,
volume
:
row
.
seaFreightVolume
,
remark
:
row
.
specialPriceType
&&
item
.
field
==
'
oneSeaFreight
'
?
this
.
$t
(
'
特价
'
)
:
null
})
}
})
})
clearanceFields
=
[
{
field
:
'
originalClearanceFreight
'
,
label
:
this
.
$t
(
'
默认单价(无牌无液无电)
'
)},
// {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
{
field
:
'
liquidClearanceFeePrice
'
,
label
:
this
.
$t
(
'
液体加价
'
)},
{
field
:
'
electrifiedClearanceFeePrice
'
,
label
:
this
.
$t
(
'
带电加价
'
)},
{
field
:
'
discountClearanceFeePrice
'
,
label
:
this
.
$t
(
'
优惠活动减免
'
)}
]
// 品牌加价
if
(
row
[
'
brandClearanceFeePrice
'
]
&&
row
[
'
brandClearanceFeePrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
brandClearanceFeePrice
'
,
label
:
brandType
==
1
?
this
.
$t
(
'
有品牌加价
'
)
:
this
.
$t
(
'
中性品牌加价
'
)})
}
if
(
row
[
'
discountClearanceFeePrice
'
]
&&
row
[
'
discountClearanceFeePrice
'
]
>
0
){
clearanceFields
.
push
({
field
:
'
afterDiscountClearanceFreight
'
,
label
:
this
.
$t
(
'
优惠后单价
'
)})
}
clearanceFields
.
push
({
field
:
'
oneClearanceFreight
'
,
label
:
this
.
$t
(
'
成交单价
'
)})
clearanceFields
.
forEach
(
item
=>
{
if
(
row
[
item
.
field
]){
clearance
.
push
({
label
:
item
.
label
,
value
:
row
[
item
.
field
],
currency
:
row
.
clearanceFreightCurrency
,
volume
:
row
.
clearanceFreightVolume
,
remark
:
row
.
specialPriceType
&&
item
.
field
==
'
oneClearanceFreight
'
?
this
.
$t
(
'
特价
'
)
:
null
})
}
})
clearanceFields
=
[
{
field
:
'
originalClearanceFreight
'
,
label
:
this
.
$t
(
'
默认单价(无牌无液无电)
'
)},
// {field: 'brandClearanceFeePrice', label: this.$t('品牌加价')},
{
field
:
'
liquidClearanceFeePrice
'
,
label
:
this
.
$t
(
'
液体加价
'
)},
{
field
:
'
electrifiedClearanceFeePrice
'
,
label
:
this
.
$t
(
'
带电加价
'
)},
{
field
:
'
discountClearanceFeePrice
'
,
label
:
this
.
$t
(
'
优惠活动减免
'
)}
]
// 品牌加价
if
(
row
[
'
brandClearanceFeePrice
'
]
&&
row
[
'
brandClearanceFeePrice
'
]
>
0
){
freightFields
.
push
({
field
:
'
brandClearanceFeePrice
'
,
label
:
brandType
==
1
?
this
.
$t
(
'
有品牌加价
'
)
:
this
.
$t
(
'
中性品牌加价
'
)})
}
if
(
row
[
'
discountClearanceFeePrice
'
]
&&
row
[
'
discountClearanceFeePrice
'
]
>
0
){
clearanceFields
.
push
({
field
:
'
afterDiscountClearanceFreight
'
,
label
:
this
.
$t
(
'
优惠后单价
'
)})
}
clearanceFields
.
push
({
field
:
'
oneClearanceFreight
'
,
label
:
this
.
$t
(
'
成交单价
'
)})
clearanceFields
.
forEach
(
item
=>
{
if
(
row
[
item
.
field
]){
clearance
.
push
({
label
:
item
.
label
,
value
:
row
[
item
.
field
],
currency
:
row
.
clearanceFreightCurrency
,
volume
:
row
.
clearanceFreightVolume
,
remark
:
row
.
specialPriceType
&&
item
.
field
==
'
oneClearanceFreight
'
?
this
.
$t
(
'
特价
'
)
:
null
})
}
})
freight
.
push
({
label
:
'
价格更新时间
'
,
...
...
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