Skip to content

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

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

parents 416cf4cf 9e8501a8
Show whitespace changes
Inline Side-by-side
Showing with 513 additions and 417 deletions
src/assets/common/lang/zh.js
View file @ b45895be
...@@ -1394,7 +1394,31 @@ export const Operation = { ...@@ -1394,7 +1394,31 @@ export const Operation = {
Op_carType:'车型', Op_carType:'车型',
Op_choicePlat:'请选择上架平台', Op_choicePlat:'请选择上架平台',
Op_salesPlat:'销售平台', Op_salesPlat:'销售平台',
Op_scTrip:'上传WORD行程' Op_scTrip:'上传WORD行程',
Op_longTerm:'长线',
Op_shortTerm:'短线',
Op_hetuan:'合团团号',
Op_shipNum:'舱位',
Op_chaifen:'团队拆分',
Op_orderNum:'收订人数',
Op_signUp:'报名',
Op_price:'价格',
Op_ArriveTime:'抵离时间',
Op_jinchudian:'进出点',
Op_chutuan:'出团',
Op_jiweiTotal:'机位统计 共',
Op_taoTotal:'套, 总机位数',
Op_baomingCompany:'报名公司',
Op_peopleChoice:'人员选择',
Op_salesTotal:'销售额统计',
Op_yingPay:'应付款',
Op_yiShou:'已收款',
Op_weiShou:'未收款',
Op_platZaitu:'平台在途',
Op_daishou:'待收金额',
Op_teamInfo:'团期信息',
Op_tripUpdate:'行程修改',
Op_tripCopy:'行程复制',
} }
export const rule = { export const rule = {
company: '请选择公司', company: '请选择公司',
......
src/components/Hotel/roomReservations.vue
View file @ b45895be
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total></el-pagination> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
</div> </div>
</template> </template>
<script> <script>
......
src/components/Ticketing/TicketManager.vue
View file @ b45895be
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
.TicketManager ._ol_info { .TicketManager ._ol_info {
font-size: 12px; font-size: 12px;
/* width: 100%;
overflow-x: auto; */
height: 100%; height: 100%;
} }
...@@ -68,19 +66,17 @@ ...@@ -68,19 +66,17 @@
min-height: 500px; min-height: 500px;
} }
.TicketManager ._ol_list > li { .TicketManager ._ol_list>li {
/* height: 107px; */
margin: 20px 0 0px 0px; margin: 20px 0 0px 0px;
transition: linear all 0.5s; transition: linear all 0.5s;
background-color: #fff; background-color: #fff;
border: 1px solid #dddddd; border: 1px solid #dddddd;
border-left: 0; border-left: 0;
/* overflow: hidden; */
position: relative; position: relative;
padding-top:10px; padding-top: 10px;
} }
.TicketManager ._ol_list > li:hover { .TicketManager ._ol_list>li:hover {
box-shadow: 0px 0px 20px rgba(191, 191, 191, 1); box-shadow: 0px 0px 20px rgba(191, 191, 191, 1);
transition: all linear 0.5s; transition: all linear 0.5s;
} }
...@@ -125,8 +121,6 @@ ...@@ -125,8 +121,6 @@
} }
.TicketManager ._oll_info { .TicketManager ._oll_info {
/* padding-left: 20px;
width: 200px; */
max-width: 100%; max-width: 100%;
} }
...@@ -268,24 +262,22 @@ ...@@ -268,24 +262,22 @@
} }
.TicketManager .TK_SeatList { .TicketManager .TK_SeatList {
/* width: 245px; */
height: 60px; height: 60px;
background-color: #f9f9f9; background-color: #f9f9f9;
/* margin-top: 9px; */
padding-right: 3px; padding-right: 3px;
} }
.TicketManager .TK_SeatList > ul > li:nth-child(1) { .TicketManager .TK_SeatList>ul>li:nth-child(1) {
margin-left: 5px; margin-left: 5px;
} }
.TicketManager .TK_SeatList > ul > li { .TicketManager .TK_SeatList>ul>li {
float: left; float: left;
text-align: center; text-align: center;
margin: 5px 4px 0 0; margin: 5px 4px 0 0;
} }
.TicketManager .TK_SeatList > ul > li:last-child { .TicketManager .TK_SeatList>ul>li:last-child {
margin-right: 0; margin-right: 0;
} }
...@@ -327,32 +319,26 @@ ...@@ -327,32 +319,26 @@
text-decoration: underline; text-decoration: underline;
} }
.TMA_raduis > ul { .TMA_raduis>ul {
display: -webkit-box; display: -webkit-box;
align-items: center; align-items: center;
} }
.TMA_raduis > ul > li { .TMA_raduis>ul>li {}
} .TMA_raduis>ul>li._head {
/* .TMA_raduis > ul > li:not(._head) {
background-color: #bcbcbc;
color: #909090;
} */
.TMA_raduis > ul > li._head {
display: flex; display: flex;
align-items: center; align-items: center;
} }
.TMA_raduis > ul > li._head img { .TMA_raduis>ul>li._head img {
height: 26px; height: 26px;
width: 26px; width: 26px;
border-radius: 50%; border-radius: 50%;
margin-left: 15px; margin-left: 15px;
} }
.TMA_raduis > ul > li._head span { .TMA_raduis>ul>li._head span {
padding-left: 7px; padding-left: 7px;
display: inline-block; display: inline-block;
margin-right: 25px; margin-right: 25px;
...@@ -422,17 +408,17 @@ ...@@ -422,17 +408,17 @@
border: none !important; border: none !important;
} }
._add_sel > ul > li { ._add_sel>ul>li {
margin-right: 15px; margin-right: 15px;
float: left; float: left;
} }
._add_sel > ul > li input, ._add_sel>ul>li input,
._add_ret > ul > li input { ._add_ret>ul>li input {
height: 30px; height: 30px;
} }
._add_ret > ul > li { ._add_ret>ul>li {
margin-bottom: 20px; margin-bottom: 20px;
} }
...@@ -447,18 +433,18 @@ ...@@ -447,18 +433,18 @@
border-bottom: 1px dashed #dadada; border-bottom: 1px dashed #dadada;
} }
._add_hangban > li { ._add_hangban>li {
float: left; float: left;
display: -webkit-box; display: -webkit-box;
padding: 20px 0; padding: 20px 0;
overflow: auto; overflow: auto;
} }
._add_hangban > li > div { ._add_hangban>li>div {
margin-right: 20px; margin-right: 20px;
} }
._add_hangban > li:nth-child(2) { ._add_hangban>li:nth-child(2) {
border-left: 1px dashed #dadada; border-left: 1px dashed #dadada;
padding-left: 10px; padding-left: 10px;
} }
...@@ -467,13 +453,13 @@ ...@@ -467,13 +453,13 @@
display: flex; display: flex;
} }
._add_go > span { ._add_go>span {
font-size: 14px; font-size: 14px;
color: #000000; color: #000000;
padding-right: 15px; padding-right: 15px;
} }
._add_go > div { ._add_go>div {
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
background-color: #e0f4ff; background-color: #e0f4ff;
...@@ -482,7 +468,7 @@ ...@@ -482,7 +468,7 @@
border-radius: 4px; border-radius: 4px;
} }
._add_go > div > p:nth-child(1) { ._add_go>div>p:nth-child(1) {
padding: 0 13px; padding: 0 13px;
color: #387ea5; color: #387ea5;
background-color: #cbe9fa; background-color: #cbe9fa;
...@@ -490,14 +476,14 @@ ...@@ -490,14 +476,14 @@
line-height: 34px; line-height: 34px;
} }
._add_go > div > p:nth-child(1) .icon-xingzhuang { ._add_go>div>p:nth-child(1) .icon-xingzhuang {
float: right; float: right;
font-size: 12px; font-size: 12px;
margin-top: 2px; margin-top: 2px;
cursor: pointer; cursor: pointer;
} }
._add_go > div > p:nth-child(1) .icon-xingzhuang:hover { ._add_go>div>p:nth-child(1) .icon-xingzhuang:hover {
color: #e95252; color: #e95252;
} }
...@@ -537,7 +523,8 @@ ...@@ -537,7 +523,8 @@
font-size: 12px; font-size: 12px;
border-color: #5395b9 !important; border-color: #5395b9 !important;
} }
._add_go .el-input .el-input__inner{
._add_go .el-input .el-input__inner {
height: 30px; height: 30px;
} }
...@@ -603,12 +590,6 @@ ...@@ -603,12 +590,6 @@
margin-top: 8px; margin-top: 8px;
} }
._command_box {
}
._command_tb {
}
._command_tb { ._command_tb {
width: -webkit-fill-available; width: -webkit-fill-available;
margin-top: 10px; margin-top: 10px;
...@@ -646,9 +627,6 @@ ...@@ -646,9 +627,6 @@
table-layout: fixed; table-layout: fixed;
} }
._command_tb tbody {
}
._tripDetails { ._tripDetails {
padding: 0; padding: 0;
box-shadow: 0px 1px 3px 0px #dedede; box-shadow: 0px 1px 3px 0px #dedede;
...@@ -751,7 +729,7 @@ ...@@ -751,7 +729,7 @@
font-size: 14px; font-size: 14px;
} }
._allWidth > span { ._allWidth>span {
padding-right: 10px; padding-right: 10px;
} }
...@@ -829,17 +807,16 @@ ...@@ -829,17 +807,16 @@
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar, .TicketManager .InfoChangeLog .changLog::-webkit-scrollbar,
.TicketManager ._ol_info::-webkit-scrollbar, .TicketManager ._ol_info::-webkit-scrollbar,
.addTicketManager::-webkit-scrollbar, .addTicketManager::-webkit-scrollbar,
._add_hangban > li::-webkit-scrollbar, ._add_hangban>li::-webkit-scrollbar,
.Journal .changLogList::-webkit-scrollbar { .Journal .changLogList::-webkit-scrollbar {
/*滚动条整体样式*/ width: 4px;
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/
height: 8px; height: 8px;
} }
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-thumb, .TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-thumb,
.TicketManager ._ol_info::-webkit-scrollbar-thumb, .TicketManager ._ol_info::-webkit-scrollbar-thumb,
.addTicketManager::-webkit-scrollbar-thumb, .addTicketManager::-webkit-scrollbar-thumb,
._add_hangban > li::-webkit-scrollbar-thumb, ._add_hangban>li::-webkit-scrollbar-thumb,
.Journal .changLogList::-webkit-scrollbar-thumb { .Journal .changLogList::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/ /*滚动条里面小方块*/
border-radius: 4px; border-radius: 4px;
...@@ -850,7 +827,7 @@ ...@@ -850,7 +827,7 @@
.TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-track, .TicketManager .InfoChangeLog .changLog::-webkit-scrollbar-track,
.TicketManager ._ol_info::-webkit-scrollbar-track, .TicketManager ._ol_info::-webkit-scrollbar-track,
.addTicketManager::-webkit-scrollbar-track, .addTicketManager::-webkit-scrollbar-track,
._add_hangban > li::-webkit-scrollbar-track, ._add_hangban>li::-webkit-scrollbar-track,
.Journal .changLogList::-webkit-scrollbar-track { .Journal .changLogList::-webkit-scrollbar-track {
/*滚动条里面轨道*/ /*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
...@@ -897,7 +874,7 @@ ...@@ -897,7 +874,7 @@
} }
._pingtai .el-form-item, ._pingtai .el-form-item,
._add_ret > ul > li .el-form-item { ._add_ret>ul>li .el-form-item {
display: flex; display: flex;
} }
...@@ -1051,7 +1028,8 @@ ...@@ -1051,7 +1028,8 @@
.TicketManager .addTicketManager::-webkit-scrollbar { .TicketManager .addTicketManager::-webkit-scrollbar {
/*滚动条整体样式*/ /*滚动条整体样式*/
width: 4px; /*高宽分别对应横竖滚动条的尺寸*/ width: 4px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 8px; height: 8px;
} }
...@@ -1129,7 +1107,6 @@ ...@@ -1129,7 +1107,6 @@
.TicketManager .vmiddle { .TicketManager .vmiddle {
display: flex; display: flex;
align-items: Center; align-items: Center;
/* height: 78px; */
} }
.Plan_Query .el-button--primary { .Plan_Query .el-button--primary {
...@@ -1189,14 +1166,13 @@ ...@@ -1189,14 +1166,13 @@
} }
.Ticket_TCID { .Ticket_TCID {
margin:5px 25px 5px 0; margin: 5px 25px 5px 0;
display: inline-block; display: inline-block;
} }
/*航班详情*/ /*航班详情*/
.TicketManager .FlightDivDetails { .TicketManager .FlightDivDetails {
width: 100%; width: 100%;
/* height: 65px; */
overflow: auto; overflow: auto;
} }
...@@ -1228,19 +1204,21 @@ ...@@ -1228,19 +1204,21 @@
} }
.TicketManager .TK_raduis ul li { .TicketManager .TK_raduis ul li {
margin-left:10px; margin-left: 10px;
float: left; float: left;
} }
.FinaceDanList { .FinaceDanList {
cursor: pointer; cursor: pointer;
} }
.teamTitle{
text-indent:10px; .teamTitle {
min-height:28px; text-indent: 10px;
border-top:1px solid #ccc; min-height: 28px;
line-height:28px; border-top: 1px solid #ccc;
line-height: 28px;
} }
</style> </style>
<template> <template>
<div class="flexOne TicketManager"> <div class="flexOne TicketManager">
...@@ -1260,8 +1238,8 @@ ...@@ -1260,8 +1238,8 @@
<em>线路</em> <em>线路</em>
<el-select v-model="msg.LineId" :placeholder="$t('pub.pleaseSel')" class="w120"> <el-select v-model="msg.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" <el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
:value="item.LineID"></el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -1270,19 +1248,19 @@ ...@@ -1270,19 +1248,19 @@
<em>航空公司</em> <em>航空公司</em>
<el-select v-model="msg.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w120"> <el-select v-model="msg.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" <el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" :key="item.AirLineId">
:key="item.AirLineId"></el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>航班日期</em> <em>航班日期</em>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateStart" type="date" <el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck" :picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker> </el-date-picker>
<span class="_ln">-</span> <span class="_ln">-</span>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck" <el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker> value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span> </span>
</li> </li>
...@@ -1307,8 +1285,8 @@ ...@@ -1307,8 +1285,8 @@
<em>定金类型</em> <em>定金类型</em>
<el-select v-model="msg.DepositType" filterable :placeholder="$t('system.ph_in')" class="w120"> <el-select v-model="msg.DepositType" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in DepositTypeArray" :label="item.Name" :value="item.Id" <el-option v-for="item in DepositTypeArray" :label="item.Name" :value="item.Id" :key="item.Id">
:key="item.Id"></el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -1490,7 +1468,8 @@ ...@@ -1490,7 +1468,8 @@
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContent">
<span v-if="item.FirstAuditList!=null" v-for="childItem in item.FirstAuditList"> <span v-if="item.FirstAuditList!=null" v-for="childItem in item.FirstAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li>
...@@ -1503,7 +1482,8 @@ ...@@ -1503,7 +1482,8 @@
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContent">
<span v-if="item.SecondAuditList!=null" v-for="childItem in item.SecondAuditList"> <span v-if="item.SecondAuditList!=null" v-for="childItem in item.SecondAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li>
...@@ -1516,7 +1496,8 @@ ...@@ -1516,7 +1496,8 @@
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContent">
<span v-if="item.ThirdAuditList!=null" v-for="childItem in item.ThirdAuditList"> <span v-if="item.ThirdAuditList!=null" v-for="childItem in item.ThirdAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li>
...@@ -1529,7 +1510,8 @@ ...@@ -1529,7 +1510,8 @@
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContent">
<span v-if="item.FourthAuditList!=null" v-for="childItem in item.FourthAuditList"> <span v-if="item.FourthAuditList!=null" v-for="childItem in item.FourthAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li>
...@@ -1542,7 +1524,8 @@ ...@@ -1542,7 +1524,8 @@
</div> </div>
<div class="FinaDetailContent"> <div class="FinaDetailContent">
<span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList"> <span v-if="item.FinalAuditList!=null" v-for="childItem in item.FinalAuditList">
<span class="FinaceDanList" @click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span> <span class="FinaceDanList"
@click="goFinaceDetails(childItem.FinaceId)">{{childItem.FinaceId}}</span>
</span> </span>
</div> </div>
</li> </li>
...@@ -1572,13 +1555,12 @@ ...@@ -1572,13 +1555,12 @@
<el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></el-button> <el-button type="primary" icon="iconfont icon-Edit" @click="getEntityExtend(item.ID)"></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-lists" <el-button type="primary" icon="iconfont icon-lists" @click="goUrl('PassengerList',item,'旅客名单')">
@click="goUrl('PassengerList',item,'旅客名单')"></el-button> </el-button>
</el-tooltip> </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" style="display:none;">
<el-button type="primary" icon="iconfont icon-ico_shezhi" <el-button type="primary" icon="iconfont icon-ico_shezhi"
@click="goUrl('ThroughSetting',item,'联运设置')" @click="goUrl('ThroughSetting',item,'联运设置')" style="margin-left:0;"></el-button>
style="margin-left:0;"></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-img_delete_small" @click="DeleteAirticket(item.ID)" <el-button type="primary" icon="iconfont icon-img_delete_small" @click="DeleteAirticket(item.ID)"
...@@ -1587,8 +1569,7 @@ ...@@ -1587,8 +1569,7 @@
<el-tooltip class="item" effect="dark" :content="item.TripItinerary==''?'行程单上传':'行程单下载'" <el-tooltip class="item" effect="dark" :content="item.TripItinerary==''?'行程单上传':'行程单下载'"
placement="top-start"> placement="top-start">
<el-button v-if="item.TripItinerary==''" type="primary" icon="iconfont icon-upload" <el-button v-if="item.TripItinerary==''" type="primary" icon="iconfont icon-upload"
style="margin-left:0;" style="margin-left:0;" @click="outerVisible1=true,UploadItineraryMsg.ID=item.ID"></el-button>
@click="outerVisible1=true,UploadItineraryMsg.ID=item.ID"></el-button>
<el-button v-else type="primary" icon="iconfont icon-xiazai2" style="margin-left:0;" <el-button v-else type="primary" icon="iconfont icon-xiazai2" style="margin-left:0;"
@click="DownLoad(3,item.TripItinerary)"></el-button> @click="DownLoad(3,item.TripItinerary)"></el-button>
</el-tooltip> </el-tooltip>
...@@ -1630,7 +1611,8 @@ ...@@ -1630,7 +1611,8 @@
<div class="TCID_cont PingFangSC"> <div class="TCID_cont PingFangSC">
<span v-show="item.PriceList==null ||item.PriceList.length==0">暂无</span> <span v-show="item.PriceList==null ||item.PriceList.length==0">暂无</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList"> <span class="Ticket_TCID" v-for="subItem in item.PriceList">
<a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'> ({{subItem.TCID}}){{subItem.TCNUM}} </a> <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",subItem.TCID,"报名清单")'>
({{subItem.TCID}}){{subItem.TCNUM}} </a>
<a style="color:red;cursor:pointer;" @click="goUrlTicketUnion(subItem.TCID,item.ID)">设置联运</a> <a style="color:red;cursor:pointer;" @click="goUrlTicketUnion(subItem.TCID,item.ID)">设置联运</a>
</span> </span>
</div> </div>
...@@ -1643,8 +1625,7 @@ ...@@ -1643,8 +1625,7 @@
</ul> </ul>
<div class="noData" v-show="noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
:page-size="msg.pageSize" :total="total"></el-pagination>
</div> </div>
</div> </div>
<el-form class="addTicketManager" :class="addShow==true?'edHeight':''" :model="addMsg" :rules="rules" ref="addMsg" <el-form class="addTicketManager" :class="addShow==true?'edHeight':''" :model="addMsg" :rules="rules" ref="addMsg"
...@@ -1655,16 +1636,16 @@ ...@@ -1655,16 +1636,16 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_positions')" prop="FreightSpace"> <el-form-item :label="$t('Airticket.Air_positions')" prop="FreightSpace">
<el-select v-model="addMsg.FreightSpace" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.FreightSpace" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in FreightSpaceList" :key="item.Id" :label="item.Name" <el-option v-for="item in FreightSpaceList" :key="item.Id" :label="item.Name" :value="item.Id">
:value="item.Id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_TicketType')" prop="TicketType"> <el-form-item :label="$t('Airticket.Air_TicketType')" prop="TicketType">
<el-select v-model="addMsg.TicketType" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.TicketType" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in TicketTypeList" :key="item.Id" :label="item.Name" <el-option v-for="item in TicketTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
:value="item.Id"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1681,30 +1662,31 @@ ...@@ -1681,30 +1662,31 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice"> <el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" placeholder="0.0" <el-input v-model="addMsg.CostPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'CostPrice')">
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice"> <el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice">
<el-input v-model="addMsg.SalePrice" placeholder="0.0" <el-input v-model="addMsg.SalePrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'SalePrice')">
@keyup.native="checkPrice(addMsg,'SalePrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice"> <el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice">
<el-input v-model="addMsg.B2BPrice" placeholder="0.0" <el-input v-model="addMsg.B2BPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2BPrice')">
@keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice"> <el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice">
<el-input v-model="addMsg.B2CPrice" placeholder="0.0" <el-input v-model="addMsg.B2CPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2CPrice')">
@keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</ul> </ul>
</div> </div>
<!--添加修改航班-->
<ul class="_add_hangban clearfix"> <ul class="_add_hangban clearfix">
<li v-if="addMsg.TicketType" :class="addMsg.TicketType==1?'_allWidth':''"> <li v-if="addMsg.TicketType" :class="addMsg.TicketType==1?'_allWidth':''">
<span class="_add_go_label">{{$t('Airticket.Air_go')}}</span> <span class="_add_go_label">{{$t('Airticket.Air_go')}}</span>
...@@ -1735,10 +1717,12 @@ ...@@ -1735,10 +1717,12 @@
</p> </p>
</el-tooltip> </el-tooltip>
<div style="margin:10px 0 0 12px;"> <div style="margin:10px 0 0 12px;">
<el-input type="text" class="w80" v-model="item.TicketDepartureTime" @keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5" <el-input type="text" class="w80" v-model="item.TicketDepartureTime"
@keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> - :placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime" @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" <el-input type="text" class="w80" v-model="item.TicketArrivalTime"
:placeholder="$t('system.ph_time')"></el-input> @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" :placeholder="$t('system.ph_time')">
</el-input>
</div> </div>
</div> </div>
</div> </div>
...@@ -1751,8 +1735,7 @@ ...@@ -1751,8 +1735,7 @@
<span class="_add_hbh"> <span class="_add_hbh">
<em class>航空公司</em> <em class>航空公司</em>
<el-select v-model="addGoFlight.AirLineID" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="addGoFlight.AirLineID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getAirportNameList(addGoFlight.AirLineID,1)" @change="getAirportNameList(addGoFlight.AirLineID,1)" class="w150">
class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" <el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option> :key="item.AirLineId"></el-option>
...@@ -1768,8 +1751,8 @@ ...@@ -1768,8 +1751,8 @@
<span class="_add_hbh"> <span class="_add_hbh">
<em class="demonstration">{{$t('pub.date')}}</em> <em class="demonstration">{{$t('pub.date')}}</em>
<el-date-picker class="w150 _add_date" v-model="addGoFlight.FlightDate" type="date" <el-date-picker class="w150 _add_date" v-model="addGoFlight.FlightDate" type="date"
:placeholder="$t('admin.admin_choDate')" :placeholder="$t('admin.admin_choDate')" value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker> </el-date-picker>
</span> </span>
</div> </div>
</div> </div>
...@@ -1803,10 +1786,12 @@ ...@@ -1803,10 +1786,12 @@
</p> </p>
</el-tooltip> </el-tooltip>
<div style="margin:10px 0 0 12px;"> <div style="margin:10px 0 0 12px;">
<el-input type="text" class="w80" v-model="item.TicketDepartureTime" @keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5" <el-input type="text" class="w80" v-model="item.TicketDepartureTime"
@keyup.native="checkTime(item,'TicketDepartureTime')" maxlength="5"
:placeholder="$t('system.ph_time')"></el-input> - :placeholder="$t('system.ph_time')"></el-input> -
<el-input type="text" class="w80" v-model="item.TicketArrivalTime" @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" <el-input type="text" class="w80" v-model="item.TicketArrivalTime"
:placeholder="$t('system.ph_time')"></el-input> @keyup.native="checkTime(item,'TicketArrivalTime')" maxlength="5" :placeholder="$t('system.ph_time')">
</el-input>
</div> </div>
</div> </div>
</div> </div>
...@@ -1819,8 +1804,7 @@ ...@@ -1819,8 +1804,7 @@
<span class="_add_hbh"> <span class="_add_hbh">
<em class>航空公司</em> <em class>航空公司</em>
<el-select v-model="returnTripData.AirLineID" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="returnTripData.AirLineID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getAirportNameList(returnTripData.AirLineID,2)" @change="getAirportNameList(returnTripData.AirLineID,2)" class="w150">
class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId" <el-option v-for="item in airlineList" :label="item.AlName" :value="item.AirLineId"
:key="item.AirLineId"></el-option> :key="item.AirLineId"></el-option>
...@@ -1837,8 +1821,8 @@ ...@@ -1837,8 +1821,8 @@
<span class="_add_hbh"> <span class="_add_hbh">
<em class="demonstration">{{$t('pub.date')}}</em> <em class="demonstration">{{$t('pub.date')}}</em>
<el-date-picker class="w150 _add_date" v-model="returnTripData.FlightDate" type="date" <el-date-picker class="w150 _add_date" v-model="returnTripData.FlightDate" type="date"
:placeholder="$t('admin.admin_choDate')" :placeholder="$t('admin.admin_choDate')" value-format="yyyy-MM-dd" :picker-options="pickerOptions1">
value-format="yyyy-MM-dd" :picker-options="pickerOptions1"></el-date-picker> </el-date-picker>
</span> </span>
</div> </div>
</div> </div>
...@@ -1891,8 +1875,8 @@ ...@@ -1891,8 +1875,8 @@
<el-form-item label="线路" prop="LineId"> <el-form-item label="线路" prop="LineId">
<el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')" class="multiple_input"> <el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')" class="multiple_input">
<el-option label='不限' :value='comdefaultSelect'></el-option> <el-option label='不限' :value='comdefaultSelect'></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" <el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
:value="item.LineID"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -1905,8 +1889,8 @@ ...@@ -1905,8 +1889,8 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules" ref="addMsgCmd" <el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules"
label-width="100px"> ref="addMsgCmd" label-width="100px">
<div class="combottomTitle">{{$t('Airticket.Air_orderImport')}}</div> <div class="combottomTitle">{{$t('Airticket.Air_orderImport')}}</div>
<div class="_command_box"> <div class="_command_box">
<table class="_command_tb" border="0" cellspacing="0" cellpadding="0"> <table class="_command_tb" border="0" cellspacing="0" cellpadding="0">
...@@ -1988,26 +1972,26 @@ ...@@ -1988,26 +1972,26 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice"> <el-form-item :label="$t('Airticket.Air_unitPrice')" prop="CostPrice">
<el-input v-model="addMsg.CostPrice" placeholder="0.0" <el-input v-model="addMsg.CostPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'CostPrice')">
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice"> <el-form-item :label="$t('Airticket.Air_salesPrice')" prop="SalePrice">
<el-input v-model="addMsg.SalePrice" placeholder="0.0" <el-input v-model="addMsg.SalePrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'SalePrice')">
@keyup.native="checkPrice(addMsg,'SalePrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice"> <el-form-item :label="$t('Airticket.Air_b2bPrice')" prop="B2BPrice">
<el-input v-model="addMsg.B2BPrice" placeholder="0.0" <el-input v-model="addMsg.B2BPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2BPrice')">
@keyup.native="checkPrice(addMsg,'B2BPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice"> <el-form-item :label="$t('Airticket.Air_b2cPrice')" prop="B2CPrice">
<el-input v-model="addMsg.B2CPrice" placeholder="0.0" <el-input v-model="addMsg.B2CPrice" placeholder="0.0" @keyup.native="checkPrice(addMsg,'B2CPrice')">
@keyup.native="checkPrice(addMsg,'B2CPrice')"></el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -2025,8 +2009,8 @@ ...@@ -2025,8 +2009,8 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="线路"> <el-form-item label="线路">
<el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')"> <el-select v-model="addMsg.LineId" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" <el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
:value="item.LineID"></el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -2036,8 +2020,8 @@ ...@@ -2036,8 +2020,8 @@
<i class="iconfont icon-arrow1"></i> <i class="iconfont icon-arrow1"></i>
</span> </span>
<el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none" <el-input type="textarea" :autosize="{minRows: 1, maxRows: 8 }" resize="none"
:placeholder="$t('Airticket.Air_inputOrder')" :placeholder="$t('Airticket.Air_inputOrder')" v-model="TicketOrder" class="cmd_input"
v-model="TicketOrder" class="cmd_input" @keyup.enter.native="getPostTicketOrder()"></el-input> @keyup.enter.native="getPostTicketOrder()"></el-input>
</div> </div>
<div class="TM_OrderRemind">输入完成后回车即可导入</div> <div class="TM_OrderRemind">输入完成后回车即可导入</div>
</el-col> </el-col>
...@@ -2057,16 +2041,9 @@ ...@@ -2057,16 +2041,9 @@
<p class="_add_t">散卖机票</p> <p class="_add_t">散卖机票</p>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<button <button type="button" class="normalBtn" @click="saveSales()">{{$t('pub.saveBtn')}}</button>
type="button" <button class="hollowFixedBtn" type="button"
class="normalBtn" @click="resetForm('addMsg'),sanmai=false">{{$t('pub.cancelBtn')}}</button>
@click="saveSales()"
>{{$t('pub.saveBtn')}}</button>
<button
class="hollowFixedBtn"
type="button"
@click="resetForm('addMsg'),sanmai=false"
>{{$t('pub.cancelBtn')}}</button>
</el-col> </el-col>
</el-row> </el-row>
<div class="_add_sel"> <div class="_add_sel">
...@@ -2271,17 +2248,17 @@ ...@@ -2271,17 +2248,17 @@
dataList: [], dataList: [],
addShow: false, addShow: false,
command: false, command: false,
sanmai:false, sanmai: false,
uploadDoc: true, uploadDoc: true,
//散卖obj //散卖obj
sales:{ sales: {
AirTicketId:0, AirTicketId: 0,
AirTicketNum:0, AirTicketNum: 0,
B2BPrice:'', B2BPrice: '',
B2CPrice:'', B2CPrice: '',
IsDiscounts:'0' IsDiscounts: '0'
}, },
//1-一般导入，2-多航段导入 //1-一般导入，2-多航段导入
...@@ -2293,14 +2270,26 @@ ...@@ -2293,14 +2270,26 @@
}, },
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
if (this.msg.QFlightDateEnd) {
let endTime = new Date(this.msg.QFlightDateEnd); let endTime = new Date(this.msg.QFlightDateEnd);
return endTime.getTime() < time.getTime(); return time&&endTime.getTime() < time.getTime();
}else
{
return false;
}
} }
}, },
afterCheck: { afterCheck: {
disabledDate: time => { disabledDate: time => {
if (this.msg.QFlightDateStart) {
let startTime = new Date(this.msg.QFlightDateStart); let startTime = new Date(this.msg.QFlightDateStart);
return startTime.getTime() >= time.getTime(); //可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
}
else
{
return false;
}
} }
}, },
rules: { rules: {
...@@ -2361,7 +2350,7 @@ ...@@ -2361,7 +2350,7 @@
required: true, required: true,
}], }],
}, },
salerules:{ salerules: {
AirTicketNum: [{ AirTicketNum: [{
required: true, required: true,
message: "请填写人数", message: "请填写人数",
...@@ -2383,12 +2372,26 @@ ...@@ -2383,12 +2372,26 @@
methods: { methods: {
//页面跳转 //页面跳转
goUrlT(path, obj, title) { goUrlT(path, obj, title) {
this.$router.push({name: path, query: {"id": obj, blank: 'y', tab: title}}) this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
}, },
//联运跳转 //联运跳转
goUrlTicketUnion(TCID,AirticketId) goUrlTicketUnion(TCID, AirticketId) {
{ this.$router.push({
this.$router.push({name: "TicketTransport", query: {"tcid": TCID,"AirticketId":AirticketId, blank: 'y', tab: "设置联运"}}) name: "TicketTransport",
query: {
"tcid": TCID,
"AirticketId": AirticketId,
blank: 'y',
tab: "设置联运"
}
})
}, },
//上传行程单 //上传行程单
uploadItinerary(item) { uploadItinerary(item) {
...@@ -2505,8 +2508,7 @@ ...@@ -2505,8 +2508,7 @@
this.outerVisible = true; this.outerVisible = true;
}, },
//下载(不要删除) //下载(不要删除)
getDownLoad() { getDownLoad() {},
},
//下载文件 //下载文件
DownLoad(Type, str) { DownLoad(Type, str) {
if (Type == 1) { if (Type == 1) {
...@@ -2545,8 +2547,7 @@ ...@@ -2545,8 +2547,7 @@
this.msg.ID = ""; this.msg.ID = "";
} }
}, },
err => { err => {}
}
); );
}, },
//初始化航空公司下拉 //初始化航空公司下拉
...@@ -2558,8 +2559,7 @@ ...@@ -2558,8 +2559,7 @@
this.airlineList = res.data.data; this.airlineList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//获取舱位列表 //获取舱位列表
...@@ -2571,8 +2571,7 @@ ...@@ -2571,8 +2571,7 @@
this.FreightSpaceList = res.data.data; this.FreightSpaceList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//获取机票类型 //获取机票类型
...@@ -2584,8 +2583,7 @@ ...@@ -2584,8 +2583,7 @@
this.TicketTypeList = res.data.data; this.TicketTypeList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//新增去程 //新增去程
...@@ -2617,6 +2615,8 @@ ...@@ -2617,6 +2615,8 @@
newList.AirLineTicketId = this.addGoFlight.AirLineTicketId; newList.AirLineTicketId = this.addGoFlight.AirLineTicketId;
newList.AirLineID = this.addGoFlight.AirLineID; newList.AirLineID = this.addGoFlight.AirLineID;
newList.FlightSubType = this.addGoFlight.FlightSubType; newList.FlightSubType = this.addGoFlight.FlightSubType;
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.addGoFlight.ID; newList.ID = this.addGoFlight.ID;
this.addMsg.flightList.push(newList); this.addMsg.flightList.push(newList);
} }
...@@ -2656,6 +2656,8 @@ ...@@ -2656,6 +2656,8 @@
newList.AirLineTicketId = this.returnTripData.AirLineTicketId; newList.AirLineTicketId = this.returnTripData.AirLineTicketId;
newList.FlightSubType = this.returnTripData.FlightSubType; newList.FlightSubType = this.returnTripData.FlightSubType;
newList.AirLineID = this.returnTripData.AirLineID; newList.AirLineID = this.returnTripData.AirLineID;
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.returnTripData.ID; newList.ID = this.returnTripData.ID;
this.addMsg.flightList.push(newList); this.addMsg.flightList.push(newList);
} }
...@@ -2733,7 +2735,7 @@ ...@@ -2733,7 +2735,7 @@
this.chengeDelIdList = []; this.chengeDelIdList = [];
this.apipost( this.apipost(
"ticket_get_GetEntityExtend", { "ticket_get_GetEntityExtend", {
ID:ID ID: ID
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -2754,8 +2756,7 @@ ...@@ -2754,8 +2756,7 @@
this.Warning(res.data.message); this.Warning(res.data.message);
} }
}, },
err => { err => {}
}
); );
}, },
//根据航空公司ID 获取机场列表 //根据航空公司ID 获取机场列表
...@@ -2782,8 +2783,7 @@ ...@@ -2782,8 +2783,7 @@
} }
} }
}, },
err => { err => {}
}
); );
}, },
...@@ -2842,8 +2842,7 @@ ...@@ -2842,8 +2842,7 @@
this.Warning(res.data.message); this.Warning(res.data.message);
} }
}, },
err => { err => {}
}
); );
}, },
//删除 //删除
...@@ -2862,10 +2861,8 @@ ...@@ -2862,10 +2861,8 @@
"AirticketFlight_Post_RemoveByIds", { "AirticketFlight_Post_RemoveByIds", {
TicketFlightId: chengeDelIdList.toString() TicketFlightId: chengeDelIdList.toString()
}, },
res => { res => {},
}, err => {}
err => {
}
); );
}); });
}, },
...@@ -2878,10 +2875,8 @@ ...@@ -2878,10 +2875,8 @@
"AirticketFlight_Post_Remove", { "AirticketFlight_Post_Remove", {
TicketFlightId: id TicketFlightId: id
}, },
res => { res => {},
}, err => {}
err => {
}
); );
}); });
}, },
...@@ -2915,7 +2910,8 @@ ...@@ -2915,7 +2910,8 @@
delete x.aName; delete x.aName;
delete x.dName; delete x.dName;
}); });
if (newList.flightList != null && newList.flightList.length > 0 && newList.flightList[0].AirLineID != undefined) { if (newList.flightList != null && newList.flightList.length > 0 && newList.flightList[0].AirLineID !=
undefined) {
this.addMsg.AirLineID = newList.flightList[0].AirLineID; this.addMsg.AirLineID = newList.flightList[0].AirLineID;
} }
// if (!this.addMsg.AirLineID) { // if (!this.addMsg.AirLineID) {
...@@ -2938,8 +2934,7 @@ ...@@ -2938,8 +2934,7 @@
this.command = false; this.command = false;
this.isSubmit = true; this.isSubmit = true;
}, },
err => { err => {}
}
); );
} }
}, },
...@@ -2973,8 +2968,7 @@ ...@@ -2973,8 +2968,7 @@
res => { res => {
this.orderlogList = res.data.data; this.orderlogList = res.data.data;
}, },
err => { err => {}
}
); );
}, },
//获取开放平台 //获取开放平台
...@@ -3051,8 +3045,7 @@ ...@@ -3051,8 +3045,7 @@
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => { err => {}
}
); );
}, },
goUrl(path, obj, name) { goUrl(path, obj, name) {
...@@ -3102,8 +3095,7 @@ ...@@ -3102,8 +3095,7 @@
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//获取线路列表 //获取线路列表
...@@ -3115,12 +3107,11 @@ ...@@ -3115,12 +3107,11 @@
this.LineList = res.data.data; this.LineList = res.data.data;
} }
}, },
err => { err => {}
}
); );
}, },
//散卖机票 //散卖机票
sanSale(item){ sanSale(item) {
this.sanmai = true; this.sanmai = true;
this.addShow = false; this.addShow = false;
this.command = false; this.command = false;
...@@ -3128,14 +3119,14 @@ ...@@ -3128,14 +3119,14 @@
this.sales.AirTicketNum = item.AirTicketScatterNum; this.sales.AirTicketNum = item.AirTicketScatterNum;
this.sales.B2BPrice = item.ScatterB2BPrice; this.sales.B2BPrice = item.ScatterB2BPrice;
this.sales.B2CPrice = item.ScatterB2CPrice; this.sales.B2CPrice = item.ScatterB2CPrice;
if(item.IsDiscounts!=null){ if (item.IsDiscounts != null) {
this.sales.IsDiscounts=item.IsDiscounts.toString(); this.sales.IsDiscounts = item.IsDiscounts.toString();
}else{ } else {
this.sales.IsDiscounts='0'; this.sales.IsDiscounts = '0';
} }
}, },
//保存 //保存
saveSales(){ saveSales() {
this.apipost( this.apipost(
"ticket_post_SetAirTicketScattering", this.sales, "ticket_post_SetAirTicketScattering", this.sales,
res => { res => {
...@@ -3143,12 +3134,11 @@ ...@@ -3143,12 +3134,11 @@
this.Success(res.data.message); this.Success(res.data.message);
this.getList(); this.getList();
this.sanmai = false; this.sanmai = false;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, },
err => { err => {}
}
); );
} }
......
src/components/Ticketing/seatStatistics.vue
View file @ b45895be
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>线路</em> <em>{{$t('advmanager.v_line')}}</em>
<el-select v-model="msg.QLineId" :placeholder="$t('pub.pleaseSel')" filterable> <el-select v-model="msg.QLineId" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option <el-option
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>出发城市</em> <em>{{$t('system.table_goCity')}}</em>
<el-select v-model="msg.QCityId" :placeholder="$t('system.ph_in')" filterable> <el-select v-model="msg.QCityId" :placeholder="$t('system.ph_in')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option <el-option
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>操作人</em> <em>{{$t('admin.admin_czPerson')}}</em>
<el-select <el-select
v-model="msg.QCreateBy" v-model="msg.QCreateBy"
filterable filterable
...@@ -248,8 +248,8 @@ ...@@ -248,8 +248,8 @@
</ul> </ul>
</div> </div>
<div class="title"> <div class="title">
机位统计 共 {{$t('Operation.Op_jiweiTotal')}}
<span class="Owe_Room">{{TotalCount}}</span> 套, 总机位数 <span class="Owe_Room">{{TotalCount}}</span> {{$t('Operation.Op_taoTotal')}}
<span class="Owe_Room">{{TotalSeat}}</span> <span class="Owe_Room">{{TotalSeat}}</span>
</div> </div>
<div class="month"> <div class="month">
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ b45895be
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
<span @click="goUrl('leaderChedule',item.ID)">{{$t('leader.leader_schedule')}}<i></i></span> <span @click="goUrl('leaderChedule',item.ID)">{{$t('leader.leader_schedule')}}<i></i></span>
<span @click="goUrl2('leaderStateDetails',item.ID)">{{$t('leader.leader_performance')}}<i></i></span> <span @click="goUrl2('leaderStateDetails',item.ID)">{{$t('leader.leader_performance')}}<i></i></span>
<span @click="deletelist(item.ID)">{{$t('system.table_delete')}}<i></i></span> <span @click="deletelist(item.ID)">{{$t('system.table_delete')}}<i></i></span>
<span @click="AccountManage(item)">账户管理</span> <span @click="AccountManage(item)">{{$t('visaT.Accountmanagement')}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -274,10 +274,10 @@ ...@@ -274,10 +274,10 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="类型" v-if="addMsg.Type==2"> <el-form-item :label="$t('system.query_type')" v-if="addMsg.Type==2">
<el-radio-group v-model="addMsg.LeaderGuidType"> <el-radio-group v-model="addMsg.LeaderGuidType">
<el-radio label="1">长线</el-radio> <el-radio label="1">{{$t('Operation.Op_longTerm')}}</el-radio>
<el-radio label="2">短线</el-radio> <el-radio label="2">{{$t('Operation.Op_shortTerm')}}</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.query_goCoun')" prop="CountryID"> <el-form-item :label="$t('system.query_goCoun')" prop="CountryID">
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ b45895be
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>所属线路</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'> <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>系列名称</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
...@@ -28,14 +28,14 @@ ...@@ -28,14 +28,14 @@
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>操作人</em> <em>{{$t('admin.admin_czPerson')}}</em>
<el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' <el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId'
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter"
...@@ -77,19 +77,19 @@ ...@@ -77,19 +77,19 @@
</div> </div>
<div class="el-col" style="width:220px;"> <div class="el-col" style="width:220px;">
<div class="d3"> <div class="d3">
<p><i class="iconfont icon-tuandui"></i>团队信息</p> <p><i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}</p>
<p><em>{{item.DayNum}}天{{item.NightNum}}晚</em></p> <p><em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</em></p>
</div> </div>
</div> </div>
<div class="el-col" style="width:220px;"> <div class="el-col" style="width:220px;">
<div class="d3"> <div class="d3">
<p><i class="iconfont icon-tuandui"></i>团期信息</p> <p><i class="iconfont icon-tuandui"></i>{{$t('Operation.Op_teamInfo')}}</p>
<p class="d12p">{{item.TCNUMS}}</p> <p class="d12p">{{item.TCNUMS}}</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:130px;"> <div class="el-col" style="width:130px;">
<div class="d5 TC-oparation" style="padding-top:10px;"> <div class="d5 TC-oparation" style="padding-top:10px;">
<p><i class="iconfont icon-yuangong"></i>操作OP</p> <p><i class="iconfont icon-yuangong"></i>{{$t('system.table_operation')}}OP</p>
<div class="clearfix TC-OpInfo"> <div class="clearfix TC-OpInfo">
<div class="TC-leftIMG"> <div class="TC-leftIMG">
<img v-if="item.OPPhoto" :src="item.OPPhoto" alt=""> <img v-if="item.OPPhoto" :src="item.OPPhoto" alt="">
...@@ -101,15 +101,15 @@ ...@@ -101,15 +101,15 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">行程修改</el-button> <el-button @click="goToOpenTravel('TravelManager2',item.ID)" type="primary">{{$t('Operation.Op_tripUpdate')}}</el-button>
<el-button @click="copyTravelInfo(item.ID)" type="primary">行程复制</el-button> <el-button @click="copyTravelInfo(item.ID)" type="primary">{{$t('Operation.Op_tripCopy')}}</el-button>
<el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">删除</el-button> <el-button v-if="item.TCNUMS==''" @click="delConfig(item.ID)" type="primary">{{$t('system.table_delete')}}</el-button>
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent"> <div class="TC_remarkContent">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle TCL-redType">团名：</div> <div class="TCL_remarkTitle TCL-redType">{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content">{{item.Title}}</div> <div class="TCL_Content">{{item.Title}}</div>
</div> </div>
</div> </div>
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ b45895be
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>公司</em> <em>{{$t('system.table_company')}}</em>
<el-select class="w150" filterable placeholder="公司" v-model="queryMsg.OutBranchId"> <el-select class="w150" filterable placeholder="公司" v-model="queryMsg.OutBranchId">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue2'></el-option>
<el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id"> <el-option v-for='item in queryCommonData.BranchList' :key="item.Id" :label="item.BName" :value="item.Id">
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>线路</em> <em>{{$t('advmanager.v_line')}}</em>
<el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class='w150' v-model="queryMsg.LineID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'> <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>系列</em> <em>{{$t('advmanager.v_xilie')}}</em>
<el-select class='w150' v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.ltID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>团期</em> <em>{{$t('fnc.tuanqi')}}</em>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QStartDate"> <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QStartDate">
</el-date-picker> </el-date-picker>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QEndDate"> <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" v-model="queryMsg.QEndDate">
...@@ -81,26 +81,26 @@ ...@@ -81,26 +81,26 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()" /> &nbsp; <input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="getList()" /> &nbsp;
<button class="hollowFixedBtn" @click="DownLoadFile()">下载</button> <button class="hollowFixedBtn" @click="DownLoadFile()">{{$t('adm.adm_download')}}</button>
</li> </li>
</ul> </ul>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading='queryCommonData.loading'>
<tr> <tr>
<th width="50">序</th> <th width="50">{{$t('active.ad_xuhao')}}</th>
<th width="80">出团</th> <th width="80">{{$t('Operation.Op_chutuan')}}</th>
<th width='200'>团名</th> <th width='200'>{{$t('Operation.Op_TeamName')}}</th>
<th width="80">团期</th> <th width="80">{{$t('fnc.tuanqi')}}</th>
<th width="80">进出点</th> <th width="80">{{$t('Operation.Op_jinchudian')}}</th>
<th width="100">抵离时间</th> <th width="100">{{$t('Operation.Op_ArriveTime')}}</th>
<th width="50">价格</th> <th width="50">{{$t('Operation.Op_price')}}</th>
<th width="100">机位</th> <th width="100">{{$t('Airticket.Air_reservation')}}</th>
<th width="80">报名</th> <th width="80">{{$t('Operation.Op_signUp')}}</th>
<th width="80">收订人数</th> <th width="80">{{$t('Operation.Op_orderNum')}}</th>
<th width="100">领队</th> <th width="100">{{$t('leader.leader_Leader')}}</th>
<th width="100">导游</th> <th width="100">{{$t('leader.leader_Guide')}}</th>
<th>备注</th> <th>{{$t('hotel.hotel_remark')}}</th>
</tr> </tr>
<tbody v-for="item in DataList"> <tbody v-for="item in DataList">
<tr> <tr>
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ b45895be
...@@ -4,23 +4,23 @@ ...@@ -4,23 +4,23 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>出团公司</em> <em>{{$t('scen.sc_cp')}}</em>
<el-select class="w200" v-model="msg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w200" v-model="msg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>线路</em> <em>{{$t('advmanager.v_line')}}</em>
<el-select <el-select
class="w200" class="w200"
v-model="msg.LineId" v-model="msg.LineId"
filterable filterable
:placeholder="$t('pub.pleaseSel')" :placeholder="$t('pub.pleaseSel')"
> >
<el-option label="不限" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option <el-option
v-for="item in LineList" v-for="item in LineList"
:label="item.LineName" :label="item.LineName"
...@@ -33,16 +33,16 @@ ...@@ -33,16 +33,16 @@
<li> <li>
<span> <span>
<em>报名公司</em> <em>{{$t('Operation.Op_baomingCompany')}}</em>
<el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w200" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="-1"></el-option>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option> <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>人员选择</em> <em>{{$t('Operation.Op_peopleChoice')}}</em>
</span> </span>
<el-select <el-select
class="w200" class="w200"
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
filterable filterable
:placeholder="$t('pub.pleaseSel')" :placeholder="$t('pub.pleaseSel')"
> >
<el-option label="不限" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option <el-option
v-for="item in employeeList" v-for="item in employeeList"
:label="item.name" :label="item.name"
...@@ -61,20 +61,20 @@ ...@@ -61,20 +61,20 @@
</li> </li>
<li> <li>
<span> <span>
<em>订单号</em> <em>{{$t('hotel.order_Number')}}</em>
</span> </span>
<el-input class="w200" v-model="msg.tempOrderId"></el-input> <el-input class="w200" v-model="msg.tempOrderId"></el-input>
</li> </li>
<li> <li>
<span> <span>
<em>订单状态</em> <em>{{$t('hotel.hotel_OrderStates')}}</em>
</span> </span>
<el-select v-model="msg.OrderState" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.OrderState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in ddztList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option> <el-option v-for="item in ddztList" :label="item.Name" :value="item.Id" :key="item.Id"></el-option>
</el-select> </el-select>
</li> </li>
<li><span><em>报名日期</em><el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <li><span><em>{{$t('fnc.bmriqi')}}</em><el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
- -
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span> </span>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<input <input
type="button" type="button"
class="hollowFixedBtn" class="hollowFixedBtn"
value="查询" :value="$t('pub.searchBtn')"
@click="resetPageIndex();getList()" @click="resetPageIndex();getList()"
> >
</li> </li>
...@@ -96,13 +96,13 @@ ...@@ -96,13 +96,13 @@
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-qian groupTourOrder_count_green"></i> <i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>销售额统计</span> <span>{{$t('Operation.Op_salesTotal')}}</span>
</div> </div>
<p> <p>
<span>应收款：{{countData.PreferPrice}};</span> <span>{{$t('Operation.Op_yingPay')}}：{{countData.PreferPrice}};</span>
<span>已收款：{{countData.Income}};</span> <span>{{$t('Operation.Op_yiShou')}}：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span> <span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">{{$t('Operation.Op_weiShou')}}：{{countData.DueinMoney}};</span>
<span>在途金额：{{countData.ZaiTu}};</span> <span>{{$t('fnc.ztjine')}}：{{countData.ZaiTu}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -110,13 +110,13 @@ ...@@ -110,13 +110,13 @@
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_blue"> <div class="groupTourOrder_count_blue">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
<span>正常报名人数</span> <span>{{$t('fnc.zcbmrenshu')}}</span>
<span>{{countData.NormalGuestNum}}</span> <span>{{countData.NormalGuestNum}}</span>
</div> </div>
<p> <p>
<span>经济舱：{{countData.NormalYSeatNum}};</span> <span>{{$t('Airticket.Air_EconomyClass')}}：{{countData.NormalYSeatNum}};</span>
<span>商务舱：{{countData.NormalESeatNum}};</span> <span>{{$t('Airticket.Air_businessClass')}}：{{countData.NormalESeatNum}};</span>
<span>头等舱：{{countData.NormalFSeatNum}};</span> <span>{{$t('Airticket.Air_firstClass')}}：{{countData.NormalFSeatNum}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -124,13 +124,13 @@ ...@@ -124,13 +124,13 @@
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div class="groupTourOrder_count_yellow"> <div class="groupTourOrder_count_yellow">
<i class="iconfont icon-baomingrenshu"></i> <i class="iconfont icon-baomingrenshu"></i>
<span>取消人数</span> <span>{{$t('fnc.qxrenshu')}}</span>
<span>{{countData.CancelGuestNum}}</span> <span>{{countData.CancelGuestNum}}</span>
</div> </div>
<p> <p>
<span>经济舱：{{countData.CancelYSeatNum}};</span> <span>{{$t('Airticket.Air_EconomyClass')}}：{{countData.CancelYSeatNum}};</span>
<span>商务舱：{{countData.CancelESeatNum}};</span> <span>{{$t('Airticket.Air_businessClass')}}：{{countData.CancelESeatNum}};</span>
<span>头等舱：{{countData.CancelFSeatNum}};</span> <span>{{$t('Airticket.Air_firstClass')}}：{{countData.CancelFSeatNum}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>其他统计项</span> <span>{{$t('fnc.qtxtongji')}}</span>
</div> </div>
<p> <p>
<span>内部报名：{{countData.InteriorNum}};</span> <span>{{$t('fnc.nbbaoming')}}：{{countData.InteriorNum}};</span>
<span>B2B/WAP网络报名：{{countData.B2BNum}};</span> <span>{{$t('fnc.B2BWAP')}}：{{countData.B2BNum}};</span>
</p> </p>
</div> </div>
</el-col> </el-col>
...@@ -150,24 +150,24 @@ ...@@ -150,24 +150,24 @@
<div class="groupTourOrder_count_item"> <div class="groupTourOrder_count_item">
<div> <div>
<i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i> <i class="iconfont icon-tongji1 groupTourOrder_count_gray"></i>
<span>财务单据说明</span> <span>{{$t('fnc.cwdjshuoming')}}</span>
</div> </div>
<p> <p>
<span class="groupTourOrderByTuan_ico"> <span class="groupTourOrderByTuan_ico">
<i style="background-color:#0000ff"></i> <i style="background-color:#0000ff"></i>
<span>已打单</span> <span>{{$t('fnc.yidadan')}}</span>
</span> </span>
<span class="groupTourOrderByTuan_ico"> <span class="groupTourOrderByTuan_ico">
<i style="background-color:#008000"></i> <i style="background-color:#008000"></i>
<span>平台出纳已审核</span> <span>{{$t('fnc.ptcnyshenhe')}}</span>
</span> </span>
<span class="groupTourOrderByTuan_ico"> <span class="groupTourOrderByTuan_ico">
<i style="background-color:#ff0000"></i> <i style="background-color:#ff0000"></i>
<span>银行出纳已审核</span> <span>{{$t('fnc.yhcnyshenhe')}}</span>
</span> </span>
<span class="groupTourOrderByTuan_ico"> <span class="groupTourOrderByTuan_ico">
<i style="background-color:#000000"></i> <i style="background-color:#000000"></i>
<span>已通过</span> <span>{{$t('fnc.ytongguo')}}</span>
</span> </span>
</p> </p>
</div> </div>
...@@ -184,31 +184,31 @@ ...@@ -184,31 +184,31 @@
v-loading="loading" v-loading="loading"
> >
<tr> <tr>
<th width="80">单号&团号</th> <th width="80">{{$t('fnc.danhao')}}&{{$t('visa.v_tuanhao')}}</th>
<th width="70">类型</th> <th width="70">{{$t('advmanager.v_type')}}</th>
<th width="180">系列&线路</th> <th width="180">{{$t('advmanager.v_xilie')}}&{{$t('advmanager.v_line')}}</th>
<th width="50">人数</th> <th width="50">{{$t('admin.admin_personNumber')}}</th>
<th width="80">单价</th> <th width="80">{{$t('fnc.danjia')}}</th>
<th width="80">成交单价</th> <th width="80">{{$t('fnc.cjdanjia')}}</th>
<th width="80">应收总额</th> <th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">实收</th> <th width="80">{{$t('fnc.shishou')}}</th>
<th width="80">优惠</th> <th width="80">{{$t('fnc.youhui')}}</th>
<th width="60">小费</th> <th width="60">{{$t('fnc.xiaofei')}}</th>
<th width="80">退款</th> <th width="80">{{$t('fnc.tuikuan')}}</th>
<th width="80">平台税金</th> <th width="80">{{$t('fnc.ptshuijin')}}</th>
<th width="80">平台在途</th> <th width="80">{{$t('Operation.Op_platZaitu')}}</th>
<th width="80">待收金额</th> <th width="80">{{$t('Operation.Op_daishou')}}</th>
<th width="60">状态</th> <th width="60">{{$t('admin.admin_status')}}</th>
<th width="60">客户信息</th> <th width="60">{{$t('fnc.khxinxi')}}</th>
<th v-if="userId==1" width="130">操作</th> <th v-if="userId==1" width="130">{{$t('system.table_operation')}}</th>
</tr> </tr>
<tr> <tr>
<td v-show="OrderList.length==0" colspan="15" align="center">暂无数据</td> <td v-show="OrderList.length==0" colspan="15" align="center">{{$t('system.content_noData')}}</td>
</tr> </tr>
<tbody v-for="(item,index) in OrderList" :key="index"> <tbody v-for="(item,index) in OrderList" :key="index">
<tr> <tr>
<td rowspan="2"> <td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p> <p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p <p
class="fbold over_ellipsis" class="fbold over_ellipsis"
style="width: 100%;cursor:pointer;" style="width: 100%;cursor:pointer;"
...@@ -261,29 +261,29 @@ ...@@ -261,29 +261,29 @@
<div class="personNolayer"> <div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
<th>优惠券名称</th> <th>{{$t('active.cl_couponName')}}</th>
<th>优惠券类型</th> <th>{{$t('active.cl_couponType')}}</th>
<th>抵扣金额/折扣</th> <th>{{$t('active.cl_dkjezk')}}</th>
<th>使用条件</th> <th>{{$t('active.cl_sytiaojian')}}</th>
<th>获取方式</th> <th>{{$t('active.cl_huoqufangshi')}}</th>
<th>获取日期</th> <th>{{$t('active.cl_hqriqi')}}</th>
</tr> </tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2"> <tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td> <td>{{item2.couponsName}}</td>
<td> <td>
<span v-if="item2.couponsType==1">抵用券</span> <span v-if="item2.couponsType==1">{{$t('active.cl_dyquan')}}</span>
<span v-if="item2.couponsType==2">折扣卷</span> <span v-if="item2.couponsType==2">{{$t('active.cl_zkquan')}}</span>
</td> </td>
<td>{{item2.denomination}}</td> <td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td> <td>{{$t('active.cl_man')}}{{item2.useCondition}}{{$t('active.cl_keyong')}}</td>
<td> <td>
<span v-if="item2.accessType==1">抽奖</span> <span v-if="item2.accessType==1">{{$t('active.cl_choujiang')}}</span>
<span v-else></span> <span v-else></span>
</td> </td>
<td>{{item2.acessDate}}</td> <td>{{item2.acessDate}}</td>
</tr> </tr>
<tr v-if='item.couponAllotList.length==0'> <tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td> <td colspan="6" align="center">{{$t('system.content_noData')}}</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
<td>{{item.platformTax}}</td> <td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td> <td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">{{$t('fnc.shousun')}}</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td> <td>
<p <p
...@@ -318,14 +318,14 @@ ...@@ -318,14 +318,14 @@
</div> --> </div> -->
<div> <div>
<div> <div>
<span>备注：</span> <span>{{$t('hotel.hotel_remark')}}：</span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p> <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p>
</div> </div>
<div> <div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<el-popover width="600" placement="bottom-end" trigger="click"> <el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover"> <div class="groupTourOrder_remarks_popover">
<div>历史备注</div> <div>{{$t('fnc.lsbeizhu')}}</div>
<p <p
v-if="item.remarksList.length !== 0" v-if="item.remarksList.length !== 0"
v-for="(item2, index2) in item.remarksList" v-for="(item2, index2) in item.remarksList"
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<span style="color: #666666;">{{item2.createDate}}</span> <span style="color: #666666;">{{item2.createDate}}</span>
</span> </span>
</p> </p>
<span v-if="item.remarksList.length === 0">暂无数据</span> <span v-if="item.remarksList.length === 0">{{$t('system.content_noData')}}</span>
</div> </div>
<el-button <el-button
slot="reference" slot="reference"
...@@ -351,7 +351,7 @@ ...@@ -351,7 +351,7 @@
</td> </td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>
<div style="white-space: nowrap">收款单据：<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span <span
v-if="item2.colorState===1" v-if="item2.colorState===1"
...@@ -382,7 +382,7 @@ ...@@ -382,7 +382,7 @@
</div> </div>
</div> </div>
<div> <div>
<div style="white-space: nowrap">付款单据：<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <div style="white-space: nowrap">{{$t('fnc.fkdanju')}}：<span v-if="item.financeList.length===0" style="cursor: default;">{{$t('system.content_noData')}}</span>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span <span
v-if="item2.colorState===1" v-if="item2.colorState===1"
......
src/components/dmc/manager/tripsManager.vue
View file @ b45895be
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>系列名称</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option>
...@@ -346,14 +346,14 @@ ...@@ -346,14 +346,14 @@
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder></el-date-picker> value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter"
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>团队状态</em> <em>{{$t('scen.sc_temStatu')}}</em>
<el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.QTCState" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id" <el-option v-for="tcItem in $tripUtils.TeamStatesList.TeamStates" :label="tcItem.Name" :key="tcItem.Id"
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>出团公司</em> <em>{{$t('scen.sc_cp')}}</em>
<el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.OutBranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.BranchDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.BranchDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option> <el-option v-for="item in queryCommonData.BranchList" :label="item.BName" :key="item.Id" :value="item.Id">{{item.BName}}</el-option>
...@@ -381,7 +381,7 @@ ...@@ -381,7 +381,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>合团团号</em> <em>{{$t('Operation.Op_hetuan')}}</em>
<el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.CombinationNum" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
...@@ -418,16 +418,16 @@ ...@@ -418,16 +418,16 @@
<td> <td>
<div class="d2" style="width: 100%!important;"> <div class="d2" style="width: 100%!important;">
<p class="TCLflight_GO"> <p class="TCLflight_GO">
<i class="iconfont icon-hangban1"></i>航班 <i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}
</p> </p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th> <th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th> <th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">起飞时间</th> <th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">到达时间</th> <th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">经停城市</th> <th width="100">{{$t('system.query_stopCity')}}</th>
</tr> </tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;"> <tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
...@@ -457,8 +457,8 @@ ...@@ -457,8 +457,8 @@
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}} <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>{{subItem.DepartureName}}
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
{{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}} {{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span> <span v-if="subItem.FlightState==1" class="TCL-greenType">【{{$t('pub.sureBtn')}}】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span> <span v-if="subItem.FlightState==2" class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span> </span>
</div> </div>
</div> </div>
...@@ -468,11 +468,11 @@ ...@@ -468,11 +468,11 @@
<td> <td>
<div class="d3"> <div class="d3">
<p> <p>
<i class="iconfont icon-tuandui"></i>团队信息 <i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}
<em>{{item.DayNum}}天{{item.NightNum}}晚</em> <em>{{item.DayNum}}天{{item.NightNum}}晚</em>
</p> </p>
<p> <p>
<span>出发时间</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
{{item.StartDate}} {{item.StartDate}}
</p> </p>
...@@ -481,36 +481,36 @@ ...@@ -481,36 +481,36 @@
<td> <td>
<div class="d5"> <div class="d5">
<p> <p>
<i class="iconfont icon-tuanwei"></i>团位信息 <i class="iconfont icon-tuanwei"></i>{{$t('visa.v_tuanweiinfo')}}
</p> </p>
<p> <p>
<span>舱位</span> <span>{{$t('Operation.Op_shipNum')}}</span>
<i> {{item.YSeat}}Y + {{item.FSeat}}F + {{item.CSeat}}F </i> <i> {{item.YSeat}}Y + {{item.FSeat}}F + {{item.CSeat}}F </i>
</p> </p>
<p> <p>
<span>已报入</span> <span>{{$t('visa.v_yibaoru')}}</span>
<i>{{item.Seat==''?"0":item.Seat}}人</i> <i>{{item.Seat==''?"0":item.Seat}}人</i>
<!-- (占位：{{item.Occupied}}人) --> <!-- (占位：{{item.Occupied}}人) -->
</p> </p>
<p> <p>
<span>候补</span> <span>{{$t('visa.v_houbu')}}</span>
<span v-if="item.IsSubstitution==1">允许候补</span> <span v-if="item.IsSubstitution==1">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">不允许候补</span> <span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
</p> </p>
</div> </div>
</td> </td>
<td width="240"> <td width="240">
<div class="d7"> <div class="d7">
<el-button-group v-if='outItem.TravelPriceList.length>1'> <el-button-group v-if='outItem.TravelPriceList.length>1'>
<el-button @click.native='chaiTuan(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">团队分拆</el-button> <el-button @click.native='chaiTuan(item)' type="primary" style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_chaifen')}}</el-button>
</el-button-group> </el-button-group>
</div> </div>
</td> </td>
</tr> </tr>
<tr height="40"> <tr height="40">
<td colspan="5" style="padding-left: 30px;"> <td colspan="5" style="padding-left: 30px;">
<div>备注：{{item.OPRemark}}</div> <div>{{$t('fnc.beizhu')}}：{{item.OPRemark}}</div>
<div v-if="item.DmcRemarkLast">地接备注：{{item.DmcRemarkLast.DMCRemark}}</div> <div v-if="item.DmcRemarkLast">{{$t('Operation.Op_dijieRemark')}}：{{item.DmcRemarkLast.DMCRemark}}</div>
</td> </td>
</tr> </tr>
</template> </template>
......
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ b45895be
...@@ -275,6 +275,7 @@ ...@@ -275,6 +275,7 @@
/*初始化组件*/ /*初始化组件*/
init() { init() {
this.$emit("headCallBack", this.PostConfig); this.$emit("headCallBack", this.PostConfig);
console.log(this.PostConfig,'postconfig');
}, },
//上传图片 //上传图片
reUpload(file) { reUpload(file) {
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ b45895be
...@@ -401,6 +401,7 @@ ...@@ -401,6 +401,7 @@
//初始化团的幻灯片 //初始化团的幻灯片
initFileList() { initFileList() {
this.PostConfig.fileList=[];
for (var i = 0; i < 5; i++) { for (var i = 0; i < 5; i++) {
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
this.PostConfig.fileList.push(fileObj); this.PostConfig.fileList.push(fileObj);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ b45895be
...@@ -21,7 +21,12 @@ ...@@ -21,7 +21,12 @@
.TPDateContent .currentInput { .TPDateContent .currentInput {
background-color: transparent; background-color: transparent;
} }
/* .TPDateContent .month ul li {
font-size: 12px;
position: relative;
float: left;
letter-spacing: 3px;
} */
.TP_tips { .TP_tips {
display: inline-block; display: inline-block;
padding: 5px; padding: 5px;
...@@ -328,7 +333,6 @@ ...@@ -328,7 +333,6 @@
cursor: default !important; cursor: default !important;
box-shadow: none !important; box-shadow: none !important;
} }
</style> </style>
<template> <template>
...@@ -348,18 +352,23 @@ ...@@ -348,18 +352,23 @@
<div class="TPDateContent" id="DayAll"> <div class="TPDateContent" id="DayAll">
<div class="month"> <div class="month">
<ul> <ul>
<li> <li style="margin:0 0 0 20px;">
<i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">&lt;</i> <i class="arrow monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)">&lt;</i>
<input type="text" v-model="currentYear" disabled class="currentInput" <input type="text" v-model="currentYear" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)">年 @input="getDateString(),initCalendar(dateString)">年
<i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">&gt;</i> <i class="arrow monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)">&gt;</i>
</li> </li>
<li> <li style="margin:0 40px 0 40px;">
<i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">&lt;</i> <i class="arrow monthminus" @click="pickPre(currentYear,currentMonth)">&lt;</i>
<input type="text" v-model="currentMonth" disabled class="currentInput" <input type="text" v-model="currentMonth" disabled class="currentInput"
@input="getDateString(),initCalendar(dateString)">月 @input="getDateString(),initCalendar(dateString)">月
<i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">&gt;</i> <i class="arrow monthadd" @click="pickNext(currentYear,currentMonth)">&gt;</i>
</li> </li>
<li style="margin:25px 0 0 0;">
<div class="ckAll">
<el-checkbox class="checkBox" v-model='isCheckAll' @change="checkAll">全选</el-checkbox>
</div>
</li>
</ul> </ul>
</div> </div>
<!-- 星期 --> <!-- 星期 -->
...@@ -816,6 +825,7 @@ ...@@ -816,6 +825,7 @@
data() { data() {
return { return {
outerVisible: false, outerVisible: false,
isCheckAll: false,
currentDay: 1, currentDay: 1,
currentMonth: 1, currentMonth: 1,
currentYear: 1970, currentYear: 1970,
...@@ -1014,6 +1024,76 @@ ...@@ -1014,6 +1024,76 @@
break; break;
} }
}, },
//日历全选
checkAll() {
this.returnPriceList=[];
if(this.isCheckAll){
this.days.forEach(x=>{
x.checkState='1';
let obj = {
AdImage:'',
AirTicketId:0,
AirportService:'',
AirticketBindList:[],
AirticketMoney:0,
B2BMemberPrice:0,
B2BPrice:0,
B2CMemberPrice:0,
B2CPrice:0,
BabyChargePrice:0,
BabyPrice:0,
BackSafeMoney:0,
BackVisaPrice:0,
CSeat:0,
CanSellTicketNum:0,
Checked:false,
ChildNeedPrice:0,
ChildNoNeedPrice:0,
ChooseHotelArray:[],
ClearOrderHour:'',
ContractArray:[],
ContractUrl:'',
DeleteAirticketIds:'',
DiscountPrice:0,
FSeat:0,
GatherAddress:'',
GatherTag:'',
GatherTime:'',
Inventory:0,
IsB2B:0,
IsB2C:0,
IsBookTeam:0,
IsNew:false,
IsOrder: 0,
IsSubstitution: 1,
IsSupportChildren: 1,
LeaderNum: 0,
OPRemark: "",
OfferId: 0,
OldManChargePrice: 0,
OtherPrice: 0,
OutBranchId: 0,
PeopleNum: 0,
PriceFlight: [],
RebatePrice: 0,
SafeMoney: 0,
SaleBranchId: "",
SaleBranchIdArray: [],
SendVisaTime: "",
SingleDMCPrice: 0,
SingleRoomPrice: 0,
StartDate: this.getDayStr(x.day),
TCID: 0,
TCSaleState: 1,
VisaPrice: 0,
YSeat: 0,
}
this.returnPriceList.push(obj);
})
}
},
//单团期修改重置日历选中 //单团期修改重置日历选中
initDatePickerCheched() { initDatePickerCheched() {
......
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