Skip to content

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

地接报价调整

parent 45d8e403
Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 32 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ec393c40
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
top: 0; top: 0;
z-index: 10; z-index: 10;
} }
</style> </style>
<template> <template>
...@@ -209,9 +208,22 @@ ...@@ -209,9 +208,22 @@
</td> </td>
</tr> </tr>
</table> </table>
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font style="color:red;"> <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font
style="color:red;">
{{subItem.OfferHotelName}}( {{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/{{$t('hotel.hotel_people')}})</font></span> {{subItem.OfferUnitPrice}}<template v-if="subItem.IsHotelChange">
<el-tooltip :content="subItem.HotelChangeRemark">
<font style="color:blue;">
<template v-if="subItem.HotelChangeValue>0">
+{{subItem.HotelChangeValue}}
</template>
<template v-else>
{{subItem.HotelChangeValue}}
</template>
</font>
</el-tooltip>
</template>/{{$t('hotel.hotel_people')}})</font>
</span>
</td> </td>
<!-- 机位总数/(Y/E/F) --> <!-- 机位总数/(Y/E/F) -->
<td v-if="childIndex==0" :rowspan="6"> <td v-if="childIndex==0" :rowspan="6">
...@@ -803,8 +815,9 @@ ...@@ -803,8 +815,9 @@
if (objData.list && objData.list.length > 0) { if (objData.list && objData.list.length > 0) {
var str = ""; var str = "";
objData.list.forEach((cItem, cIndex) => { objData.list.forEach((cItem, cIndex) => {
str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + this.$t('objFill.shiyongle') + cItem.LastUseNum + this.$t( str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + this.$t('objFill.shiyongle') + cItem
'hotel.hotel_room'); .LastUseNum + this.$t(
'hotel.hotel_room');
}); });
if (str != "") { if (str != "") {
this.Info(str); this.Info(str);
...@@ -1286,7 +1299,6 @@ ...@@ -1286,7 +1299,6 @@
this.getList(); this.getList();
} }
} }
</script> </script>
<style> <style>
.roomReservationsDetailsTalbe { .roomReservationsDetailsTalbe {
...@@ -1358,5 +1370,4 @@ ...@@ -1358,5 +1370,4 @@
.roomReservationsDetailsTalbe .hotelTable tr td { .roomReservationsDetailsTalbe .hotelTable tr td {
border: none; border: none;
} }
</style>
</style> \ No newline at end of file
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ec393c40
...@@ -152,8 +152,21 @@ ...@@ -152,8 +152,21 @@
</div> </div>
</template> </template>
</template> </template>
<template v-if="item.BusOfferPrice&&item.BusOfferPrice"> <template v-if="item.BusOfferPrice&&item.BusOfferPrice>0">
<br /> {{$t('objFill.baojia')}}:<font style="color:red;">{{item.BusOfferPrice}}</font> <br /> {{$t('objFill.baojia')}}:<font style="color:red;">{{item.BusOfferPrice}}
<template v-if="item.IsBusChange">
<el-tooltip :content="item.BusChangeRemark">
<font style="color:blue;">
<template v-if="item.BusChangeValue>0">
+{{item.BusChangeValue}}
</template>
<template v-else>
{{item.BusChangeValue}}
</template>
</font>
</el-tooltip>
</template>
</font>
</template> </template>
</td> </td>
<td> <td>
...@@ -313,7 +326,19 @@ ...@@ -313,7 +326,19 @@
<br /> <br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font style="color:red;"> <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajiudian')}}：<font style="color:red;">
{{subItem.OfferHotelName}}( {{subItem.OfferHotelName}}(
{{subItem.OfferUnitPrice}}/{{$t('hotel.hotel_people')}})</font></span> {{subItem.OfferUnitPrice}}<template v-if="subItem.IsHotelChange">
<el-tooltip :content="subItem.HotelChangeRemark">
<font style="color:blue;">
<template v-if="subItem.HotelChangeValue>0">
+{{subItem.HotelChangeValue}}
</template>
<template v-else>
{{subItem.HotelChangeValue}}
</template>
</font>
</el-tooltip>
</template>
/{{$t('hotel.hotel_people')}})</font></span>
<br /> <br />
<span style="color:red" <span style="color:red"
v-if="subItem.StandardRoomPrice">{{$t('objFill.shijijine')}}:{{subItem.StandardRoomPrice}}/{{$t('objFill.v101.LeaderManagement.renbiaoj')}}</span> v-if="subItem.StandardRoomPrice">{{$t('objFill.shijijine')}}:{{subItem.StandardRoomPrice}}/{{$t('objFill.v101.LeaderManagement.renbiaoj')}}</span>
...@@ -588,7 +613,18 @@ ...@@ -588,7 +613,18 @@
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0"> <template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br /> <br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font style="color:red;"> <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/{{$t('hotel.hotel_people')}}) {{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}} <template v-if="subItem.IsDinnerChange">
<el-tooltip :content="subItem.DinnerChangeRemark">
<font style="color:blue;">
<template v-if="subItem.DinnerChangeValue>0">
+{{subItem.DinnerChangeValue}}
</template>
<template v-else>
{{subItem.DinnerChangeValue}}
</template>
</font>
</el-tooltip>
</template>/{{$t('hotel.hotel_people')}})
</font></span> </font></span>
</template> </template>
</td> </td>
...@@ -726,7 +762,18 @@ ...@@ -726,7 +762,18 @@
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font
style="color:red;"> style="color:red;">
{{subItem.ScenicOfferName}} {{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/{{$t('hotel.hotel_people')}})</font> ({{subItem.ScenicOfferPrice}}<template v-if="subItem.IsScenicChange">
<el-tooltip :content="subItem.ScenicChangeRemark">
<font style="color:blue;">
<template v-if="subItem.ScenicChangeValue>0">
+{{subItem.ScenicChangeValue}}
</template>
<template v-else>
{{subItem.ScenicChangeValue}}
</template>
</font>
</el-tooltip>
</template>/{{$t('hotel.hotel_people')}})</font>
</span> </span>
</template> </template>
</td> </td>
...@@ -753,7 +800,7 @@ ...@@ -753,7 +800,7 @@
{{childItem.DiscountPrice}}% {{childItem.DiscountPrice}}%
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}} {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<span v-if="subItem.PayStyle === 1">{{$t('objFill.xianfu')}}</span> <span v-if="subItem.PayStyle === 1">{{$t('objFill.xianfu')}}</span>
...@@ -2419,8 +2466,9 @@ ...@@ -2419,8 +2466,9 @@
arrList(x.ScenicStatisticsList) //门票 arrList(x.ScenicStatisticsList) //门票
}) })
arrList(data.OtherOrderReportList) //其它 arrList(data.OtherOrderReportList) //其它
this.list = data; this.list = data;
console.log("this.list",this.list);
var lineArray = [168]; //新欧洲线只显示标准间 var lineArray = [168]; //新欧洲线只显示标准间
var lineId = 0; var lineId = 0;
//转成数字类型 //转成数字类型
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ ec393c40
...@@ -100,8 +100,22 @@ ...@@ -100,8 +100,22 @@
</el-popover> </el-popover>
<template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0"> <template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
<br /> <br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font style="color:red;"> <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}/{{$t('hotel.hotel_people')}}) style="color:red;">
{{subItem.DinnerOfferName}}({{subItem.DinnerOfferPrice}}
<template v-if="subItem.IsDinnerChange">
<el-tooltip :content="subItem.DinnerChangeRemark">
<font style="color:blue;">
<template v-if="subItem.DinnerChangeValue>0">
+{{subItem.DinnerChangeValue}}
</template>
<template v-else>
{{subItem.DinnerChangeValue}}
</template>
</font>
</el-tooltip>
</template>
/{{$t('hotel.hotel_people')}})
</font></span> </font></span>
</template> </template>
</td> </td>
...@@ -230,8 +244,8 @@ ...@@ -230,8 +244,8 @@
{{$t('salesModule.SureTime')}}： {{$t('salesModule.SureTime')}}：
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-date-picker class='w135' v-model="subItem.SureTime" type="date" :placeholder="$t('salesModule.SureTime')" <el-date-picker class='w135' v-model="subItem.SureTime" type="date"
value-format="yyyy-MM-dd"> :placeholder="$t('salesModule.SureTime')" value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</td> </td>
</tr> </tr>
...@@ -567,7 +581,6 @@ ...@@ -567,7 +581,6 @@
}, err => {}); }, err => {});
} }
}; };
</script> </script>
<style> <style>
...@@ -619,5 +632,4 @@ ...@@ -619,5 +632,4 @@
.bookDinnerStatisticsTalbe .dinnerTable tr td { .bookDinnerStatisticsTalbe .dinnerTable tr td {
border: none; border: none;
} }
</style>
</style> \ No newline at end of file
src/components/busManagement/BusInfo.vue
View file @ ec393c40
...@@ -156,7 +156,6 @@ ...@@ -156,7 +156,6 @@
line-height: 34px; line-height: 34px;
text-align: left; text-align: left;
} }
</style> </style>
<template> <template>
<div class="flexOne busInfo"> <div class="flexOne busInfo">
...@@ -252,7 +251,20 @@ ...@@ -252,7 +251,20 @@
</span> </span>
<br /> <br />
</div> </div>
{{$t('objFill.v101.busManagement.chezhibj')}}:<font style="color:red">{{scope.row.BusOfferPrice}}</font> {{$t('objFill.v101.busManagement.chezhibj')}}:<font style="color:red">{{scope.row.BusOfferPrice}}
<template v-if="scope.row.IsBusChange">
<el-tooltip :content="scope.row.BusChangeRemark">
<font style="color:blue;">
<template v-if="scope.row.BusChangeValue>0">
+{{scope.row.BusChangeValue}}
</template>
<template v-else>
{{scope.row.BusChangeValue}}
</template>
</font>
</el-tooltip>
</template>
</font>
</template> </template>
</el-table-column> </el-table-column>
<!-- <!--
...@@ -857,5 +869,4 @@ ...@@ -857,5 +869,4 @@
this.getSupplierList(); this.getSupplierList();
} }
}; };
</script>
</script> \ No newline at end of file
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ ec393c40
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<span class="spanlink" @click="goUrl('ticketManagement',subItem,'门票管理')"> <span class="spanlink" @click="goUrl('ticketManagement',subItem,'门票管理')">
{{subItem.ScenicName}} {{subItem.ScenicName}}
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -75,9 +74,21 @@ ...@@ -75,9 +74,21 @@
</table> </table>
<template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0"> <template v-if="subItem.ScenicOfferPrice&& subItem.ScenicOfferPrice>0">
<br /> <br />
<span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font style="color:red;"> <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiajingdian')}}:<font
style="color:red;">
{{subItem.ScenicOfferName}} {{subItem.ScenicOfferName}}
({{subItem.ScenicOfferPrice}}/{{$t('hotel.hotel_people')}})</font> ({{subItem.ScenicOfferPrice}}<template v-if="subItem.IsScenicChange">
<el-tooltip :content="subItem.ScenicChangeRemark">
<font style="color:blue;">
<template v-if="subItem.ScenicChangeValue>0">
+{{subItem.ScenicChangeValue}}
</template>
<template v-else>
{{subItem.ScenicChangeValue}}
</template>
</font>
</el-tooltip>
</template>/{{$t('hotel.hotel_people')}})</font>
</span> </span>
</template> </template>
</td> </td>
...@@ -321,7 +332,6 @@ ...@@ -321,7 +332,6 @@
this.getCurrencyList(); this.getCurrencyList();
}, },
} }
</script> </script>
<style> <style>
.admissionStatisticsDetailsTalbe { .admissionStatisticsDetailsTalbe {
...@@ -368,5 +378,4 @@ ...@@ -368,5 +378,4 @@
.admissionStatisticsDetailsTalbe .scenicTable tr td { .admissionStatisticsDetailsTalbe .scenicTable tr td {
border: none; border: none;
} }
</style>
</style> \ No newline at end of file
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