Skip to content

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

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

parents 050dc40f 5dff5f3a
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 84 deletions
src/components/SalesModule/productQuery.vue
View file @ de35fb85
...@@ -710,7 +710,8 @@ ...@@ -710,7 +710,8 @@
<tr> <tr>
<th width="100">日期</th> <th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th> <th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th> <th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
</tr> </tr>
<template v-for="subItem in item.HotelOrderListReports"> <template v-for="subItem in item.HotelOrderListReports">
...@@ -721,19 +722,26 @@ ...@@ -721,19 +722,26 @@
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}} {{childItem.HotelName}}
</td> </td>
<td style="text-align:left;padding-left:3px;color:red">
{{childItem.HotelName!=childItem.NewHotelName?""+childItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'"> <span v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1"> <template v-if="childItem.OPState==1">
OP-OK <a style="color:green">OP-OK</a>
</template> </template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0"> <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定 <a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="childItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template> </template>
<template v-else> <template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}} <a style="color:red"> {{childItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template> </template>
】 </template>
</a> </span>
</td> </td>
</tr> </tr>
</template> </template>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ de35fb85
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
.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">
...@@ -489,13 +490,15 @@ ...@@ -489,13 +490,15 @@
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span> <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p> </p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop"> <el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr> <tr>
<th width="100">日期</th> <th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th> <th style="width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th> <th style="width:150px;">更换酒店</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th> <th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:120px">占房时间</th>
</tr> </tr>
<template v-for="subItem in item.HotelOrderListReports"> <template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList"> <tr v-for="(childItem,childIndex) in subItem.SubList">
...@@ -505,30 +508,42 @@ ...@@ -505,30 +508,42 @@
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}} {{childItem.HotelName}}
</td> </td>
<td style="text-align:left;padding-left:3px;color:red">
{{childItem.HotelName!=childItem.NewHotelName?""+childItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'"> <span v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1"> <template v-if="childItem.OPState==1">
OP-OK <a style="color:green">OP-OK</a>
</template> </template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0"> <template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定 <a style="color:red">OP-暂定</a>
</template> </template>
<template v-else> <template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}} <template v-if="childItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template> </template>
】 <template v-else>
</a> <a style="color:red"> {{childItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green"> </template>
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】 </template>
</span>
</td>
<td>
<a v-if="(childItem.OPState==1|| childItem.OPState==2 || childItem.DMCState==1 )">
{{childItem.UseCount>0? childItem.UseCount+" 间" :""}}
{{childItem.CostPrice!=0?" 价格:"+childItem.CostPrice:""}}
</a> </a>
</td> </td>
<td> <td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template> <template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)">
{{childItem.CreateDateStr}}</template>
</td> </td>
</tr> </tr>
</template> </template>
</table> </table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span> <span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover> </el-popover>
</p> </p>
<p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1"> <p class="travelnowrap" v-if="item.LineID==14 && item.IsOpenHotel==1">
...@@ -666,7 +681,7 @@ ...@@ -666,7 +681,7 @@
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div> <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">绑定数量: {{item.BindNum}}</div>
<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="440" trigger="click" popper-class="TC_customerInfo"> <el-popover width="440" trigger="click" popper-class="TC_customerInfo">
<table width="440" border="0" cellspacing="0" cellpadding="0" > <table width="440" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="70" style="text-align:center;">绑定数量</th> <th width="70" style="text-align:center;">绑定数量</th>
<th width="70" style="text-align:center;">机票数量</th> <th width="70" style="text-align:center;">机票数量</th>
...@@ -782,10 +797,12 @@ ...@@ -782,10 +797,12 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="SetGroupRecommendType(item,1)" v-if="item.b2b&&item.GroupRecommendType==0"> <el-dropdown-item @click.native="SetGroupRecommendType(item,1)"
v-if="item.b2b&&item.GroupRecommendType==0">
设为精品推荐 设为精品推荐
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)" v-if="item.b2b&&item.GroupRecommendType==1"> <el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
v-if="item.b2b&&item.GroupRecommendType==1">
取消设为精品 取消设为精品
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)"> <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
...@@ -1108,10 +1125,10 @@ ...@@ -1108,10 +1125,10 @@
} }
}, },
methods: { methods: {
SetGroupRecommendType(item,num){ SetGroupRecommendType(item, num) {
let msg={}; let msg = {};
msg.groupRecommendType=num; msg.groupRecommendType = num;
msg.tcid=item.TCID; msg.tcid = item.TCID;
this.apipost( this.apipost(
'travel_post_SetGroupRecommendType', msg, 'travel_post_SetGroupRecommendType', msg,
...@@ -1119,7 +1136,7 @@ ...@@ -1119,7 +1136,7 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(res.data.message) this.Success(res.data.message)
this.getControlList() this.getControlList()
}else{ } else {
this.Error(res.data.message) this.Error(res.data.message)
} }
...@@ -1259,8 +1276,8 @@ ...@@ -1259,8 +1276,8 @@
this.queryCommonData.dataList.forEach(item => { this.queryCommonData.dataList.forEach(item => {
item.SalePlatList = [] item.SalePlatList = []
if (item.SalePlat !== null) { if (item.SalePlat !== null) {
if(item.SalePlat.indexOf("1") != -1){ if (item.SalePlat.indexOf("1") != -1) {
item.b2b=true; item.b2b = true;
} }
var SalePlatArr = item.SalePlat.split(',') var SalePlatArr = item.SalePlat.split(',')
SalePlatArr.forEach(y => { SalePlatArr.forEach(y => {
...@@ -1268,7 +1285,7 @@ ...@@ -1268,7 +1285,7 @@
}) })
} }
}); });
console.log("this.queryCommonData.dataList",this.queryCommonData.dataList); console.log("this.queryCommonData.dataList", this.queryCommonData.dataList);
} }
}, },
err => {} err => {}
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ de35fb85
...@@ -265,13 +265,16 @@ ...@@ -265,13 +265,16 @@
</div> </div>
<p <p
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0"> v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop"> <el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr> <tr>
<th width="100">日期</th> <th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th> <th style="width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th> <th style="width:150px;">更换酒店</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th> <th style="width:100px;">状态</th>
<th style="width:150px;">使用数量/价格</th>
<th style="width:120px">占房时间</th>
</tr> </tr>
<template v-for="hotelItem in item.CommonReport.PriceHotelResult"> <template v-for="hotelItem in item.CommonReport.PriceHotelResult">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList"> <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
...@@ -281,28 +284,35 @@ ...@@ -281,28 +284,35 @@
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}} {{hotelSubItem.HotelName}}
</td> </td>
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="hotelSubItem.HotelName!='温馨的家'"> <span v-if="hotelSubItem.HotelName!='温馨的家'">
【<template v-if="hotelSubItem.OPState==1"> <template v-if="hotelSubItem.OPState==1">
OP-OK <a style="color:green">OP-OK</a>
</template> </template>
<template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0"> <template v-else-if="hotelSubItem.OPState==2&&hotelSubItem.DMCState==0">
OP-暂定 <a style="color:red">OP-暂定</a>
</template> </template>
<template v-else> <template v-else>
{{hotelSubItem.DMCState==1?"地接-OK":(hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作")}} <template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template> </template>
】 <template v-else>
</a> <a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
<a v-if="(hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0))&& hotelSubItem.UseCount>0 " </template>
style="color:green"> </template>
【使用: {{hotelSubItem.UseCount}} 间 </span>
{{hotelSubItem.CostPrice!=0?"价格:"+hotelSubItem.CostPrice:""}} 】 </td>
<td>
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:""}}
</a> </a>
</td> </td>
<td> <td>
<template <template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}</template> {{hotelSubItem.CreateDateStr}}</template>
</td> </td>
</tr> </tr>
......
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