Skip to content

S
SuperMan
Commit 91302454 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents db1bf8f7 26efc504
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 156 deletions
src/assets/common/lang/zh.js
View file @ 91302454
...@@ -658,6 +658,12 @@ export const visa = { ...@@ -658,6 +658,12 @@ export const visa = {
v_yibaoru:'已报入', v_yibaoru:'已报入',
v_houbu:'候补', v_houbu:'候补',
v_yxhoubu:'允许候补', v_yxhoubu:'允许候补',
v_byxhoubu:'不允许候补',
v_sqtime:'送签日期',
v_cqtime:'出签日期',
v_kptime:'开票日期',
v_EuropeanVisaType:'欧洲签证类型',
v_britishVisa:'英国签证',
...@@ -1217,6 +1223,50 @@ export const Operation = { ...@@ -1217,6 +1223,50 @@ export const Operation = {
Op_localBranchPrice:'当地分公司价格', Op_localBranchPrice:'当地分公司价格',
Op_localdaiPrice:'当地代销商价格', Op_localdaiPrice:'当地代销商价格',
Op_localDangPrice:'当地当团利润归属', Op_localDangPrice:'当地当团利润归属',
Op_Country:'国别',
Op_WarningTeam:'预警团',
Op_TransportState:'联运状态',
Op_hide:'隐藏',
Op_TeamWarningSearch:'团控预警查询',
Op_daysChoice:'天数选择',
Op_Attendance:'上座率',
Op_warningSearch:'预警查询',
Op_TeamName:'团名',
Op_nei:'内',
Op_zhu:'主',
Op_lian:'联',
Op_jietuan:'结团',
Op_night:'晚',
Op_teamNotice:'出团通知书',
Op_downLoadword:'下载WORD行程',
Op_PriceInfo:'价格信息',
Op_tradePrice:'同业价',
Op_directPrice:'直客价',
Op_fellowMember:'同行会员',
Op_standard:'标准',
Op_fellow:'同行',
Op_directMember:'直客会员',
Op_direct:'直客',
Op_baby:'婴儿',
Op_spickupPrice:'单地接价格',
Op_Income:'增收',
Op_childBed:'儿童占床',
Op_childSurcharge:'儿童附加费',
Op_oldmanSurcharge:'老人附加费',
Op_visaPrice:'签证费',
Op_singleRoomcha:'单房差',
Op_insurance:'保险',
Op_zafei:'杂费',
Op_jianmian:'减免',
Op_childNobed:'儿童不占床',
Op_visafeeBack:'退签证费',
Op_priceDetail:'查看价格明细',
Op_people:'人',
Op_takeSeat:'占位',
Op_nozhipai:'尚未指派',
Op_caozuoop:'操作op',
Op_bindNum:'绑定数量',
Op_Warmprompt:'温馨提示',
} }
export const rule = { export const rule = {
company: '请选择公司', company: '请选择公司',
...@@ -1450,7 +1500,8 @@ export const visaT = { ...@@ -1450,7 +1500,8 @@ export const visaT = {
qxzcjka:'请选择出境口岸', qxzcjka:'请选择出境口岸',
qxzcjhbh:'请选择出境航班号', qxzcjhbh:'请选择出境航班号',
qtxywx:'请填写英文姓', qtxywx:'请填写英文姓',
qsrywx:'请输入中文姓', qsrzwx:'请输入中文姓',
qsrywx:'请输入英文姓',
qtxywm:'请填写英文名', qtxywm:'请填写英文名',
qtxzcsrq:'请填选择出生日期', qtxzcsrq:'请填选择出生日期',
qtxzxb:'请填选择性别', qtxzxb:'请填选择性别',
......
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 91302454
...@@ -584,7 +584,8 @@ export default { ...@@ -584,7 +584,8 @@ export default {
IsLeader:1, IsLeader:1,
PayDate:'', PayDate:'',
CallType:0, CallType:0,
Type:0 Type:0,
GuestInfoList:[]
}, },
detailList:{ detailList:{
ID:0, ID:0,
...@@ -871,9 +872,23 @@ export default { ...@@ -871,9 +872,23 @@ export default {
this.msg.detailList.forEach(x=>{ this.msg.detailList.forEach(x=>{
delete x.rate; delete x.rate;
}); });
//旅客名单数据组装
if(this.orderObj!=null&&this.orderObj.OrderSource===10){
console.log("getGuestInfo",this.$store.getters.getGuestInfo)
let guestInfo = this.$store.getters.getGuestInfo;
this.msg.GuestInfoList=[];
if(guestInfo!=null&&guestInfo.length>0){
guestInfo.forEach(t=>{
this.msg.GuestInfoList.push({GuestId:t.guestId,GuestName:t.guestName})
})
}
}
console.log("1234",this.msg);
this.loading = true; this.loading = true;
this.apipost('Financial_post_Set',this.msg,res=>{ this.apipost('Financial_post_Set',this.msg,res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
//清除旅客名单数据
this.$store.commit('saveGuestInfo',[])
this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), { this.$confirm(this.$t('tips.czcgsfjxzhidan'), this.$t('tips.tips'), {
confirmButtonText: this.$t('fnc.jxzhidan'), confirmButtonText: this.$t('fnc.jxzhidan'),
cancelButtonText: this.$t('fnc.nothanks'), cancelButtonText: this.$t('fnc.nothanks'),
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 91302454
...@@ -447,91 +447,91 @@ ...@@ -447,91 +447,91 @@
<div class="el-col" style="width:220px;"> <div class="el-col" style="width:220px;">
<div class="d3"> <div class="d3">
<p> <p>
<i class="iconfont icon-tuandui"></i>团队信息 <i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}
</p> </p>
<p> <p>
<em>{{item.DayNum}}天{{item.NightNum}}晚</em> <em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}{{$t('Operation.Op_night')}}</em>
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>出发时间</span> <span>{{$t('Airticket.Air_StartTime')}}</span>
<span class="go_date">{{item.StartDate}}</span> <span class="go_date">{{item.StartDate}}</span>
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>出团通知书</span> <span>{{$t('Operation.Op_teamNotice')}}</span>
{{item.OutNotice==1?'OK':'暂定'}} {{item.OutNotice==1?'OK':'暂定'}}
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>出团公司</span> <span>{{$t('scen.sc_cp')}}</span>
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p class="travelnowrap" v-if="item.WordPath!=''"> <p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;" :href="domainManager().ViittoFileUrl+item.WordPath">下载WORD行程</a> <a style="corsor:pointer;" :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p> </p>
</div> </div>
</div> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
<div class="d4"> <div class="d4">
<p> <p>
<i class="iconfont icon-jiage"></i>价格信息 <i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p> </p>
<p class="travelprice">同业价：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p> <p class="travelprice">{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
<p class="travelprice">直客价：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p> <p class="travelprice">{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
<p> <p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo"> <el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<td rowspan="2" style="text-align:center" width="60"> <td rowspan="2" style="text-align:center" width="60">
<i>标准</i> <i>{{$t('Operation.Op_standard')}}</i>
</td> </td>
<td class="TC_cusTitle">同行会员</td> <td class="TC_cusTitle">{{$t('Operation.Op_fellowMember')}}</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td> <td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td>
<td class="TC_cusTitle">同行</td> <td class="TC_cusTitle">{{$t('Operation.Op_fellow')}}</td>
<td><b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b></td> <td><b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b></td>
<td class="TC_cusTitle">直客会员</td> <td class="TC_cusTitle">{{$t('Operation.Op_directMember')}}</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td> <td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td>
<td class="TC_cusTitle">直客</td> <td class="TC_cusTitle">{{$t('Operation.Op_direct')}}</td>
<td><b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b></td> <td><b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b></td>
</tr> </tr>
<tr> <tr>
<td class="TC_cusTitle">婴儿</td> <td class="TC_cusTitle">{{$t('Operation.Op_baby')}}</td>
<td><b>{{item.BabyPrice|priceFormat(item.BabyPrice)}}</b></td> <td><b>{{item.BabyPrice|priceFormat(item.BabyPrice)}}</b></td>
<td class="TC_cusTitle">单地接价格</td> <td class="TC_cusTitle">{{$t('Operation.Op_spickupPrice')}}</td>
<td colspan="5"> <td colspan="5">
<b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b> <b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
</td> </td>
</tr> </tr>
<tr> <tr>
<td rowspan="2" style="text-align:center"> <td rowspan="2" style="text-align:center">
<i>增收</i> <i>{{$t('Operation.Op_Income')}}</i>
</td> </td>
<td class="TC_cusTitle">儿童占床</td> <td class="TC_cusTitle">{{$t('Operation.Op_childBed')}}</td>
<td><b>{{(item.ChildNeedPrice)|priceFormat(item.ChildNeedPrice)}}</b></td> <td><b>{{(item.ChildNeedPrice)|priceFormat(item.ChildNeedPrice)}}</b></td>
<td class="TC_cusTitle">儿童附加费</td> <td class="TC_cusTitle">{{$t('Operation.Op_childSurcharge')}}</td>
<td><b>{{item.BabyChargePrice|priceFormat(item.BabyChargePrice)}}</b></td> <td><b>{{item.BabyChargePrice|priceFormat(item.BabyChargePrice)}}</b></td>
<td class="TC_cusTitle">老人附加费</td> <td class="TC_cusTitle">{{$t('Operation.Op_oldmanSurcharge')}}</td>
<td><b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b></td> <td><b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b></td>
<td class="TC_cusTitle">签证费</td> <td class="TC_cusTitle">{{$t('Operation.Op_visaPrice')}}</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td> <td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td>
</tr> </tr>
<tr> <tr>
<td class="TC_cusTitle">单房差</td> <td class="TC_cusTitle">{{$t('Operation.Op_singleRoomcha')}}</td>
<td><b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b></td> <td><b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b></td>
<td class="TC_cusTitle">保险</td> <td class="TC_cusTitle">{{$t('Operation.Op_insurance')}}</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td> <td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td>
<td class="TC_cusTitle">杂费</td> <td class="TC_cusTitle">{{$t('Operation.Op_zafei')}}</td>
<td colspan="3"><b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b></td> <td colspan="3"><b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b></td>
</tr> </tr>
<tr> <tr>
<td style="text-align:center"> <td style="text-align:center">
<i>减免</i> <i>{{$t('Operation.Op_jianmian')}}</i>
</td> </td>
<td class="TC_cusTitle">儿童不占床</td> <td class="TC_cusTitle">{{$t('Operation.Op_childNobed')}}</td>
<td><b>{{item.ChildNoNeedPrice|priceFormat(item.ChildNoNeedPrice)}}</b></td> <td><b>{{item.ChildNoNeedPrice|priceFormat(item.ChildNoNeedPrice)}}</b></td>
<td class="TC_cusTitle">退签证费</td> <td class="TC_cusTitle">{{$t('Operation.Op_visafeeBack')}}</td>
<td colspan="6"><b>{{item.BackVisaPrice|priceFormat(item.BackVisaPrice)}}</b></td> <td colspan="6"><b>{{item.BackVisaPrice|priceFormat(item.BackVisaPrice)}}</b></td>
</tr> </tr>
</table> </table>
<span slot="reference" class="price">查看价格明细</span> <span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover> </el-popover>
</p> </p>
</div> </div>
...@@ -539,31 +539,31 @@ ...@@ -539,31 +539,31 @@
<div class="el-col" style="width:150px;"> <div class="el-col" style="width:150px;">
<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('visa.v_currentseat')}}</span>
<i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p> <i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p>
<p> <p>
<span>已报入</span> <span>{{$t('visa.v_yibaoru')}}</span>
<i> <i>
{{item.OrderGuestNum}} {{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人 <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</i> </i>
</p> </p>
<p> <p>
<span>占位</span> <span>{{$t('Operation.Op_takeSeat')}}</span>
<i>{{item.Occupied}}</i>人 <i>{{item.Occupied}}</i>{{$t('Operation.Op_people')}}
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>候补</span> <span>{{$t('visa.v_houbu')}}</span>
<span v-if="item.IsSubstitution==1" class="TCL-greenType">允许候补（候补{{item.HBNum}}人）</span> <span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('Operation.Op_people')}}）</span>
<span v-else class="TCL-redType">不允许候补</span> <span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
</p> </p>
<p> <p>
<span>领队</span> <span>{{$t('leader.leader_Leader')}}</span>
<span v-if="item.LeaderName==null" class="TCL-redType">尚未指派</span> <span v-if="item.LeaderName==null" class="TCL-redType">{{$t('Operation.Op_nozhipai')}}</span>
<span v-else class="TCL-greenType">{{item.LeaderName}}</span> <span v-else class="TCL-greenType">{{item.LeaderName}}</span>
</p> </p>
</div> </div>
...@@ -571,7 +571,7 @@ ...@@ -571,7 +571,7 @@
<div class="el-col" style="width:130px;"> <div class="el-col" style="width:130px;">
<div class="d5 TC-oparation"> <div class="d5 TC-oparation">
<p> <p>
<i class="iconfont icon-yuangong"></i>操作OP <i class="iconfont icon-yuangong"></i>{{$t('Operation.Op_caozuoop')}}
</p> </p>
<div class="clearfix TC-OpInfo"> <div class="clearfix TC-OpInfo">
<div class="TC-leftIMG"> <div class="TC-leftIMG">
...@@ -580,38 +580,38 @@ ...@@ -580,38 +580,38 @@
</div> </div>
<div class="TC-OPName">{{item.OPName}}</div> <div class="TC-OPName">{{item.OPName}}</div>
</div> </div>
<div class="TC_SeatList">头等舱：{{item.FSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">商务舱：{{item.CSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">经济舱：{{item.YSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList">绑定数量：<span style="color:red">{{item.BindNum}}</span></div> <div class="TC_SeatList">{{$t('Operation.Op_bindNum')}}：<span style="color:red">{{item.BindNum}}</span></div>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
<div class="d3"> <div class="d3">
<p> <p>
<i class="iconfont icon-wenxintishi"></i>温馨提示 <i class="iconfont icon-wenxintishi"></i>{{$t('Operation.Op_Warmprompt')}}
</p> </p>
<p v-if="item.VisaType"> <p v-if="item.VisaType">
<span>签证类型</span> <span>{{$t('visa.v_visaType')}}</span>
<span v-if="item.VisaType==1">个签</span> <span v-if="item.VisaType==1">{{$t('visa.v_gvisa')}}</span>
<span v-else-if="item.VisaType==2">团签</span> <span v-else-if="item.VisaType==2">{{$t('visa.v_tvisa')}}</span>
</p> </p>
<p> <p>
<span>送签日期</span> <span>{{$t('visa.v_sqtime')}}</span>
<span class="TCL-redType"> {{item.SendVisaTime}}</span> <span class="TCL-redType"> {{item.SendVisaTime}}</span>
</p> </p>
<p> <p>
<span>出签日期</span> <span>{{$t('visa.v_cqtime')}}</span>
{{item.OutVisaTime}} {{item.OutVisaTime}}
</p> </p>
<p> <p>
<span>开票日期</span> <span>{{$t('visa.v_kptime')}}</span>
{{item.TicketDeadline}} {{item.TicketDeadline}}
</p> </p>
<p v-if="item.LineID==2&&item.EuropeVisaType>0"> <p v-if="item.LineID==2&&item.EuropeVisaType>0">
<span> <span>
<span v-if="item.EuropeVisaType">欧洲签证类型</span> <span v-if="item.EuropeVisaType">{{$t('visa.v_EuropeanVisaType')}}</span>
<span v-if="item.EuropeVisaType==1">英国签证</span> <span v-if="item.EuropeVisaType==1">{{$t('visa.v_britishVisa')}}</span>
<span v-else-if="item.EuropeVisaType==2">申根签证</span> <span v-else-if="item.EuropeVisaType==2">申根签证</span>
</span> </span>
</p> </p>
......
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ 91302454
...@@ -26,8 +26,12 @@ ...@@ -26,8 +26,12 @@
{{$t('visa.v_tvisa')}} {{$t('visa.v_tvisa')}}
<el-dropdown-menu slot="dropdown" > <el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item> <el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
<<<<<<< HEAD
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
=======
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item> <el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
>>>>>>> 3f75667611ac72e4be81b0af1210cd16ce00a70b
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa"> <el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
...@@ -186,7 +190,7 @@ export default { ...@@ -186,7 +190,7 @@ export default {
message: this.$t('tips.cancleDelete') message: this.$t('tips.cancleDelete')
}); });
}); });
}, },
deleteTshi(id){ // 删除操作 deleteTshi(id){ // 删除操作
this.apipost('dmc_post_DelVisaPeople',{GuestId:id},res=>{ this.apipost('dmc_post_DelVisaPeople',{GuestId:id},res=>{
if(res.data.resultCode==1){ if(res.data.resultCode==1){
......
src/components/VisaCenter/addVisaNew.vue
View file @ 91302454
...@@ -796,9 +796,9 @@ export default { ...@@ -796,9 +796,9 @@ export default {
} }
}; };
result.forEach(x=>{ result.forEach(x=>{
let str = x.replace(/-/, "年") let str = x.replace(/-/, this.$t('pub.year'))
let strS = str.replace(/-/, "月") let strS = str.replace(/-/, this.$t('pub.month'))
let strSi = strS+'日' let strSi = strS+ this.$t('fnc.day')
let msg = { let msg = {
VisaPlanId:_this.addMsg.Id, VisaPlanId:_this.addMsg.Id,
Date:strSi, Date:strSi,
...@@ -842,7 +842,7 @@ export default { ...@@ -842,7 +842,7 @@ export default {
}, },
submitForm(addMsg) { submitForm(addMsg) {
if(this.addMsg.PeopleList.length<1){ if(this.addMsg.PeopleList.length<1){
this.$message.error('请添加申请人') this.$message.error(this.$t('visaT.qtjsqr'))
return return
} }
//提交创建、修改表单 //提交创建、修改表单
...@@ -929,17 +929,17 @@ export default { ...@@ -929,17 +929,17 @@ export default {
}, },
deleteThis(i){ deleteThis(i){
this.$confirm('是否删除?删除后已填写资料无法恢复！', '提示', { this.$confirm(this.$t('visaT.ts'), this.$t('tips.tips'), {
confirmButtonText: '确定', confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: '取消', cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.addMsg.PeopleList.splice(i,1) this.addMsg.PeopleList.splice(i,1)
this.$message.success('删除成功'); this.$message.success(this.$t('tips.shanchuchenggong'));
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消删除' message: this.$t('tips.cancleDelete')
}); });
}); });
}, },
......
src/components/busManagement/BusInfo.vue
View file @ 91302454
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
cursor: pointer; cursor: pointer;
} }
.BusTyleFirst .w150 { .BusTyleFirst .w170 {
margin-right: 22px; margin-right: 22px;
} }
...@@ -157,38 +157,94 @@ ...@@ -157,38 +157,94 @@
<el-form :model="PostData" :rules="rules" ref="PostData"> <el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1"> <table class="bo_bus" cellspacing="1">
<tr> <tr>
<th width="100">日期</th>
<th width="280">酒店名称</th>
<th width="50">停车场</th>
<th width="400">用车计划</th>
<th width="200">订团号</th>
<th width="100">司机姓名</th> <th width="100">司机姓名</th>
<th width="100">联系电话</th> <th width="280">联系电话</th>
<th width="50">车牌号码</th>
<th width="120">供应商</th>
<th width="120">付款方式</th>
<th width="200">订团号</th>
<th width="250">司机住宿</th> <th width="250">司机住宿</th>
<th>泊车说明</th> <th>泊车说明</th>
<th width="120">车辆类型</th>
<th width="120">使用人数</th> <th width="120">使用人数</th>
<th width="120">车牌号码</th>
<th width="120">供应商</th>
<th>成本价</th> <th>成本价</th>
<th width="120">付款方式</th>
<th width="120">备注</th> <th width="120">备注</th>
<th width="400">用车计划</th>
<th width="100">日期</th>
<th width="100">酒店名称</th>
<th width="120">车辆类型</th>
<th width="120">停车场</th>
<th width="120">小计</th> <th width="120">小计</th>
</tr> </tr>
<tr v-for="(item,index) in PlanTableData"> <tr v-for="(item,index) in PlanTableData">
<td> <td>
<div class="w100"> <el-input class="w100" v-model="item.DriverName"></el-input>
{{item.PlanDateStr}} </td>
<td>
<el-input class="w100" v-model="item.DriverTel"></el-input>
</td>
<td>
<div class="w150">
<el-input class="w135" v-model="item.BusNum"></el-input>
</div> </div>
</td> </td>
<td> <td>
<div class="w280"> <div class="w200">
{{item.HotelName}} <el-select class="w150" filterable placeholder="请选择" v-model="item.BusCompany">
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div> </div>
</td> </td>
<td> <td>
<div class="w50"> <div class="w120">
{{item.IsHavearking=='0'?'无':'有'}} <el-select class='w100 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
</el-select>
</div>
</td>
<td>
<div class="w200" :class="{'BusTyleFirst':index==0}">
<el-input class='w170' type="text" v-model="item.BookGroup"></el-input>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="index!=0"
@click="getBeforeInfo(index)"></i>
</el-tooltip>
</div>
</td>
<td class="carPlanOne">
<!--司机住宿类型-->
<div class="w200">
<span v-for="subItem in AccommodationTypeArray">
<span class="subName" :class="{'spanCked':item.AccommodationType==subItem.Id}"
@click="AccommodationCLick(subItem.Id,index)">{{subItem.Name}}</span>
<span v-if="subItem.Id==1 && item.AccommodationType==1">
<el-input class="w135" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
</span>
</span>
</div>
</td>
<td>
<div class="w150">
<el-input class="w135" v-model="item.ParkExplain" placeholder="请输入说明"></el-input>
</div>
</td>
<td>
<div class="w80">
<el-input class="w50" v-model="item.UseNum" @keyup.native="checkPrice(item,'UseNum')"></el-input>
</div>
</td>
<td>
<div class="w120">
<el-input class="w120" v-model="item.CostPrice" @keyup.native="checkPrice(item,'CostPrice')"
placeholder="请输入成本价"></el-input>
</div>
</td>
<td>
<div class="w180">
<el-input class='w180' type="text" v-model="item.Remarks"></el-input>
</div> </div>
</td> </td>
<td class="carPlanOne" :class="{'otherSpan':index!=0&&index!=PlanTableData.length-1}"> <td class="carPlanOne" :class="{'otherSpan':index!=0&&index!=PlanTableData.length-1}">
...@@ -219,84 +275,26 @@ ...@@ -219,84 +275,26 @@
</div> </div>
</td> </td>
<td> <td>
<el-input class='w170' type="text" v-model="item.BookGroup"></el-input> <div class="w100">
</td> {{item.PlanDateStr}}
<td>
<el-input class="w100" v-model="item.DriverName"></el-input>
</td>
<td>
<el-input class="w100" v-model="item.DriverTel"></el-input>
</td>
<td class="carPlanOne">
<!--司机住宿类型-->
<div class="w260">
<span v-for="subItem in AccommodationTypeArray">
<span class="subName" :class="{'spanCked':item.AccommodationType==subItem.Id}"
@click="AccommodationCLick(subItem.Id,index)">{{subItem.Name}}</span>
<span v-if="subItem.Id==1 && item.AccommodationType==1">
<el-input class="w135" v-model="item.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
</span>
</span>
</div> </div>
</td> </td>
<td> <td>
<div class="w150"> <div class="w280">{{item.HotelName}}</div>
<el-input class="w135" v-model="item.ParkExplain" placeholder="请输入说明"></el-input>
</div>
</td> </td>
<td> <td>
<div class="w180" :class="{'BusTyleFirst':index==0}"> <div class="w180">
<el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType" <el-select clearable class="w150" filterable placeholder="请选择" v-model="item.BusType"
:disabled="forbidInput" @change='getBusPrice(item)'> :disabled="forbidInput" @change='getBusPrice(item)'>
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id"> <el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="index!=0"
@click="getBeforeInfo(index)"></i>
</el-tooltip>
</div>
</td>
<td>
<div class="w80">
<el-input class="w50" v-model="item.UseNum" @keyup.native="checkPrice(item,'UseNum')"></el-input>
</div> </div>
</td> </td>
<td> <td>
<div class="w150"> <div class="w50">
<el-input class="w135" v-model="item.BusNum"></el-input> {{item.IsHavearking=='0'?'无':'有'}}
</div>
</td>
<td>
<div class="w200">
<el-select class="w150" filterable placeholder="请选择" v-model="item.BusCompany">
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</div>
</td>
<td>
<div class="w100">
<el-input class="w80" v-model="item.CostPrice" @keyup.native="checkPrice(item,'CostPrice')"
placeholder="请输入成本价"></el-input>
</div>
</td>
<td>
<div class="w120">
<el-select class='w100 sel' v-model='item.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
</el-select>
</div>
</td>
<td>
<div class="w80">
<el-input class='w80' type="text" v-model="item.Remarks"></el-input>
</div> </div>
</td> </td>
<td> <td>
...@@ -569,6 +567,7 @@ ...@@ -569,6 +567,7 @@
x.BookGroup = this.$route.query.NewCombinationNum; x.BookGroup = this.$route.query.NewCombinationNum;
} }
}) })
console.log(this.PlanTableData,'planTabledata');
} }
}, },
null null
...@@ -753,20 +752,12 @@ ...@@ -753,20 +752,12 @@
getBeforeInfo(index) { getBeforeInfo(index) {
let oldPlanData = this.PlanTableData[index - 1]; let oldPlanData = this.PlanTableData[index - 1];
let newPlanData = this.PlanTableData[index]; let newPlanData = this.PlanTableData[index];
newPlanData.AirportPickUp = oldPlanData.AirportPickUp;
newPlanData.UseType = oldPlanData.UseType;
newPlanData.UseTime = oldPlanData.UseTime;
newPlanData.BookGroup = oldPlanData.BookGroup;
newPlanData.DriverName = oldPlanData.DriverName; newPlanData.DriverName = oldPlanData.DriverName;
newPlanData.DriverTel = oldPlanData.DriverTel; newPlanData.DriverTel = oldPlanData.DriverTel;
newPlanData.AccommodationType = oldPlanData.AccommodationType;
newPlanData.AccommodationRemark = oldPlanData.AccommodationRemark;
newPlanData.BusType = oldPlanData.BusType;
newPlanData.UseNum = oldPlanData.UseNum;
newPlanData.BusNum = oldPlanData.BusNum; newPlanData.BusNum = oldPlanData.BusNum;
newPlanData.BusCompany = oldPlanData.BusCompany; newPlanData.BusCompany = oldPlanData.BusCompany;
newPlanData.ParkExplain = oldPlanData.ParkExplain; newPlanData.PayType = oldPlanData.PayType;
newPlanData.CostPrice = oldPlanData.CostPrice; newPlanData.BookGroup = oldPlanData.BookGroup;
} }
}, },
mounted() { mounted() {
......
src/router/config.js
View file @ 91302454
...@@ -1443,6 +1443,14 @@ export default { ...@@ -1443,6 +1443,14 @@ export default {
title: '一日游' title: '一日游'
}, },
}, },
{
path:'/oneDayTrip2', //一日游销售自主开团用
name:'oneDayTrip2',
component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
meta: {
title: '一日游'
},
},
{ {
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo', name: 'priceIncomeConfirmInfo',
......
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