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
145c1ec9
Commit
145c1ec9
authored
Jan 14, 2020
by
黄媛媛
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
4421941b
975d21d0
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
416 additions
and
181 deletions
+416
-181
ticketSearch.vue
src/components/FinancialModule/ticketSearch.vue
+148
-0
RegistrationList.vue
src/components/TravelManager/TravelList/RegistrationList.vue
+227
-170
leaderPay2.vue
src/components/leaderPay2.vue
+30
-9
TravelPrice.vue
...nents/newTravelmanager/TravelGroupControl/TravelPrice.vue
+1
-1
config.js
src/router/config.js
+10
-1
No files found.
src/components/FinancialModule/ticketSearch.vue
0 → 100644
View file @
145c1ec9
<
style
>
.ts_Click
{
color
:
blue
;
text-decoration
:
underline
;
font-size
:
12px
;
cursor
:
pointer
;
}
</
style
>
<
template
>
<div
class=
""
>
<div
class=
"query-box"
>
<ul>
<li>
<span>
<em>
日期
</em>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.QStartDate"
:picker-options=
"pickerBeginDateBefore"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
<el-date-picker
class=
"w150"
type=
"date"
v-model=
"msg.QEndDate"
:picker-options=
"pickerBeginDateAfter"
value-format=
"yyyy-MM-dd"
placeholder
></el-date-picker>
</span>
</li>
<li>
<span>
<em>
团号
</em>
<el-input
v-model=
"msg.TCNUM"
type=
"text"
></el-input>
</span>
</li>
<li>
<span>
<em>
团队编号
</em>
<el-input
v-model=
"msg.TCID"
type=
"text"
@
keyup
.
native=
"checkInteger(msg,'TCID')"
></el-input>
</span>
</li>
<li>
<button
class=
"hollowFixedBtn"
@
click=
"getList(),resetPageIndex()"
>
{{
$t
(
'pub.searchBtn'
)
}}
</button>
</li>
</ul>
</div>
<div
class=
"_fnDm_content"
>
<table
class=
"singeRowTable"
cellspacing=
"0"
cellpadding=
"0"
v-loading=
"loading"
>
<tr>
<th>
团号/团队编号
</th>
<th>
订单号
</th>
<th>
下单时间
</th>
<th>
业务员
</th>
<th>
票务出票时间/尾款时间
</th>
<th>
订单取消时间
</th>
<th>
订单取消人
</th>
</tr>
<tr
v-for=
"(item,index) in dataList"
:key=
"index"
>
<td>
<span
class=
"ts_Click"
@
click=
'goUrl("RegistrationList", item.TCID,"报名清单")'
>
{{
item
.
TCNUM
}}
(
{{
item
.
TCID
}}
)
</span>
</td>
<td>
{{
item
.
OrderId
}}
</td>
<td>
{{
item
.
CreateDateStr
}}
</td>
<td>
{{
item
.
EnterName
}}
</td>
<td>
{{
item
.
TicketSureTimeStr
}}
</td>
<td>
{{
item
.
OrderCancelTimeStr
}}
</td>
<td>
{{
item
.
LogUpdateByName
}}
</td>
</tr>
</table>
<div
class=
"noDataNotice"
v-if=
"dataList.length
<1
"
>
<i
class=
"iconfont icon-kong"
></i>
<p>
{{
$t
(
"active.ld_noData"
)
}}
</p>
</div>
<el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"total"
>
</el-pagination>
</div>
</div>
</
template
>
<
script
>
// 自定义列组件
export
default
{
data
()
{
return
{
loading
:
false
,
msg
:
{
QStartDate
:
''
,
QEndDate
:
''
,
TCNUM
:
''
,
TCID
:
''
,
pageIndex
:
1
,
pageSize
:
15
},
dataList
:
[],
currentPage
:
1
,
total
:
0
,
pickerBeginDateBefore
:
{
disabledDate
:
time
=>
{
if
(
this
.
msg
.
QEndDate
==
null
)
{
return
false
;
}
else
{
let
endTime
=
new
Date
(
this
.
msg
.
QEndDate
);
return
endTime
.
getTime
()
<
time
.
getTime
();
}
}
},
pickerBeginDateAfter
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
msg
.
QStartDate
);
return
startTime
.
getTime
()
>=
time
.
getTime
();
}
}
}
},
created
()
{
},
components
:
{},
mounted
()
{
this
.
getList
();
},
methods
:
{
getList
:
function
()
{
this
.
loading
=
true
;
this
.
apipost
(
'sellorder_get_GetOrderCancelListService'
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
dataList
=
res
.
data
.
data
.
pageData
;
this
.
total
=
res
.
data
.
data
.
count
;
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
//翻页
handleCurrentChange
(
val
)
{
this
.
msg
.
pageIndex
=
val
;
this
.
getList
();
},
resetPageIndex
()
{
// 重置页码
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
},
goUrl
(
path
,
id
,
name
)
{
this
.
$router
.
push
({
name
:
path
,
query
:
{
id
:
id
,
blank
:
"y"
,
tab
:
name
}
});
},
}
}
</
script
>
\ No newline at end of file
src/components/TravelManager/TravelList/RegistrationList.vue
View file @
145c1ec9
This diff is collapsed.
Click to expand it.
src/components/leaderPay2.vue
View file @
145c1ec9
...
...
@@ -571,7 +571,7 @@
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
{{
subItem
.
HotelName
}}
</td>
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
<td
v-if=
"subIndex==0 && childIndex == 0"
:rowspan=
"item.row"
>
{{
subItem
.
NewHotelName
}}
</td>
<td>
...
...
@@ -974,6 +974,8 @@
<input
type=
"button"
class=
"leader2Btn"
@
click=
"AuditOrder(1)"
value=
"审核不通过"
v-show=
"dataList.LeaderApply.Status==1"
>
<input
type=
"button"
class=
"leader2Btn"
value=
"打印"
@
click=
"printTable()"
>
<input
v-if=
"UserId==615 && dataList.LeaderApply.Status==2"
type=
"button"
class=
"leader2Btn"
value=
"取消审核"
@
click=
"CancelLeaderApply()"
>
</div>
</div>
<a
:href=
"blankUrl"
id=
"blankLink"
target=
"_blank"
style=
"display:none"
>
1
</a>
...
...
@@ -1024,6 +1026,7 @@
export
default
{
data
()
{
return
{
UserId
:
0
,
LineId
:
0
,
planPriceList
:
[],
zhuijiaList
:
[],
...
...
@@ -1094,9 +1097,7 @@
if
(
subItem
.
DiningID
==
DiningID
&&
subItem
.
UseDinnerType
==
UseDinnerType
&&
subItem
.
UseTimeStr
==
UseTimeStr
)
{
totalPrice
+=
0
}
else
{
}
else
{
totalPrice
+=
subItem
.
TradingTotalPrice
}
DiningID
=
subItem
.
DiningID
;
...
...
@@ -1398,7 +1399,7 @@
}
else
{
this
.
$message
.
error
(
res
.
data
.
message
)
}
},
null
)
},
goZhiDan
:
function
(
obj
)
{
...
...
@@ -1656,11 +1657,10 @@
let
list
=
[]
for
(
var
j
=
0
;
j
<
Diningdest
.
length
;
j
++
)
{
var
dj
=
Diningdest
[
j
];
if
(
dj
.
id
==
(
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
))
{
if
(
dj
.
id
==
(
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
))
{
dj
.
data
.
push
(
ai
);
break
;
}
else
{
}
else
{
list
.
push
(
ai
)
}
}
...
...
@@ -1668,7 +1668,7 @@
Diningdest
.
push
({
UseTimeStr
:
ai
.
UseTimeStr
,
DiningID
:
ai
.
NewDiningID
,
id
:
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
,
id
:
ai
.
NewDiningID
+
ai
.
UseTimeStr
+
ai
.
UseDinnerTypeStr
,
data
:
[
ai
]
});
}
...
...
@@ -1842,12 +1842,33 @@
this
.
$message
.
error
(
res
.
data
.
message
);
}
},
err
=>
{})
},
//取消审核
CancelLeaderApply
()
{
var
that
=
this
;
this
.
Confirm
(
"是否要取消审核?"
,
function
()
{
var
msg
=
{
TCIDs
:
that
.
msg
.
TCIDs
};
that
.
apipost
(
"miniProgram_price_CancelLeaderApplyService"
,
msg
,
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
that
.
Success
(
'取消审核成功!'
);
that
.
getList
();
}
else
{
that
.
Error
(
res
.
data
.
data
);
}
},
null
);
});
}
},
created
()
{},
mounted
()
{
this
.
isUpdate
=
this
.
$route
.
query
.
isUpdate
;
this
.
msg
.
TCIDs
=
this
.
$route
.
query
.
id
;
let
userInfo
=
this
.
getLocalStorage
();
this
.
UserId
=
userInfo
.
EmployeeId
;
this
.
getzongJE
();
this
.
getNav
();
this
.
getList
();
...
...
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @
145c1ec9
...
...
@@ -453,7 +453,7 @@
:false-label=
"UnCheckedLessPrice"
>
{{
$t
(
'op.CanLessPrice'
)
}}
</el-checkbox>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('op.HotelUse')"
@
click=
"outerVisible=true"
v-if=
"
PostConfig.LineId==14
&& priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
v-if=
"
(PostConfig.LineId==14 || PostConfig.LineId==131)
&& priceData.PriceHotelList&&priceData.PriceHotelList.length>0"
/>
</div>
<el-form-item
prop=
"B2BMemberPrice"
>
<el-input
:placeholder=
"$t('pub.pleaseImport')"
class=
"w190 ComSeat"
v-model=
"priceData.B2BMemberPrice"
...
...
src/router/config.js
View file @
145c1ec9
...
...
@@ -3012,7 +3012,16 @@ export default {
meta
:
{
title
:
'现金日报表'
},
},
{
//财务 银行日报表
},
{
//财务 票务订单查询
path
:
'/ticketSearch'
,
name
:
'ticketSearch'
,
component
:
resolve
=>
require
([
'@/components/FinancialModule/ticketSearch'
],
resolve
),
meta
:
{
title
:
'票务订单查询'
},
},
{
//财务 银行日报表
path
:
'/TransferReport'
,
name
:
'TransferReport'
,
component
:
resolve
=>
require
([
'@/components/FinancialModule/TransferReport'
],
resolve
),
...
...
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