Commit 26a22137 authored by 黄奎's avatar 黄奎

11

parent e375549c
...@@ -25,10 +25,12 @@ ...@@ -25,10 +25,12 @@
<template> <template>
<div> <div>
<div> <div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr v-if="showHotelObj.showPrice"> <tr v-if="showHotelObj.showPrice">
<td> <td>
{{$t('salesModule.CompanyNum')}} {{$t('salesModule.CompanyNum')}}
</td> </td>
<td colspan="4" style="text-align:left;"> <td colspan="4" style="text-align:left;">
<span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span> <span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
...@@ -48,7 +50,7 @@ ...@@ -48,7 +50,7 @@
<th width="120">{{$t('salesModule.OPstatus')}}</th> <th width="120">{{$t('salesModule.OPstatus')}}</th>
<th width="120">{{$t('salesModule.DJstatus')}}</th> <th width="120">{{$t('salesModule.DJstatus')}}</th>
<th width="110" v-if="showHotelObj.showPrice"> <th width="110" v-if="showHotelObj.showPrice">
{{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}}</th> {{$t('restaurant.res_Number')}}<br />{{$t('Operation.Op_price')}} </th>
<th width="120" v-if="showHotelObj.showPay"> <th width="120" v-if="showHotelObj.showPay">
{{$t('fnc.fkfangshi')}}<br />{{$t('restaurant.res_commissionColumn')}}</th> {{$t('fnc.fkfangshi')}}<br />{{$t('restaurant.res_commissionColumn')}}</th>
<th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th> <th width="130" v-if="showHotelObj.showZhan">{{$t('salesModule.UseRoomTime')}}</th>
...@@ -186,13 +188,13 @@ ...@@ -186,13 +188,13 @@
库存:{{hotelSubItem.Inventory}} 库存:{{hotelSubItem.Inventory}}
<br /> <br />
<el-popover placement="right" width="460" trigger="click"> <el-popover placement="right" width="460" trigger="click">
<el-table :data="hotelSubItem.UseList" > <el-table :data="hotelSubItem.UseList">
<el-table-column width="160" property="CreateTime" label="占房时间"></el-table-column> <el-table-column width="160" property="CreateTime" label="占房时间"></el-table-column>
<el-table-column width="80" property="UseNum" label="使用数量"></el-table-column> <el-table-column width="80" property="UseNum" label="使用数量"></el-table-column>
<el-table-column width="210" property="TCNUM" label="使用团号"> <el-table-column width="210" property="TCNUM" label="使用团号">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.TCNUM}}({{scope.row.TCID}}) {{scope.row.TCNUM}}({{scope.row.TCID}})
<br/> <br />
{{scope.row.DMCNum}} {{scope.row.DMCNum}}
</template> </template>
</el-table-column> </el-table-column>
...@@ -216,11 +218,22 @@ ...@@ -216,11 +218,22 @@
</td> </td>
</tr> </tr>
</template> </template>
<tfoot v-if="showHotelObj.showPrice">
<tr>
<td colspan="6" style="text-align:right; font-weight:bold;">
合计:
</td>
<td colspan="6" style="text-align:left; font-weight:bold; padding-left:5px;">
{{getTotalPrice()}}
</td>
</tr>
</tfoot>
</table> </table>
</div> </div>
<div> <div>
<table width="100%" class="comHotelOperation" v-if="showHotelObj.showCaozuoTime"> <table width="100%" class="comHotelOperation" v-if="showHotelObj.showCaozuoTime">
<template v-if="HotelObj&&HotelObj.length>0"> <template v-if="HotelObj&&HotelObj.length>0">
<tr> <tr>
<td class="tdRight"> <td class="tdRight">
{{$t('salesModule.TeamTime')}} {{$t('salesModule.TeamTime')}}
...@@ -237,22 +250,6 @@ ...@@ -237,22 +250,6 @@
<span v-else>{{$t('active.cl_zanwu')}}</span> <span v-else>{{$t('active.cl_zanwu')}}</span>
</td> </td>
</tr> </tr>
<!-- <tr>
<td class="tdRight">
{{$t('salesModule.UseRoomTime')}}
</td>
<td class="tdLeft">
<span v-if="HotelObj[0].UseHotelTimeStr">{{HotelObj[0].UseHotelTimeStr}}</span>
<span v-else>{{$t('active.cl_zanwu')}}</span>
</td>
<td class="tdRight">
{{$t('salesModule.SPtime')}}
</td>
<td class="tdLeft">
<span v-if="HotelObj[0].ShouPeiStatusTimeStr">{{HotelObj[0].ShouPeiStatusTimeStr}}</span>
<span v-else>{{$t('active.cl_zanwu')}}</span>
</td>
</tr> -->
<tr v-if="showHotelObj.caiwu&&HotelObj&&HotelObj.length>0&&HotelObj[0].FrList&&HotelObj[0].FrList.length > 0"> <tr v-if="showHotelObj.caiwu&&HotelObj&&HotelObj.length>0&&HotelObj[0].FrList&&HotelObj[0].FrList.length > 0">
<td class="tdRight"> <td class="tdRight">
{{$t('salesModule.DJNUM')}} {{$t('salesModule.DJNUM')}}
...@@ -265,7 +262,7 @@ ...@@ -265,7 +262,7 @@
</td> </td>
</tr> </tr>
</template> </template>
<template v-if="showHotelObj.showBtnList"> <!-- <template v-if="showHotelObj.showBtnList">
<tr> <tr>
<td colspan="4" style="padding:10px 0;text-align:center;"> <td colspan="4" style="padding:10px 0;text-align:center;">
<input type="button" class="normalBtn" <input type="button" class="normalBtn"
...@@ -274,7 +271,8 @@ ...@@ -274,7 +271,8 @@
<input type="button" class="normalBtn" :value="$t('objFill.xz')" @click="DownLoadShouPeiShu()" /> <input type="button" class="normalBtn" :value="$t('objFill.xz')" @click="DownLoadShouPeiShu()" />
</td> </td>
</tr> </tr>
</template> </template> -->
</table> </table>
</div> </div>
</div> </div>
...@@ -283,6 +281,7 @@ ...@@ -283,6 +281,7 @@
<script> <script>
import commonHotelLog from "../commonPage/commonHotelLog.vue"; import commonHotelLog from "../commonPage/commonHotelLog.vue";
export default { export default {
props: ["HotelObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"], props: ["HotelObj", "showHotelObj", "TCID", "DMCNum", "TCNUM"],
data() { data() {
return { return {
...@@ -301,7 +300,26 @@ ...@@ -301,7 +300,26 @@
//日志组件 //日志组件
commonHotelLog commonHotelLog
}, },
methods: { methods: {
//计算合计
getTotalPrice() {
let totalPrice = 0;
if (this.HotelObj && this.HotelObj.length > 0) {
this.HotelObj.forEach(hotelItem => {
hotelItem.SubList.forEach(subItem => {
if ((subItem.OPState == 1 || subItem.OPState == 2 || subItem.DMCState == 1)) {
if (subItem.CostPriceNew > 0) {
totalPrice += subItem.CostPriceNew;
} else {
totalPrice += subItem.CostPrice;
}
}
});
});
return totalPrice;
}
},
//初始化参数 //初始化参数
InitData() { InitData() {
this.HotelList = []; this.HotelList = [];
......
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