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
f9f4e950
Commit
f9f4e950
authored
Aug 10, 2023
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款单金额优化
parent
7ffedc66
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
creatCollection.vue
src/views/ecw/financial/creatCollection.vue
+8
-8
receiptDetail.vue
src/views/ecw/financial/receiptDetail.vue
+4
-3
No files found.
src/views/ecw/financial/creatCollection.vue
View file @
f9f4e950
...
@@ -983,11 +983,10 @@ export default {
...
@@ -983,11 +983,10 @@ export default {
// totalAmount
// totalAmount
res
.
data
=
[...
res
.
data
,
{
res
.
data
=
[...
res
.
data
,
{
type
:
'
total
'
,
type
:
'
total
'
,
writeOffAmount
:
res
.
data
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
),
writeOffAmount
:
res
.
data
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
)
.
toFixed
(
2
)
,
collectionAmount
:
[]
collectionAmount
:
[]
}
]
}
]
}
}
console
.
log
(
res
.
data
)
this
.
$set
(
this
.
form
,
'
receiptAccountList
'
,
res
.
data
)
this
.
$set
(
this
.
form
,
'
receiptAccountList
'
,
res
.
data
)
this
.
$nextTick
(()
=>
{
this
.
$nextTick
(()
=>
{
...
@@ -1010,6 +1009,7 @@ export default {
...
@@ -1010,6 +1009,7 @@ export default {
// this.rateChange(item, index)
// this.rateChange(item, index)
//
}
);
//
}
);
console
.
log
(
111
)
if
(
this
.
form
.
receiptAccountList
.
length
>
0
){
if
(
this
.
form
.
receiptAccountList
.
length
>
0
){
this
.
editReceiptAccountList
()
this
.
editReceiptAccountList
()
}
}
...
@@ -1071,7 +1071,7 @@ export default {
...
@@ -1071,7 +1071,7 @@ export default {
}
}
if
(
row
.
writeOffRate
){
if
(
row
.
writeOffRate
){
row
.
writeOffAmount
=
Math
.
round
(
NP
.
times
(
row
.
writeOffRate
||
0
,
NP
.
minus
(
row
.
receivableAmount
,
row
.
discountTotal
||
0
))
)
row
.
writeOffAmount
=
NP
.
times
(
row
.
writeOffRate
||
0
,
NP
.
minus
(
row
.
receivableAmount
,
row
.
discountTotal
||
0
)).
toFixed
(
2
)
}
else
{
}
else
{
row
.
writeOffAmount
=
''
row
.
writeOffAmount
=
''
}
}
...
@@ -1101,7 +1101,7 @@ export default {
...
@@ -1101,7 +1101,7 @@ export default {
var
dollarList
=
this
.
form
.
receiptAccountList
.
filter
(
v
=>
v
.
collectionCurrencyId
==
item
.
id
)
var
dollarList
=
this
.
form
.
receiptAccountList
.
filter
(
v
=>
v
.
collectionCurrencyId
==
item
.
id
)
if
(
dollarList
.
length
>
0
){
if
(
dollarList
.
length
>
0
){
var
dollar
=
dollarList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
collectionAmount
),
0
)
var
dollar
=
dollarList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
collectionAmount
),
0
)
amountList
.
push
({
currencyId
:
item
.
id
,
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
amountList
.
push
({
currencyId
:
item
.
id
,
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
.
toFixed
(
2
)
}
)
}
}
}
)
}
)
this
.
form
.
receiptAccountList
[
this
.
form
.
receiptAccountList
.
length
-
1
].
collectionAmount
=
amountList
this
.
form
.
receiptAccountList
[
this
.
form
.
receiptAccountList
.
length
-
1
].
collectionAmount
=
amountList
...
@@ -1228,11 +1228,11 @@ export default {
...
@@ -1228,11 +1228,11 @@ export default {
const
totalt
=
this
.
form
.
receiptAccountList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
)
const
totalt
=
this
.
form
.
receiptAccountList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
)
this
.
form
.
receiptAccountList
=
[...
this
.
form
.
receiptAccountList
,
{
this
.
form
.
receiptAccountList
=
[...
this
.
form
.
receiptAccountList
,
{
type
:
'
total
'
,
type
:
'
total
'
,
writeOffAmount
:
Math
.
round
(
totalt
),
writeOffAmount
:
totalt
.
toFixed
(
2
),
collectionAmount
:
[
this
.
form
.
receiptAccountList
.
discountNaira
,
0
,
0
]
collectionAmount
:
[]
}
]
}
]
this
.
form
.
receivableTotalAmount
=
totalt
this
.
form
.
receivableTotalAmount
=
totalt
.
toFixed
(
2
)
}
}
// receiptAccountList: [
// receiptAccountList: [
//
{
currencyId
:
1
,
receivableAmount
:
0
,
writeOffRate
:
1
,
writeOffAmount
:
999
,
platformAccountId
:
''
,
currencyId
:
''
,
rate
:
1
,
collectionAmount
:
0
}
,
//
{
currencyId
:
1
,
receivableAmount
:
0
,
writeOffRate
:
1
,
writeOffAmount
:
999
,
platformAccountId
:
''
,
currencyId
:
''
,
rate
:
1
,
collectionAmount
:
0
}
,
...
@@ -1272,7 +1272,7 @@ export default {
...
@@ -1272,7 +1272,7 @@ export default {
const
index
=
this
.
form
.
receiptAccountList
.
findIndex
(
v
=>
v
.
currencyId
==
type
)
const
index
=
this
.
form
.
receiptAccountList
.
findIndex
(
v
=>
v
.
currencyId
==
type
)
const
t
=
this
.
form
.
receiptAccountList
[
index
]
const
t
=
this
.
form
.
receiptAccountList
[
index
]
if
(
t
)
{
if
(
t
)
{
t
.
writeOffAmount
=
Math
.
round
(
NP
.
times
(
t
.
writeOffRate
||
0
,
usCount
)
)
t
.
writeOffAmount
=
NP
.
times
(
t
.
writeOffRate
||
0
,
usCount
).
toFixed
(
2
)
this
.
rateChange
(
t
,
index
)
this
.
rateChange
(
t
,
index
)
}
}
}
,
}
,
...
...
src/views/ecw/financial/receiptDetail.vue
View file @
f9f4e950
...
@@ -664,6 +664,7 @@ export default {
...
@@ -664,6 +664,7 @@ export default {
total
=
NP
.
plus
(
total
,
item
.
writeOffAmount
)
total
=
NP
.
plus
(
total
,
item
.
writeOffAmount
)
}
}
}
)
}
)
return
total
.
toFixed
(
2
)
return
total
.
toFixed
(
2
)
}
,
}
,
//显示反审核反核销弹窗
//显示反审核反核销弹窗
...
@@ -741,7 +742,7 @@ export default {
...
@@ -741,7 +742,7 @@ export default {
// totalAmount
// totalAmount
res
.
data
=
[...
res
.
data
,
{
res
.
data
=
[...
res
.
data
,
{
type
:
'
total
'
,
type
:
'
total
'
,
writeOffAmount
:
res
.
data
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
),
writeOffAmount
:
res
.
data
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
writeOffAmount
||
0
),
0
)
.
toFixed
(
2
)
,
collectionAmount
:
[]
collectionAmount
:
[]
}
]
}
]
}
}
...
@@ -824,8 +825,8 @@ export default {
...
@@ -824,8 +825,8 @@ export default {
this
.
currencyList
.
forEach
((
item
,
index
)
=>
{
this
.
currencyList
.
forEach
((
item
,
index
)
=>
{
var
dollarList
=
this
.
form
.
receiptAccountList
.
filter
(
v
=>
v
.
collectionCurrencyId
==
item
.
id
)
var
dollarList
=
this
.
form
.
receiptAccountList
.
filter
(
v
=>
v
.
collectionCurrencyId
==
item
.
id
)
if
(
dollarList
.
length
>
0
){
if
(
dollarList
.
length
>
0
){
var
dollar
=
Math
.
round
(
dollarList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
collectionAmount
),
0
)
)
var
dollar
=
dollarList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
collectionAmount
),
0
)
amountList
.
push
({
currencyId
:
item
.
id
,
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
amountList
.
push
({
currencyId
:
item
.
id
,
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
.
toFixed
(
2
)
}
)
}
}
}
)
}
)
this
.
form
.
receiptAccountList
[
this
.
form
.
receiptAccountList
.
length
-
1
].
collectionAmount
=
amountList
this
.
form
.
receiptAccountList
[
this
.
form
.
receiptAccountList
.
length
-
1
].
collectionAmount
=
amountList
...
...
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