Skip to content

S
SuperMan
Commit ac896bc9 authored by zhengke's avatar zhengke
Browse files
Options

增加跳转参数

parent 09c344a3
Show whitespace changes
Inline Side-by-side
Showing with 139 additions and 51 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ac896bc9
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<tr> <tr>
<th class="fz14" colspan="10">团队信息</th> <th class="fz14" colspan="10">团队信息(定团号：{{NewCombinationNum}})</th>
<th class="fz14" colspan="12">地接操作信息</th> <th class="fz14" colspan="12">地接操作信息</th>
</tr> </tr>
<tr> <tr>
...@@ -306,9 +306,10 @@ export default { ...@@ -306,9 +306,10 @@ export default {
}, },
mounted() { mounted() {
this.TCNUM=this.$route.query.TCNUM this.TCNUM=this.$route.query.TCNUM;
this.flightTotal=this.$route.query.flightTotal this.flightTotal=this.$route.query.flightTotal;
this.GuestNum=this.$route.query.GuestNum this.GuestNum=this.$route.query.GuestNum;
this.NewCombinationNum=this.$route.query.NewCombinationNum;
this.getList() this.getList()
// this.getHotelList() // this.getHotelList()
}, },
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ac896bc9
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
<tr> <tr>
<th width="8%">出发地</th> <th width="8%">出发地</th>
<th width="30%">行程名称</th> <th width="30%">行程名称</th>
<th width="15%">团号</th> <th width="10%">团号</th>
<th width="15%">出发时间</th> <th width="10%">定团号</th>
<th width="10%">出发时间</th>
<th width="8%">天数</th> <th width="8%">天数</th>
<th width="8%">出团人数</th> <th width="8%">出团人数</th>
<th width="8%">领队</th> <th width="8%">领队</th>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<div class="padding10">{{item.Titles}}</div> <div class="padding10">{{item.Titles}}</div>
</td> </td>
<td>{{item.TCNUMS}}</td> <td>{{item.TCNUMS}}</td>
<td>{{NewCombinationNum}}</td>
<td>{{item.FlightDate}}</td> <td>{{item.FlightDate}}</td>
<td>{{item.DayNum}}天</td> <td>{{item.DayNum}}天</td>
<td>{{item.TotalSeat}}人</td> <td>{{item.TotalSeat}}人</td>
...@@ -566,6 +568,8 @@ ...@@ -566,6 +568,8 @@
TravelDayNum:0, TravelDayNum:0,
RealityNum:0, RealityNum:0,
UseCount:'', UseCount:'',
//定团号
NewCombinationNum:'',
} }
}, },
methods: { methods: {
...@@ -736,8 +740,9 @@ ...@@ -736,8 +740,9 @@
}, },
}, },
mounted() { mounted() {
this.isUpdate=this.$route.query.isUpdate this.isUpdate=this.$route.query.isUpdate;
this.msg.TCIDs=this.$route.query.id this.msg.TCIDs=this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getNav() this.getNav()
this.getList() this.getList()
} }
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ ac896bc9
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="130">定团号</th>
<th width="150">用餐时间</th> <th width="150">用餐时间</th>
<th width="200">餐厅名称</th> <th width="200">餐厅名称</th>
<th width="200">修改餐厅</th> <th width="200">修改餐厅</th>
...@@ -38,6 +39,9 @@ ...@@ -38,6 +39,9 @@
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p> <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
</div> </div>
</td> </td>
<td :rowspan="list.length" v-if="index==0">
<div class="w120" style="margin:0 5px;">{{NewCombinationNum}}</div>
</td>
<td> <td>
<div class="w120">{{item.UseTimeStr}}</div> <div class="w120">{{item.UseTimeStr}}</div>
</td> </td>
...@@ -214,6 +218,7 @@ export default { ...@@ -214,6 +218,7 @@ export default {
TCNUM: "", TCNUM: "",
flightTotal: 0, flightTotal: 0,
GuestNum: 0, GuestNum: 0,
NewCombinationNum:'',
}; };
}, },
methods: { methods: {
...@@ -326,6 +331,7 @@ export default { ...@@ -326,6 +331,7 @@ export default {
mounted() { mounted() {
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.GuestNum= this.$route.query.GuestNum; this.GuestNum= this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList(); this.getList();
} }
}; };
......
src/components/dmc/manager/LeaderHander.vue
View file @ ac896bc9
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.LH_contentDiv { .LH_contentDiv {
width: 1000px; width: 1000px;
height: 1500px; height: 1500px;
position: relative; position: absolute;
background-color: #fff; background-color: #fff;
padding: 20px 10px; padding: 20px 10px;
} }
...@@ -100,26 +100,34 @@ ...@@ -100,26 +100,34 @@
top: 20px; top: 20px;
right: 20px; right: 20px;
} }
@media print {
.LH_btnList,.nav{display:none;}
}
</style> </style>
<template> <template>
<div class="LH_contentDiv" v-if="isShow" id="print"> <div class="LH_contentDiv" v-if="isShow" id="print">
<div class="LH_btnList"> <div class="LH_btnList">
<input type="button" v-if="ishowBtn" @click="saveDelivery()" value="保存" class="normalBtn"/> <input type="button" @click="saveDelivery()" value="保存" class="normalBtn"/>
<input type="button" v-if="ishowBtn" value="打印" @click.prevent="doPrint" class="normalBtn"/> <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn"/>
</div> </div>
<table class="Lh_Toptable"> <table class="Lh_Toptable">
<tr> <tr>
<th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th> <th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th>
</tr> </tr>
<tr>
<td colspan="9">
<div style="float:left;">团名：</div>
<div style="float:left;width:95%;">{{sendReceiptData.Title}}</div>
</td>
</tr>
<tr> <tr>
<td width="300"> <td width="300">
团号： 团号：
<el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/> <el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/>
</td> </td>
<td colspan="8"> <td colspan="8">
团名： 定团号：{{NewCombinationNum}}
<el-input type="text" class="w160" v-model="sendReceiptData.Title"/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -185,14 +193,14 @@ ...@@ -185,14 +193,14 @@
</tr> </tr>
<tr> <tr>
<th width="180">项目</th> <th width="180">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
<th with="260">项目</th> <th with="260">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
<th width="160">项目</th> <th width="160">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -387,7 +395,8 @@ ...@@ -387,7 +395,8 @@
return { return {
isShow:false, isShow:false,
sendReceiptData: "", sendReceiptData: "",
ishowBtn:true, //定团号
NewCombinationNum:'',
}; };
}, },
methods: { methods: {
...@@ -402,6 +411,7 @@ ...@@ -402,6 +411,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.sendReceiptData = res.data.data; this.sendReceiptData = res.data.data;
console.log(this.sendReceiptData,'sssssssssssss');
this.isShow=true; this.isShow=true;
} }
}, },
...@@ -424,24 +434,13 @@ ...@@ -424,24 +434,13 @@
} }
); );
}, },
//打印 doPrint(){
doPrint() {
this.ishowBtn=false;
setTimeout(this.getPrint,500);
},
getPrint(){
let subOutputRankPrint = document.getElementById("print");
let newContent = subOutputRankPrint.innerHTML;
let oldContent = document.body.innerHTML;
document.body.innerHTML = newContent;
window.print(); window.print();
window.location.reload();
document.body.innerHTML = oldContent;
return false;
}, },
}, },
mounted() { mounted() {
this.getLeaderGuideSendReceipt(); this.getLeaderGuideSendReceipt();
this.NewCombinationNum = this.$route.query.NewCombinationNum;
} }
} }
</script> </script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ ac896bc9
...@@ -185,31 +185,31 @@ ...@@ -185,31 +185,31 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,'领队交接表')"> <div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,outItem,'领队交接表')">
<span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,'用款计划')"> <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,'订房详情')"> <div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,'门票详情')"> <div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,'餐厅详情')"> <div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span>
</div> </div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,'领队报账')"> <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
<span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
</div> </div>
...@@ -388,17 +388,18 @@ ...@@ -388,17 +388,18 @@
} }
}) })
}, },
goUrlT(path, obj, title) { goUrlT(path, obj,outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj, "id": obj,
NewCombinationNum:outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
} }
}) })
}, },
goUrl(path, obj, title) { goUrl(path, obj,outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -406,7 +407,7 @@ ...@@ -406,7 +407,7 @@
'TCNUM': obj.TCNUMS, 'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat, 'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum, 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
} }
...@@ -425,11 +426,13 @@ ...@@ -425,11 +426,13 @@
} }
}) })
}, },
goUrlLeaderIsApply(path, obj, title) { goUrlLeaderIsApply(path, obj,outItem, title) {
console.log(outItem,'outItem');
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj.TCIDS, "id": obj.TCIDS,
NewCombinationNum:outItem.NewCombinationNum,
isUpdate: false, isUpdate: false,
blank: 'y', blank: 'y',
tab: title tab: title
...@@ -559,7 +562,6 @@ ...@@ -559,7 +562,6 @@
} }
.dmcTotalTable tr td .pMsgStyle { .dmcTotalTable tr td .pMsgStyle {
;
padding: 0 10px; padding: 0 10px;
line-height: 20px; line-height: 20px;
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ ac896bc9
...@@ -259,6 +259,54 @@ ...@@ -259,6 +259,54 @@
top: 10px; top: 10px;
margin: 20px 0 30px 11px; margin: 20px 0 30px 11px;
} }
.Tp_hotelDialog{
width:900px;
}
.TphotelTable{
width:100%;
margin:auto;
text-align: center;
font-size: 12px;
color: #333;
border-collapse: collapse;
background-color: #fff;
border: 1px solid #d1d1d1;
}
.TphotelTable th{
background: #E6E6E6;
padding:8px 0;
color: #333;
border: 1px solid #d1d1d1;
font-weight:bold;
}
.TphotelTable tr td{
background-color:#fff;
/* padding:8px 0; */
border: 1px solid #d1d1d1;
}
.Tp_btn{
color: #fff;
height: 25px;
background: #E95252;
border: 1px solid #E95252;
cursor: pointer;
border-radius: 15px;
margin-left: 10px;
}
.tp_divList{
width:100%;
min-height:30px;
border-bottom: 1px dashed #ccc;
}
.tp_divList div{
text-align: left;
padding:0 20px;
margin-top:5px;
}
.tp_divList:last-child{
border:0;
}
</style> </style>
<template> <template>
...@@ -359,6 +407,7 @@ ...@@ -359,6 +407,7 @@
<el-checkbox v-model="priceData.IsBookTeam" style="display:none" <el-checkbox v-model="priceData.IsBookTeam" style="display:none"
:true-label="CheckedVaule" :false-label="UnCheckedVaule">订团 :true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
</el-checkbox> </el-checkbox>
<input type="button" class="normalBtn" style="display:none;" value="酒店使用情况" @click="outerVisible=true"/>
</div> </div>
<el-form-item prop="B2BMemberPrice"> <el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
...@@ -701,6 +750,25 @@ ...@@ -701,6 +750,25 @@
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds" :AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds"
:selectFilghtList="selectFilghtList"></TravelPriceFlightList> :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div> </div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<table class="TphotelTable" border="0" cellspacing='1'>
<tr v-for="item in returnPriceList[0].PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;<el-checkbox></el-checkbox>
</div>
</div>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -710,6 +778,7 @@ ...@@ -710,6 +778,7 @@
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid"], props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid"],
data() { data() {
return { return {
outerVisible:false,
currentDay: 1, currentDay: 1,
currentMonth: 1, currentMonth: 1,
currentYear: 1970, currentYear: 1970,
...@@ -956,6 +1025,8 @@ ...@@ -956,6 +1025,8 @@
} }
}); });
} }
console.log(this.priceList,'priceList');
console.log(this.PostConfig,'PostConfig');
this.initDatePickerCheched(); this.initDatePickerCheched();
}, },
//点击左箭头切换年月 //点击左箭头切换年月
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ ac896bc9
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="120">定团号</th>
<th width="120">游览时间</th> <th width="120">游览时间</th>
<th width="200">景点名称</th> <th width="200">景点名称</th>
<th width="100">总人数</th> <th width="100">总人数</th>
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td> <td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td>
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{NewCombinationNum}}</div></td>
<td> <td>
<div class="w120"> <div class="w120">
{{item.UseTimeStr}} {{item.UseTimeStr}}
...@@ -146,7 +148,8 @@ export default { ...@@ -146,7 +148,8 @@ export default {
roomList:[], roomList:[],
TCNUM:'', TCNUM:'',
flightTotal:0, flightTotal:0,
GuestNum:0 GuestNum:0,
NewCombinationNum:''
} }
}, },
methods: { methods: {
...@@ -229,6 +232,7 @@ export default { ...@@ -229,6 +232,7 @@ export default {
this.TCNUM=this.$route.query.TCNUM this.TCNUM=this.$route.query.TCNUM
this.flightTotal=this.$route.query.flightTotal this.flightTotal=this.$route.query.flightTotal
this.GuestNum=this.$route.query.GuestNum this.GuestNum=this.$route.query.GuestNum
this.NewCombinationNum = this.$route.query.NewCombinationNum
this.getList() this.getList()
}, },
} }
......
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