Skip to content

S
SuperMan
Commit ffc46466 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 404e6eb0 1eb9a8db
Show whitespace changes
Inline Side-by-side
Showing with 785 additions and 850 deletions
src/components/LeaderManagement/leaderPay.vue
View file @ ffc46466
...@@ -222,8 +222,7 @@ ...@@ -222,8 +222,7 @@
<tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'> <tr class="splitP ScenicTr" v-for='(titem,tindex) in item.DiningSummaryList'>
<td>{{titem.UseTimeStr}}</td> <td>{{titem.UseTimeStr}}</td>
<td> <td>
<p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" <p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" v-for="subItem in item.DiningSummaryList">
v-for="subItem in item.DiningSummaryList">
{{subItem.DiningName}} {{subItem.DiningName}}
</p> </p>
</td> </td>
...@@ -278,9 +277,10 @@ ...@@ -278,9 +277,10 @@
<td>备注</td> <td>备注</td>
<td>凭证</td> <td>凭证</td>
</tr> </tr>
<template v-for='(item,index) in list.ScenicList'> <template v-for='(item,index) in list.ScenicList'>
<tr class="splitP ScenicTr" v-for='(sitem,sindex) in item.ScenicStatisticsList'> <tr class="splitP ScenicTr">
<td>{{sitem.UseTimeStr}}</td> <td>{{item.UseTimeStr}}</td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}} {{subItem.ScenicName}}
...@@ -299,30 +299,43 @@ ...@@ -299,30 +299,43 @@
</div> </div>
</td> </td>
<td> <td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
<template v-for="(ssItem,ssIndex) in sitem.ReimburseList.ReimburseDetailsList"> <template v-for="(ssItem,ssIndex) in sitem.ReimburseList.ReimburseDetailsList">
<div v-if="ssItem.ID!==0"> <div :style="{height:60/sitem.ReimburseList.ReimburseDetailsList.length+'px',lineHeight:60/sitem.ReimburseList.ReimburseDetailsList.length+'px'}">
{{ssItem.UserTypeStr}}：{{ssItem.UserNum}}*{{ssItem.UnitPrice}} {{ssItem.UserTypeStr}}：{{ssItem.UserNum}}*{{ssItem.UnitPrice}}
</div> </div>
</template> </template>
</template>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList" >
{{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}} {{diningTotalPrice(subItem.ReimburseList.ReimburseDetailsList)}}
</div> </div>
</td> </td>
<td> <td>
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
{{sitem.Remarks}} {{sitem.Remarks}}
</template>
</td> </td>
<td> <td>
<div class="uploadListDiv ownScrollbarStyle" style="overflow-y: auto;"> <div class="uploadListDiv ownScrollbarStyle" style="overflow-y: auto;">
<template v-for='(sitem,sindex) in item.ScenicStatisticsList'>
<p v-for="(img,index) in sitem.ReimburseList.VoucherPicList" @click="analyzeItem(sitem.VoucherPicList,index)"> <p v-for="(img,index) in sitem.ReimburseList.VoucherPicList" @click="analyzeItem(sitem.VoucherPicList,index)">
{{img.FileName}} {{img.FileName}}
</p> </p>
</template>
</div> </div>
</td> </td>
</tr> </tr>
</template> </template>
</tbody> </tbody>
<!-- <tfoot>
<tr>
<td colspan="9">
{{list.ScenicList}}
</td>
</tr>
</tfoot> -->
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
...@@ -343,7 +356,8 @@ ...@@ -343,7 +356,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.OtherList'> <tr v-for='(item,index) in list.OtherOrderInfo.OtherList'>
<td> <td>
<el-date-picker v-model='item.UseDate' prefix-icon="s" class='w105' value-format="yyyy-MM-dd" type="date" :disabled="true"></el-date-picker> <el-date-picker v-model='item.UseDate' prefix-icon="s" class='w105' value-format="yyyy-MM-dd" type="date"
:disabled="true"></el-date-picker>
</td> </td>
<td> <td>
<el-select class='w120 sel' v-model='item.CostProject' :placeholder="$t('pub.pleaseSel')" :disabled="true"> <el-select class='w120 sel' v-model='item.CostProject' :placeholder="$t('pub.pleaseSel')" :disabled="true">
...@@ -444,7 +458,8 @@ ...@@ -444,7 +458,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingIncomeList'> <tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingIncomeList'>
<td> <td>
<el-date-picker prefix-icon="s" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date" :disabled="true"></el-date-picker> <el-date-picker prefix-icon="s" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"
:disabled="true"></el-date-picker>
</td> </td>
<td> <td>
{{item.TotalNum}} {{item.TotalNum}}
...@@ -488,7 +503,8 @@ ...@@ -488,7 +503,8 @@
</tr> </tr>
<tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingExpendList'> <tr v-for='(item,index) in list.OtherOrderInfo.SelfPlayingExpendList'>
<td> <td>
<el-date-picker prefix-icon="s" :disabled="true" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker prefix-icon="s" :disabled="true" v-model='item.UseDate' class='w105' value-format="yyyy-MM-dd"
type="date"></el-date-picker>
</td> </td>
<td> <td>
{{item.TotalNum}} {{item.TotalNum}}
...@@ -518,13 +534,13 @@ ...@@ -518,13 +534,13 @@
</table> </table>
<p class="alcenter"> <p class="alcenter">
<input type="button" value="保存" class="normalBtn" @click="saveData()"/> <input type="button" value="保存" class="normalBtn" @click="saveData()" />
</p> </p>
<div v-if='picIsShow' class="viewBigPicLayer"> <div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i> <i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item"/></div> <div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
...@@ -551,7 +567,7 @@ ...@@ -551,7 +567,7 @@
nav: [], nav: [],
TravelDayNum: 0, TravelDayNum: 0,
RealityNum: 0, RealityNum: 0,
isShow:false isShow: false
} }
}, },
methods: { methods: {
...@@ -655,8 +671,7 @@ ...@@ -655,8 +671,7 @@
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
saveitem(obj) { saveitem(obj) {
this.TemporaryItem = obj this.TemporaryItem = obj
...@@ -686,14 +701,15 @@ ...@@ -686,14 +701,15 @@
return '晚餐' return '晚餐'
}, },
getNav() { getNav() {
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {TCIDs: this.$route.query.id}, res => { this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.nav = res.data.data this.nav = res.data.data
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
getList() { getList() {
this.loading = true this.loading = true
...@@ -710,8 +726,7 @@ ...@@ -710,8 +726,7 @@
this.loading = false this.loading = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => { }, err => {})
})
}, },
uploadImg(file) { uploadImg(file) {
//上传 //上传
...@@ -736,6 +751,7 @@ ...@@ -736,6 +751,7 @@
} }
} }
</script> </script>
<style> <style>
...@@ -820,11 +836,11 @@ ...@@ -820,11 +836,11 @@
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable tr td .pDateStyle > span:after { .leaderReimbursementTable tr td .pDateStyle>span:after {
content: '/'; content: '/';
} }
.leaderReimbursementTable tr td .pDateStyle > span:last-child:after { .leaderReimbursementTable tr td .pDateStyle>span:last-child:after {
content: '' content: ''
} }
...@@ -848,51 +864,51 @@ ...@@ -848,51 +864,51 @@
height: 34px !important; height: 34px !important;
} }
.leaderReimbursementTable .splitP td > p { .leaderReimbursementTable .splitP td>p {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .splitP td > p:last-child { .leaderReimbursementTable .splitP td>p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .ScenicTr td > div { .leaderReimbursementTable .ScenicTr td>div {
height: 60px; height: 60px;
line-height: 60px; line-height: 60px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .ScenicTr td > div:last-child { .leaderReimbursementTable .ScenicTr td>div:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .ScenicTr td > div p { .leaderReimbursementTable .ScenicTr td>div p {
line-height: 20px; line-height: 20px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .ScenicTr td > div p:last-child { .leaderReimbursementTable .ScenicTr td>div p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .HotelTr td > div { .leaderReimbursementTable .HotelTr td>div {
/*height: 100px;*/ /*height: 100px;*/
/*line-height: 100px;*/ /*line-height: 100px;*/
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .HotelTr td > div:last-child { .leaderReimbursementTable .HotelTr td>div:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .HotelTr td > div p { .leaderReimbursementTable .HotelTr td>div p {
line-height: 19px; line-height: 19px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
} }
.leaderReimbursementTable .HotelTr td > div p:last-child { .leaderReimbursementTable .HotelTr td>div p:last-child {
border-bottom: none; border-bottom: none;
} }
...@@ -906,23 +922,23 @@ ...@@ -906,23 +922,23 @@
width: 100%; width: 100%;
} }
.leaderReimbursementTable .uploadListDiv > p { .leaderReimbursementTable .uploadListDiv>p {
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
cursor: pointer; cursor: pointer;
width: 100% !important; width: 100% !important;
} }
.leaderReimbursementTable .uploadListDiv > p:last-child { .leaderReimbursementTable .uploadListDiv>p:last-child {
border-bottom: none; border-bottom: none;
} }
.leaderReimbursementTable .uploadListDiv > p i { .leaderReimbursementTable .uploadListDiv>p i {
color: #999; color: #999;
vertical-align: sub; vertical-align: sub;
margin: 3px; margin: 3px;
} }
.leaderReimbursementTable .jdtd > div { .leaderReimbursementTable .jdtd>div {
height: auto !important; height: auto !important;
padding: 0 10px; padding: 0 10px;
} }
...@@ -930,4 +946,5 @@ ...@@ -930,4 +946,5 @@
.leaderReimbursementTable .leaderPayTable .el-input__prefix { .leaderReimbursementTable .leaderPayTable .el-input__prefix {
display: none; display: none;
} }
</style> </style>
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ffc46466
...@@ -104,7 +104,6 @@ ...@@ -104,7 +104,6 @@
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
{{subItem.HotelName}} {{subItem.HotelName}}
</div> </div>
<!-- <div style="width: 100%;">{{item.HotelName}}</div> -->
</td> </td>
<td> <td>
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
...@@ -123,10 +122,6 @@ ...@@ -123,10 +122,6 @@
{{childItem.HouseTypeName}} {{childItem.HouseTypeName}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HouseTypeName}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -138,9 +133,6 @@ ...@@ -138,9 +133,6 @@
</p> </p>
</div> </div>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HouseTypeCount}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -150,9 +142,6 @@ ...@@ -150,9 +142,6 @@
{{childItem.HotelDiscount}} {{childItem.HotelDiscount}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.HotelDiscount}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -162,9 +151,6 @@ ...@@ -162,9 +151,6 @@
{{childItem.UnitPrice}} {{childItem.UnitPrice}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.UnitPrice}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -174,9 +160,6 @@ ...@@ -174,9 +160,6 @@
{{childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount)}} {{childItem.UnitPrice*(childItem.HouseGuestNum-childItem.HotelDiscount)}}
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{x.UnitPrice*(x.HouseGuestNum-x.HotelDiscount)}}
</p> -->
</div> </div>
</td> </td>
<td> <td>
...@@ -186,23 +169,16 @@ ...@@ -186,23 +169,16 @@
{{childItem.RebateRatio}}% {{childItem.RebateRatio}}%
</p> </p>
</div> </div>
<!-- <p v-for="x in item.HouseStatistics.HouseTypeList">
{{item.RebateRatio}}%
</p> -->
</div> </div>
</td> </td>
<td> <td>
<div class="alcenter"> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<!-- <p v-for="childItem in subItem.HouseStatistics.HouseTypeList"> -->
{{hotelTotalPrice(subItem.OrderDetailsList)}} {{hotelTotalPrice(subItem.OrderDetailsList)}}
<!-- </p> -->
</div> </div>
</div> </div>
<!-- {{hotelTotalPrice(item.HouseStatistics.HouseTypeList)}} -->
</td> </td>
<td> <td>
<div class="alcenter"> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<p> <p>
......
src/components/Ticketing/flightManagement.vue
View file @ ffc46466
<style> <style>
.clearfix:after { .clearfix:after {
content: "\0020"; content: "\0020";
display: block; display: block;
height: 0; height: 0;
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
<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}}</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>
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
{{$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" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total> :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">
...@@ -250,10 +250,16 @@ ...@@ -250,10 +250,16 @@
<el-form-item :label="$t('system.query_flightNum')" prop="Flight_number" class="other_input"> <el-form-item :label="$t('system.query_flightNum')" prop="Flight_number" class="other_input">
<el-input v-model="addMsg.Flight_number" :placeholder="$t('system.ph_airNum')"></el-input> <el-input v-model="addMsg.Flight_number" :placeholder="$t('system.ph_airNum')"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="时间类型" style="display:none">
<el-select v-model="addMsg.SeasonType">
<el-option v-for='item in SeasonTypeList' :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</el-form-item>
<el-form-item :label="$t('system.query_type')" prop="Type"> <el-form-item :label="$t('system.query_type')" prop="Type">
<el-select v-model="addMsg.Type" :placeholder="$t('system.ph_type')"> <el-select v-model="addMsg.Type" :placeholder="$t('system.ph_type')">
<el-option :label='$t("system.label_zhifei")' value='1'></el-option> <el-option :label='$t("system.label_zhifei")' :value='1'></el-option>
<el-option :label='$t("system.label_jingting")' value='2'></el-option> <el-option :label='$t("system.label_jingting")' :value='2'></el-option>
</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">
...@@ -269,7 +275,8 @@ ...@@ -269,7 +275,8 @@
</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="changeV(addMsg)" maxlength="5" :placeholder="$t('system.ph_time')"></el-input> <el-input type="text" v-model="addMsg.Departure_time" @keyup.native="changeV(addMsg)" 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">
...@@ -285,23 +292,9 @@ ...@@ -285,23 +292,9 @@
</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-time-select v-model="addMsg.Arrival_stopover_time" :picker-options="{
start: '00:00',
step: '00:01',
end: '23:59'
}"
:placeholder="$t('system.ph_time')">
</el-time-select> -->
<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" class='flightMg_delete_icon time'>
<!-- <el-time-select v-model="addMsg.Departure_stopover_time" :picker-options="{
start: '00:00',
step: '00:01',
end: '23:59'
}"
:placeholder="$t('system.ph_time')">
</el-time-select> -->
<el-input type="text" v-model="addMsg.Departure_stopover_time" :placeholder="$t('system.ph_time')"></el-input> <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>
...@@ -318,41 +311,9 @@ ...@@ -318,41 +311,9 @@
</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-time-select v-model="addMsg.Arrival_time" :picker-options="{ <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="changeV2(addMsg)" maxlength="5"
start: '00:00', :placeholder="$t('system.ph_time')"></el-input>
step: '00:01',
end: '23:59'
}"
:placeholder="$t('system.ph_time')">
</el-time-select> -->
<el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="changeV2(addMsg)" maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item>
<el-form-item class="flightMg_info">
<el-checkbox v-model="checked">{{$t('system.table_tips_fmgCk')}}</el-checkbox>
</el-form-item>
<p class="flightMg_info_tips">{{$t('system.table_tips_fmgInfo')}}</p>
<div v-if="checked">
<el-form-item :label="$t('system.table_begTime')" class='time'>
<!-- <el-time-select :picker-options="{
start: '00:00',
step: '00:01',
end: '23:59'
}"
:placeholder="$t('system.ph_choice')">
</el-time-select> -->
<el-input type="text" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_overTime')" class='time'>
<!-- <el-time-select :picker-options="{
start: '00:00',
step: '00:01',
end: '23:59'
}"
:placeholder="$t('system.ph_choice')">
</el-time-select> -->
<el-input type="text" :placeholder="$t('system.ph_time')"></el-input>
</el-form-item>
</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;
...@@ -362,7 +323,7 @@ ...@@ -362,7 +323,7 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
checked: false, checked: false,
...@@ -396,8 +357,10 @@ export default { ...@@ -396,8 +357,10 @@ export default {
Stopover_city: "", Stopover_city: "",
Stopover_airport: "", Stopover_airport: "",
Arrival_stopover_time: "", Arrival_stopover_time: "",
Departure_stopover_time: "" Departure_stopover_time: "",
SeasonType: 0,
}, },
SeasonTypeList: [],
DataList: [], DataList: [],
chosenIndex: -1, chosenIndex: -1,
total: 0, total: 0,
...@@ -417,97 +380,71 @@ export default { ...@@ -417,97 +380,71 @@ export default {
noData: false, noData: false,
rules: { rules: {
//表单必填验证 //表单必填验证
AirlineID: [ AirlineID: [{
{
required: true, required: true,
message: "请选择航空公司", message: "请选择航空公司",
trigger: "change" trigger: "change"
} }],
], Flight_number: [{
Flight_number: [
{
required: true, required: true,
message: "请输入航班号", message: "请输入航班号",
trigger: "blur" trigger: "blur"
} }],
], Type: [{
Type: [
{
required: true, required: true,
message: "请选择类型", message: "请选择类型",
trigger: "change" trigger: "change"
} }],
], Departure_city: [{
Departure_city: [
{
required: true, required: true,
message: "请选择起飞城市", message: "请选择起飞城市",
trigger: "change" trigger: "change"
} }],
], Departure_airport: [{
Departure_airport: [
{
required: true, required: true,
message: "请选择起飞机场", message: "请选择起飞机场",
trigger: "change" trigger: "change"
} }],
], Departure_time: [{
Departure_time: [
{
required: true, required: true,
message: "请填写起飞时间", message: "请填写起飞时间",
trigger: "change" trigger: "change"
} }],
], Arrival_time: [{
Arrival_time: [
{
required: true, required: true,
message: "请填写到达时间", message: "请填写到达时间",
trigger: "change" trigger: "change"
} }],
], Stopover_city: [{
Stopover_city: [
{
required: true, required: true,
message: "请选择经停城市", message: "请选择经停城市",
trigger: "change" trigger: "change"
} }],
], Stopover_airport: [{
Stopover_airport: [
{
required: true, required: true,
message: "请选择起飞机场", message: "请选择起飞机场",
trigger: "change" trigger: "change"
} }],
], Arrival_stopover_time: [{
Arrival_stopover_time: [
{
required: true, required: true,
message: "请填写经停到达时间", message: "请填写经停到达时间",
trigger: "change" trigger: "change"
} }],
], Departure_stopover_time: [{
Departure_stopover_time: [
{
required: true, required: true,
message: "请填写经停起飞时间", message: "请填写经停起飞时间",
trigger: "change" trigger: "change"
} }],
], Arrival_city: [{
Arrival_city: [
{
required: true, required: true,
message: "请选择到达城市", message: "请选择到达城市",
trigger: "change" trigger: "change"
} }],
], Arrival_airport: [{
Arrival_airport: [
{
required: true, required: true,
message: "请选择到达机场", message: "请选择到达机场",
trigger: "change" trigger: "change"
} }]
]
} }
}; };
}, },
...@@ -534,8 +471,7 @@ export default { ...@@ -534,8 +471,7 @@ export default {
//获取城市列表 //获取城市列表
getDepartureCityList() { getDepartureCityList() {
this.apipost( this.apipost(
"dict_post_Destination_GetCityList", "dict_post_Destination_GetCityList", {},
{},
res => { res => {
this.cityList = res.data.data; this.cityList = res.data.data;
}, },
...@@ -579,18 +515,17 @@ export default { ...@@ -579,18 +515,17 @@ export default {
Stopover_city: "", Stopover_city: "",
Stopover_airport: "", Stopover_airport: "",
Arrival_stopover_time: "", Arrival_stopover_time: "",
Departure_stopover_time: "" Departure_stopover_time: "",
SeasonType: 0
}; };
this.addMsg = newMsg; this.addMsg = newMsg;
}, },
getaStopAirport(ID, blo) {
//根据城市获取经停机场 //根据城市获取经停机场
let msg = { getaStopAirport(ID, blo) {
City_id: ID
};
this.apipost( this.apipost(
"airport_post_GetList", "airport_post_GetList", {
msg, City_id: ID
},
res => { res => {
if (this.outerVisible) { if (this.outerVisible) {
if (!blo) { if (!blo) {
...@@ -630,8 +565,7 @@ export default { ...@@ -630,8 +565,7 @@ export default {
//获取航空公司* //获取航空公司*
getAirlineList() { getAirlineList() {
this.apipost( this.apipost(
"airline_post_GetList", "airline_post_GetList", {},
{},
res => { res => {
this.airlineList = res.data.data; this.airlineList = res.data.data;
}, },
...@@ -698,7 +632,6 @@ export default { ...@@ -698,7 +632,6 @@ export default {
}, },
//删除 //删除
deleteFligt(index) { deleteFligt(index) {
let msg = { let msg = {
ID: this.DataList[index].ID ID: this.DataList[index].ID
}; };
...@@ -737,7 +670,6 @@ export default { ...@@ -737,7 +670,6 @@ export default {
msg, msg,
res => { res => {
var newMsg = res.data.data; var newMsg = res.data.data;
newMsg.Type = newMsg.Type.toString();
this.getaAirport(newMsg.Departure_city, true); this.getaAirport(newMsg.Departure_city, true);
if (newMsg.Stopover_city) { if (newMsg.Stopover_city) {
this.getaStopAirport(newMsg.Stopover_city, true); this.getaStopAirport(newMsg.Stopover_city, true);
...@@ -759,100 +691,110 @@ export default { ...@@ -759,100 +691,110 @@ export default {
}, },
//验证时间格式 //验证时间格式
changeV(addMsg){ changeV(addMsg) {
var date = addMsg.Departure_time; var date = addMsg.Departure_time;
if(date.length==1){ if (date.length == 1) {
var v1 = date.substring(0,1); var v1 = date.substring(0, 1);
addMsg.Departure_time = v1.replace(/[^0-2]{1}/g, ''); addMsg.Departure_time = v1.replace(/[^0-2]{1}/g, '');
} }
if(date.length==2){ if (date.length == 2) {
var v1 = date.substring(0,1); var v1 = date.substring(0, 1);
if(v1 == 2){ if (v1 == 2) {
var reg = /[^0-3]{1}/g; var reg = /[^0-3]{1}/g;
}else{ } else {
var reg = /[^0-9]{1}/g; var reg = /[^0-9]{1}/g;
} }
var v2 = date.substring(1,2); var v2 = date.substring(1, 2);
if(!reg.test(v2)){ if (!reg.test(v2)) {
addMsg.Departure_time = date+":" addMsg.Departure_time = date + ":"
}else{ } else {
addMsg.Departure_time = date.substring(0,1); addMsg.Departure_time = date.substring(0, 1);
} }
} }
if(date.length==4){ if (date.length == 4) {
reg = /[^0-5]{1}/g; reg = /[^0-5]{1}/g;
var v3 = date.substring(3,4); var v3 = date.substring(3, 4);
if(!reg.test(v3)){ if (!reg.test(v3)) {
addMsg.Departure_time = date; addMsg.Departure_time = date;
}else{ } else {
addMsg.Departure_time = date.substring(0,3); addMsg.Departure_time = date.substring(0, 3);
} }
} }
if(date.length==5){ if (date.length == 5) {
var reg = /[^0-9]{1}/g; var reg = /[^0-9]{1}/g;
var v4 = date.substring(4, 5); var v4 = date.substring(4, 5);
if (!reg.test(v4)) { if (!reg.test(v4)) {
addMsg.Departure_time = date addMsg.Departure_time = date
} } else {
else { addMsg.Departure_time = date.substring(0, 4);
addMsg.Departure_time = date.substring(0,4);
} }
} }
if(date.length>5){ if (date.length > 5) {
addMsg.Departure_time = date.substring(0,5); addMsg.Departure_time = date.substring(0, 5);
} }
this.$forceUpdate(); this.$forceUpdate();
}, },
//验证时间格式 //验证时间格式
changeV2(addMsg){ changeV2(addMsg) {
var date = addMsg.Arrival_time; var date = addMsg.Arrival_time;
if(date.length==1){ if (date.length == 1) {
var v1 = date.substring(0,1); var v1 = date.substring(0, 1);
addMsg.Arrival_time = v1.replace(/[^0-2]{1}/g, ''); addMsg.Arrival_time = v1.replace(/[^0-2]{1}/g, '');
} }
if(date.length==2){ if (date.length == 2) {
var v1 = date.substring(0,1); var v1 = date.substring(0, 1);
if(v1 == 2){ if (v1 == 2) {
var reg = /[^0-3]{1}/g; var reg = /[^0-3]{1}/g;
}else{ } else {
var reg = /[^0-9]{1}/g; var reg = /[^0-9]{1}/g;
} }
var v2 = date.substring(1,2); var v2 = date.substring(1, 2);
if(!reg.test(v2)){ if (!reg.test(v2)) {
addMsg.Arrival_time = date+":" addMsg.Arrival_time = date + ":"
}else{ } else {
addMsg.Arrival_time = date.substring(0,1); addMsg.Arrival_time = date.substring(0, 1);
} }
} }
if(date.length==4){ if (date.length == 4) {
reg = /[^0-5]{1}/g; reg = /[^0-5]{1}/g;
var v3 = date.substring(3,4); var v3 = date.substring(3, 4);
if(!reg.test(v3)){ if (!reg.test(v3)) {
addMsg.Arrival_time = date; addMsg.Arrival_time = date;
}else{ } else {
addMsg.Arrival_time = date.substring(0,3); addMsg.Arrival_time = date.substring(0, 3);
} }
} }
if(date.length==5){ if (date.length == 5) {
var reg = /[^0-9]{1}/g; var reg = /[^0-9]{1}/g;
var v4 = date.substring(4, 5); var v4 = date.substring(4, 5);
if (!reg.test(v4)) { if (!reg.test(v4)) {
addMsg.Arrival_time = date addMsg.Arrival_time = date
} } else {
else { addMsg.Arrival_time = date.substring(0, 4);
addMsg.Arrival_time = date.substring(0,4);
} }
} }
if(date.length>5){ if (date.length > 5) {
addMsg.Arrival_time = date.substring(0,5); addMsg.Arrival_time = date.substring(0, 5);
} }
this.$forceUpdate(); this.$forceUpdate();
},
//获取季节类型枚举列表
getSeasonTypeList() {
this.apipost(
"flight_get_GetSeasonTypeList", {},
res => {
this.SeasonTypeList = res.data.data;
},
err => {}
);
} }
}, },
mounted() { mounted() {
this.getSeasonTypeList()
this.getList(); this.getList();
this.getAirlineList(); this.getAirlineList();
this.getDepartureCityList(); this.getDepartureCityList();
} }
}; };
</script> </script>
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