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
9339cc69
Commit
9339cc69
authored
Dec 30, 2022
by
我在何方
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
收款单修复
parent
8fb403ea
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
creatCollection.vue
src/views/ecw/financial/creatCollection.vue
+1
-1
receiptDetail.vue
src/views/ecw/financial/receiptDetail.vue
+2
-1
No files found.
src/views/ecw/financial/creatCollection.vue
View file @
9339cc69
...
@@ -893,7 +893,7 @@ export default {
...
@@ -893,7 +893,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
).
toFixed
(
6
)
var
dollar
=
dollarList
.
reduce
((
total
,
currentValue
)
=>
NP
.
plus
(
total
,
currentValue
.
collectionAmount
),
0
).
toFixed
(
6
)
amountList
.
push
({
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
amountList
.
push
({
currency
Id
:
item
.
id
,
currency
NameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
}
}
}
)
}
)
// const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
// const dollarList = this.form.receiptAccountList.filter(v => v.collectionCurrencyId == 1)
...
...
src/views/ecw/financial/receiptDetail.vue
View file @
9339cc69
...
@@ -644,7 +644,7 @@ export default {
...
@@ -644,7 +644,7 @@ export default {
// if(n && n.discountTotal&&n.discountTotal>0)
{
// if(n && n.discountTotal&&n.discountTotal>0)
{
// amountList.push(
{
currencyName
:
item
.
titleZh
,
currencyId
:
item
.
id
,
amount
:(
dollar
-
n
.
discountTotal
).
toFixed
(
2
)
}
)
// amountList.push(
{
currencyName
:
item
.
titleZh
,
currencyId
:
item
.
id
,
amount
:(
dollar
-
n
.
discountTotal
).
toFixed
(
2
)
}
)
//
}
else
{
//
}
else
{
amountList
.
push
({
currencyNameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
amountList
.
push
({
currency
Id
:
item
.
id
,
currency
NameEn
:
item
.
titleEn
,
currencyNameZh
:
item
.
titleZh
,
amount
:
dollar
}
)
//
}
//
}
}
}
...
@@ -953,6 +953,7 @@ export default {
...
@@ -953,6 +953,7 @@ export default {
this
.
form
.
receiptAccountList
.
find
(
item
=>
item
.
type
==
'
total
'
).
collectionAmount
.
forEach
(
item
=>
{
this
.
form
.
receiptAccountList
.
find
(
item
=>
item
.
type
==
'
total
'
).
collectionAmount
.
forEach
(
item
=>
{
collom
[
item
.
currencyId
]
=
item
.
amount
collom
[
item
.
currencyId
]
=
item
.
amount
}
)
}
)
console
.
log
(
this
.
form
.
receiptAccountList
)
console
.
log
(
'
collom
'
,
collom
)
console
.
log
(
'
collom
'
,
collom
)
// if(recepted.length>collom.length)
{
// if(recepted.length>collom.length)
{
recepted
.
forEach
((
amount
,
currency
)
=>
{
recepted
.
forEach
((
amount
,
currency
)
=>
{
...
...
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