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
7de05dab
Commit
7de05dab
authored
Sep 29, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
票务管理,财务单据转移
parent
6a2515f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
122 additions
and
3 deletions
+122
-3
EasyReport.vue
src/components/FinancialModule/ReportForm/EasyReport.vue
+1
-1
TicketManager.vue
src/components/Ticketing/TicketManager.vue
+121
-2
No files found.
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @
7de05dab
...
...
@@ -885,7 +885,7 @@ export default {
if
(
rowData
.
ZhaiYao
==
"员工提成"
){
if
(
Number
(
this
.
year
)
==
2019
){
if
(
column
.
title
==
"
七月"
||
column
.
title
==
"
八月"
||
column
.
title
==
"九月"
||
column
.
title
==
"十月"
||
column
.
title
==
"十一月"
||
column
.
title
==
"十二月"
){
if
(
column
.
title
==
"八月"
||
column
.
title
==
"九月"
||
column
.
title
==
"十月"
||
column
.
title
==
"十一月"
||
column
.
title
==
"十二月"
){
let
CostIds
=
""
;
CostIds
=
rowData
.
CostIds
.
replace
(
'112,'
,
''
);
that
.
GoUrlFan
(
'JumpReport'
,
month
,
rowData
.
Year
,
rowData
.
BranchId
,
CostIds
)
...
...
src/components/Ticketing/TicketManager.vue
View file @
7de05dab
...
...
@@ -1218,10 +1218,13 @@
border-top
:
1px
solid
#ccc
;
line-height
:
28px
;
}
.MyTicketManager
.el-checkbox
{
margin-left
:
30px
;
}
</
style
>
<
template
>
<div
class=
"flexOne TicketManager"
>
<div
class=
"flexOne TicketManager
MyTicketManager
"
>
<div
class=
"query-box Plan_Query"
>
<ul>
<li>
...
...
@@ -1613,7 +1616,9 @@
<el-tooltip
class=
"item"
effect=
"dark"
content=
"散卖"
placement=
"top-start"
>
<el-button
type=
"primary"
icon=
"iconfont icon-maichu"
@
click=
"sanSale(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"机票单据转移"
placement=
"top-start"
>
<el-button
type=
"primary"
icon=
"iconfont icon-gengduo1"
@
click=
"OpenFindig(item)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"日志"
placement=
"top-start"
>
<el-popover
popper-class=
"Journal"
width=
"400"
trigger=
"click"
>
<div
class=
"InfoChangeLog"
>
...
...
@@ -2187,6 +2192,30 @@
<div
slot=
"tip"
class=
"el-upload__tip"
></div>
</el-upload>
</el-dialog>
<!-- 单据转移 -->
<el-dialog
custom-class=
"w400"
title=
"机票单据转移"
:visible
.
sync=
"ticketDia"
center
>
<el-form
label-width=
"110px"
>
<el-form-item
label=
"原机票编码"
>
<el-input
v-model=
"ticketMsg.OldAirId"
:disabled=
"true"
></el-input>
</el-form-item>
<el-form-item
label=
"新机票编码"
>
<el-input
v-model=
"ticketMsg.NewAirId"
></el-input>
</el-form-item>
<el-form-item
label=
"财务单据ID"
>
<!-- <el-checkbox-group > -->
<
template
v-for=
"(item,index) in ticketMsg.FinalList"
>
<el-checkbox
v-model=
"ckedArr"
@
change=
"handleChange(item)"
:label=
"item"
:key=
"index+5000"
>
{{
item
}}
</el-checkbox>
</
template
>
<span
v-show=
"ticketMsg.FinalList.length==0"
style=
"font-size:14px"
>
暂无数据
</span>
<!-- </el-checkbox-group> -->
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"hollowFixedBtn"
@
click=
"ticketDia=false"
>
{{$t('pub.cancelBtn')}}
</button>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"TicketFinalTranfer"
>
{{$t('pub.sureBtn')}}
</button>
</div>
</el-dialog>
</div>
</template>
<
script
>
...
...
@@ -2200,6 +2229,14 @@
}
}
return
{
ticketMsg
:{
OldAirId
:
""
,
NewAirId
:
''
,
FinalList
:[],
FinanceId
:
''
,
},
ckedArr
:[],
ticketDia
:
false
,
MidpiecePNR
:
''
,
ZhongDuanID
:
0
,
ZhongDuanPNR
:
false
,
...
...
@@ -2464,6 +2501,87 @@
};
},
methods
:
{
TicketFinalTranfer
(){
if
(
this
.
ticketMsg
.
NewAirId
==
""
){
this
.
Error
(
"请输入新机票编码"
);
return
;
}
if
(
this
.
ticketMsg
.
FinanceId
==
""
){
this
.
Error
(
"请选择财务单据"
);
return
;
}
this
.
apipost
(
"Financial_post_AirTicketFinanceTransfer"
,
this
.
ticketMsg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
ticketDia
=
false
;
this
.
Success
(
res
.
data
.
message
);
this
.
getList
();
}
else
{
this
.
Error
(
res
.
data
.
message
)
}
},
err
=>
{}
);
},
handleChange
(
val
){
let
index
=
this
.
ckedArr
.
indexOf
(
val
)
if
(
index
>=
0
)
{
this
.
ckedArr
=
[
val
]
}
else
{
this
.
ckedArr
.
splice
(
index
,
1
)
}
if
(
this
.
ckedArr
.
length
>
0
){
this
.
ticketMsg
.
FinanceId
=
this
.
ckedArr
[
0
];
}
else
{
this
.
ticketMsg
.
FinanceId
=
""
;
}
},
OpenFindig
(
item
){
this
.
ticketDia
=
true
;
this
.
ticketMsg
=
{
OldAirId
:
""
,
NewAirId
:
''
,
FinalList
:[],
FinanceId
:
''
,
};
this
.
ckedArr
=
[];
this
.
ticketMsg
.
OldAirId
=
item
.
ID
;
let
FinalList
=
[];
if
(
item
.
FirstAuditList
){
item
.
FirstAuditList
.
forEach
(
child
=>
{
FinalList
.
push
(
child
.
FinaceId
);
})
}
if
(
item
.
SecondAuditList
){
item
.
SecondAuditList
.
forEach
(
child
=>
{
FinalList
.
push
(
child
.
FinaceId
);
})
}
if
(
item
.
ThirdAuditList
){
item
.
ThirdAuditList
.
forEach
(
child
=>
{
FinalList
.
push
(
child
.
FinaceId
);
})
}
if
(
item
.
FourthAuditList
){
item
.
FourthAuditList
.
forEach
(
child
=>
{
FinalList
.
push
(
child
.
FinaceId
);
})
}
if
(
item
.
FinalAuditList
){
item
.
FinalAuditList
.
forEach
(
child
=>
{
FinalList
.
push
(
child
.
FinaceId
);
})
}
this
.
ticketMsg
.
FinalList
=
FinalList
;
},
//页面跳转
goUrlT
(
path
,
obj
,
title
)
{
this
.
$router
.
push
({
...
...
@@ -2652,6 +2770,7 @@
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
this
.
dataList
=
res
.
data
.
data
.
pageData
;
// console.log("this.dataList",this.dataList)
this
.
noData
=
!
this
.
total
>
0
;
}
if
(
this
.
msg
.
ID
==
0
)
{
...
...
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