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
ebf897da
Commit
ebf897da
authored
Aug 19, 2020
by
Mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
e728afdd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
72 additions
and
59 deletions
+72
-59
addFinancialDocuments.vue
src/components/FinancialModule/addFinancialDocuments.vue
+41
-35
addReceivablesDocuments.vue
src/components/FinancialModule/addReceivablesDocuments.vue
+31
-24
No files found.
src/components/FinancialModule/addFinancialDocuments.vue
View file @
ebf897da
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/addReceivablesDocuments.vue
View file @
ebf897da
...
...
@@ -236,7 +236,7 @@
<td
height=
"26px"
><el-input
v-model=
"da.Number"
@
keyup
.
native=
"checkInteger(da,'Number')"
type=
"text"
@
blur=
"addList(2,daIn+1)"
@
change=
"Calculation(2,daIn+1)"
class=
"w80 _border_b_1"
></el-input></td>
<td
height=
"26px"
>
<el-input
v-model=
"da.UnitPrice"
type=
"text"
@
keyup
.
native=
"checkPrice(da,'UnitPrice',true)"
@
change=
"Calculation(2,daIn+1)"
@
blur=
"addList(2,daIn+1)"
class=
"w80 h34 _border_b_1"
></el-input>
</td>
</td>
<td
height=
"26px"
>
<span
class=
"w80"
>
{{
da
.
currenName
}}
</span>
</td>
...
...
@@ -399,7 +399,7 @@
<div
class=
"_remark"
>
<p>
{{$t('system.label_info')}}
</p>
<textarea
v-model=
"Description"
>
</textarea>
</div>
<div
class=
""
>
...
...
@@ -752,7 +752,7 @@ export default {
this
.
picIsShow
=
true
;
// this.hideFlashMan = true;
}
else
{
if
(
i
.
Content
.
substring
(
i
.
Content
.
lastIndexOf
(
'.'
)
+
1
,
i
.
Content
.
length
).
toUpperCase
()
==
'PDF'
){
if
(
i
.
Content
.
substring
(
i
.
Content
.
lastIndexOf
(
'.'
)
+
1
,
i
.
Content
.
length
).
toUpperCase
()
==
'PDF'
){
this
.
previewPDF
(
i
.
Url
)
}
else
{
window
.
open
(
"https://view.officeapps.live.com/op/view.aspx?src="
+
i
.
Url
)
...
...
@@ -807,7 +807,7 @@ export default {
zhifu
=
OcrStr
.
match
(
/商家可扫码退款或查询交易.
\d
+/
);
let
barcode
=
x
.
data
.
Barcode
;
if
(
wechat
==
null
&&
zhifu
==
null
&&
barcode
==
""
){
return
;
return
;
}
if
(
zhifu
==
null
&&
wechat
!=
null
&&
wechat
.
length
>
0
&&
wechat
[
wechat
.
length
-
1
].
length
>
20
){
this
.
setCode
=
wechat
[
wechat
.
length
-
1
].
replace
(
'商户单号'
,
''
);
...
...
@@ -840,7 +840,7 @@ export default {
// this.msg.detailList.forEach(x=>{ //2019-02-01注释:页面手续费只需要计算一次,多个费用说明,重复计算 BY:W
// allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
// })
this
.
msg
.
detailList
.
forEach
(
x
=>
{
this
.
msg
.
detailList
.
forEach
(
x
=>
{
allPrice
=
allPrice
+
parseFloat
(
x
.
bTotalPrice
);
})
allPrice
=
allPrice
-
parseFloat
(
this
.
msg
.
Fee
);
...
...
@@ -853,11 +853,11 @@ export default {
let
f
=
parseFloat
(
this
.
msg
.
OriginalFee
);
this
.
msg
.
Fee
=
Math
.
round
((
r
*
f
)
*
100
)
/
100
;
let
allPrice
=
0
;
// this.msg.detailList.forEach(x=>{ //2019-02-01注释:页面手续费只需要计算一次,多个费用说明,重复计算 BY:W
// allPrice = allPrice+parseFloat(x.bTotalPrice)-parseFloat(this.msg.Fee);
// });
this
.
msg
.
detailList
.
forEach
(
x
=>
{
this
.
msg
.
detailList
.
forEach
(
x
=>
{
allPrice
=
allPrice
+
parseFloat
(
x
.
bTotalPrice
);
})
allPrice
=
allPrice
-
parseFloat
(
this
.
msg
.
Fee
);
...
...
@@ -927,7 +927,7 @@ export default {
}
}
},
err
=>
{})
},
BankAccount_post_GetPlatformList
(
i
){
//获取平台账户
let
msg
=
{
...
...
@@ -1052,17 +1052,18 @@ export default {
e
.
target
.
value
=
(
e
.
target
.
value
.
match
(
/^
\d
*
(\.?\d{0,1})
/g
)[
0
])
||
null
},
AddFinancial
(
z
){
//保存
console
.
log
(
this
.
orderObj
)
if
(
this
.
Handmsg
!=
null
){
this
.
msg
.
ReFinanceId
=
this
.
Handmsg
.
ReFinanceId
;
if
(
this
.
Handmsg
.
TCNUM
){
this
.
msg
.
TCNUM
=
this
.
Handmsg
.
TCNUM
}
}
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
8
&&
this
.
orderObj
.
tipObj
==
1
){
let
tipguestInfo
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"TipGuestList"
));
this
.
msg
.
TipGuestList
=
tipguestInfo
;
}
this
.
msg
.
Description
=
this
.
Description
;
if
(
z
){
...
...
@@ -1081,7 +1082,7 @@ export default {
// if(this.msg.IsHave==0&&this.chosenPeople.length==0)return this.$message.error('请选择下一步审核人')
if
(
this
.
msg
.
BankId
==
''
)
return
this
.
$message
.
error
(
this
.
$t
(
'rule.qxzskzhanghao'
));
if
(
!
this
.
msg
.
RB_Depart_Id
)
return
this
.
$message
.
error
(
this
.
$t
(
'rule.qxzzdbumen'
));
if
(
!
this
.
$route
.
query
.
edit
){
if
(
!
this
.
$route
.
query
.
edit
){
this
.
msg
.
Type
=
this
.
$route
.
query
.
Type
}
delete
this
.
msg
.
DetailList
;
...
...
@@ -1094,6 +1095,12 @@ export default {
this
.
msg
.
emList
=
this
.
chosenPeople
;
if
(
this
.
orderObj
){
this
.
msg
.
VisaIds
=
this
.
orderObj
.
VisaIds
?
this
.
orderObj
.
VisaIds
:
''
;
//从电商过来的参数处理
this
.
msg
.
OrderSource
=
this
.
orderObj
.
OrderSource
?
this
.
orderObj
.
OrderSource
:
0
;
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
this
.
msg
.
ReFinanceId
=
this
.
orderObj
.
ReFinanceId
?
this
.
orderObj
.
ReFinanceId
:
0
;
this
.
msg
.
ReFinanceId2
=
this
.
orderObj
.
ReFinanceId2
?
this
.
orderObj
.
ReFinanceId2
:
0
;
this
.
msg
.
ECOrderList
=
this
.
orderObj
.
ECOrderList
?
this
.
orderObj
.
ECOrderList
:[];
}
this
.
msg
.
detailList
.
forEach
(
x
=>
{
delete
x
.
rate
;
...
...
@@ -1108,11 +1115,11 @@ export default {
cancelButtonText
:
this
.
$t
(
'fnc.nothanks'
),
type
:
'warning'
}).
then
(()
=>
{
this
.
$router
.
push
({
name
:
'addReceivablesDocuments'
,
query
:{
"id"
:
this
.
$route
.
query
.
id
,
"Name"
:
this
.
$route
.
query
.
Name
,
'InPay'
:
this
.
$route
.
query
.
InPay
,
"Type"
:
this
.
$route
.
query
.
Type
,
"orderObj"
:
this
.
$route
.
query
.
orderObj
,
'IsUploadPic'
:
this
.
$route
.
query
.
IsUploadPic
,
'companyID'
:
this
.
$route
.
query
.
companyID
}});
this
.
$router
.
push
({
name
:
'addReceivablesDocuments'
,
query
:{
"id"
:
this
.
$route
.
query
.
id
,
"Name"
:
this
.
$route
.
query
.
Name
,
'InPay'
:
this
.
$route
.
query
.
InPay
,
"Type"
:
this
.
$route
.
query
.
Type
,
"orderObj"
:
this
.
$route
.
query
.
orderObj
,
'IsUploadPic'
:
this
.
$route
.
query
.
IsUploadPic
,
'companyID'
:
this
.
$route
.
query
.
companyID
}});
}).
catch
(()
=>
{
this
.
$router
.
push
({
name
:
'FinancialDocuments'
,
query
:{
'Type'
:
this
.
$route
.
query
.
Type
,
'InPay'
:
this
.
$route
.
query
.
InPay
}})
;
this
.
$router
.
push
({
name
:
'FinancialDocuments'
,
query
:{
'Type'
:
this
.
$route
.
query
.
Type
,
'InPay'
:
this
.
$route
.
query
.
InPay
}})
;
});
}
else
{
this
.
resultCode
=
res
.
data
.
resultCode
;
this
.
$message
.
error
(
res
.
data
.
message
);
...
...
@@ -1299,7 +1306,7 @@ export default {
}
}
this
.
msg
.
BankList
[
0
].
Fee
=
parseFloat
(
this
.
msg
.
BankList
[
0
].
ybFee
);
this
.
$forceUpdate
();
},
shouxufeiJiSuan
:
function
(){
...
...
@@ -1422,7 +1429,7 @@ export default {
this
.
msg
.
CallType
=
this
.
orderObj
.
CallType
?
this
.
orderObj
.
CallType
:
0
;
this
.
msg
.
OtherType
=
this
.
orderObj
.
OtherType
?
this
.
orderObj
.
OtherType
:
0
;
if
(
!
JSON
.
parse
(
sessionStorage
.
getItem
(
"saveGuestInfo"
))
&&
!
JSON
.
parse
(
sessionStorage
.
getItem
(
"TipGuestList"
))){
this
.
Description
=
this
.
orderObj
.
laRemark
?
this
.
orderObj
.
laRemark
:
''
;
}
...
...
@@ -1435,7 +1442,7 @@ export default {
})
this
.
msg
.
Description
=
Description
}
}
}
...
...
@@ -1523,15 +1530,15 @@ export default {
}
})
})
this
.
companyList
=
data
;
this
.
companyList
=
data
;
}
}
},
err
=>
{})
}
},
err
=>
{})
},
},
...
...
@@ -1541,7 +1548,7 @@ export default {
this
.
platformAccount
=
this
.
$route
.
query
.
platformAccount
?
this
.
$route
.
query
.
platformAccount
:
0
;
this
.
orderObj
=
this
.
$route
.
query
.
orderObj
?
JSON
.
parse
(
this
.
$route
.
query
.
orderObj
):
null
;
this
.
Handmsg
=
this
.
$route
.
query
.
Handmsg
?
JSON
.
parse
(
this
.
$route
.
query
.
Handmsg
):
null
;
if
(
this
.
orderObj
!=
null
&&
this
.
orderObj
.
OrderSource
===
8
&&
this
.
orderObj
.
tipObj
==
1
){
that
.
Description
=
"旅客名单:"
;
that
.
describeList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"TipGuestList"
));
...
...
@@ -1550,7 +1557,7 @@ export default {
that
.
Description
+=
item
.
GuestName
+
" "
;
})
}
}
},
mounted
(){
...
...
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