Skip to content

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

页面修改

parent 2eb5932a
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 48 deletions
src/components/Hotel/HotelInfo.vue
View file @ b1a7d803
...@@ -100,36 +100,7 @@ ...@@ -100,36 +100,7 @@
<el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button> <el-button icon="el-icon-minus" circle @click="deleteAir(index)"> </el-button>
</el-col> </el-col>
</el-row> </el-row>
<!-- <el-row :gutter="0">
<el-col :span="6">
<el-form-item label="开始数量" >
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束数量" >
<el-input class='w80'type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="返还数量">
<el-input class='w80' type="text" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
</el-col>
<el-col :span="6" style='padding-top: 5px;'>
</el-col>
</el-row> -->
</div> </div>
<!--<div v-for="(item) in GetPolicy" :key="item.subCode">
<div class="common-lefttit">{{item.Content}}</div>
<span class="resource-net">
<el-input v-model="item.checked" maxlength="50" class="w300"></el-input>
</span>
</div>-->
</div> </div>
<div class="resource-imginfo"> <div class="resource-imginfo">
<div class="resourcerightTop"> <div class="resourcerightTop">
......
src/components/Hotel/HotelProductManage2.vue
View file @ b1a7d803
...@@ -187,27 +187,27 @@ ...@@ -187,27 +187,27 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice"> <el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice"> <el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg2.ChildNotBedPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice"> <el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg2.AddBedPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice"> <el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg2.DriverRoomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice"> <el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg2.GuideRoomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg2.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -424,27 +424,27 @@ ...@@ -424,27 +424,27 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="单人间成本价" prop="SingleroomPrice"> <el-form-item label="单间成本价" prop="SingleroomPrice">
<el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.SingleroomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="小孩不占床成本价" prop="ChildNotBedPrice"> <el-form-item label="不占床成本价" prop="ChildNotBedPrice">
<el-input-number v-model="msg.ChildNotBedPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.ChildNotBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="加床成本价" prop="AddBedPrice"> <el-form-item label="三人间成本价" prop="AddBedPrice">
<el-input-number v-model="msg.AddBedPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.AddBedPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6" style="display:none;">
<el-form-item label="司机房成本价" prop="DriverRoomPrice"> <el-form-item label="司机房成本价" prop="DriverRoomPrice">
<el-input-number v-model="msg.DriverRoomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.DriverRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="导游房成本价" prop="GuideRoomPrice"> <el-form-item label="司导间成本价" prop="GuideRoomPrice">
<el-input-number v-model="msg.GuideRoomPrice" :precision="2" :min="0"></el-input-number> <el-input-number v-model="msg.GuideRoomPrice" :precision="2" :min="0"></el-input-number>
</el-form-item> </el-form-item>
</el-col> </el-col>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ b1a7d803
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<ul> <ul>
<li> <li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" /> <input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span> <span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
</li> </li>
</ul> </ul>
...@@ -52,6 +52,7 @@ ...@@ -52,6 +52,7 @@
<th width="80">金额小计</th> <th width="80">金额小计</th>
<th width="80">返佣类型</th> <th width="80">返佣类型</th>
<th width="80">返佣</th> <th width="80">返佣</th>
<th width="80">返佣金额</th>
<th width="80">入汤税</th> <th width="80">入汤税</th>
<th width="80">城市税</th> <th width="80">城市税</th>
<th width="80">停车费</th> <th width="80">停车费</th>
...@@ -221,7 +222,7 @@ ...@@ -221,7 +222,7 @@
<!-- 返佣类型 --> <!-- 返佣类型 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6"> <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<span style="color:green">含税</span> <span style="color:green">含税</span>
</template> </template>
<template v-else> <template v-else>
<span style="color:red"> 不含税</span> <span style="color:red"> 不含税</span>
...@@ -239,6 +240,29 @@ ...@@ -239,6 +240,29 @@
:disabled="IsEditHotel==0?true:false"></el-input> % :disabled="IsEditHotel==0?true:false"></el-input> %
</template> </template>
</td> </td>
<!--返佣金额-->
<td>
<!--含税-->
<template v-if="subItem.RebateType==1">
<!--税别-->
<template v-if="subItem.TaxType==2">
{{ (childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08 )*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2) }}
</template>
</template>
<!--不含税-->
<template v-else>
<!--税别-->
<template v-if="subItem.TaxType==2">
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1 + 0.08)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
<template v-else>
{{(childItem.UnitPrice * (childItem.BookNum - childItem.HotelDiscount) * (1)*( childItem.RebateRatio / 100)).toFixed(2)}}
</template>
</template>
</td>
<!-- 入汤税 --> <!-- 入汤税 -->
<td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6"> <td style="white-space:nowrap;" v-if="childIndex==0" :rowspan="6">
{{subItem.InTangTax}} {{subItem.InTangTax}}
...@@ -453,8 +477,8 @@ ...@@ -453,8 +477,8 @@
IsEditHotel: 0, IsEditHotel: 0,
//0-可以操作，1-已制单，不能操作 //0-可以操作，1-已制单，不能操作
IsOperation: 1, IsOperation: 1,
LeaderName:"",//领队名称 LeaderName: "", //领队名称
GuideName:"",//导游名称 GuideName: "", //导游名称
} }
}, },
components: { components: {
...@@ -693,7 +717,8 @@ ...@@ -693,7 +717,8 @@
if (obj.TaxType == 2) { if (obj.TaxType == 2) {
if (index == 4) { if (index == 4) {
if (obj.DriverGuideIsRebate == 1) { if (obj.DriverGuideIsRebate == 1) {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio / 100); totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 + 0.08 - item.RebateRatio /
100);
} else { } else {
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100); totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
} }
...@@ -868,8 +893,8 @@ ...@@ -868,8 +893,8 @@
}, },
}, },
mounted() { mounted() {
this.LeaderName=this.$route.query.LeaderName; this.LeaderName = this.$route.query.LeaderName;
this.GuideName=this.$route.query.GuideName; this.GuideName = this.$route.query.GuideName;
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.flightTotal = this.$route.query.flightTotal; this.flightTotal = this.$route.query.flightTotal;
this.GuestNum = this.$route.query.GuestNum; this.GuestNum = this.$route.query.GuestNum;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ b1a7d803
...@@ -176,8 +176,8 @@ ...@@ -176,8 +176,8 @@
</td> </td>
<td> <td>
<span v-if="childItem.HouseType === 1">单间</span> <span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span> <span v-if="childItem.HouseType === 2">标准间</span>
<span v-if="childItem.HouseType === 3">大床房</span> <span v-if="childItem.HouseType === 3">大床间</span>
<span v-if="childItem.HouseType === 4">三人间</span> <span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5"> <span v-if="childItem.HouseType === 5">
司导间 司导间
......
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