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
908da6c6
Commit
908da6c6
authored
Mar 15, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
26affe74
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
76 deletions
+64
-76
flightChild.vue
src/components/Ticketing/flightChild.vue
+63
-75
flightManagement.vue
src/components/Ticketing/flightManagement.vue
+1
-1
No files found.
src/components/Ticketing/flightChild.vue
View file @
908da6c6
<
style
>
.flightMg
.flightAddCompany
{
.flightMg
.flightAddCompany
{
width
:
900px
;
min-height
:
300px
;
}
...
...
@@ -99,21 +99,16 @@
<div
class=
"query-box"
>
<ul>
<li>
<label>
{{
$t
(
'system.query_airCompanyName'
)
}}
</label>
<el-select
v-model=
"msg.airlineID"
filterable
:placeholder=
"$t('system.ph_buxian')"
class=
"w210"
>
<el-option
:label=
'$t("system.ph_buxian")'
value=
'0'
></el-option>
<el-option
v-for=
"item in airlineList"
:key=
"item.AirLineId"
:label=
"item.AlName"
:value=
"item.AirLineId"
>
</el-option>
</el-select>
</li>
<li>
<label>
{{
$t
(
'system.query_flightNum'
)
}}
</label>
<el-input
v-model=
"msg.Flight_number"
placeholder=
""
@
keyup
.
native
.
enter=
"getList"
class=
"w210"
></el-input>
<label>
日期范围:
</label>
<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>
</li>
<li>
<input
type=
"button"
class=
"hollowFixedBtn"
:value=
"$t('pub.searchBtn')"
@
click=
"resetPageIndex(),getList()"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
@
click=
"outerVisible = true,dialogTitle='新增
航班
'"
/>
<input
type=
"button"
class=
"normalBtn"
:value=
"$t('pub.addBtn')"
@
click=
"outerVisible = true,dialogTitle='新增
效期
'"
/>
</li>
</ul>
</div>
...
...
@@ -127,11 +122,11 @@
<th>
操作
</th>
</tr>
<tr
v-for=
"(item,index) in DataList"
:key=
"index"
>
<td><input
type=
"checkbox"
/></td>
<td>
2018-08-09
</td>
<td>
123456
</td>
<td>
2019-09-09
</td>
<td>
2018-09-09
</td>
<td><input
type=
"checkbox"
:value=
"item.ID"
/></td>
<td>
{{
item
.
FDateStr
}}
</td>
<td>
{{
item
.
Flight_number
}}
}
</td>
<td>
{{
item
.
CDepartTime
}}
}
</td>
<td>
{{
item
.
CArrivalTime
}}
}
</td>
<td>
<el-row>
<el-tooltip
class=
"item"
effect=
"dark"
:content=
"$t('system.table_edit')"
placement=
"top-start"
>
...
...
@@ -144,39 +139,38 @@
<div
class=
"noData"
v-show=
"noData"
>
{{
$t
(
'system.content_noData'
)
}}
</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>
-->
<
el-pagination
background
@
current-change=
"handleCurrentChange"
:current-page
.
sync=
"msg.
currentPage"
layout=
"total,prev, pager, next, jumper"
:page-size=
"msg.pageSize"
:total=
"
msg.
total"
>
</el-pagination>
<el-dialog
custom-class=
'flightAddCompany'
:title=
"dialogTitle"
:visible
.
sync=
"outerVisible"
center
:before-close=
"closeChangeMachie"
>
<el-form>
<table
class=
"flightChildTable"
style=
"border-collapse: collapse;"
>
<table
class=
"flightChildTable"
style=
"border-collapse: collapse;"
>
<tr>
<td
width=
"350"
>
<div
style=
"float:left;margin-left:30px;"
>
<div
style=
"margin-bottom:5px;"
>
开始日期:
<el-date-picker
clearable
class=
"w135"
v-model=
"startDate"
type=
"date"
:picker-options=
"beforeCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
<div
style=
"margin-bottom:5px;"
>
开始日期:
<el-date-picker
clearable
class=
"w135"
v-model=
"PostData.StartDate"
type=
"date"
:picker-options=
"beforeCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
</div>
<div>
结束日期:
<el-date-picker
clearable
class=
"w135"
v-model=
"e
ndDate"
type=
"date"
:picker-options=
"afterCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
结束日期:
<el-date-picker
clearable
class=
"w135"
v-model=
"PostData.E
ndDate"
type=
"date"
:picker-options=
"afterCheck"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
</div>
</div>
<div
class=
"flightaddICon"
>
<i
class=
"iconfont icon-img_haha"
></i>
<i
class=
"iconfont icon-img_haha"
></i>
</div>
</td>
<td>
<div
class=
"FweekList"
v-for=
"item in dateObj"
>
<el-input
type=
"text"
v-model=
"item.week"
class=
"w60"
></el-input>
<el-date-picker
clearable
class=
"w135"
v-model=
"item.Departure_date"
type=
"date
"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
<el-date-picker
clearable
class=
"w135"
v-model=
"item.Arrival_date"
type=
"date
"
value-format=
"yyyy-MM-dd"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
</div>
<div
class=
"FweekList"
v-for=
"item in dateObj"
>
<el-input
type=
"text"
v-model=
"item.week"
class=
"w60"
></el-input>
<el-date-picker
clearable
class=
"w135"
v-model=
"item.Departure_date"
type=
"date"
value-format=
"yyyy-MM-dd
"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
<el-date-picker
clearable
class=
"w135"
v-model=
"item.Arrival_date"
type=
"date"
value-format=
"yyyy-MM-dd
"
:placeholder=
"$t('admin.admin_choDate')"
></el-date-picker>
</div>
</td>
</tr>
</table>
</table>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<button
class=
"normalBtn"
type=
"primary"
@
click=
"submitForm('addMsg')"
>
{{
$t
(
'pub.saveBtn'
)
}}
</button>
...
...
@@ -195,48 +189,54 @@
//请求数据参数
pageIndex
:
1
,
pageSize
:
15
,
airlineID
:
"0"
,
Flight_number
:
""
,
Type
:
"0"
,
Departure_city
:
"0"
,
Departure_airport
:
"0"
,
Stopover_city
:
"0"
,
Stopover_airport
:
"0"
,
Arrival_city
:
"0"
,
Arrival_airport
:
"0"
,
Status
:
"0"
FlightId
:
this
.
$route
.
query
.
id
,
QStartDate
:
""
,
QEndDate
:
""
,
total
:
0
,
currentPage
:
1
,
},
loading
:
true
,
noData
:
false
,
dialogTitle
:
''
,
dateObj
:[
{
week
:
'周一'
,
Departure_date
:
'2018-09-09'
,
Arrival_date
:
'2019-09-18'
PostData
:
{
StartDate
:
""
,
EndDate
:
""
,
FlightId
:
this
.
$route
.
query
.
id
,
//1-全部更新,2,按周一,周二更新
UpdateType
:
1
,
SubList
:
[{
CDepartTime
:
"09:00"
,
CArrivalTime
:
"16:40"
,
//0-全部,1周一...7周日
WeekDay
:
0
}]
},
dialogTitle
:
''
,
dateObj
:
[{
week
:
'周一'
,
Departure_date
:
'2018-09-09'
,
Arrival_date
:
'2019-09-18'
},
{
week
:
'周二'
,
Departure_date
:
'2018-09-09'
,
Arrival_date
:
'2019-09-18'
week
:
'周二'
,
Departure_date
:
'2018-09-09'
,
Arrival_date
:
'2019-09-18'
}
],
startDate
:
''
,
endDate
:
''
,
beforeCheck
:
{
disabledDate
:
time
=>
{
let
endTime
=
new
Date
(
this
.
e
ndDate
);
let
endTime
=
new
Date
(
this
.
msg
.
QE
ndDate
);
return
endTime
.
getTime
()
<
time
.
getTime
();
}
},
afterCheck
:
{
disabledDate
:
time
=>
{
let
startTime
=
new
Date
(
this
.
s
tartDate
);
let
startTime
=
new
Date
(
this
.
msg
.
QS
tartDate
);
return
startTime
.
getTime
()
>=
time
.
getTime
();
}
},
airlineList
:[],
DataList
:[],
airlineList
:
[],
DataList
:
[],
};
},
methods
:
{
...
...
@@ -244,12 +244,12 @@
getList
()
{
this
.
loading
=
true
;
this
.
apipost
(
"flight_
post_Get
PageList"
,
"flight_
get_GetChild
PageList"
,
this
.
msg
,
res
=>
{
this
.
loading
=
false
;
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
total
=
res
.
data
.
data
.
count
;
this
.
msg
.
total
=
res
.
data
.
data
.
count
;
this
.
noData
=
!
this
.
total
>
0
;
this
.
DataList
=
res
.
data
.
data
.
pageData
;
}
else
{
...
...
@@ -259,17 +259,6 @@
err
=>
{}
);
},
//获取航空公司*
getAirlineList
()
{
this
.
apipost
(
"airline_post_GetList"
,
{},
res
=>
{
this
.
airlineList
=
res
.
data
.
data
;
},
err
=>
{}
);
},
//提交创建、修改表单
submitForm
(
addMsg
)
{
this
.
$refs
[
addMsg
].
validate
(
valid
=>
{
...
...
@@ -288,7 +277,7 @@
//查询初始化页码
resetPageIndex
()
{
this
.
msg
.
pageIndex
=
1
;
this
.
currentPage
=
1
;
this
.
msg
.
currentPage
=
1
;
},
closeChangeMachie
(
done
)
{
//弹出框关闭初始化弹框内表单
...
...
@@ -302,7 +291,6 @@
},
mounted
()
{
this
.
getList
();
this
.
getAirlineList
();
}
};
...
...
src/components/Ticketing/flightManagement.vue
View file @
908da6c6
...
...
@@ -230,7 +230,7 @@
<el-button
type=
"danger"
icon=
"el-icon-delete"
circle
@
click=
"deletelist(index,1)"
></el-button>
</el-tooltip>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"效期维护"
placement=
"top-start"
style=
"display:none;"
>
<el-tooltip
class=
"item"
effect=
"dark"
content=
"效期维护"
placement=
"top-start"
>
<el-button
type=
"danger"
icon=
"el-icon-delete"
circle
@
click=
"gotoChild(item)"
></el-button>
</el-tooltip>
</el-row>
...
...
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