Skip to content

S
SuperMan
Commit 8ef2444f authored by 黄奎's avatar 黄奎
Browse files
Options

1

parent 3657dccf
Hide whitespace changes
Inline Side-by-side
Showing with 308 additions and 68 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 8ef2444f
...@@ -1070,6 +1070,7 @@ ...@@ -1070,6 +1070,7 @@
} }
} }
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => { this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
console.log("roomdataList",res.data);
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation; this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) { if (this.IsEditHotel == 0) {
......
src/components/SalesModule/productQuery2.vue
View file @ 8ef2444f
...@@ -238,7 +238,8 @@ ...@@ -238,7 +238,8 @@
<li> <li>
<span><em>{{ $t("scen.sc_cp") }}</em> <span><em>{{ $t("scen.sc_cp") }}</em>
<!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加--> <!--台湾印象只能看自公司的 不能切换 HK 2023-10-26 添加-->
<el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220" :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="msg.BranchId" filterable :disabled="CurrentUserInfo.RB_Branch_id==1220"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id"> <el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -290,10 +291,10 @@ ...@@ -290,10 +291,10 @@
<span><em>{{ $t("hotel.hotel_StarDate") }}</em> <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> --> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit> <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime"
@change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
- -
<el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" type="date"
type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker> :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
...@@ -638,9 +639,11 @@ ...@@ -638,9 +639,11 @@
Id: "", Id: "",
BName: "", BName: "",
}; };
obj.Id = x.Id.toString(); if (x.Id != 1248 && x.Id != 1255 && x.Id != 1256 && x.Id != 1256 && x.Id != 1258) {
obj.BName = x.BName; obj.Id = x.Id.toString();
this.companyList.push(obj); obj.BName = x.BName;
this.companyList.push(obj);
}
}); });
} }
}, },
......
src/components/Ticketing/TicketManager.vue
View file @ 8ef2444f
...@@ -1327,7 +1327,6 @@ ...@@ -1327,7 +1327,6 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('admin.admin_czPerson')}}</em> <em>{{$t('admin.admin_czPerson')}}</em>
...@@ -1444,7 +1443,6 @@ ...@@ -1444,7 +1443,6 @@
<el-dropdown-item command="2">{{$t('objFill.v101.duohdmbdru')}}</el-dropdown-item> <el-dropdown-item command="2">{{$t('objFill.v101.duohdmbdru')}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-dropdown @command="getDownLoad"> <el-dropdown @command="getDownLoad">
<el-button type="primary"> <el-button type="primary">
{{$t('objFill.v101.xiazaimob')}} {{$t('objFill.v101.xiazaimob')}}
...@@ -1534,7 +1532,24 @@ ...@@ -1534,7 +1532,24 @@
<span class="iconfont icon-img_yizi"></span> <span class="iconfont icon-img_yizi"></span>
</li> </li>
<li> <li>
<p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}}</p> <p class="_num3">{{item.TicketNum==null?'0':item.TicketNum}}
<template v-if="item.ChangeNum!=0">
<el-popover placement="top-start" title="变更记录" width="250" trigger="hover">
<table>
<template v-for="(cItem,cIndex) in item.ChangeList">
<tr :key="`c_`+cIndex">
<td>
{{cItem.TCNUM}}({{cItem.RelationTCID}}){{cItem.ChangeValue>0?'新增':'减少'}}
<font style="color:blue;">{{cItem.ChangeValue}}</font>人;
</td>
</tr>
</template>
</table>
<font style="color:blue" slot="reference"> {{item.ChangeNum>0?'+':'-'}}{{item.ChangeNum}}
</font>
</el-popover>
</template>
</p>
<p class="_wz">{{$t('Airticket.Air_reservation')}}</p> <p class="_wz">{{$t('Airticket.Air_reservation')}}</p>
</li> </li>
<li> <li>
...@@ -2042,6 +2057,7 @@ ...@@ -2042,6 +2057,7 @@
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>
</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"
label-width="100px"> label-width="100px">
<p class="_add_t">{{$t('Airticket.Air_AddTickets')}}</p> <p class="_add_t">{{$t('Airticket.Air_AddTickets')}}</p>
...@@ -2071,7 +2087,54 @@ ...@@ -2071,7 +2087,54 @@
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
<el-form-item :label="$t('Airticket.Air_Number')" prop="TicketNum"> <el-form-item :label="$t('Airticket.Air_Number')" prop="TicketNum">
<el-input v-model="addMsg.TicketNum" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input> <el-input v-model="addMsg.TicketNum" onkeyup="value=value.replace(/[^\d]/g,'')"
:disabled="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<template v-if="addMsg.TCIDList&&addMsg.TCIDList.length>0">
<el-button slot="append">
<el-popover width="450">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tbody>
<template v-for="(rootItem,rootIndex) in addMsg.ChangeList">
<tr :key="rootIndex">
<td>
团号:
<el-select v-model="rootItem.RelationTCID" filterable class="w180">
<el-option v-for="(subItem,subIndex) in addMsg.PriceList"
:key="subItem.TCID+`_`+subIndex" :value="subItem.TCID"
:label="subItem.TCNUM+`(`+subItem.TCID+`)`"></el-option>
</el-select>
</td>
<td>
人数:
<el-input v-model="rootItem.ChangeValue" class="w80"
@keyup.native="checkInteger(rootItem,'ChangeValue',true)">
</el-input>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-img_delete_small" style="cursor:pointer;"
@click="deleteChangeTicketNum(rootItem,rootIndex)"></i>
</el-tooltip>
</td>
</tr>
</template>
</tbody>
<tfoot>
<tr>
<td colspan="3" style="text-align:center;margin-top:10px;">
<el-tooltip class="item" effect="dark" content="点击添加" placement="top-start">
<i class="el-icon-plus" style="cursor:pointer;" @click="addChangeTicketNum()"></i>
</el-tooltip>
</td>
</tr>
</tfoot>
</table>
<p slot="reference" class="_wz _yiyong">机位变更</p>
</el-popover>
</el-button>
</template>
</el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -2343,6 +2406,7 @@ ...@@ -2343,6 +2406,7 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<!--命令导入-->
<el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules" <el-form class="addTicketManager" :class="command==true?'edHeight':''" :model="addMsg" :rules="rules"
ref="addMsgCmd" label-width="100px"> ref="addMsgCmd" label-width="100px">
<div class="combottomTitle">{{$t('Airticket.Air_orderImport')}}</div> <div class="combottomTitle">{{$t('Airticket.Air_orderImport')}}</div>
...@@ -2523,6 +2587,7 @@ ...@@ -2523,6 +2587,7 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<!--散卖机票-->
<el-form class="combottomDiv" v-if="sanmai" label-width="100px" :model="sales" :rules="salerules"> <el-form class="combottomDiv" v-if="sanmai" label-width="100px" :model="sales" :rules="salerules">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
...@@ -2571,6 +2636,7 @@ ...@@ -2571,6 +2636,7 @@
</div> </div>
</el-form> </el-form>
<!--修改中段PNR-->
<el-dialog custom-class="w400" :title="importFileTitle" :visible.sync="ZhongDuanPNR" center> <el-dialog custom-class="w400" :title="importFileTitle" :visible.sync="ZhongDuanPNR" center>
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item :label="$t('op.CenterPNR')"> <el-form-item :label="$t('op.CenterPNR')">
...@@ -2583,6 +2649,7 @@ ...@@ -2583,6 +2649,7 @@
@click="UpdateTicketState(ZhongDuanID, 2)">{{$t('pub.sureBtn')}}</button> @click="UpdateTicketState(ZhongDuanID, 2)">{{$t('pub.sureBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
<!--机票导入-->
<el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center> <el-dialog custom-class="w700" :title="importFileTitle" :visible.sync="outerVisible" center>
<el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()" <el-upload v-if="uploadDoc" ref="ticketUpload" drag class="upload-demo" :action="getImportFileUrl()"
:on-success="handleAvatarSuccess"> :on-success="handleAvatarSuccess">
...@@ -2594,7 +2661,7 @@ ...@@ -2594,7 +2661,7 @@
<div slot="tip" class="el-upload__tip">{{$t('ground.znscexcel')}}</div> <div slot="tip" class="el-upload__tip">{{$t('ground.znscexcel')}}</div>
</el-upload> </el-upload>
</el-dialog> </el-dialog>
<!--行程单上传-->
<el-dialog custom-class="w400" :title="$t('objFill.v101.xingchendsc')" :visible.sync="outerVisible1" center> <el-dialog custom-class="w400" :title="$t('objFill.v101.xingchendsc')" :visible.sync="outerVisible1" center>
<el-upload v-if="uploadDoc" ref="ticketUploadItinerary" drag class="upload-demo" :http-request="uploadItinerary" <el-upload v-if="uploadDoc" ref="ticketUploadItinerary" drag class="upload-demo" :http-request="uploadItinerary"
:on-success="handleAvatarItinerarySuccess" action> :on-success="handleAvatarItinerarySuccess" action>
...@@ -2810,7 +2877,6 @@ ...@@ -2810,7 +2877,6 @@
PayDate: "", PayDate: "",
CurrencyId: 1 CurrencyId: 1
}, },
ticketMsg: { ticketMsg: {
OldAirId: "", OldAirId: "",
NewAirId: "", NewAirId: "",
...@@ -2916,6 +2982,10 @@ ...@@ -2916,6 +2982,10 @@
B2BSellNum: 0, //可售机票数量 B2BSellNum: 0, //可售机票数量
TravelTicketType: 1, // 团票/散票： 1-系列票 2-散客票，3-临时票 TravelTicketType: 1, // 团票/散票： 1-系列票 2-散客票，3-临时票
OPRemark: "", //对OP备注 OPRemark: "", //对OP备注
TCIDList: [], //已绑定的团期(TCID)
PriceList: [], //已绑团期列表{TCID,TCNUM等}
ChangeList: [], //变更列表
}, },
//去程 //去程
addGoFlight: { addGoFlight: {
...@@ -3112,6 +3182,40 @@ ...@@ -3112,6 +3182,40 @@
}; };
}, },
methods: { methods: {
//新增团期绑定
addChangeTicketNum() {
if (this.addMsg.ChangeList) {
var tempObj = {
ChangeId: 0,
AirticketId: 0,
ChangType: 1,
ChangeValue: 0,
RelationTCID: 0,
}
this.addMsg.ChangeList.push(tempObj);
}
},
//删除绑定数据
deleteChangeTicketNum(rootItem, index) {
if (rootItem.ChangeId > 0) {
var dMsg = {
AirticketId: rootItem.AirticketId,
ChangeId: rootItem.ChangeId,
};
this.apipost(
"AirTicket_post_DeleteAirticketChange", dMsg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
this.addMsg.ChangeList.splice(index, 1);
},
//生成虚拟团 //生成虚拟团
createTravel(item) { createTravel(item) {
var that = this; var that = this;
...@@ -3172,7 +3276,6 @@ ...@@ -3172,7 +3276,6 @@
this.Btnloading = false; this.Btnloading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
// this.initMsg();
this.BillingChargeDialog = false this.BillingChargeDialog = false
this.getList(); this.getList();
} else { } else {
...@@ -3182,7 +3285,6 @@ ...@@ -3182,7 +3285,6 @@
err => {} err => {}
); );
}, },
BillingCharge(item, type) { BillingCharge(item, type) {
if (type) { if (type) {
this.BillingChargeTitle = this.$t('objFill.v101.kaipfyxianq') this.BillingChargeTitle = this.$t('objFill.v101.kaipfyxianq')
...@@ -3222,7 +3324,6 @@ ...@@ -3222,7 +3324,6 @@
this.MsgRAirServiceList.push(obj); this.MsgRAirServiceList.push(obj);
} }
}) })
}); });
this.computeBillingCharge() this.computeBillingCharge()
} }
...@@ -3232,7 +3333,6 @@ ...@@ -3232,7 +3333,6 @@
this.TotalNum = 0 this.TotalNum = 0
this.MsgRAirServiceList.forEach(x => { this.MsgRAirServiceList.forEach(x => {
x.TotalPrice = (x.GuestNum * x.UnitPrice) + Number(x.IncreaseIncome) x.TotalPrice = (x.GuestNum * x.UnitPrice) + Number(x.IncreaseIncome)
// this.TotalNum+=Number(x.GuestNum)
}) })
}, },
SelectFinaceId(val, index) { SelectFinaceId(val, index) {
...@@ -3284,7 +3384,6 @@ ...@@ -3284,7 +3384,6 @@
} }
}); });
}, },
IsPublicChange(val) { IsPublicChange(val) {
this.showDisable = false; this.showDisable = false;
this.Ticketform.ClientType = ""; this.Ticketform.ClientType = "";
...@@ -3321,10 +3420,6 @@ ...@@ -3321,10 +3420,6 @@
} }
this.Ticketform.vorcherInos = this.saveMsg; this.Ticketform.vorcherInos = this.saveMsg;
// if(this.Ticketform.PayDate==""){
// this.Error(this.$t('sm.qxztime')+'!');
// return;
// }
this.Btnloading = true; this.Btnloading = true;
this.apipost( this.apipost(
"Financial_post_SetAirTicketServiceBetchImport", "Financial_post_SetAirTicketServiceBetchImport",
...@@ -3448,7 +3543,6 @@ ...@@ -3448,7 +3543,6 @@
1 1
); );
}, },
TicketFinalTranfer() { TicketFinalTranfer() {
if (this.ticketMsg.NewAirId == "") { if (this.ticketMsg.NewAirId == "") {
this.Error(this.$t('objFill.v101.qingsrxjipbma')); this.Error(this.$t('objFill.v101.qingsrxjipbma'));
...@@ -3773,7 +3867,6 @@ ...@@ -3773,7 +3867,6 @@
}); });
}); });
}); });
this.noData = !this.total > 0; this.noData = !this.total > 0;
} }
if (this.msg.ID == 0) { if (this.msg.ID == 0) {
...@@ -4283,6 +4376,8 @@ ...@@ -4283,6 +4376,8 @@
this.addMsg.DayNum = 0; this.addMsg.DayNum = 0;
this.addMsg.Remark = ""; this.addMsg.Remark = "";
this.addMsg.OPRemark = ""; this.addMsg.OPRemark = "";
this.addMsg.TCIDList = [];
this.addMsg.ChangeList = [];
}, },
//弹出框取消 初始化谈框内表单 //弹出框取消 初始化谈框内表单
resetForm(formName) { resetForm(formName) {
......
src/components/Ticketing/ticketSpider.vue
View file @ 8ef2444f
...@@ -297,7 +297,6 @@ ...@@ -297,7 +297,6 @@
}, },
created() { created() {
this.getCompanyList(); this.getCompanyList();
//this.GetLineList();
this.initAirlines(); this.initAirlines();
this.getCondition(); this.getCondition();
if (this.$route.query) { if (this.$route.query) {
...@@ -305,9 +304,17 @@ ...@@ -305,9 +304,17 @@
this.msg.AirticketId = this.$route.query.AirticketId; this.msg.AirticketId = this.$route.query.AirticketId;
} }
} }
let myDate = new Date();
myDate.setDate(myDate.getDate());
let nowDate =
myDate.getFullYear() +
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.msg.QStartDate = nowDate;
}, },
mounted() { mounted() {
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getDataList(); this.getDataList();
} }
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 8ef2444f
...@@ -1107,7 +1107,7 @@ ...@@ -1107,7 +1107,7 @@
<span>{{ $t("Operation.Op_takeSeat") }}</span> <span>{{ $t("Operation.Op_takeSeat") }}</span>
<i>{{ item.Occupied }}</i>{{ $t("Operation.Op_people") }} <i>{{ item.Occupied }}</i>{{ $t("Operation.Op_people") }}
</p> </p>
<p> <p>
<span>已收订</span> <span>已收订</span>
<i> <i>
<span class="TCL-greenType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }} <span class="TCL-greenType">{{ item.DJNum }}</span> {{ $t("Operation.Op_people") }}
...@@ -1173,42 +1173,84 @@ ...@@ -1173,42 +1173,84 @@
<div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red"> <div class="TC_SeatList" v-if="item.BindNum > 0" style="color: red">
{{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }} {{ $t("Operation.Op_bindNum") }}: {{ item.BindNum }}
</div> </div>
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
<div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList"> <div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList">
<el-popover width="700" trigger="click"> <el-popover width="700" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="145" style="text-align: center"> <th width="185" style="text-align: center">
团号 团号/{{ $t("Operation.Op_bindNum") }}
</th> </th>
<th width="90" style="text-align: center"> <th width="75" style="text-align: center">
{{ $t("Operation.Op_bindNum") }} 总机位
</th> </th>
<th width="90" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }} {{ $t("Operation.Op_price") }}
</th> </th>
<th width="80" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }} {{ $t('Airticket.Air_TicketType') }}
</th> </th>
<th width="80" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }} {{ $t('Airticket.Air_TicketDeadLine') }}
</th> </th>
<th width="100" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t("op.Tickets") }} {{ $t("op.Tickets") }}
</th> </th>
</tr> </tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex"> <tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr> <tr>
<td style="text-align: center"> <td style="text-align: center">
<a style="color:blue;text-decoration:underline;cursor:pointer;" @click="gotoTCList(subItem)"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{ subItem.TCNUM }}<br/> <br v-if="thirdIndex!=0" />
({{subItem.TCID}}) <span style="color:blue;text-decoration:underline;cursor:pointer;"
</a> @click="gotoTCList(thirdItem)">
{{ thirdItem.TCNUM }}
({{thirdItem.TCID}})&nbsp;绑定:
{{ thirdItem.BindNum }}
</span>
</template>
</td>
<td style="text-align: center">{{ subItem.TicketNum }}
<template v-if="subItem.ChangeNum!=0">
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td> </td>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td> <td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center"> <td style="text-align: center">
<template v-if="subItem.TravelTicketType==1"> <template v-if="subItem.TravelTicketType==1">
...@@ -1586,7 +1628,6 @@ ...@@ -1586,7 +1628,6 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="ckOPInfo(item)">{{ $t("objFill.v101.qianzopshez") }} <el-dropdown-item @click.native="ckOPInfo(item)">{{ $t("objFill.v101.qianzopshez") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item, 1)">{{ $t("objFill.v101.fuzhixingc") }} <el-dropdown-item @click.native="CopyTripAndFeature(item, 1)">{{ $t("objFill.v101.fuzhixingc") }}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="CopyTripAndFeature(item, 2)"> <el-dropdown-item @click.native="CopyTripAndFeature(item, 2)">
...@@ -1681,6 +1722,15 @@ ...@@ -1681,6 +1722,15 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
</font> </font>
...@@ -1688,7 +1738,6 @@ ...@@ -1688,7 +1738,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="TC_remarkContent" v-if="item.BranchAuditState > 0"> <div class="TC_remarkContent" v-if="item.BranchAuditState > 0">
<div class="clearfix TCL-redType"> <div class="clearfix TCL-redType">
<div class="TCL_remarkTitle" style="width: auto"> <div class="TCL_remarkTitle" style="width: auto">
...@@ -2353,7 +2402,7 @@ ...@@ -2353,7 +2402,7 @@
}, },
}, },
methods: { methods: {
gotoTCList(item) { gotoTCList(item) {
var path = "TravelControlList"; var path = "TravelControlList";
if (item.TeamType == 1) { if (item.TeamType == 1) {
path = "TravelControlListSale"; path = "TravelControlListSale";
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 8ef2444f
...@@ -778,42 +778,84 @@ ...@@ -778,42 +778,84 @@
<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.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}: <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
{{item.BindNum}}</div> {{item.BindNum}}</div>
<div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList"> <el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(subItem,subIndex) in item.TicketList">
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</template>
</table>
<div class="TC_SeatList" v-if="item.NoBindNum > 0"
style="color: blue;font-weight:bold;cursor:pointer;" slot="reference">
尚未绑定: {{ item.NoBindNum }}
</div>
</el-popover>
<div class="TC_SeatList" v-if="item.TicketNum > 0 && item.TicketList">
<el-popover width="700" trigger="click"> <el-popover width="700" trigger="click">
<table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="145" style="text-align: center"> <th width="185" style="text-align: center">
团号 团号/{{ $t("Operation.Op_bindNum") }}
</th> </th>
<th width="90" style="text-align: center"> <th width="75" style="text-align: center">
{{ $t("Operation.Op_bindNum") }} 总机位
</th> </th>
<th width="90" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t("op.TicketNum") }}
</th>
<th width="70" style="text-align: center">
{{ $t("Operation.Op_price") }} {{ $t("Operation.Op_price") }}
</th> </th>
<th width="80" style="text-align: center"> <th width="65" style="text-align: center">
{{ $t('Airticket.Air_TicketType') }} {{ $t('Airticket.Air_TicketType') }}
</th> </th>
<th width="80" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t('Airticket.Air_TicketDeadLine') }} {{ $t('Airticket.Air_TicketDeadLine') }}
</th> </th>
<th width="100" style="text-align: center"> <th width="80" style="text-align: center">
{{ $t("op.Tickets") }} {{ $t("op.Tickets") }}
</th> </th>
</tr> </tr>
<tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex"> <tbody v-for="(subItem, subIndex) in item.TicketList" :key="subIndex">
<tr> <tr>
<td style="text-align: center"> <td style="text-align: center">
<a style="color:blue;text-decoration:underline;cursor:pointer;" @click="gotoTCList(subItem)"> <template v-for="(thirdItem,thirdIndex) in subItem.SubList">
{{ subItem.TCNUM }}<br/> <br v-if="thirdIndex!=0" />
({{subItem.TCID}}) <span style="color:blue;text-decoration:underline;cursor:pointer;"
</a> @click="gotoTCList(thirdItem)">
{{ thirdItem.TCNUM }}
({{thirdItem.TCID}})&nbsp;绑定:
{{ thirdItem.BindNum }}
</span>
</template>
</td>
<td style="text-align: center">{{ subItem.TicketNum }}
<template v-if="subItem.ChangeNum!=0">
<el-popover placement="top-start" title="变更记录" width="260" trigger="hover">
<table>
<template v-for="(changeItem,changeIndex) in subItem.SubList">
<template v-if="changeItem.ChangeModel&&changeItem.ChangeModel.ChangeValue!=0">
<tr>
<td>
{{changeItem.TCNUM}}({{changeItem.TCID}})
{{changeItem.ChangeModel.ChangeValue>0?'+':'-'}}
{{changeItem.ChangeModel.ChangeValue}} 人
</td>
</tr>
</template>
</template>
</table>
<font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
</el-popover>
</template>
</td> </td>
<td style="text-align: center">{{ subItem.BindNum }}</td>
<td style="text-align: center">{{ subItem.TicketNum }}</td>
<td style="text-align: center">{{ subItem.TicketPrice }}</td> <td style="text-align: center">{{ subItem.TicketPrice }}</td>
<td style="text-align: center"> <td style="text-align: center">
<template v-if="subItem.TravelTicketType==1"> <template v-if="subItem.TravelTicketType==1">
...@@ -1183,6 +1225,15 @@ ...@@ -1183,6 +1225,15 @@
<template v-else-if="subItem.TravelTicketType==3"> <template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font> <font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template> </template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}} {{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】 【{{subItem.TicketCreateByName}}】
</font> </font>
...@@ -1690,7 +1741,7 @@ ...@@ -1690,7 +1741,7 @@
}; };
}, },
methods: { methods: {
gotoTCList(item) { gotoTCList(item) {
var path = "TravelControlList"; var path = "TravelControlList";
if (item.TeamType == 1) { if (item.TeamType == 1) {
path = "TravelControlListSale"; path = "TravelControlListSale";
...@@ -2533,7 +2584,7 @@ ...@@ -2533,7 +2584,7 @@
SalePlat: "" SalePlat: ""
}; };
this.apipost("travel_post_SetPriceTCState", msg, res => { this.apipost("travel_post_SetPriceTCState", msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message); this.Success(res.data.message);
this.getControlList(); this.getControlList();
this.queryCommonData.checkDialogAll = false; this.queryCommonData.checkDialogAll = false;
......
src/components/orderCommon/productOrderList.vue
View file @ 8ef2444f
...@@ -486,7 +486,7 @@ ...@@ -486,7 +486,7 @@
</p> </p>
</div> </div>
<div v-if="item.SalePlatList&&item.SalePlatList.length>0" style="margin-top:5px;"> <div v-if="item.SalePlatList&&item.SalePlatList.length>0" style="margin-top:5px;">
<span class="TC_neibu" style="margin-right:5px;" <span class="TC_neibu" style="margin-right:5px;"
:class="{TCneibu: plat == 3, TCb2b: plat == 1,TCb2c: plat == 2, AppPlat: plat == 4, otherPlat: plat == 5,}" :class="{TCneibu: plat == 3, TCb2b: plat == 1,TCb2c: plat == 2, AppPlat: plat == 4, otherPlat: plat == 5,}"
v-for="plat in item.SalePlatList" :key="plat.subCode">{{ $tripUtils.getPlatName(plat) }}</span> v-for="plat in item.SalePlatList" :key="plat.subCode">{{ $tripUtils.getPlatName(plat) }}</span>
</div> </div>
...@@ -1001,8 +1001,42 @@ ...@@ -1001,8 +1001,42 @@
" slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span> " slot="reference">{{ $t("Operation.Op_bentuanMaidian") }}</span>
</el-popover> </el-popover>
</template> </template>
<p>{{ $t("Operation.Op_remark") }}:</p> <p>{{ $t("Operation.Op_remark") }}:</p>
<p :title="item.OpRemark">{{ item.OpRemark }}</p> <p :title="item.OpRemark">{{ item.OpRemark }}</p>
<template v-if="item.TicketList&&item.TicketList.length>0">
<br/>
<p>票务备注：</p>
<p>
<template v-for="(subItem,subIndex) in item.TicketList">
<font :key="`p_`+subIndex">
<template v-if="subItem.TravelTicketType==1">
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==2">
<font style="color:blue;"> {{$t('objFill.v101.shanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
总机位：<font style="font-weight:bold;">{{subItem.TicketNum}}</font>
<template v-if="subItem.ChangeNum!=0">
<font style="font-weight:bold;">
{{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}={{item.TicketNum}}</font>
</template>
;
<template v-for="thirdItem in subItem.SubList">
{{thirdItem.TCNUM}}({{thirdItem.TCID}}) 绑定：<font style="font-weight:bold;color:blue;">
{{thirdItem.BindNum}}</font>,
</template>
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
</font>
</template>
</p>
</template>
</div> </div>
</li> </li>
</ul> </ul>
...@@ -1143,7 +1177,7 @@ ...@@ -1143,7 +1177,7 @@
this.tripObj.cityId = obj.StartCityID; this.tripObj.cityId = obj.StartCityID;
this.tripObj.orderId = 0; this.tripObj.orderId = 0;
this.tripObj.lineID = obj.LineID; this.tripObj.lineID = obj.LineID;
this.tripObj.ltID = obj.ltID this.tripObj.ltID = obj.ltID
this.travelControlTripLayerShow = true; this.travelControlTripLayerShow = true;
}, },
hideTripDown() { hideTripDown() {
...@@ -1203,7 +1237,7 @@ ...@@ -1203,7 +1237,7 @@
var that = this; var that = this;
this.tripTitle = title; this.tripTitle = title;
this.$nextTick(() => { this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id, TCID,2); that.$refs.comTeam.GetTrip(id, TCID, 2);
}); });
that.outerVisible = true; that.outerVisible = true;
}, },
......
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