Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
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
罗超
SuperMan
Commits
9bfc0514
Commit
9bfc0514
authored
Jun 21, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改汇率bug修复
parent
b9836316
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
42 additions
and
42 deletions
+42
-42
BillModule.vue
src/components/FinancialModule/components/BillModule.vue
+26
-26
ReceivablesModule.vue
...mponents/FinancialModule/components/ReceivablesModule.vue
+16
-16
No files found.
src/components/FinancialModule/components/BillModule.vue
View file @
9bfc0514
...
...
@@ -171,7 +171,6 @@ export default {
},
calculation
(
i
){
if
(
!
i
){
let
Money
=
0
let
benMoney
=
0
this
.
currentMoney
=
0
...
...
@@ -188,22 +187,22 @@ export default {
benMoney
+=
Money
this
.
benMoney
=
benMoney
/
100
;
})
}
else
{
let
Money
=
0
let
benMoney
=
0
this
.
benMoney2
=
0
this
.
GetDetail
.
CashierDetail
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
// x.Money = Math.round(x.Money)
x
.
Money
=
x
.
Money
.
toFixed
(
2
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money
=
parseFloat
(
x
.
Money
)
*
100
benMoney
+=
Money
this
.
benMoney2
=
benMoney
/
100
;
})
}
// 有收款账户需对比总金额
if
(
this
.
GetDetail
.
CashierDetail
&&
this
.
GetDetail
.
CashierDetail
.
length
>
0
){
let
Money1
=
0
let
benMoney1
=
0
this
.
benMoney2
=
0
this
.
GetDetail
.
CashierDetail
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
// x.Money = Math.round(x.Money
)
x
.
Money
=
x
.
Money
.
toFixed
(
2
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money1
=
parseFloat
(
x
.
Money
)
*
100
benMoney1
+=
Money1
this
.
benMoney2
=
benMoney1
/
100
;
})
}
},
Financial_post_GetDetail
(
id
){
//获取单据详情
...
...
@@ -240,6 +239,7 @@ export default {
let
TCID
=
data
.
TCIDList
.
length
>
0
?
data
.
TCIDList
[
0
]
:
0
this
.
financeinfo_post_GetList
(
TCID
);
}
this
.
calculation
()
}
},
err
=>
{})
},
...
...
@@ -330,15 +330,15 @@ export default {
watch
:
{
// 监听参数变化
GetDetail
:
{
handler
:
function
(
val
,
oldVal
)
{
let
isAmount
=
true
if
(
this
.
GetDetail
.
CashierDetail
&&
this
.
GetDetail
.
CashierDetail
.
length
){
if
(
this
.
benMoney2
===
this
.
benMoney
){
isAmount
=
false
}
else
{
isAmount
=
true
}
}
this
.
$emit
(
'getList'
,
val
,
isAmount
)
//
let isAmount = true
//
if(this.GetDetail.CashierDetail&&this.GetDetail.CashierDetail.length){
//
if(this.benMoney2===this.benMoney){
//
isAmount = false
//
}else{
//
isAmount = true
//
}
//
}
this
.
$emit
(
'getList'
,
val
,
false
)
},
deep
:
true
,
immediate
:
true
...
...
src/components/FinancialModule/components/ReceivablesModule.vue
View file @
9bfc0514
...
...
@@ -138,7 +138,6 @@ export default {
},
calculation
(
i
){
if
(
!
i
){
let
Money
=
0
let
benMoney
=
0
this
.
currentMoney
=
0
...
...
@@ -155,21 +154,21 @@ export default {
benMoney
+=
Money
this
.
benMoney
=
benMoney
/
100
;
})
}
else
{
let
Money
=
0
let
benMoney
=
0
this
.
benMoney2
=
0
this
.
GetDetail
.
CashierDetail
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
x
.
Money
=
x
.
Money
.
toFixed
(
2
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money
=
parseFloat
(
x
.
Money
)
*
100
benMoney
+=
Money
this
.
benMoney2
=
benMoney
/
100
;
})
}
// 有收款账户需对比总金额
if
(
this
.
GetDetail
.
CashierDetail
&&
this
.
GetDetail
.
CashierDetail
.
length
>
0
){
let
Money1
=
0
let
benMoney1
=
0
this
.
benMoney2
=
0
this
.
GetDetail
.
CashierDetail
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
x
.
Money
=
x
.
Money
.
toFixed
(
2
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money1
=
parseFloat
(
x
.
Money
)
*
100
benMoney1
+=
Money1
this
.
benMoney2
=
benMoney1
/
100
;
})
}
},
Financial_post_GetDetail
(
id
){
//获取单据详情
if
(
!
id
)
return
;
...
...
@@ -199,6 +198,7 @@ export default {
this
.
benMoney2
=
0
this
.
loading
=
false
this
.
$set
(
this
.
$data
,
"GetDetail"
,
data
);
this
.
calculation
()
}
},
err
=>
{})
},
...
...
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