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
056f45db
Commit
056f45db
authored
Jul 21, 2023
by
youjie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
3bfd9679
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
12 deletions
+19
-12
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+2
-1
HandFeeStatistics.vue
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
+9
-1
BillModule.vue
src/components/FinancialModule/components/BillModule.vue
+2
-4
ReceivablesModule.vue
...mponents/FinancialModule/components/ReceivablesModule.vue
+2
-2
index.js
src/plug/index.js
+4
-4
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
056f45db
...
...
@@ -1061,7 +1061,8 @@
</div>
</
template
>
</div>
<div
style=
"margin-top: 102px;"
class=
"page_fdd"
v-if=
"isShowAttachment&&GetDetail.IsUploadPic===1"
>
<!-- isShowAttachment&&GetDetail.IsUploadPic===1 -->
<div
style=
"margin-top: 102px;"
class=
"page_fdd"
>
<div
v-if=
"saveMsg.length>0"
>
<div
class=
"_addUpload_box _addUpload_box_btm clearfix"
>
<
template
v-for=
"(file,fIndex) in saveMsg"
>
...
...
src/components/FinancialModule/HandFee/HandFeeStatistics.vue
View file @
056f45db
...
...
@@ -417,7 +417,8 @@ export default {
BillMakingMsg
:
{
OtherType
:
0
,
StandardCurrencyName
:
""
,
Money
:
0
Money
:
0
,
IsUploadPic
:
1
,
},
rules
:{
HandFeeFrId
:
[{
...
...
@@ -603,9 +604,16 @@ export default {
let
query
=
{
blank
:
"y"
,
tab
:
`新增
${
text
}
单据`
,
Name
:
'PIC手配费月结收款单'
,
Type
:
type
,
id
:
271
,
orderObj
:
JSON
.
stringify
(
this
.
BillMakingMsg
),
};
this
.
$router
.
push
({
path
:
"/addReceivablesDocuments"
,
query
});
return
this
.
$store
.
commit
(
"ChoiceAddFinancialDocuments"
);
this
.
$router
.
push
({
path
:
"/ChoiceAddFinancialDocuments"
,
...
...
src/components/FinancialModule/components/BillModule.vue
View file @
056f45db
...
...
@@ -180,8 +180,7 @@ export default {
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
// x.Money = x.Money.toFixed(2)
// x.Money = Math.round(x.Money * 100) / 100
x
.
Money
=
this
.
RoundItUp
(
x
.
Money
)
x
.
Money
=
this
.
RoundItUp
(
parseFloat
(
x
.
Money
).
toFixed
(
3
))
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
this
.
currentMoney
+=
parseFloat
(
x
.
OriginalMoney
);
...
...
@@ -197,8 +196,7 @@ export default {
this
.
GetDetail
.
CashierDetail
.
forEach
(
x
=>
{
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
x
.
Money
=
this
.
RoundItUp
(
x
.
Money
)
x
.
Money
=
this
.
RoundItUp
(
parseFloat
(
x
.
Money
).
toFixed
(
3
))
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money1
=
parseFloat
(
x
.
Money
)
*
100
...
...
src/components/FinancialModule/components/ReceivablesModule.vue
View file @
056f45db
...
...
@@ -146,7 +146,7 @@ export default {
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
x
.
Money
=
this
.
RoundItUp
(
x
.
Money
)
x
.
Money
=
this
.
RoundItUp
(
parseFloat
(
x
.
Money
).
toFixed
(
3
)
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
this
.
currentMoney
+=
parseFloat
(
x
.
OriginalMoney
);
...
...
@@ -163,7 +163,7 @@ export default {
x
.
UnitPrice
=
this
.
$commonUtils
.
addCommas
(
Math
.
round
(
x
.
UnitPrice
*
100
)
/
100
)
x
.
Money
=
x
.
Rate
*
x
.
OriginalMoney
x
.
Money
=
this
.
RoundItUp
(
x
.
Money
)
x
.
Money
=
this
.
RoundItUp
(
parseFloat
(
x
.
Money
).
toFixed
(
3
)
)
x
.
OriginalMoney
=
Math
.
round
(
x
.
OriginalMoney
*
100
)
/
100
Money1
=
parseFloat
(
x
.
Money
)
*
100
...
...
src/plug/index.js
View file @
056f45db
...
...
@@ -120,8 +120,8 @@ export default {
let
crmUrl
=
""
;
//crm API
let
locationName
=
window
.
location
.
hostname
;
domainUrl
=
"http://192.168.10.25:8083"
;
// 刘东电脑
domainUrl
=
"http://192.168.10.
128"
;
//domainUrl = "http://reborn.oytour.com";
domainUrl
=
"http://192.168.10.
226:8015"
;
//春姐
//
domainUrl = "http://reborn.oytour.com";
let
crmLocalFileStreamDownLoadUrl
=
""
;
crmLocalFileStreamDownLoadUrl
=
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://crm.oytour.com"
:
"http://testcrm.oytour.com"
;
...
...
@@ -138,7 +138,7 @@ export default {
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://testcrm.oytour.com"
}
else
if
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
)
{
domainUrl
=
"http://
reborn.oytour.com
"
;
domainUrl
=
"http://
192.168.10.25:8083
"
;
mallUrl
=
"https://mallapi.oytour.com"
;
lxymallUrl
=
"https://erpmallapi.oytour.com"
;
crmUrl
=
"http://crm.oytour.com"
...
...
@@ -1718,7 +1718,7 @@ export default {
Vue
.
prototype
.
RoundItUp
=
function
(
Money
)
{
let
FractionalPart
=
String
(
Money
).
split
(
'.'
)
if
(
FractionalPart
&&
FractionalPart
[
1
]
&&
FractionalPart
[
1
].
length
>
2
){
return
Money
=
(
parseFloat
(
Money
.
toFixed
(
3
))
+
0.001
).
toFixed
(
2
)
return
Money
=
(
parseFloat
(
Money
)).
toFixed
(
2
)
//(parseFloat(Money
.toFixed(3))+0.001).toFixed(2)
}
else
{
return
Money
=
Math
.
round
(
Money
*
100
)
/
100
}
...
...
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