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
e460d283
Commit
e460d283
authored
Aug 27, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报价单详情优化
parent
51d1c900
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
63 deletions
+52
-63
detail.vue
src/views/ecw/offer/detail.vue
+46
-59
edit.vue
src/views/ecw/offer/edit.vue
+6
-4
No files found.
src/views/ecw/offer/detail.vue
View file @
e460d283
...
...
@@ -183,7 +183,7 @@
<el-descriptions
:column=
"5"
border
>
<el-descriptions-item
:label=
"$t('保价费')"
>
{{list.estCostVO?list.estCostVO.insuranceFee: 0}} {{
$t('美元')
}}
{{list.estCostVO?list.estCostVO.insuranceFee: 0}} {{
selectedRouter ? currentcyMap[selectedRouter.currencyUnit || 1] : ''
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('总运费')"
>
<
template
v-if=
"freightFeeList.length>0"
v-for=
"item in freightFeeList"
>
...
...
@@ -431,6 +431,11 @@
return
this
.
$l
(
row
,
'
prodTitle
'
)
}
},
selectedRouter
(){
// otherService 1 送货上门,2非控货订单代收货款
if
(
!
this
.
list
.
lineId
)
return
null
return
this
.
routerList
.
find
(
item
=>
item
.
id
==
this
.
list
.
lineId
)
},
currentcyMap
(){
let
map
=
{}
this
.
currencyList
.
forEach
(
item
=>
{
...
...
@@ -491,32 +496,32 @@
originalFeeList
(){
let
arr
=
[]
this
.
clearanceFeeList
.
forEach
(
item
=>
{
let
it
=
{...
item
}
let
it
=
{
src
:
this
.
$t
(
'
清关费
'
),
currencyId
:
item
.
currencyId
,
amount
:
Decimal
(
item
.
amount
)
}
let
freight
=
this
.
freightFeeList
.
find
(
fee
=>
fee
.
currencyId
==
item
.
currencyId
)
if
(
freight
){
it
.
amount
+=
freight
.
amount
it
.
amount
=
it
.
amount
.
plus
(
freight
.
amount
)
}
arr
.
push
(
it
)
})
// 判断是否有运费单位不在清关费里的
this
.
freightFeeList
.
forEach
(
item
=>
{
if
(
!
arr
.
find
(
items
=>
items
.
currencyId
==
item
.
currencyId
)){
let
its
=
{...
item
}
// let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
// if(freights){
// its.amount += freights.amount
// }
arr
.
push
(
its
)
if
(
!
arr
.
find
(
arrItem
=>
arrItem
.
currencyId
==
item
.
currencyId
)){
arr
.
push
({
src
:
this
.
$t
(
'
未计算的运费
'
),
currencyId
:
item
.
currencyId
,
amount
:
Decimal
(
item
.
amount
)
})
}
})
return
arr
},
// 预计费用(原价 - 优惠金额)
estimatedCosts
(){
let
arr
=
[]
let
withInsuranceFee
=
false
let
withOtherFee
=
false
this
.
originalFeeList
.
forEach
(
item
=>
{
let
it
=
{
currencyId
:
item
.
currencyId
,
...
...
@@ -526,56 +531,38 @@
if
(
coupon
){
it
.
amount
=
it
.
amount
.
minus
(
coupon
.
reduceAmount
)
}
// if(this.list.otherFee && this.list.otherFeeCurrencyId == item.currencyId){
// it.amount = it.amount.plus(this.list.otherFee)
// withOtherFee = true
// }
let
otherFee
=
this
.
otherFeeList
.
find
(
fee
=>
fee
.
currencyId
==
item
.
currencyId
)
if
(
otherFee
){
it
.
amount
=
it
.
amount
.
plus
(
otherFee
.
amount
||
0
)
withOtherFee
=
true
}
// 保价费(美元)
if
(
item
.
currencyId
==
1
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
){
it
.
amount
=
it
.
amount
.
plus
(
this
.
fee
.
insuranceFee
)
withInsuranceFee
=
true
}
arr
.
push
(
it
)
})
// 如果没有累加其他费用,则另外增加货币
if
(
!
withOtherFee
&&
this
.
list
.
otherFee
){
let
fee
=
{
currencyId
:
this
.
list
.
otherFeeCurrencyId
,
amount
:
Decimal
(
this
.
list
.
otherFee
)
// 累加保价费
const
insuranceFeeIndex
=
arr
.
findIndex
(
item
=>
item
.
currencyId
==
this
.
insuranceFeeCurrency
)
const
insuranceFee
=
this
.
list
&&
this
.
list
.
estCostVO
&&
this
.
list
.
estCostVO
.
insuranceFee
if
(
insuranceFeeIndex
>
-
1
){
arr
[
insuranceFeeIndex
].
amount
=
arr
[
insuranceFeeIndex
].
amount
.
plus
(
insuranceFee
||
0
)
}
else
{
arr
.
push
({
currencyId
:
this
.
insuranceFeeCurrency
,
amount
:
Decimal
(
insuranceFee
||
0
)
})
}
// 如果保价费跟其他费用是同一种货币(都是美元)
if
(
!
withInsuranceFee
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
&&
this
.
list
.
otherFeeCurrencyId
==
1
){
fee
.
amount
=
fee
.
amount
.
plus
(
this
.
fee
.
insuranceFee
)
}
arr
.
push
(
fee
)
}
// 没有累加保价费(没有美元计价)但是有保价费则需要加上去
if
(
!
withInsuranceFee
&&
this
.
fee
&&
this
.
fee
.
insuranceFee
){
// 累加其他费用
const
otherFeeIndex
=
arr
.
findIndex
(
item
=>
item
.
currencyId
==
this
.
list
.
otherFeeCurrencyId
)
if
(
otherFeeIndex
>
-
1
){
arr
[
otherFeeIndex
].
amount
=
arr
[
otherFeeIndex
].
amount
.
plus
(
this
.
form
.
otherFee
||
0
)
}
else
{
if
(
this
.
list
.
otherFee
>
0
){
arr
.
push
({
currencyId
:
1
,
amount
:
Decimal
(
this
.
fee
.
insuranceFee
)
currencyId
:
this
.
list
.
otherFeeCurrencyId
,
amount
:
Decimal
(
this
.
list
.
otherFee
||
0
)
})
}
this
.
otherFeeList
.
forEach
(
item
=>
{
if
(
!
arr
.
find
(
items
=>
items
.
currencyId
==
item
.
currencyId
)){
let
its
=
{...
item
}
// let freights = this.clearanceFeeList.find(fee => fee.currencyId == item.currencyId)
// if(freights){
// its.amount += freights.amount
// }
arr
.
push
(
its
)
}
})
return
arr
}
},
// 保价费单位(路线里设置,默认美元)
insuranceFeeCurrency
()
{
return
this
.
selectedRouter
?.
currencyUnit
||
1
;
},
},
created
()
{
getCurrencyList
().
then
(
res
=>
this
.
currencyList
=
res
.
data
)
...
...
src/views/ecw/offer/edit.vue
View file @
e460d283
...
...
@@ -758,11 +758,13 @@ export default {
if
(
otherFeeIndex
>
-
1
){
arr
[
otherFeeIndex
].
amount
=
arr
[
otherFeeIndex
].
amount
.
plus
(
this
.
form
.
otherFee
||
0
)
}
else
{
if
(
this
.
form
.
otherFee
>
0
){
arr
.
push
({
currencyId
:
this
.
form
.
otherFeeCurrencyId
,
amount
:
Decimal
(
this
.
form
.
otherFee
||
0
)
})
}
}
return
arr
},
...
...
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