Commit 8e4f8fc1 authored by 黄奎's avatar 黄奎

页面修改

parent db28dcd8
...@@ -4,104 +4,123 @@ ...@@ -4,104 +4,123 @@
display: block; display: block;
height: 0; height: 0;
clear: both; clear: both;
} }
.flightMg .addCompany {
.flightMg .addCompany {
width: 440px; width: 440px;
max-height: 600px; max-height: 600px;
} }
.flightMg .addCompany .el-dialog__body {
.flightMg .addCompany .el-dialog__body {
height: 486px; height: 486px;
overflow: auto; overflow: auto;
} }
.flightMg .addCompany input {
.flightMg .addCompany input {
width: 208px; width: 208px;
height: 34px; height: 34px;
border-radius: 17px; border-radius: 17px;
} }
.flightMg .name_input .el-form-item__content,
.other_input .el-form-item__content .el-input input { .flightMg .name_input .el-form-item__content,
.other_input .el-form-item__content .el-input input {
width: 208px; width: 208px;
} }
.flightMg .name_input .el-form-item__content .el-input input {
.flightMg .name_input .el-form-item__content .el-input input {
border-radius: 0; border-radius: 0;
} }
.flightMg .name_input .el-form-item__content .el-input:first-child input {
.flightMg .name_input .el-form-item__content .el-input:first-child input {
border-top-left-radius: 17px; border-top-left-radius: 17px;
border-bottom-left-radius: 17px; border-bottom-left-radius: 17px;
border-right: 0; border-right: 0;
} }
.flightMg
.cn_name .flightMg .cn_name .el-form-item:nth-child(2) .el-form-item__content .el-input:last-child input,
.el-form-item:nth-child(2) .is-error .el-form-item__content {
.el-form-item__content
.el-input:last-child
input,
.is-error .el-form-item__content {
border-top-right-radius: 17px; border-top-right-radius: 17px;
border-bottom-right-radius: 17px; border-bottom-right-radius: 17px;
} }
.flightMg .el-form-item__content .el-textarea {
.flightMg .el-form-item__content .el-textarea {
width: 208px; width: 208px;
} }
.flightMg .cn_name .el-form-item:nth-child(1) {
.flightMg .cn_name .el-form-item:nth-child(1) {
width: 55%; width: 55%;
float: left; float: left;
} }
.flightMg .cn_name .el-form-item:nth-child(2) {
.flightMg .cn_name .el-form-item:nth-child(2) {
width: 45%; width: 45%;
float: left; float: left;
} }
.flightMg .cn_name .el-form-item:nth-child(2) .el-form-item__content {
.flightMg .cn_name .el-form-item:nth-child(2) .el-form-item__content {
margin: 0 !important; margin: 0 !important;
} }
.flightMg .cn_name .el-form-item:nth-child(2) .el-form-item__content input {
.flightMg .cn_name .el-form-item:nth-child(2) .el-form-item__content input {
border-radius: 0; border-radius: 0;
border-top-right-radius: 17px; border-top-right-radius: 17px;
border-bottom-right-radius: 17px; border-bottom-right-radius: 17px;
} }
.flightMg .flightMg .cn_name .name_input .el-form-item__content,
.cn_name .name_input .el-form-item__content .el-input input { .flightMg .flightMg .cn_name .name_input .el-form-item__content,
.cn_name .name_input .el-form-item__content .el-input input {
width: 108.5px; width: 108.5px;
} }
.flightMg .el-dialog__header {
.flightMg .el-dialog__header {
background-color: #e95252; background-color: #e95252;
} }
.flightMg .el-dialog__header .el-dialog__title {
.flightMg .el-dialog__header .el-dialog__title {
color: white; color: white;
font-size: 14px; font-size: 14px;
} }
.flightMg .el-dialog__header .el-dialog__close {
.flightMg .el-dialog__header .el-dialog__close {
color: #d23131; color: #d23131;
} }
.flightMg .el-pagination {
.flightMg .el-pagination {
text-align: center; text-align: center;
padding-top: 10px; padding-top: 10px;
} }
.flightMg .el-pagination.is-background .el-pager li:not(.disabled).active {
.flightMg .el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #e95252; background-color: #e95252;
color: #fff; color: #fff;
} }
.flightMg_info {
.flightMg_info {
margin-bottom: 0; margin-bottom: 0;
} }
.flightMg_info_tips {
.flightMg_info_tips {
color: #999999; color: #999999;
font-size: 12px; font-size: 12px;
text-align: center; text-align: center;
} }
.flightMg_delete_icon .el-input__suffix {
.flightMg_delete_icon .el-input__suffix {
right: 15px; right: 15px;
} }
.flightMg .time .el-input--prefix .el-input__inner {
.flightMg .time .el-input--prefix .el-input__inner {
padding-left: 30px; padding-left: 30px;
} }
.flightMg .query-box li label {
.flightMg .query-box li label {
display: inline-block; display: inline-block;
min-width: 80px; min-width: 80px;
text-align: right; text-align: right;
font-style: normal; font-style: normal;
margin: 0 20px 0 0; margin: 0 20px 0 0;
} }
</style> </style>
<template> <template>
<div class="flexOne flightMg"> <div class="flexOne flightMg">
...@@ -129,8 +148,8 @@ ...@@ -129,8 +148,8 @@
</li> </li>
<li> <li>
<label>{{$t('system.query_flightCity')}}</label> <label>{{$t('system.query_flightCity')}}</label>
<el-select v-model="msg.Departure_city" filterable :placeholder="$t('system.ph_buxian')" @change="getaAirport(msg.Departure_city,false)" <el-select v-model="msg.Departure_city" filterable :placeholder="$t('system.ph_buxian')"
class="w210"> @change="getaAirport(msg.Departure_city,false)" class="w210">
<el-option :label='$t("system.ph_buxian")' value='0'></el-option> <el-option :label='$t("system.ph_buxian")' value='0'></el-option>
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -146,8 +165,8 @@ ...@@ -146,8 +165,8 @@
</li> </li>
<li> <li>
<label>{{$t('system.query_stopCity')}}</label> <label>{{$t('system.query_stopCity')}}</label>
<el-select v-model="msg.Stopover_city" filterable :placeholder="$t('system.ph_buxian')" @change="getaStopAirport(msg.Stopover_city,false)" <el-select v-model="msg.Stopover_city" filterable :placeholder="$t('system.ph_buxian')"
class="w210"> @change="getaStopAirport(msg.Stopover_city,false)" class="w210">
<el-option :label='$t("system.ph_buxian")' value='0'></el-option> <el-option :label='$t("system.ph_buxian")' value='0'></el-option>
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -163,8 +182,8 @@ ...@@ -163,8 +182,8 @@
</li> </li>
<li> <li>
<label>{{$t('system.query_arrivalCity')}}</label> <label>{{$t('system.query_arrivalCity')}}</label>
<el-select v-model="msg.Arrival_city" filterable :placeholder="$t('system.ph_buxian')" @change="getaArrivalAirport(msg.Arrival_city,false)" <el-select v-model="msg.Arrival_city" filterable :placeholder="$t('system.ph_buxian')"
class="w210"> @change="getaArrivalAirport(msg.Arrival_city,false)" class="w210">
<el-option :label='$t("system.ph_buxian")' value='0'></el-option> <el-option :label='$t("system.ph_buxian")' value='0'></el-option>
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
...@@ -187,9 +206,11 @@ ...@@ -187,9 +206,11 @@
</el-select> </el-select>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
&nbsp; &nbsp;
<input type="button" class="normalBtn" :value="$t('pub.addBtn')" @click="outerVisible = true,dialogTitle='新增航班',initAddMsg()" /> <input type="button" class="normalBtn" :value="$t('pub.addBtn')"
@click="outerVisible = true,dialogTitle='新增航班',initAddMsg()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -208,7 +229,9 @@ ...@@ -208,7 +229,9 @@
<th width="200">{{$t("admin.admin_operate")}}</th> <th width="200">{{$t("admin.admin_operate")}}</th>
</tr> </tr>
<tr v-for="(item,index) in DataList" :key="index"> <tr v-for="(item,index) in DataList" :key="index">
<td>{{item.Flight_number}} <!--{{item.SeasonTypeStr}}--></td> <td>{{item.Flight_number}}
<!--{{item.SeasonTypeStr}}-->
</td>
<td>{{item.DName}}</td> <td>{{item.DName}}</td>
<td>{{item.Departure_time}}</td> <td>{{item.Departure_time}}</td>
<td>{{item.SName}}</td> <td>{{item.SName}}</td>
...@@ -221,16 +244,18 @@ ...@@ -221,16 +244,18 @@
<td style="position: relative;"> <td style="position: relative;">
<el-row> <el-row>
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
<el-button type="primary" icon="el-icon-edit" circle @click="outerVisible = true,dialogTitle='修改航班',updateData(item.ID)"></el-button> <el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible = true,dialogTitle='修改航班',updateData(item.ID)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('pub.revoke')" placement="top-start" v-if="item.Status==1"> <el-tooltip class="item" effect="dark" :content="$t('pub.revoke')" placement="top-start"
<el-button type="danger" icon="iconfont icon-web-icon-revoke" circle @click="deletelist(index,2)"></el-button> v-if="item.Status==1">
<el-button type="danger" icon="iconfont icon-web-icon-revoke" circle @click="deletelist(index,2)">
</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else>
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button> <el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start">
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start" >
<el-button type="primary" icon="iconfont icon-weihu" circle @click="gotoChild(item)"></el-button> <el-button type="primary" icon="iconfont icon-weihu" circle @click="gotoChild(item)"></el-button>
</el-tooltip> </el-tooltip>
</el-row> </el-row>
...@@ -240,10 +265,11 @@ ...@@ -240,10 +265,11 @@
<div class="noData" v-show="noData"> <div class="noData" v-show="noData">
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
:page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie"> <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-form-item :label="$t('system.query_airCompanyName')" prop="AirlineID"> <el-form-item :label="$t('system.query_airCompanyName')" prop="AirlineID">
<el-select v-model="addMsg.AirlineID" filterable :placeholder="$t('system.ph_choiceAir')"> <el-select v-model="addMsg.AirlineID" filterable :placeholder="$t('system.ph_choiceAir')">
...@@ -267,7 +293,8 @@ ...@@ -267,7 +293,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.query_flightCity')" prop="Departure_city"> <el-form-item :label="$t('system.query_flightCity')" prop="Departure_city">
<el-select v-model="addMsg.Departure_city" filterable :placeholder="$t('system.ph_flightCity')" @change="getaAirport(addMsg.Departure_city,false)"> <el-select v-model="addMsg.Departure_city" filterable :placeholder="$t('system.ph_flightCity')"
@change="getaAirport(addMsg.Departure_city,false)">
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -279,12 +306,13 @@ ...@@ -279,12 +306,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.ph_flightTime')" prop="Departure_time" class='flightMg_delete_icon time'> <el-form-item :label="$t('system.ph_flightTime')" prop="Departure_time" class='flightMg_delete_icon time'>
<el-input type="text" v-model="addMsg.Departure_time" @keyup.native="checkTime(addMsg,'Departure_time')" maxlength="5" <el-input type="text" v-model="addMsg.Departure_time" @keyup.native="checkTime(addMsg,'Departure_time')"
:placeholder="$t('system.ph_time')"></el-input> maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item> </el-form-item>
<div v-if='addMsg.Type=="2"'> <div v-if='addMsg.Type=="2"'>
<el-form-item :label="$t('system.query_stopCity')" prop="Stopover_city"> <el-form-item :label="$t('system.query_stopCity')" prop="Stopover_city">
<el-select v-model="addMsg.Stopover_city" filterable :placeholder="$t('system.ph_stopCity')" @change="getaStopAirport(addMsg.Stopover_city,false)"> <el-select v-model="addMsg.Stopover_city" filterable :placeholder="$t('system.ph_stopCity')"
@change="getaStopAirport(addMsg.Stopover_city,false)">
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -295,15 +323,19 @@ ...@@ -295,15 +323,19 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.ph_stopFlightTime')" prop="Arrival_stopover_time" class='flightMg_delete_icon time'> <el-form-item :label="$t('system.ph_stopFlightTime')" prop="Arrival_stopover_time"
class='flightMg_delete_icon time'>
<el-input type="text" v-model="addMsg.Arrival_stopover_time" :placeholder="$t('system.ph_time')"></el-input> <el-input type="text" v-model="addMsg.Arrival_stopover_time" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.ph_toFlightTime')" prop="Departure_stopover_time" class='flightMg_delete_icon time'> <el-form-item :label="$t('system.ph_toFlightTime')" prop="Departure_stopover_time"
<el-input type="text" v-model="addMsg.Departure_stopover_time" :placeholder="$t('system.ph_time')"></el-input> class='flightMg_delete_icon time'>
<el-input type="text" v-model="addMsg.Departure_stopover_time" :placeholder="$t('system.ph_time')">
</el-input>
</el-form-item> </el-form-item>
</div> </div>
<el-form-item :label="$t('system.query_arrivalCity')" prop="Arrival_city"> <el-form-item :label="$t('system.query_arrivalCity')" prop="Arrival_city">
<el-select v-model="addMsg.Arrival_city" filterable :placeholder="$t('system.ph_flightCity')" @change="getaArrivalAirport(addMsg.Arrival_city,false)"> <el-select v-model="addMsg.Arrival_city" filterable :placeholder="$t('system.ph_flightCity')"
@change="getaArrivalAirport(addMsg.Arrival_city,false)">
<el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID"> <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -315,8 +347,8 @@ ...@@ -315,8 +347,8 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.query_arrivalTime')" prop="Arrival_time" class='flightMg_delete_icon time'> <el-form-item :label="$t('system.query_arrivalTime')" prop="Arrival_time" class='flightMg_delete_icon time'>
<el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="checkTime(addMsg,'Arrival_time')" maxlength="5" <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="checkTime(addMsg,'Arrival_time')"
:placeholder="$t('system.ph_time')"></el-input> maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item> </el-form-item>
<el-form-item class="flightMg_info"> <el-form-item class="flightMg_info">
<el-checkbox v-model="checked">{{$t('system.table_tips_fmgCk')}}</el-checkbox> <el-checkbox v-model="checked">{{$t('system.table_tips_fmgCk')}}</el-checkbox>
...@@ -324,16 +356,19 @@ ...@@ -324,16 +356,19 @@
<div v-if="checked"> <div v-if="checked">
<p class="flightMg_info_tips">{{$t('system.table_tips_fmgInfo')}}</p> <p class="flightMg_info_tips">{{$t('system.table_tips_fmgInfo')}}</p>
<el-form-item :label="$t('system.table_begTime')" class='time'> <el-form-item :label="$t('system.table_begTime')" class='time'>
<el-date-picker v-model='addMsg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date">
</el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_overTime')" class='time'> <el-form-item :label="$t('system.table_overTime')" class='time'>
<el-date-picker v-model='addMsg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='addMsg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date">
</el-date-picker>
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp; <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn"
@click="outerVisible = false,resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -349,7 +384,7 @@ ...@@ -349,7 +384,7 @@
callback(new Error("请输入航班号")); callback(new Error("请输入航班号"));
} else if (!reg3.test(value)) { } else if (!reg3.test(value)) {
callback(new Error("请输入数字或字母")); callback(new Error("请输入数字或字母"));
} else if(!reg2.test(value.charAt(value.length - 1))){ } else if (!reg2.test(value.charAt(value.length - 1))) {
callback(new Error("尾数必须为数字")); callback(new Error("尾数必须为数字"));
} else { } else {
callback(); callback();
...@@ -390,9 +425,9 @@ ...@@ -390,9 +425,9 @@
Departure_stopover_time: "", Departure_stopover_time: "",
SeasonType: 0, SeasonType: 0,
//是否同步 //是否同步
synchronization:0, synchronization: 0,
StartDate:"", StartDate: "",
EndDate:"" EndDate: ""
}, },
SeasonTypeList: [], SeasonTypeList: [],
DataList: [], DataList: [],
...@@ -550,9 +585,9 @@ ...@@ -550,9 +585,9 @@
Arrival_stopover_time: "", Arrival_stopover_time: "",
Departure_stopover_time: "", Departure_stopover_time: "",
SeasonType: 0, SeasonType: 0,
synchronization:0, synchronization: 0,
StartDate:"", StartDate: "",
EndDate:"" EndDate: ""
}; };
this.addMsg = newMsg; this.addMsg = newMsg;
}, },
...@@ -610,16 +645,13 @@ ...@@ -610,16 +645,13 @@
}, },
//添加 //添加
addGroupGuide() { addGroupGuide() {
if(this.checked) if (this.checked) {
{ this.addMsg.synchronization = 1;
this.addMsg.synchronization=1; } else {
} this.addMsg.synchronization = 0;
else
{
this.addMsg.synchronization=0;
} }
this.checkIsRightTime(this.addMsg.Departure_time,1); this.checkIsRightTime(this.addMsg.Departure_time, 1);
this.checkIsRightTime(this.addMsg.Arrival_time,2); this.checkIsRightTime(this.addMsg.Arrival_time, 2);
this.apipost( this.apipost(
"flight_post_Set", "flight_post_Set",
this.addMsg, this.addMsg,
...@@ -637,17 +669,16 @@ ...@@ -637,17 +669,16 @@
); );
}, },
checkIsRightTime(time,type){ checkIsRightTime(time, type) {
let arrTime = time.split(':'); let arrTime = time.split(':');
    if (arrTime[0]>=24 || arrTime[1]>=60) if (arrTime[0] >= 24 || arrTime[1] >= 60) {
    { if (type == 1) {
if(type==1){ this.Error('请输入正确的起飞时间格式!');
        this.Error('请输入正确的起飞时间格式!'); }
if (type == 2) {
this.Error('请输入正确的到达时间格式!');
} }
if(type==2){
        this.Error('请输入正确的到达时间格式!');
} }
    }
}, },
//提交创建、修改表单 //提交创建、修改表单
...@@ -760,8 +791,7 @@ ...@@ -760,8 +791,7 @@
); );
}, },
//跳转到子项 //跳转到子项
gotoChild(item) gotoChild(item) {
{
this.$router.push({ this.$router.push({
name: "flightChild", name: "flightChild",
query: { query: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment