Commit 37f7080e authored by 黄奎's avatar 黄奎

页面修改

parent 2c93c05b
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe" v-loading="loading">
<tr> <tr>
<th class="fz14" colspan="5"> <th class="fz14" colspan="5">
{{$t('visa.v_teaminfo')}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}} {{$t('visa.v_teaminfo')}}:{{TCNUM}}&nbsp;&nbsp;{{$t('leader.leader_Leader')}}:{{LeaderName}}
&nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}.</th> &nbsp;&nbsp;{{$t('leader.leader_Guide')}}:{{GuideName}}</th>
<th class="fz14" colspan="17"> <th class="fz14" colspan="17">
<el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start" <el-tooltip class="item" effect="dark" content="批量上传手配书" placement="top-start"
style="float:left;margin-left:20px;display:none;"> style="float:left;margin-left:20px;display:none;">
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
<th width="100">{{$t('ground.fangjianleixing')}}</th> <th width="100">{{$t('ground.fangjianleixing')}}</th>
<th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th> <th width="80">{{$t('ground.fangjian')}}<br />{{$t("ground.yudingshu")}}</th>
<th width="80">{{$t('ground.yudingrenshu')}}</th> <th width="80">{{$t('ground.yudingrenshu')}}</th>
<!-- <th width="80">尚差<br />房间数</th> -->
<th width="80">{{$t('ground.danjiameiren')}}</th> <th width="80">{{$t('ground.danjiameiren')}}</th>
<th width="80">{{$t('ground.mianjianrenshu')}}</th> <th width="80">{{$t('ground.mianjianrenshu')}}</th>
<th width="80">{{$t('ground.jinexiaoji')}}</th> <th width="80">{{$t('ground.jinexiaoji')}}</th>
...@@ -301,13 +300,6 @@ ...@@ -301,13 +300,6 @@
</el-input> </el-input>
</div> </div>
</td> </td>
<!-- 尚差房间数 -->
<!-- <td>
<p class="pHouseStyle"
:class="{colorRed:childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount<0}">
{{childItem.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[childIndex].HouseTypeCount}}
</p>
</td> -->
<!-- 单价/每人 --> <!-- 单价/每人 -->
<td> <td>
<div v-if="childItem.HouseType === 2"> <div v-if="childItem.HouseType === 2">
...@@ -975,11 +967,6 @@ ...@@ -975,11 +967,6 @@
this.CreateBy = res.data.data.CreateBy; this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto; this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount; this.CreateByAccount = res.data.data.CreateByAccount;
// in list">
// <template v-for="(subItem,subIndex) in item.HotelOrderList">
// <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="childIndex">
if (list != null && list.length > 0) { if (list != null && list.length > 0) {
list.forEach((item, sIndex) => { list.forEach((item, sIndex) => {
item.HotelOrderList.forEach(subItem => { item.HotelOrderList.forEach(subItem => {
...@@ -991,10 +978,7 @@ ...@@ -991,10 +978,7 @@
Name: subItem.NewHotelName, Name: subItem.NewHotelName,
ID: subItem.NewHotelId ID: subItem.NewHotelId
}); });
//默认成日元
if (subItem.CurrencyId == 0) {
subItem.CurrencyId = 3;
}
subItem.OrderDetailsList.forEach((x, index1) => { subItem.OrderDetailsList.forEach((x, index1) => {
x.HouseTypeCount = x.HouseTypeCount.toString(); x.HouseTypeCount = x.HouseTypeCount.toString();
x.UnitPrice = x.UnitPrice.toString(); x.UnitPrice = x.UnitPrice.toString();
...@@ -1004,11 +988,12 @@ ...@@ -1004,11 +988,12 @@
subItem.ReserveNo = this.$route.query.NewCombinationNum; subItem.ReserveNo = this.$route.query.NewCombinationNum;
} }
subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2) subItem.OrderDetailsList = subItem.OrderDetailsList.filter(item => item.HouseType === 2)
// this.calculationPrice(subItem); const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {
const item = subItem.OrderDetailsList.find(item => item.HouseType === 2) || {TotalPrice: 0} TotalPrice: 0
subItem.TotalPrice = item.TotalPrice.toFixed(2); }
// 将金额总计的值赋值给金额小计 subItem.TotalPrice = item.TotalPrice.toFixed(2);
subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2); // 将金额总计的值赋值给金额小计
subItem.OrderDetailsList[0].TotalPrice = Number(subItem.TotalPrice).toFixed(2);
subItem.isShowPop = false; subItem.isShowPop = false;
subItem.ckedHotelName = ""; subItem.ckedHotelName = "";
//遍历手配 //遍历手配
......
...@@ -484,9 +484,6 @@ ...@@ -484,9 +484,6 @@
<span v-if="item.CustomerName">客户名称:{{item.CustomerName}} <span v-if="item.CustomerName">客户名称:{{item.CustomerName}}
</span> </span>
</p> </p>
<!-- <p v-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
<a style="color:blue;" :href="item.PriceOfferUrl" v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
</p> -->
</div> </div>
</div> </div>
<div class="d2" v-if="pagesTitle=='跟团游产品'"> <div class="d2" v-if="pagesTitle=='跟团游产品'">
...@@ -608,7 +605,8 @@ ...@@ -608,7 +605,8 @@
<span class="TCL-greenType">{{ item.SaleClearOrderHour <span class="TCL-greenType">{{ item.SaleClearOrderHour
}}{{ $t("salesModule.Hour") }}</span> }}{{ $t("salesModule.Hour") }}</span>
</p> </p>
<p v-if="item.LineID == 14 && item.HotelOrderListReports && item.HotelOrderListReports.length > 0"> <!--日本线和欧洲线显示酒店预定情况-->
<p v-if="(item.LineID == 14||item.LineID==168) && item.HotelOrderListReports && item.HotelOrderListReports.length > 0">
<el-popover width="600" trigger="click" popper-class="PQ_HotelPop"> <el-popover width="600" trigger="click" popper-class="PQ_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"> <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj">
</commonHotelInfo> </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