Skip to content

S
SuperMan
Commit 969355f7 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 7c85074b e9ac1add
Hide whitespace changes
Inline Side-by-side
Showing with 91 additions and 82 deletions
src/components/Supplier/roomQuery2.vue
View file @ 969355f7
...@@ -203,9 +203,14 @@ ...@@ -203,9 +203,14 @@
</tr> </tr>
<tr> <tr>
<td colspan="6"> <td colspan="6">
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span> <template v-if="(childItem.DMCState==1 || childItem.OPState==1) && childItem.SupplierId!=UserInfo.SupplierId">
<span style="display:inline-block;width:87%;" <div style="height:15px;"></div>
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5}">{{childItem.Remarks}}</span> </template>
<template v-else>
<span style="display:inline-block;width:60px;vertical-align:top;">提示信息：</span>
<span style="display:inline-block;width:87%;"
:class="{'rq_disImNote':childItem.SupplierHotelStatus==1&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5,'rq_importNote':childItem.SupplierHotelStatus==2&&DateMinus(getDateStr(childItem.SupplierHotelStatusTime))<=5}">{{childItem.Remarks}}</span>
</template>
</td> </td>
</tr> </tr>
</template> </template>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 969355f7
...@@ -2225,19 +2225,14 @@ ...@@ -2225,19 +2225,14 @@
<td>{{item.PlatformTax}}</td> <td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td> <td>{{item.ZaiTuMoney}}</td>
<td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td> <td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
<td class="fz12"> <td class="fz12" colspan="2">
<span class="RL-redType">{{item.statsstr}}</span> <span class="RL-redType">{{item.statsstr}}</span>
<br /> <br />
<span class="RL-redType" v-if="item.OrderCancelDate!=''">{{item.OrderCancelDate}}</span> <span class="RL-redType" v-if="item.OrderCancelDate!=''">{{item.OrderCancelDate}}</span>
</td> </td>
<td>
<div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)"
style="color:blue;text-decoration:underline;font-size:12px;cursor:pointer;">确认函下载</span>
</td>
<td class="RL-BTNlist" rowspan="2"> <td class="RL-BTNlist" rowspan="2">
<el-button-group> <el-button-group>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start"> <el-tooltip class="item" effect="dark" content="修改" placement="top-start" style="display:none;">
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF'
icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button> icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip> </el-tooltip>
...@@ -2262,7 +2257,7 @@ ...@@ -2262,7 +2257,7 @@
icon="iconfont icon-rizhi1"></el-button> icon="iconfont icon-rizhi1"></el-button>
</el-popover> </el-popover>
</el-tooltip> </el-tooltip>
<el-tooltip effect="dark" content="更多" placement="top-start" style="float:left"> <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left;display:none;">
<el-popover width='100' trigger="hover"> <el-popover width='100' trigger="hover">
<div class="groupTourOrder_more"> <div class="groupTourOrder_more">
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div> <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
......
src/components/commonPage/commonHotelInfo.vue
View file @ 969355f7
<template> <template>
<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="width:150px;">酒店</th> <th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th> <th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th> <th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</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.showPay">付款方式</th>
<th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th> <th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
</tr> </tr>
<template v-for="hotelItem in HotelObj"> <template v-for="hotelItem in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList"> <tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="100" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length"> <td width="100" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
{{hotelItem.UseDay}} {{hotelItem.UseDay}}
</td> </td>
<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"> <td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}} {{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td> </td>
<td style="text-align:left;padding-left:3px;"> <td style="text-align:left;padding-left:3px;">
<span v-if="hotelSubItem.HotelName!='温馨的家'"> <span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1"> <template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-OK</a> <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">
<a style="color:red">OP-暂定</a> <a style="color:red">OP-暂定</a>
</template> </template>
<template v-else> <template v-else>
<template v-if="hotelSubItem.DMCState==1"> <template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a> <a style="color:green">地接-OK</a>
</template> </template>
<template v-else> <template v-else>
<a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a> <a style="color:red"> {{hotelSubItem.DMCState==2?"地接-暂定":"地接-未操作"}}</a>
</template> </template>
</template> </template>
</span> </span>
</td> </td>
<td v-if="showHotelObj.showPrice"> <td v-if="showHotelObj.showPrice">
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )"> <a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}} {{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}} {{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a> </a>
</td> </td>
<td v-if="showHotelObj.showPay"> <td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}} {{hotelSubItem.PayTypeStr}}
</td> </td>
<td v-if="showHotelObj.showZhan"> <td v-if="showHotelObj.showZhan">
<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}}
{{hotelSubItem.CreateDateStr}} </template>
</template> </td>
</td> </tr>
</tr> </template>
</template> <tfoot v-if="showHotelObj.showBtnList">
<tfoot v-if="showHotelObj.showBtnList"> <tr>
<tr> <td colspan="7" style="padding:10px 0">
<td colspan="7" style="padding:10px 0"> <input type="button" class="normalBtn" value="确定" style="display:none;" />
<input type="button" class="normalBtn" value="确定" style="display:none;"/> <input type="button" class="normalBtn" value="暂定" style="display:none;" />
<input type="button" class="normalBtn" value="暂定" style="display:none;"/> <input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadShouPeiShu()" />
<input type="button" class="normalBtn" value="下载"/> </td>
</td> </tr>
</tr> </tfoot>
</tfoot> </table>
</table>
</template> </template>
<script> <script>
export default { export default {
props: ["HotelObj","showHotelObj"], props: ["HotelObj", "showHotelObj","TCID","DMCNum","TCNUM"],
data() { data() {
return { return {
loading:false,
}; };
}, },
methods: { methods: {
DownLoadShouPeiShu() {
this.loading = true;
let qMsg = {
TCID:this.TCID
};
let fileName = "手配书【"+this.DMCNum+"】" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("hotel_SPS_DownLoad", qMsg, fileName,
res => {
this.loading = false;
});
}
}, },
mounted() { mounted() {
} }
}; };
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 969355f7
...@@ -266,7 +266,7 @@ ...@@ -266,7 +266,7 @@
<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="700" trigger="click" popper-class="TC_HotelPop"> <el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo> <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<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>
......
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