Skip to content

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

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

parents 527ff0dd 3e14311e
Show whitespace changes
Inline Side-by-side
Showing with 472 additions and 225 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ 997f788d
...@@ -1701,7 +1701,7 @@ export default { ...@@ -1701,7 +1701,7 @@ export default {
if(that.Ststus==1){ if(that.Ststus==1){
if(this.AuditOrRefundMsg.Status=='5'){ if(this.AuditOrRefundMsg.Status=='5'){
if(that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){ if(that.GetDetail.AccountNumber && that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){
if(this.allMoney==0){ if(this.allMoney==0){
this.Error("请将信息填写完整！") this.Error("请将信息填写完整！")
return; return;
...@@ -1894,17 +1894,17 @@ export default { ...@@ -1894,17 +1894,17 @@ export default {
this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{ this.apipost('AccountType_post_GetList',this.queryAccMsg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data=res.data.data; let data=res.data.data;
// if(this.RB_Post_Id!=5){ if(this.RB_Post_Id!=5){
// data.forEach(item=>{ data.forEach(item=>{
// if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){ if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="地接部专户" && item.Name!="老挝购物店资金池"){
// this.AccList.push(item); this.AccList.push(item);
// } }
// }) })
// }else{ }else{
// this.AccList = res.data.data;
// }
this.AccList = res.data.data; this.AccList = res.data.data;
}
// this.AccList = res.data.data;
}else{ }else{
this.$message.error(res.data.message); this.$message.error(res.data.message);
} }
......
src/components/SalesModule/productQuery.vue
View file @ 997f788d
...@@ -144,6 +144,17 @@ ...@@ -144,6 +144,17 @@
.PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;} .PQ_detail tr th,.v-table-title-cell{background: #E6E6E6;height:40px; font-size: 14px;border-right:1px solid #e6e6e6;color: #333;}
.PQ_detail tr{background: #fff;text-align: center; height: 40px;} .PQ_detail tr{background: #fff;text-align: center; height: 40px;}
.PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;} .PQ_detail tr td{font-size: 12px;border: 1px solid #E5E5E5;}
.TC_HotelPop >div{
overflow: auto;
max-height:350px;
}
.TC_HotelPop table td{
padding:5px 0;
text-align: center;
}
.TC_HotelPop table th{
text-align: center;
}
</style> </style>
<template> <template>
<div class="flexOne"> <div class="flexOne">
...@@ -159,7 +170,7 @@ ...@@ -159,7 +170,7 @@
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="客户类型" prop="CustomerType"> <el-form-item label="客户类型" prop="CustomerType">
<el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice();getDdlyList();getKhmdList();getTotalPrice()'> <el-select v-model='addMsg.CustomerType' filterable :placeholder="$t('pub.pleaseSel')" @change='getTypePrice(),resetSelect();getDdlyList();getKhmdList();getTotalPrice()'>
<el-option v-for="item in khlxList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in khlxList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -771,6 +782,51 @@ ...@@ -771,6 +782,51 @@
<span slot="reference" class="price">查看价格明细</span> <span slot="reference" class="price">查看价格明细</span>
</el-popover> </el-popover>
</p> </p>
<!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th width="100" style="border-right:1px solid #E5E5E5">占房时间</th>
</tr>
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding:3px 10px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
</template>
</template>
</td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td>
</tr>
</table>
</div>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p> -->
</div> </div>
<div class="d5"> <div class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p> <p><i class="iconfont icon-tuanwei"></i>团位信息</p>
...@@ -1497,21 +1553,24 @@ ...@@ -1497,21 +1553,24 @@
} }
}, err => {}) }, err => {})
}, },
resetSelect(){
if (this.addMsg.CustomerType == 1) {
this.addMsg.CustomerId = ''
}
if (this.addMsg.CustomerType == 2) {
this.addMsg.CustomerId = ''
}
},
getTypePrice() { getTypePrice() {
this.addMsg.ContactName = '' this.addMsg.ContactName = ''
this.addMsg.ContactMobile = '' this.addMsg.ContactMobile = ''
console.log('this.addMsg.CustomerType', this.addMsg.CustomerType)
if (this.addMsg.CustomerType == 1) { if (this.addMsg.CustomerType == 1) {
this.addMsg.TC_Price = this.addObj.B2BMemberPrice this.addMsg.TC_Price = this.addObj.B2BMemberPrice
this.addMsg.Unit_Price = this.addObj.B2BMemberPrice; this.addMsg.Unit_Price = this.addObj.B2BMemberPrice;
this.addMsg.CustomerId = ''
} }
if (this.addMsg.CustomerType == 2) { if (this.addMsg.CustomerType == 2) {
this.addMsg.TC_Price = this.addObj.B2BPrice this.addMsg.TC_Price = this.addObj.B2BPrice
this.addMsg.Unit_Price = this.addObj.B2BPrice; this.addMsg.Unit_Price = this.addObj.B2BPrice;
this.addMsg.CustomerId = ''
} }
if (this.addMsg.CustomerType == 3) { if (this.addMsg.CustomerType == 3) {
this.addMsg.TC_Price = this.addObj.B2CMemberPrice this.addMsg.TC_Price = this.addObj.B2CMemberPrice
...@@ -1990,9 +2049,9 @@ ...@@ -1990,9 +2049,9 @@
for (let i = 0; i < res.data.data.pageData.length; i++) { for (let i = 0; i < res.data.data.pageData.length; i++) {
res.data.data.pageData[i]['wxImage'] = '' res.data.data.pageData[i]['wxImage'] = ''
} }
this.list = res.data.data.pageData this.list = res.data.data.pageData;
} else { } else {
this.$message.error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
...@@ -2010,7 +2069,7 @@ ...@@ -2010,7 +2069,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.tripDetails = res.data.data.FlightList this.tripDetails = res.data.data.FlightList
} else { } else {
this.$message.error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 997f788d
...@@ -43,11 +43,6 @@ ...@@ -43,11 +43,6 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; "> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="ShoppingTable" <table border="0" cellspacing="1" cellpadding="0" class="ShoppingTable"
style="border: 1px solid rgb(230, 230, 230);min-width: 1600px" v-loading="loading"> style="border: 1px solid rgb(230, 230, 230);min-width: 1600px" v-loading="loading">
<!-- <tr>
<th colspan="2">公司通用信息</th>
<th colspan="6">导游操作</th>
<th colspan="9">地接OP</th>
</tr> -->
<tr> <tr>
<th width="115">序号</th> <th width="115">序号</th>
<th width="100">出发地</th> <th width="100">出发地</th>
......
src/components/Ticketing/PassengerList.vue
View file @ 997f788d
...@@ -3,96 +3,113 @@ ...@@ -3,96 +3,113 @@
width: 100%; width: 100%;
background-color: #fff; background-color: #fff;
border-collapse: collapse; border-collapse: collapse;
} }
.PT_teamTable td,
.PT_teamTable th { .PT_teamTable td,
.PT_teamTable th {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
padding: 6px; padding: 6px;
height: 30px; height: 30px;
} }
.PT_teamTable tr th {
.PT_teamTable tr th {
height: 30px; height: 30px;
background-color: #297bef; background-color: #297bef;
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
color: #fff; color: #fff;
} }
.Tp_table .el-table td {
.Tp_table .el-table td {
padding: 0 !important; padding: 0 !important;
} }
.Tp_table .el-table th {
.Tp_table .el-table th {
padding: 12px 0 !important; padding: 12px 0 !important;
} }
.Tp_table .has-gutter th {
.Tp_table .has-gutter th {
background-color: #dcdcdc; background-color: #dcdcdc;
} }
.Tp_table .el-table .cell {
.Tp_table .el-table .cell {
line-height: 3 !important; line-height: 3 !important;
} }
.passgenrDialog{
width:1000px; .passgenrDialog {
} width: 1000px;
.PgflightDiv{ }
.PgflightDiv {
font-size: 12px; font-size: 12px;
color: #666666; color: #666666;
background-color: #e0f4ff; background-color: #e0f4ff;
width: 230px; width: 230px;
height: 175px; height: 175px;
border-radius: 4px; border-radius: 4px;
float:left; float: left;
margin-right:10px; margin-right: 10px;
} }
.PgflightDiv p:first-child{
padding-left:8px; .PgflightDiv p:first-child {
padding-left: 8px;
color: #387ea5; color: #387ea5;
background-color: #cbe9fa; background-color: #cbe9fa;
height: 34px; height: 34px;
line-height: 34px; line-height: 34px;
} }
.PgflightDiv ._add_info{
.PgflightDiv ._add_info {
margin-top: 12px; margin-top: 12px;
padding: 0 12px; padding: 0 12px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
} }
.pg_table{
width:100%; .pg_table {
} width: 100%;
.pg_table tr{ }
.pg_table tr {
display: block; display: block;
margin:10px 0; margin: 10px 0;
} }
.pg_table tr:last-child{
border-top:1px dashed #d1d1d1; .pg_table tr:last-child {
padding-top:10px; border-top: 1px dashed #d1d1d1;
} padding-top: 10px;
.PassengerList .el-input__inner{ }
height:23px!important;
padding:0 5px; .PassengerList .el-input__inner {
} height: 23px !important;
.Pgzhu{ padding: 0 5px;
}
.Pgzhu {
display: inline-block; display: inline-block;
width:30px; width: 30px;
height:30px; height: 30px;
background-color: #E95252; background-color: #E95252;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
color:#fff; color: #fff;
position: absolute; position: absolute;
top:-35px; top: -35px;
left:-20px; left: -20px;
} }
.Pglian{
.Pglian {
background-color: #47bf8c; background-color: #47bf8c;
display: inline-block; display: inline-block;
width:30px; width: 30px;
height:30px; height: 30px;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
line-height: 30px; line-height: 30px;
color:#fff; color: #fff;
} }
</style> </style>
<template> <template>
...@@ -118,17 +135,22 @@ ...@@ -118,17 +135,22 @@
<li> <li>
<input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" /> <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo(),getCombinTeam()" />
<input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" /> <input type="button" class="normalBtn" v-if="isShowGuoji" value="制作财务单据" @click="makeFinacelDoc()" />
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;"/> <input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" style="display:none;" />
</li> </li>
</ul> </ul>
</div> </div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')" v-model="checkdGuoji"/></th> <th v-if="isShowGuoji">国际机票 <input type="checkbox" @change="checkAllbox(checkdGuoji,'guoji')"
<th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')" v-model="checkedGuonei"/></th> v-model="checkdGuoji" /></th>
<th v-if="isShowGuoji">国际中段 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')" v-model="checkedGJzd"/></th> <th v-if="isShowGuoji">国内机票 <input type="checkbox" @change="checkAllbox(checkedGuonei,'guonei')"
<th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')" v-model="checkedshuijin"/></th> v-model="checkedGuonei" /></th>
<th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')" v-model="checkedsc"/></th> <th v-if="isShowGuoji">国际中段 <input type="checkbox" @change="checkAllbox(checkedGJzd,'gjzd')"
v-model="checkedGJzd" /></th>
<th v-if="isShowGuoji">税金 <input type="checkbox" @change="checkAllbox(checkedshuijin,'shuijin')"
v-model="checkedshuijin" /></th>
<th v-if="isShowGuoji">升舱 <input type="checkbox" @change="checkAllbox(checkedsc,'shengcang')"
v-model="checkedsc" /></th>
<th>旅客姓名</th> <th>旅客姓名</th>
<th>身份证</th> <th>身份证</th>
<th>英文姓</th> <th>英文姓</th>
...@@ -142,19 +164,19 @@ ...@@ -142,19 +164,19 @@
</tr> </tr>
<tr v-for="(item,index) in QueryMsg.dataList"> <tr v-for="(item,index) in QueryMsg.dataList">
<td v-if="isShowGuoji"> <td v-if="isShowGuoji">
<input v-model="item.guoji" type="checkbox"/> <input v-model="item.guoji" type="checkbox" />
</td> </td>
<td v-if="isShowGuoji"> <td v-if="isShowGuoji">
<input v-model="item.guonei" type="checkbox"/> <input v-model="item.guonei" type="checkbox" />
</td> </td>
<td v-if="isShowGuoji"> <td v-if="isShowGuoji">
<input v-model="item.gjzd" type="checkbox"/> <input v-model="item.gjzd" type="checkbox" />
</td> </td>
<td v-if="isShowGuoji"> <td v-if="isShowGuoji">
<input v-model="item.shuijin" type="checkbox"/> <input v-model="item.shuijin" type="checkbox" />
</td> </td>
<td v-if="isShowGuoji"> <td v-if="isShowGuoji">
<input v-model="item.shengcang" type="checkbox"/> <input v-model="item.shengcang" type="checkbox" />
</td> </td>
<td>{{item.GuestName}}</td> <td>{{item.GuestName}}</td>
<td>{{item.IdCard}}</td> <td>{{item.IdCard}}</td>
...@@ -171,8 +193,8 @@ ...@@ -171,8 +193,8 @@
<div class="noData" v-show="QueryMsg.noData"> <div class="noData" v-show="QueryMsg.noData">
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage"
:page-size='msg.PageSize' :total='msg.total'> layout="total,prev, pager, next, jumper" :page-size='msg.PageSize' :total='msg.total'>
</el-pagination> </el-pagination>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center> <el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
...@@ -191,17 +213,20 @@ ...@@ -191,17 +213,20 @@
<tr v-for="item in flightList"> <tr v-for="item in flightList">
<td>{{item.Flight_number}}</td> <td>{{item.Flight_number}}</td>
<td> <td>
<el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
</td> </td>
<td> <td>
<el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
</td> </td>
<td>{{item.FlightDate}}</td> <td>{{item.FlightDate}}</td>
<td>{{item.dName}}</td> <td>{{item.dName}}</td>
<td>{{item.aName}}</td> <td>{{item.aName}}</td>
</tr> </tr>
</table> </table>
<table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;" v-if="combineTeamList.length>0"> <table border="0" cellspacing="0" cellpadding="0" class="singeRowTable" style="margin-top:20px;"
v-if="combineTeamList.length>0">
<tr> <tr>
<td colspan="9" style="text-align:left;font-weight:bold;padding-left:5px">联运航班信息</td> <td colspan="9" style="text-align:left;font-weight:bold;padding-left:5px">联运航班信息</td>
</tr> </tr>
...@@ -224,9 +249,11 @@ ...@@ -224,9 +249,11 @@
<td>{{subItem.GoFlightDateStr}}</td> <td>{{subItem.GoFlightDateStr}}</td>
<td>{{subItem.GoFlight_number}}</td> <td>{{subItem.GoFlight_number}}</td>
<td> <td>
<el-input class="w60" v-model="subItem.GoDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="subItem.GoDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
<td> <td>
<el-input class="w60" v-model="subItem.GoArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="subItem.GoArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
</td> </td>
</td> </td>
<td>{{subItem.GoDepartAirportName}}</td> <td>{{subItem.GoDepartAirportName}}</td>
...@@ -237,9 +264,11 @@ ...@@ -237,9 +264,11 @@
<td>{{subItem.BackFlightDateStr}}</td> <td>{{subItem.BackFlightDateStr}}</td>
<td>{{subItem.BackFlight_number}}</td> <td>{{subItem.BackFlight_number}}</td>
<td> <td>
<el-input class="w60" v-model="subItem.BackDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="subItem.BackDepartTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
<td> <td>
<el-input class="w60" v-model="subItem.BackArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input> <el-input class="w60" v-model="subItem.BackArriveTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')">
</el-input>
</td> </td>
</td> </td>
<td>{{subItem.BackDepartAirportName}}</td> <td>{{subItem.BackDepartAirportName}}</td>
...@@ -281,19 +310,19 @@ ...@@ -281,19 +310,19 @@
outerVisible: false, outerVisible: false,
flightList: [], flightList: [],
combineTeamList: [], combineTeamList: [],
isShowGuoji:false, isShowGuoji: false,
jipiaoObj:{ jipiaoObj: {
guojiArr:[], guojiArr: [],
guoneiArr:[], guoneiArr: [],
gjzdArr:[], gjzdArr: [],
shuijinArr:[], shuijinArr: [],
shengcangArr:[] shengcangArr: []
}, },
checkdGuoji:false, checkdGuoji: false,
checkedGuonei:false, checkedGuonei: false,
checkedGJzd:false, checkedGJzd: false,
checkedshuijin:false, checkedshuijin: false,
checkedsc:false, checkedsc: false,
}; };
}, },
methods: { methods: {
...@@ -316,16 +345,15 @@ ...@@ -316,16 +345,15 @@
item.Sex = "女"; item.Sex = "女";
} }
}); });
if(this.isShowGuoji){ if (this.isShowGuoji) {
this.QueryMsg.dataList.forEach(x=>{ this.QueryMsg.dataList.forEach(x => {
x.guoji = false; x.guoji = false;
x.guonei=false; x.guonei = false;
x.gjzd = false; x.gjzd = false;
x.shuijin = false; x.shuijin = false;
x.shengcang = false; x.shengcang = false;
}) })
} }
console.log(this.QueryMsg.dataList);
} }
}, },
err => {} err => {}
...@@ -358,7 +386,7 @@ ...@@ -358,7 +386,7 @@
}, err => {}); }, err => {});
}, },
//是否确定 //是否确定
getIsSure(){ getIsSure() {
this.$confirm("是否确认航班信息?", "提示", { this.$confirm("是否确认航班信息?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
...@@ -458,30 +486,30 @@ ...@@ -458,30 +486,30 @@
err => {} err => {}
); );
}, },
makeFinacelDoc(){ makeFinacelDoc() {
this.jipiaoObj.guojiArr=[]; this.jipiaoObj.guojiArr = [];
this.jipiaoObj.guoneiArr=[]; this.jipiaoObj.guoneiArr = [];
this.jipiaoObj.gjzdArr=[]; this.jipiaoObj.gjzdArr = [];
this.jipiaoObj.shuijinArr=[]; this.jipiaoObj.shuijinArr = [];
this.jipiaoObj.shengcangArr=[]; this.jipiaoObj.shengcangArr = [];
this.QueryMsg.dataList.forEach(x=>{ this.QueryMsg.dataList.forEach(x => {
if(x.guoji){ if (x.guoji) {
this.jipiaoObj.guojiArr.push(x.GuestName); this.jipiaoObj.guojiArr.push(x.GuestName);
} }
if(x.guonei){ if (x.guonei) {
this.jipiaoObj.guoneiArr.push(x.GuestName); this.jipiaoObj.guoneiArr.push(x.GuestName);
} }
if(x.gjzd){ if (x.gjzd) {
this.jipiaoObj.gjzdArr.push(x.GuestName); this.jipiaoObj.gjzdArr.push(x.GuestName);
} }
if(x.shuijin){ if (x.shuijin) {
this.jipiaoObj.shuijinArr.push(x.GuestName); this.jipiaoObj.shuijinArr.push(x.GuestName);
} }
if(x.shengcang){ if (x.shengcang) {
this.jipiaoObj.shengcangArr.push(x.GuestName); this.jipiaoObj.shengcangArr.push(x.GuestName);
} }
}) })
sessionStorage.setItem("guoji",JSON.stringify(this.jipiaoObj)); sessionStorage.setItem("guoji", JSON.stringify(this.jipiaoObj));
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
...@@ -489,12 +517,12 @@ ...@@ -489,12 +517,12 @@
Obj: JSON.parse(this.$route.query.Obj), Obj: JSON.parse(this.$route.query.Obj),
SourceID: this.$route.query.id, SourceID: this.$route.query.id,
TCIDList: JSON.parse(this.$route.query.TCIDList), TCIDList: JSON.parse(this.$route.query.TCIDList),
companyIDList:JSON.parse(this.$route.query.companyIDList), companyIDList: JSON.parse(this.$route.query.companyIDList),
isFromPassenger:true, isFromPassenger: true,
} }
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query: {
"Type": 2, "Type": 2,
"path": "", "path": "",
'blank': 'y', 'blank': 'y',
...@@ -503,14 +531,14 @@ ...@@ -503,14 +531,14 @@
}); });
}, },
//设置全选 //设置全选
checkAllbox(x,y){ checkAllbox(x, y) {
if(x){ if (x) {
this.QueryMsg.dataList.forEach(x=>{ this.QueryMsg.dataList.forEach(x => {
x[y]=true x[y] = true
}) })
}else{ } else {
this.QueryMsg.dataList.forEach(x=>{ this.QueryMsg.dataList.forEach(x => {
x[y]=false x[y] = false
}) })
} }
} }
...@@ -518,7 +546,7 @@ ...@@ -518,7 +546,7 @@
mounted() { mounted() {
this.QueryMsg.AirTicketId = this.$route.query.id; this.QueryMsg.AirTicketId = this.$route.query.id;
this.msg.AirTicketId = this.$route.query.id; this.msg.AirTicketId = this.$route.query.id;
if(this.$route.query.isFromTk!=undefined){ if (this.$route.query.isFromTk != undefined) {
this.isShowGuoji = this.$route.query.isFromTk; this.isShowGuoji = this.$route.query.isFromTk;
} }
var myDate = new Date(); var myDate = new Date();
...@@ -529,8 +557,8 @@ ...@@ -529,8 +557,8 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.getTeamInfo(); this.getTeamInfo();
if(this.isShowGuoji){ if (this.isShowGuoji) {
this.msg.PageSize=200; this.msg.PageSize = 200;
} }
this.getList(); this.getList();
} }
......
src/components/Ticketing/flightPerformance.vue 0 → 100644
View file @ 997f788d
<style>
.fpTable th {
border-bottom: 1px solid #d1d1d1;
border-right: 1px solid #d1d1d1;
}
</style>
<template>
<div class="flexOne">
<div class="query-box">
<ul>
<li>
<span>
<em>操作人</em>
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('system.ph_in')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>月份</em>
<el-date-picker v-model='msg.QMonth' value-format="yyyy-MM" type="month"></el-date-picker>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" @click="getList()" :value="$t('pub.searchBtn')" />
<input type="button" class="hollowFixedBtn" @click="DownLoad()" value="导出" />
</li>
</ul>
</div>
<table class="singeRowTable fpTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>团期</th>
<th>出团公司</th>
<th>线路</th>
<th>人数</th>
<th>操作人员</th>
</tr>
<tr v-for="item in dataList">
<td> <a style="color:blue;cursor:pointer" @click='goUrlT("RegistrationList",item.TCID,"报名清单")'>
({{item.TCID}}){{item.TCNUM}} </a></td>
<td>{{item.OutBranchName}}</td>
<td>{{item.LineName}}</td>
<td>{{item.TicketNum}}</td>
<td>{{item.CreateByName}}</td>
</tr>
</table>
</div>
</template>
<script>
export default {
data() {
return {
msg: {
LineId: 0, //线路编号
OutBranchId: -1, //出团公司
AirLineID: 0, //航空公司编号
CreateBy: 0, //操作人
QMonth: '', //月份
},
loading: false,
dataList: [],
//航空公司下拉
airlineList: [],
//操作人下拉
EmployeeList: [],
}
},
mounted() {
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
this.msg.QMonth = y + '-' + m;
this.initAirlines();
this.getEmployeeList();
this.getList()
},
methods: {
//页面跳转
goUrlT(path, obj, title) {
this.$router.push({
name: path,
query: {
"id": obj,
blank: 'y',
tab: title
}
})
},
//获取列表数据
getList() {
this.loading = true;
this.apipost("AirTicket_get_GetTicketPerformance", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
}
});
},
//初始化航空公司下拉
initAirlines() {
this.apipost(
"airline_post_GetList", {},
res => {
if (res.data.resultCode == 1) {
this.airlineList = res.data.data;
}
},
err => {}
);
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
this.apipost(
"admin_get_GetEmployeeByUserDepartmentId", {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
},
err => {}
);
},
//下载业绩数据
DownLoad() {
this.loading = true;
var fileName = "机票业绩下载" + this.msg.QMonth + ".xls";
this.GetLocalFile("AirTicket_get_DownLoadGetTicketPerformance", this.msg, fileName,
res => {
this.loading = false;
});
}
}
}
</script>
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 997f788d
...@@ -81,17 +81,21 @@ ...@@ -81,17 +81,21 @@
.TC_Content .avatar-uploader-icon { .TC_Content .avatar-uploader-icon {
height: auto; height: auto;
} }
.TC_HotelPop >div{
.TC_HotelPop>div {
overflow: auto; overflow: auto;
max-height:350px; max-height: 350px;
} }
.TC_HotelPop table td{
padding:5px 0; .TC_HotelPop table td {
padding: 5px 0;
text-align: center; text-align: center;
} }
.TC_HotelPop table th{
.TC_HotelPop table th {
text-align: center; text-align: center;
} }
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
...@@ -144,11 +148,11 @@ ...@@ -144,11 +148,11 @@
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input> @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li style="display:none;"> <li>
<span> <span>
<em>{{$t('hotel.hotel_SerialNumber')}}</em> <em>{{$t('hotel.hotel_SerialNumber')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCID" class="permiss-input w150"
@keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input>
</span> </span>
</li> </li>
<li> <li>
...@@ -569,8 +573,7 @@ ...@@ -569,8 +573,7 @@
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "> <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}} {{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a> <a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a 【<a style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div> {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList"> <template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div> <div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
...@@ -627,8 +630,13 @@ ...@@ -627,8 +630,13 @@
</p> </p>
<p> <p>
<span>{{$t('leader.leader_Leader')}}</span> <span>{{$t('leader.leader_Leader')}}</span>
<span v-if="item.LeaderName==null" class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span> <span v-if="item.LeaderName" class="TCL-greenType">{{item.LeaderName}}</span>
<span v-else class="TCL-greenType">{{item.LeaderName}}</span> <span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p>
<p>
<span>导游</span>
<span v-if="item.GuideName" class="TCL-greenType">{{item.GuideName}}</span>
<span v-else class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
</p> </p>
</div> </div>
</div> </div>
...@@ -647,24 +655,27 @@ ...@@ -647,24 +655,27 @@
<div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList">
<div class="TC_SeatList" v-if="item.BindNum>0 && item.TicketList"> <el-popover width="340" trigger="click" popper-class="TC_customerInfo">
<el-popover width="300" trigger="click" popper-class="TC_customerInfo"> <table width="340" border="0" cellspacing="0" cellpadding="0">
<table width="300" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="100">绑定数量</th> <th width="70">绑定数量</th>
<th width="100">机票数量</th> <th width="70">机票数量</th>
<th width="100">价格</th> <th width="70">价格</th>
<th width="130">PNR</th>
</tr> </tr>
<tr v-for="subItem in item.TicketList"> <tr v-for="subItem in item.TicketList">
<td>{{subItem.BindNum}}</td> <td>{{subItem.BindNum}}</td>
<td>{{subItem.TicketNum}}</td> <td>{{subItem.TicketNum}}</td>
<td>{{subItem.TicketPrice}}</td> <td>{{subItem.TicketPrice}}</td>
<td>{{subItem.PNR}}</td>
</tr> </tr>
</table> </table>
<span slot="reference" class="price" style="cursor:pointer" >机票信息</span> <span slot="reference" title="点击查看详情" class="price"
style="cursor:pointer;color:red;text-decoration: underline;">总机位数: {{item.TicketNum}}</span>
</el-popover> </el-popover>
</div> </div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
...@@ -1015,7 +1026,7 @@ ...@@ -1015,7 +1026,7 @@
RateOn: '-1', RateOn: '-1',
TeamType: 0, //一般常规团 TeamType: 0, //一般常规团
IsShowUnion: -1, IsShowUnion: -1,
TCID: '0', TCID: '',
HotelId: 0, //酒店编号 HotelId: 0, //酒店编号
HotelUseTime: "", //酒店使用时间 HotelUseTime: "", //酒店使用时间
}, },
...@@ -1191,12 +1202,18 @@ ...@@ -1191,12 +1202,18 @@
if (msg.DayNum == '') { if (msg.DayNum == '') {
msg.DayNum = -1 msg.DayNum = -1
} }
this.queryCommonData.loading = true if (msg.TCID == "") {
msg.TCID = 0;
}
this.queryCommonData.loading = true;
this.apipost( this.apipost(
'travel_get_GetTravelPrciePageList', 'travel_get_GetTravelPrciePageList',
msg, msg,
res => { res => {
this.queryCommonData.loading = false this.queryCommonData.loading = false;
if (this.queryMsg.TCID == "0") {
this.queryMsg.TCID = "";
}
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.dataList = res.data.data.pageData; this.queryCommonData.dataList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count this.queryMsg.total = res.data.data.count
......
src/components/scenicSpot/scenicSpotInfoManage.vue
View file @ 997f788d
...@@ -829,11 +829,11 @@ ...@@ -829,11 +829,11 @@
inputVisible2: false, inputVisible2: false,
inputValue2: "", inputValue2: "",
IsFreeList: [{ IsFreeList: [{
value: 0, value: 1,
label: "是" label: "是"
}, },
{ {
value: 1, value: 0,
label: "否" label: "否"
} }
], ],
......
src/components/scenicSpot/scenicSpotList.vue
View file @ 997f788d
...@@ -393,11 +393,11 @@ ...@@ -393,11 +393,11 @@
value: "-1", value: "-1",
label: "不限" label: "不限"
},{ },{
value: "0", value: "1",
label: "免费" label: "免费"
}, },
{ {
value: "1", value: "0",
label: "有价" label: "有价"
} }
], ],
......
src/router/config.js
View file @ 997f788d
...@@ -791,6 +791,14 @@ export default { ...@@ -791,6 +791,14 @@ export default {
title: '航班管理' title: '航班管理'
}, },
}, },
{
path: '/flightPerformance', //机票业绩
name: 'flightPerformance',
component: resolve => require(['@/components/Ticketing/flightPerformance'], resolve),
meta: {
title: '机票业绩'
},
},
{ {
path: '/flightChild', //航班子表管理 path: '/flightChild', //航班子表管理
name: 'flightChild', name: 'flightChild',
......
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