Skip to content

S
SuperMan
Commit 215beb5e authored by youjie's avatar youjie
Browse files
Options

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

parents 0e069548 3c9b1a9c
Show whitespace changes
Inline Side-by-side
Showing with 570 additions and 535 deletions
src/components/CarDealerOrder/components/OrderList.vue
View file @ 215beb5e
......@@ -748,7 +748,7 @@
&&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(scope.row,2)">
<span class="c059FF6">编辑总金额</span>
</div>
<ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
<ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
</div>
</div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark">
......
src/components/Hotel/reservation/OrderList.vue
View file @ 215beb5e
......@@ -689,7 +689,7 @@
</el-tooltip>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px" v-if="userInfo&&userInfo.RB_Group_id==2">
<div class="fz12">{{$t('objFill.invoicedocument')}}</div>
<div class="row wrap orderNo fz12 py">
<span
......@@ -832,7 +832,7 @@
<span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="6"></ApplyFoInvoice>
<ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="6"></ApplyFoInvoice>
</div>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div>
......
src/components/Hotel/singleProduct/HotelQueryList.vue
View file @ 215beb5e
......@@ -154,8 +154,8 @@
pageSize: 10,
//酒店选择数组
HotelChooseArray: [],
StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))),
StartDate: '',
EndDate: '',
//只查询日本
Country: "0",
Province: 0,
......
src/components/Hotel/singleProduct/ModifyHotelOrder.vue
View file @ 215beb5e
......@@ -255,7 +255,7 @@
<div>本次行程<span
v-if="order.DetailList">{{ order.DetailList.length }}</span>天，入住<span>{{ order.HotelCount }}</span>个酒店</div>
<div>{{$t('objFill.dindianfukuan')}}：<span>
<!-- ¥ -->円</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
{{order.CurrencyCode}}</span><b v-if="order.Money">{{ moneyFormat(order.Money) }}</b></div>
<div>
<button class="hollowFixedBtn" @click="cancelOrder">取消订单</button>
<button class="normalBtn" @click="saveOrderHandler">保存订单</button>
......@@ -347,8 +347,8 @@
<span>入汤税： {{ moneyFormat(y.PriceInTangTax) }}/人</span>
</div>
<div class="content-Car-heji">
<span>合计：<span>
<!-- ¥ -->円{{ moneyFormat(y.HotelMoeny) }}</span></span>
<span>合计：<span>{{y.CurrencyCode}}
{{ moneyFormat(y.HotelMoeny) }}</span></span>
</div>
</div>
</div>
......@@ -360,8 +360,9 @@
<div class="content-header" style="padding: 9px 10px;">
<span>新日期预定</span>
<div>
<!--:picker-options="beforeCheck"-->
<el-date-picker class="w150" v-model="newDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期"
:picker-options="beforeCheck"></el-date-picker>
></el-date-picker>
</div>
</div>
<div class="content-Car content-picker-text">
......@@ -400,7 +401,7 @@
},
data() {
return {
newDate: this.getBeforeDate(-20, new Date().Format("yyyy-MM-dd")),
newDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
orderId: 0,
order: {}, //下单信息
loading: false,
......
src/components/Hotel/singleProduct/components/ChosenHotel.vue
View file @ 215beb5e
......@@ -5,19 +5,21 @@
<li>
<span>
<em>{{$t('system.quety_area')}}</em>
<el-select class="option" v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
:placeholder="$t('hotel.hotel_province')">
<el-select class="option" v-model="msg.Province" filterable @change="getCityList(msg.Province)"
:placeholder="$t('hotel.hotel_province')" clearable @clear="msg.Province=0,msg.City=0">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
<el-select class="option" v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')">
<el-select class="option" v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')" clearable
@clear="msg.City=0">
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
<li><span><em>{{$t('pub.date')}}</em>
<el-date-picker disabled style="width: 135px;" v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date">
<el-date-picker disabled style="width: 135px;" v-model='msg.StartDate' value-format="yyyy-MM-dd"
type="date">
</el-date-picker>
<el-date-picker disabled style="width: 135px;" v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date">
</el-date-picker>
......@@ -26,8 +28,8 @@
<li>
<span>
<em>{{$t('hotel.hotel')}}</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input HotelChooseArray"
filterable multiple collapse-tags :multiple-limit="3">
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')"
class="multiple_input HotelChooseArray" filterable multiple collapse-tags :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
......@@ -61,12 +63,18 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">{{$t('objFill.hongri')}}</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">{{$t('objFill.wanji')}}</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">{{$t('objFill.pingji')}}</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">{{$t('objFill.danji')}}</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">{{$t('objFill.tiebiejia')}}</span>
<span style="color:#000000;background-color: #808000;padding:2px 4px;border-radius:5px">{{$t('objFill.xingqianri')}}</span>
<span
style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">{{$t('objFill.hongri')}}</span>
<span
style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">{{$t('objFill.wanji')}}</span>
<span
style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">{{$t('objFill.pingji')}}</span>
<span
style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">{{$t('objFill.danji')}}</span>
<span
style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">{{$t('objFill.tiebiejia')}}</span>
<span
style="color:#000000;background-color: #808000;padding:2px 4px;border-radius:5px">{{$t('objFill.xingqianri')}}</span>
</div>
<template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
......@@ -94,16 +102,13 @@
<template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover">
<el-popover
placement="bottom"
width="300"
trigger="hover">
<SamplePriceList
v-if="
<el-popover placement="bottom" width="300" trigger="hover">
<SamplePriceList v-if="
scope.row.subList[index].PriceList[0].BidroomPrice>0||
scope.row.subList[index].PriceList[0].SingleroomPrice>0||
scope.row.subList[index].PriceList[0].AddBedPrice>0||
scope.row.subList[index].PriceList[0].GuideRoomPrice>0" :price="scope.row.subList[index]"></SamplePriceList>
scope.row.subList[index].PriceList[0].GuideRoomPrice>0" :price="scope.row.subList[index]">
</SamplePriceList>
<div v-else style="text-align: center;width: 100%;">{{$t('objFill.wuqitafangxingbj')}}</div>
<span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span>
</el-popover>
......@@ -121,8 +126,7 @@
{{item.ConfirmNum}}/{{item.ReserveNum}}
</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="item.UseInventory-item.Inventory>0"
style="color:red;">
<span v-if="item.UseInventory-item.Inventory>0" style="color:red;">
{{item.UseInventory-item.Inventory}}
</span>
</div>
......@@ -142,23 +146,25 @@
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-pagination v-if="dataList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'></el-pagination>
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper" :page-size='msg.pageSize'
:total='total'></el-pagination>
</template>
</div>
</div>
</template>
<script>
</template>
<script>
import SamplePriceList from './SamplePriceList'
import TableOperation from './TableOperation'
import ListCar from './ListCar'
import hotelDetails from './hotelDetails'
export default {
components: { SamplePriceList, },
props:['newDate'],
components: {
SamplePriceList,
},
props: ['newDate'],
data() {
return {
total:0,
total: 0,
msg: {
pageIndex: 1,
pageSize: 10,
......@@ -167,7 +173,7 @@
StartDate: '',
EndDate: '',
//只查询日本
Country: "651",
Country: "0",
Province: 0,
City: 0,
OutBranchId: -1,
......@@ -178,7 +184,10 @@
//供应商
Supplier: 0,
MaxPrice: 0,
MinPrice: 0
MinPrice: 0,
HotelName: '',
SourceType: 1,
IsHotelAddPrice: 1
},
tableHeight: 0,
//分公司列表
......@@ -209,12 +218,13 @@
dataList: [],
isShow: false,
loading: false,
userInfo: {},
};
},
watch: {
newDate: {
handler(newValue,onldValue) {
if(newValue!=onldValue){
handler(newValue, onldValue) {
if (newValue != onldValue) {
this.getList()
}
},
......@@ -222,8 +232,8 @@
},
},
methods: {
finishHanler(hotel){
this.$emit('finish',hotel)
finishHanler(hotel) {
this.$emit('finish', hotel)
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
......@@ -239,7 +249,7 @@
this.loading = true;
this.msg.StartDate = this.newDate;
this.msg.EndDate = this.newDate;
if(!this.msg.StartDate) return
if (!this.msg.StartDate) return
this.apipost("dict_post_HotelOffer_GetClientHotelStatics", this.msg,
res => {
this.loading = false;
......@@ -256,11 +266,15 @@
},
//获取酒店列表
GetHotelList() {
this.apipost(
"hotel_post_GetHasStockHotelList", {
QCountry: "651",
var postMsg = {
QCountry: "",
IsMoreThanZero: 1
},
}
if (this.userInfo && this.userInfo.RB_Group_id == 2) {
postMsg.QCountry = "651";
}
this.apipost(
"hotel_post_GetHasStockHotelList", postMsg,
res => {
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
......@@ -274,7 +288,6 @@
var str = dateStr.split('-');
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
},
//获取星期几
......@@ -348,37 +361,41 @@
err => {}
);
},
getProvinceList(ID, type) {
getCityList(ID) {
//根据省份获取城市
let msg = {
Id: ID
};
if (type == 1) {
this.msg.Province = 0;
this.msg.City = 0;
this.provinceList = [];
this.cityList = [];
} else if (type == 2) {
this.msg.City = 0;
this.cityList = [];
}
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
if (type == 1) {
this.provinceList = res.data.data;
} else if (type == 2) {
this.cityList = res.data.data;
},
);
},
getProvinceList(countryId) {
//根据省份获取城市
this.provinceList = [];
let msg = {
CodeLevel: 2,
ParentID: 0
};
if (countryId && countryId > 0) {
msg.ParentID = countryId;
}
this.apipost(
"dict_get_Destination_GetCityExtList",
msg,
res => {
this.provinceList = res.data.data;
},
err => {}
);
},
getBranchList() {
let UserInfo = this.getLocalStorage();
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: UserInfo.RB_Group_id,
RB_Group_Id: this.userInfo.RB_Group_id,
Status: 0,
}, res => {
if (res.data.resultCode == 1) {
......@@ -387,9 +404,17 @@
}, err => {})
},
},
created() {
this.userInfo = this.getLocalStorage();
},
mounted() {
if (this.userInfo && this.userInfo.RB_Group_id == 2) {
this.msg.Country = "651";
this.getProvinceList("651");
} else {
this.getProvinceList("0");
}
this.getBranchList();
this.getProvinceList("651", 1);
this.GetHotelList();
this.getList();
this.GetHotelTipList();
......@@ -400,9 +425,9 @@
}
};
</script>
</script>
<style scoped>
<style scoped>
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
......@@ -432,9 +457,11 @@
.classTe {
background-color: rgb(2, 247, 142);
}
.hotelQueryListclass6 {
background-color:#808000;
background-color: #808000;
}
.HouseTypeList {
background: #ccc;
width: 100%;
......@@ -530,41 +557,51 @@
.HotelQueryList .el-table td {
padding: 0;
}
.CostPriceHover{
height:100%;
float:left;
width:100%;
.CostPriceHover {
height: 100%;
float: left;
width: 100%;
cursor: pointer;
}
.query-box li{
.query-box li {
margin: 0 0 10px 0;
}
.query-box li span>em{
.query-box li span>em {
min-width: 58px;
}
/deep/.query-box .option .el-input{
/deep/.query-box .option .el-input {
width: 120px !important;
}
/deep/.query-box .HotelChooseArray .el-input{
/deep/.query-box .HotelChooseArray .el-input {
width: 200px !important;
}
/deep/.query-box .Star .el-input{
/deep/.query-box .Star .el-input {
width: 100px !important;
}
/deep/.el-table td{
/deep/.el-table td {
padding: 0;
}
/deep/.el-table .cell{
/deep/.el-table .cell {
padding-left: 0;
padding-right: 0;
}
.choose-hotel{
.choose-hotel {
display: flex;
align-items: center;
justify-content: center;
padding: 10px 0;
}
.choose-hotel span{
.choose-hotel span {
padding: 0 15px;
border-radius: 5px;
border: 1px solid #009EF7;
......@@ -573,7 +610,4 @@
cursor: pointer;
}
</style>
\ No newline at end of file
</style>
src/components/scenicSpot/reservation/OrderList.vue
View file @ 215beb5e
......@@ -785,7 +785,7 @@
</el-tooltip>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px">
<div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 150px;max-width:400px" v-if="userInfo&&userInfo.RB_Group_id==2">
<div class="fz12">{{$t('objFill.invoicedocument')}}</div>
<div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
......@@ -877,7 +877,7 @@
<span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
</div>
<!-- 申请发票 -->
<ApplyFoInvoice v-if="userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
<ApplyFoInvoice v-if="userInfo&&userInfo.RB_Group_id==2&&userInfo.EmployeeId==scope.row.EnterID" :obj="scope.row" :type="7"></ApplyFoInvoice>
<!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div>
......
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