Skip to content

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

酒店保证入住修改

parent 4ef40476
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 36 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e7ade6b1
......@@ -490,7 +490,7 @@
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="850" trigger="click" popper-class="TC_HotelPop">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......
src/components/commonPage/commonHotelInfo.vue
View file @ e7ade6b1
......@@ -30,51 +30,64 @@
<td>
公司团号
</td>
<td :colspan="4" style="text-align:left;">
<td :colspan="5" style="text-align:left;">
<span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
</td>
<td>
地接团号
</td>
<td :colspan="showHotelObj.ShowTaxType?5:3" style="text-align:left;">
<td :colspan="showHotelObj.ShowTaxType?6:4" style="text-align:left;">
<span style="padding-left:5px;">{{DMCNum}}</span>
</td>
</tr>
<tr>
<th width="120">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
<th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
<th style="width:130px" v-if="showHotelObj.showZhan">占房时间</th>
<th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
<th style="width:80px;" v-if="showHotelObj.showPrice">
<th width="150">酒店</th>
<th width="150">更换酒店</th>
<th width="120">酒店状态</th>
<th width="120">OP状态</th>
<th width="120">地接状态</th>
<th width="110" v-if="showHotelObj.showPrice">数量<br />价格</th>
<th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
<th width="130" v-if="showHotelObj.showZhan">占房时间</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th>
<th width="70" v-if="showHotelObj.showPrice">
日志
</th>
</tr>
<template v-for="(hotelItem,index) in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
<template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{hotelSubItem.HotelName}}</span>
</template>
<template v-else>
{{hotelSubItem.HotelName}}
</template>
</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>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">保证入住</a>
</template>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hotelSubItem.OPState==2 && hotelSubItem.DMCState==0 ">
<template v-else-if="hotelSubItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
</span>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
......@@ -84,26 +97,22 @@
<template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</template>
</span>
</td>
<td v-if="showHotelObj.showPrice">
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
<br />
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}}
</td>
<td v-if="showHotelObj.ShowTaxType">
<template v-if="hotelSubItem.TaxType==1">税入</template>
{{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">税入</template>
<template v-if="hotelSubItem.TaxType==2">税别</template>
</td>
<td v-if="showHotelObj.ShowRebateRatio">
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.showZhan">
<td v-if="showHotelObj.showZhan" style="white-space:nowrap; ">
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}
</template>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ e7ade6b1
......@@ -305,7 +305,7 @@
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p v-if="item.LineId==14 && item.PriceHotelResult && item.PriceHotelResult.length>0">
<el-popover width="920" trigger="click" popper-class="DMC_HotelPop">
<el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
......
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