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
b4824e67
Commit
b4824e67
authored
5 years ago
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改财务
parent
ad494baf
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
40 additions
and
13 deletions
+40
-13
BasicDocuments.vue
src/components/FinancialModule/BasicDocuments.vue
+15
-1
FinancialDocumentsDetail.vue
src/components/FinancialModule/FinancialDocumentsDetail.vue
+15
-2
GuanBillModule.vue
...nts/FinancialModule/FinancialSubmodule/GuanBillModule.vue
+6
-6
GuideAccount.vue
src/components/FinancialModule/accDetail/GuideAccount.vue
+4
-4
No files found.
src/components/FinancialModule/BasicDocuments.vue
View file @
b4824e67
...
@@ -327,6 +327,7 @@
...
@@ -327,6 +327,7 @@
<td
:colspan=
"3"
>
<td
:colspan=
"3"
>
{{o.TCNUM}}({{o.TCID}})
{{o.TCNUM}}({{o.TCID}})
<span
v-if=
"GetDetail.IsShowPlanUrl === 1"
@
click=
"goInves('investigationList',o.TCID)"
class=
"FD_yijian"
>
旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份
</span>
<span
v-if=
"GetDetail.IsShowPlanUrl === 1"
@
click=
"goInves('investigationList',o.TCID)"
class=
"FD_yijian"
>
旅客意见 {{o.GuestSurveyNum}}/{{o.GuestTotalNum}}份
</span>
<span
v-if=
"GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7"
@
click=
"goGuideAccount('GuideAccount',GetDetail.ClientID)"
class=
"FD_yijian"
>
领队导游往来
</span>
</td>
</td>
<td
@
click=
"jumpPage('TravelControlList',o.TCNUM,1)"
>
<span
class=
"_jump_page _font_bold"
>
查看团队
</span>
</td>
<td
@
click=
"jumpPage('TravelControlList',o.TCNUM,1)"
>
<span
class=
"_jump_page _font_bold"
>
查看团队
</span>
</td>
<td
@
click=
"jumpPage('RegistrationList',o.TCID,7)"
>
<span
class=
"_jump_page _font_bold"
>
查看报名
</span>
</td>
<td
@
click=
"jumpPage('RegistrationList',o.TCID,7)"
>
<span
class=
"_jump_page _font_bold"
>
查看报名
</span>
</td>
...
@@ -2358,7 +2359,6 @@ export default {
...
@@ -2358,7 +2359,6 @@ export default {
this
.
apipost
(
'AccountType_post_GetList'
,
this
.
queryAccMsg
,
res
=>
{
this
.
apipost
(
'AccountType_post_GetList'
,
this
.
queryAccMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
){
if
(
res
.
data
.
resultCode
==
1
){
let
data
=
res
.
data
.
data
;
let
data
=
res
.
data
.
data
;
console
.
log
(
1
);
if
(
this
.
RB_Post_Id
!=
5
&&
this
.
userId
!=
1648
){
if
(
this
.
RB_Post_Id
!=
5
&&
this
.
userId
!=
1648
){
if
(
this
.
userId
==
1918
){
if
(
this
.
userId
==
1918
){
this
.
AccList
=
res
.
data
.
data
;
this
.
AccList
=
res
.
data
.
data
;
...
@@ -2468,6 +2468,20 @@ export default {
...
@@ -2468,6 +2468,20 @@ export default {
name
:
path
,
name
:
path
,
query
:
{
query
:
{
TCID
:
TCID
,
TCID
:
TCID
,
blank
:
'y'
}
});
},
goGuideAccount
(
path
,
ClientID
){
if
(
ClientID
==
0
){
this
.
Error
(
'临时导游,无往来'
);
return
;
}
this
.
$router
.
push
({
name
:
path
,
query
:
{
ClientID
:
ClientID
,
blank
:
'y'
}
}
});
});
},
},
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @
b4824e67
...
@@ -391,6 +391,7 @@
...
@@ -391,6 +391,7 @@
<td
:colspan=
"3"
>
<td
:colspan=
"3"
>
{{
o
.
TCNUM
}}
(
{{
o
.
TCID
}}
)
{{
o
.
TCNUM
}}
(
{{
o
.
TCID
}}
)
<span
v-if=
"GetDetail.IsShowPlanUrl === 1"
@
click=
"goInves('investigationList',o.TCID)"
class=
"FD_yijian"
>
旅客意见
{{
o
.
GuestSurveyNum
}}
/
{{
o
.
GuestTotalNum
}}
份
</span>
<span
v-if=
"GetDetail.IsShowPlanUrl === 1"
@
click=
"goInves('investigationList',o.TCID)"
class=
"FD_yijian"
>
旅客意见
{{
o
.
GuestSurveyNum
}}
/
{{
o
.
GuestTotalNum
}}
份
</span>
<span
v-if=
"GetDetail.IsShowPlanUrl==1&&GetDetail.ClientType==7"
@
click=
"goGuideAccount('GuideAccount',GetDetail.ClientID)"
class=
"FD_yijian"
>
领队导游往来
</span>
</td>
</td>
<td
@
click=
"jumpPage('TravelControlList',o.TCNUM,1)"
>
<span
class=
"_jump_page _font_bold"
>
查看团队
</span>
</td>
<td
@
click=
"jumpPage('TravelControlList',o.TCNUM,1)"
>
<span
class=
"_jump_page _font_bold"
>
查看团队
</span>
</td>
<td
@
click=
"jumpPage('RegistrationList',o.TCID,7)"
>
<span
class=
"_jump_page _font_bold"
>
查看报名
</span>
</td>
<td
@
click=
"jumpPage('RegistrationList',o.TCID,7)"
>
<span
class=
"_jump_page _font_bold"
>
查看报名
</span>
</td>
...
@@ -973,6 +974,20 @@ export default {
...
@@ -973,6 +974,20 @@ export default {
name
:
path
,
name
:
path
,
query
:
{
query
:
{
TCID
:
TCID
,
TCID
:
TCID
,
blank
:
'y'
}
});
},
goGuideAccount
(
path
,
ClientID
){
if
(
ClientID
==
0
){
this
.
Error
(
'临时导游,无往来'
);
return
;
}
this
.
$router
.
push
({
name
:
path
,
query
:
{
ClientID
:
ClientID
,
blank
:
'y'
}
}
});
});
},
},
...
@@ -1245,7 +1260,6 @@ export default {
...
@@ -1245,7 +1260,6 @@ export default {
handleAvatarSuccess
(
res
,
file
)
{
//上传
handleAvatarSuccess
(
res
,
file
)
{
//上传
if
(
res
.
resultCode
==
1
){
if
(
res
.
resultCode
==
1
){
var
img_path
=
res
.
data
.
FullFilePath
var
img_path
=
res
.
data
.
FullFilePath
console
.
log
(
res
.
data
)
this
.
imageUrl
=
img_path
this
.
imageUrl
=
img_path
let
obj
=
{
let
obj
=
{
src
:
img_path
src
:
img_path
...
@@ -1319,7 +1333,6 @@ export default {
...
@@ -1319,7 +1333,6 @@ export default {
this
.
FrID
=
this
.
GetDetail
.
FrID
;
this
.
FrID
=
this
.
GetDetail
.
FrID
;
this
.
SourceID
=
this
.
GetDetail
.
SourceID
;
this
.
SourceID
=
this
.
GetDetail
.
SourceID
;
this
.
Callback
=
this
.
GetDetail
.
Callback
;
this
.
Callback
=
this
.
GetDetail
.
Callback
;
// 拼接团号显示团信息
// 拼接团号显示团信息
let
str
=
''
;
let
str
=
''
;
if
(
data
.
TCIDList
.
length
>
0
){
if
(
data
.
TCIDList
.
length
>
0
){
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/FinancialSubmodule/GuanBillModule.vue
View file @
b4824e67
...
@@ -44,18 +44,18 @@
...
@@ -44,18 +44,18 @@
<div
class=
"_sanjiao_"
></div>
<div
class=
"_sanjiao_"
></div>
<table
border=
"1"
class=
"_border_color_b Receipt_table"
bordercolor=
"#c94052"
style=
"border-collapse:collapse;width: 100%;"
v-loading=
'loading'
>
<table
border=
"1"
class=
"_border_color_b Receipt_table"
bordercolor=
"#c94052"
style=
"border-collapse:collapse;width: 100%;"
v-loading=
'loading'
>
<tr>
<tr>
<th
rowspan=
"2"
>
{{
$t
(
'system.query_company'
)
}}
</th>
<th
rowspan=
"2"
width=
"100"
>
{{
$t
(
'system.query_company'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th
rowspan=
"2"
width=
"70"
>
{{
$t
(
'fnc.danhao'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.fyshuoming'
)
}}
</th>
<th
rowspan=
"2"
width=
"120"
>
{{
$t
(
'fnc.fyshuoming'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_Currency'
)
}}
</th>
<th
colspan=
"3"
>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th
colspan=
"3"
>
{{
$t
(
'fnc.jine'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'hotel.hotel_remark'
)
}}
</th>
<th
rowspan=
"2"
>
{{
$t
(
'fnc.zhidanren'
)
}}
</th>
<th
rowspan=
"2"
width=
"70"
>
{{
$t
(
'fnc.zhidanren'
)
}}
</th>
</tr>
</tr>
<tr>
<tr>
<th
width=
"88"
>
{{
$t
(
'fnc.yuanbi'
)
}}
</th>
<th
width=
"88"
>
{{
$t
(
'fnc.yuanbi'
)
}}
</th>
<th
width=
"
5
0"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"
9
0"
>
{{
$t
(
'hotel.hotel_CurrentRate'
)
}}
</th>
<th
width=
"
68
"
>
{{
$t
(
'fnc.bweibi'
)
}}
</th>
<th
width=
"
75
"
>
{{
$t
(
'fnc.bweibi'
)
}}
</th>
</tr>
</tr>
<template
v-if=
"details&&details.length"
>
<template
v-if=
"details&&details.length"
>
<tr
v-for=
"(item) in details"
class=
"_color_b"
>
<tr
v-for=
"(item) in details"
class=
"_color_b"
>
...
...
This diff is collapsed.
Click to expand it.
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @
b4824e67
...
@@ -588,7 +588,6 @@ export default {
...
@@ -588,7 +588,6 @@ export default {
this
.
dataJson
=
data
;
this
.
dataJson
=
data
;
this
.
DataList
=
data
.
Rlist
;
this
.
DataList
=
data
.
Rlist
;
// console.log("this.DataList",this.DataList)
if
(
this
.
msg
.
ClientID
==
0
){
if
(
this
.
msg
.
ClientID
==
0
){
...
@@ -661,7 +660,6 @@ export default {
...
@@ -661,7 +660,6 @@ export default {
this
.
accountList
.
forEach
(
x
=>
{
this
.
accountList
.
forEach
(
x
=>
{
if
(
x
.
ID
===
i
){
if
(
x
.
ID
===
i
){
this
.
payMsg
.
Account
=
x
.
allName
;
this
.
payMsg
.
Account
=
x
.
allName
;
console
.
log
(
x
);
this
.
payMsg
.
CurrenName
=
x
.
CurrencyName
;
this
.
payMsg
.
CurrenName
=
x
.
CurrencyName
;
this
.
payMsg
.
Rate
=
x
.
CurrencyRate
?
x
.
CurrencyRate
:
x
.
CurrentRate
;
this
.
payMsg
.
Rate
=
x
.
CurrencyRate
?
x
.
CurrencyRate
:
x
.
CurrentRate
;
this
.
payMsg
.
CurrencyId
=
x
.
CurrencyId
;
this
.
payMsg
.
CurrencyId
=
x
.
CurrencyId
;
...
@@ -673,7 +671,6 @@ export default {
...
@@ -673,7 +671,6 @@ export default {
this
.
accountList
.
forEach
(
x
=>
{
this
.
accountList
.
forEach
(
x
=>
{
if
(
x
.
ID
===
i
){
if
(
x
.
ID
===
i
){
this
.
payMsgList
[
index
].
Account
=
x
.
allName
;
this
.
payMsgList
[
index
].
Account
=
x
.
allName
;
console
.
log
(
x
);
this
.
payMsgList
[
index
].
CurrenName
=
x
.
CurrencyName
;
this
.
payMsgList
[
index
].
CurrenName
=
x
.
CurrencyName
;
this
.
payMsgList
[
index
].
Rate
=
x
.
CurrencyRate
?
x
.
CurrencyRate
:
x
.
CurrentRate
;
this
.
payMsgList
[
index
].
Rate
=
x
.
CurrencyRate
?
x
.
CurrencyRate
:
x
.
CurrentRate
;
this
.
payMsgList
[
index
].
CurrencyId
=
x
.
CurrencyId
;
this
.
payMsgList
[
index
].
CurrencyId
=
x
.
CurrencyId
;
...
@@ -782,7 +779,6 @@ export default {
...
@@ -782,7 +779,6 @@ export default {
this
.
allLoading
=
true
this
.
allLoading
=
true
this
.
apipost
(
'Financial_post_MergeFinance'
,
this
.
addMsg
,
r
=>
{
this
.
apipost
(
'Financial_post_MergeFinance'
,
this
.
addMsg
,
r
=>
{
if
(
r
.
data
.
resultCode
===
1
)
{
if
(
r
.
data
.
resultCode
===
1
)
{
console
.
log
(
r
)
this
.
addChuNa
=
false
this
.
addChuNa
=
false
this
.
getList
()
this
.
getList
()
}
else
{
}
else
{
...
@@ -913,6 +909,10 @@ export default {
...
@@ -913,6 +909,10 @@ export default {
},
},
},
mounted
(){
},
mounted
(){
let
userInfo
=
this
.
getLocalStorage
();
let
userInfo
=
this
.
getLocalStorage
();
let
ClientID
=
this
.
$route
.
query
.
ClientID
;
if
(
ClientID
){
this
.
msg
.
ClientID
=
Number
(
ClientID
);
}
this
.
getAccountTypeList
();
this
.
getAccountTypeList
();
this
.
AccountType_post_GetList
();
this
.
AccountType_post_GetList
();
this
.
BankAccount_post_GetAccountType
();
this
.
BankAccount_post_GetAccountType
();
...
...
This diff is collapsed.
Click to expand it.
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