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
Hide 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 @@ ...@@ -748,7 +748,7 @@
&&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(scope.row,2)"> &&pagesTitle=='OP'" class="row-c cursor-pointer radius5 change py5" @click="clickCorrelation(scope.row,2)">
<span class="c059FF6">编辑总金额</span> <span class="c059FF6">编辑总金额</span>
</div> </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> </div>
<div class="mt mb20 bgf5 pa15 row-c" v-if="scope.row.CancelRemark"> <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 @@ ...@@ -689,7 +689,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</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="fz12">{{$t('objFill.invoicedocument')}}</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -832,7 +832,7 @@ ...@@ -832,7 +832,7 @@
<span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span> <span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
</div> </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>
<!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997"> <!-- <div v-if="item.OrderStatus==2" class="column-jac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div> <div class="mb5">已支付</div>
......
src/components/Hotel/singleProduct/HotelQueryList.vue
View file @ 215beb5e
...@@ -154,8 +154,8 @@ ...@@ -154,8 +154,8 @@
pageSize: 10, pageSize: 10,
//酒店选择数组 //酒店选择数组
HotelChooseArray: [], HotelChooseArray: [],
StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), StartDate: '',
EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))), EndDate: '',
//只查询日本 //只查询日本
Country: "0", Country: "0",
Province: 0, Province: 0,
......
src/components/Hotel/singleProduct/ModifyHotelOrder.vue
View file @ 215beb5e
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
<div>本次行程<span <div>本次行程<span
v-if="order.DetailList">{{ order.DetailList.length }}</span>天，入住<span>{{ order.HotelCount }}</span>个酒店</div> v-if="order.DetailList">{{ order.DetailList.length }}</span>天，入住<span>{{ order.HotelCount }}</span>个酒店</div>
<div>{{$t('objFill.dindianfukuan')}}：<span> <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> <div>
<button class="hollowFixedBtn" @click="cancelOrder">取消订单</button> <button class="hollowFixedBtn" @click="cancelOrder">取消订单</button>
<button class="normalBtn" @click="saveOrderHandler">保存订单</button> <button class="normalBtn" @click="saveOrderHandler">保存订单</button>
...@@ -347,8 +347,8 @@ ...@@ -347,8 +347,8 @@
<span>入汤税： {{ moneyFormat(y.PriceInTangTax) }}/人</span> <span>入汤税： {{ moneyFormat(y.PriceInTangTax) }}/人</span>
</div> </div>
<div class="content-Car-heji"> <div class="content-Car-heji">
<span>合计：<span> <span>合计：<span>{{y.CurrencyCode}}
<!-- ¥ -->円{{ moneyFormat(y.HotelMoeny) }}</span></span> {{ moneyFormat(y.HotelMoeny) }}</span></span>
</div> </div>
</div> </div>
</div> </div>
...@@ -360,8 +360,9 @@ ...@@ -360,8 +360,9 @@
<div class="content-header" style="padding: 9px 10px;"> <div class="content-header" style="padding: 9px 10px;">
<span>新日期预定</span> <span>新日期预定</span>
<div> <div>
<!--:picker-options="beforeCheck"-->
<el-date-picker class="w150" v-model="newDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择日期" <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> </div>
<div class="content-Car content-picker-text"> <div class="content-Car content-picker-text">
...@@ -400,7 +401,7 @@ ...@@ -400,7 +401,7 @@
}, },
data() { data() {
return { return {
newDate: this.getBeforeDate(-20, new Date().Format("yyyy-MM-dd")), newDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
orderId: 0, orderId: 0,
order: {}, //下单信息 order: {}, //下单信息
loading: false, loading: false,
......
src/components/Hotel/singleProduct/components/ChosenHotel.vue
View file @ 215beb5e
<template> <template>
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<span> <span>
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<el-select class="option" v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)" <el-select class="option" v-model="msg.Province" filterable @change="getCityList(msg.Province)"
:placeholder="$t('hotel.hotel_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 :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-option v-for="item in provinceList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </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
<el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option> @clear="msg.City=0">
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option :key="0" :value="0" :label="$t('pub.pleaseSel')"></el-option>
</el-select> <el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</span> </el-select>
</li> </span>
<li><span><em>{{$t('pub.date')}}</em> </li>
<el-date-picker disabled style="width: 135px;" v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"> <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> </el-date-picker>
<el-date-picker disabled style="width: 135px;" v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"> <el-date-picker disabled style="width: 135px;" v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date">
</el-date-picker> </el-date-picker>
...@@ -26,88 +28,91 @@ ...@@ -26,88 +28,91 @@
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel')}}</em> <em>{{$t('hotel.hotel')}}</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input HotelChooseArray" <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')"
filterable multiple collapse-tags :multiple-limit="3"> 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-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_starlevel')}}</em> <em>{{$t('hotel.hotel_starlevel')}}</em>
<el-select class="Star" v-model="msg.Star" :placeholder="$t('pub.pleaseSel')"> <el-select class="Star" v-model="msg.Star" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option :label="$t('objFill.sanxingsw')" :value='3'></el-option> <el-option :label="$t('objFill.sanxingsw')" :value='3'></el-option>
<el-option :label="$t('objFill.sixing')" :value='4'></el-option> <el-option :label="$t('objFill.sixing')" :value='4'></el-option>
<el-option :label="$t('objFill.wuxing')" :value='5'></el-option> <el-option :label="$t('objFill.wuxing')" :value='5'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('objFill.jiagequjian')}}</em> <em>{{$t('objFill.jiagequjian')}}</em>
<el-input class="w50" type="Number" v-model="msg.MinPrice"></el-input> <el-input class="w50" type="Number" v-model="msg.MinPrice"></el-input>
<span style="padding: 0 10px;">-</span> <span style="padding: 0 10px;">-</span>
<el-input class="w50" type="Number" v-model="msg.MaxPrice"></el-input> <el-input class="w50" type="Number" v-model="msg.MaxPrice"></el-input>
</span> </span>
</li> </li>
<li style="position: inherit;"> <li style="position: inherit;">
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="getList()" />
</li> </li>
</ul> </ul>
</div>
<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>
</div> </div>
<template v-if="isShow">
<div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList" <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
v-loading="loading"> :height="tableHeight">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;"> <el-table-column fixed :label="$t('hotel.hotel_name')" min-width="180">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">{{$t('objFill.hongri')}}</span> <template slot-scope="scope">
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">{{$t('objFill.wanji')}}</span> <div>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">{{$t('objFill.pingji')}}</span> {{scope.row.HotelName}}</div>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">{{$t('objFill.danji')}}</span> </template>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">{{$t('objFill.tiebiejia')}}</span> </el-table-column>
<span style="color:#000000;background-color: #808000;padding:2px 4px;border-radius:5px">{{$t('objFill.xingqianri')}}</span> <el-table-column :label="$t('objFill.jiagekucun')" fixed min-width="120">
</div> <template slot-scope="scope">
<template v-if="isShow"> <div class="Hotel_kong">{{$t('Operation.Op_price')}}</div>
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' <div class="Hotel_kong" style="min-width:60px;">{{$t('objFill.zongyongsen')}}</div>
:height="tableHeight"> <div class="Hotel_kong">{{$t('objFill.querenyudin')}}</div>
<el-table-column fixed :label="$t('hotel.hotel_name')" min-width="180"> <div class="Hotel_kong">{{$t('objFill.chaodin')}}</div>
<template slot-scope="scope"> </template>
<div> </el-table-column>
{{scope.row.HotelName}}</div> <el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
</template> min-width="120">
</el-table-column> <template slot-scope="scope">
<el-table-column :label="$t('objFill.jiagekucun')" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">{{$t('Operation.Op_price')}}</div>
<div class="Hotel_kong" style="min-width:60px;">{{$t('objFill.zongyongsen')}}</div>
<div class="Hotel_kong">{{$t('objFill.querenyudin')}}</div>
<div class="Hotel_kong">{{$t('objFill.chaodin')}}</div>
</template>
</el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
min-width="120">
<template slot-scope="scope">
<div> <div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0"> <template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList"> <template v-for="childItem in scope.row.subList[index].PriceList">
<div :class="getClass(1,childItem.InventoryType)" <div :class="getClass(1,childItem.InventoryType)"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover"> :style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover">
<el-popover <el-popover placement="bottom" width="300" trigger="hover">
placement="bottom" <SamplePriceList v-if="
width="300"
trigger="hover">
<SamplePriceList
v-if="
scope.row.subList[index].PriceList[0].BidroomPrice>0|| scope.row.subList[index].PriceList[0].BidroomPrice>0||
scope.row.subList[index].PriceList[0].SingleroomPrice>0|| scope.row.subList[index].PriceList[0].SingleroomPrice>0||
scope.row.subList[index].PriceList[0].AddBedPrice>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> <div v-else style="text-align: center;width: 100%;">{{$t('objFill.wuqitafangxingbj')}}</div>
<span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span> <span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span>
</el-popover> </el-popover>
</div> </div>
</template> </template>
</template> </template>
<template v-else> <template v-else>
...@@ -121,459 +126,488 @@ ...@@ -121,459 +126,488 @@
{{item.ConfirmNum}}/{{item.ReserveNum}} {{item.ConfirmNum}}/{{item.ReserveNum}}
</div> </div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv">
<span v-if="item.UseInventory-item.Inventory>0" <span v-if="item.UseInventory-item.Inventory>0" style="color:red;">
style="color:red;">
{{item.UseInventory-item.Inventory}} {{item.UseInventory-item.Inventory}}
</span> </span>
</div> </div>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('hotel.hotel_name')" min-width="100"> <el-table-column :label="$t('hotel.hotel_name')" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="choose-hotel"> <div class="choose-hotel">
<span @click="finishHanler(scope.row)">选择</span> <span @click="finishHanler(scope.row)">选择</span>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="noDataNotice" v-else> <div class="noDataNotice" v-else>
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p> <p>{{$t("active.ld_noData")}}</p>
</div> </div>
<el-pagination v-if="dataList.length>0" background @current-change="handleCurrentChange" <el-pagination v-if="dataList.length>0" background @current-change="handleCurrentChange"
:current-page.sync="msg.pageIndex" :current-page.sync="msg.pageIndex" layout="total,prev, pager, next, jumper" :page-size='msg.pageSize'
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'></el-pagination> :total='total'></el-pagination>
</template> </template>
</div>
</div> </div>
</template> </div>
<script> </template>
import SamplePriceList from './SamplePriceList' <script>
import TableOperation from './TableOperation' import SamplePriceList from './SamplePriceList'
import ListCar from './ListCar' import TableOperation from './TableOperation'
import hotelDetails from './hotelDetails' import ListCar from './ListCar'
export default { import hotelDetails from './hotelDetails'
components: { SamplePriceList, }, export default {
props:['newDate'], components: {
data() { SamplePriceList,
return { },
total:0, props: ['newDate'],
msg: { data() {
pageIndex: 1, return {
pageSize: 10, total: 0,
//酒店选择数组 msg: {
HotelChooseArray: [], pageIndex: 1,
StartDate: '', pageSize: 10,
EndDate: '', //酒店选择数组
//只查询日本 HotelChooseArray: [],
Country: "651", StartDate: '',
Province: 0, EndDate: '',
City: 0, //只查询日本
OutBranchId: -1, Country: "0",
//星级 Province: 0,
Star: 0, City: 0,
//价格等级 OutBranchId: -1,
PriceLevel: 0, //星级
//供应商 Star: 0,
Supplier: 0, //价格等级
MaxPrice: 0, PriceLevel: 0,
MinPrice: 0 //供应商
}, Supplier: 0,
tableHeight: 0, MaxPrice: 0,
//分公司列表 MinPrice: 0,
companyList: [], HotelName: '',
//国家 省市 区 SourceType: 1,
provinceList: [], IsHotelAddPrice: 1
cityList: [],
district: [],
queryMsg: {
QStartDate: '',
QEndDate: '',
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0,
OpType: 0
},
postMsg: {
Id: 0,
TipContent: '',
OpType: 0,
},
//默认显示弹窗信息
showHQinfo: false,
//酒店温馨提示列表
HotelTipList: [],
HotelList: [],
dataList: [],
isShow: false,
loading: false,
};
},
watch: {
newDate: {
handler(newValue,onldValue) {
if(newValue!=onldValue){
this.getList()
}
},
immediate: true
}, },
}, tableHeight: 0,
methods: { //分公司列表
finishHanler(hotel){ companyList: [],
this.$emit('finish',hotel) //国家 省市 区
}, provinceList: [],
com_onresize() { cityList: [],
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定， district: [],
var contentsHeight = document.body.clientHeight; queryMsg: {
var h = contentsHeight - 50 - 180 - 350; QStartDate: '',
if (h < 110) { QEndDate: '',
return; pageIndex: 1,
} pageSize: 5,
//设置table的行高 currentPage: 1,
this.tableHeight = h; total: 0,
}, OpType: 0
getList() {
this.loading = true;
this.msg.StartDate = this.newDate;
this.msg.EndDate = this.newDate;
if(!this.msg.StartDate) return
this.apipost("dict_post_HotelOffer_GetClientHotelStatics", this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data.pageData;
this.total = res.data.data.count
this.isShow = true;
} else {
this.Error(res.data.message);
}
},
err => {}
);
}, },
//获取酒店列表 postMsg: {
GetHotelList() { Id: 0,
this.apipost( TipContent: '',
"hotel_post_GetHasStockHotelList", { OpType: 0,
QCountry: "651",
IsMoreThanZero: 1
},
res => {
if (res.data.resultCode == 1) {
this.HotelList = res.data.data;
}
},
err => {}
);
}, },
//格式化返回显示日期 //默认显示弹窗信息
getDateList(dateStr) { showHQinfo: false,
var str = dateStr.split('-'); //酒店温馨提示列表
var weekDay = ["天", "一", "二", "三", "四", "五", "六"]; HotelTipList: [],
var myDate = new Date(Date.parse(dateStr)); HotelList: [],
dataList: [],
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）"; isShow: false,
}, loading: false,
//获取星期几 userInfo: {},
getWeek(dateStr) { };
var weekDay = ["天", "一", "二", "三", "四", "五", "六"]; },
var myDate = new Date(Date.parse(dateStr)); watch: {
return weekDay[myDate.getDay()] newDate: {
}, handler(newValue, onldValue) {
//获取颜色状态 if (newValue != onldValue) {
getClass(Status, InventoryType) { this.getList()
var classStr = "";
if (Status == 0) {
classStr = 'noKucun';
} }
switch (InventoryType) {
case 1:
classStr = "classHong";
break;
case 2:
classStr = "classWang";
break;
case 3:
classStr = "classPing";
break;
case 4:
classStr = "classDan";
break;
case 5:
classStr = "classTe";
break;
case 6:
classStr = "hotelQueryListclass6"
break;
}
return classStr;
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
}, },
resetPageIndex() { immediate: true
this.queryMsg.pageIndex = 1; },
this.queryMsg.currentPage = 1; },
}, methods: {
//获取酒店列表 finishHanler(hotel) {
GetHotelTipList() { this.$emit('finish', hotel)
this.apipost( },
"hoteltip_get_GetPageList", this.queryMsg, com_onresize() {
res => { //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
if (res.data.resultCode == 1) { var contentsHeight = document.body.clientHeight;
this.HotelTipList = res.data.data.pageData; var h = contentsHeight - 50 - 180 - 350;
this.queryMsg.total = res.data.data.count; if (h < 110) {
} return;
}, }
err => {} //设置table的行高
); this.tableHeight = h;
}, },
GetHotelTip(Id) { getList() {
this.apipost( this.loading = true;
"hoteltip_get_GetHotelTip", { this.msg.StartDate = this.newDate;
ID: Id this.msg.EndDate = this.newDate;
}, if (!this.msg.StartDate) return
res => { this.apipost("dict_post_HotelOffer_GetClientHotelStatics", this.msg,
if (res.data.resultCode == 1) { res => {
this.postMsg.Id = res.data.data.Id; this.loading = false;
this.postMsg.TipContent = res.data.data.TipContent;
} else {
this.Error("获取数据失败!");
}
},
err => {}
);
},
getProvinceList(ID, type) {
//根据省份获取城市
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;
}
},
err => {}
);
},
getBranchList() {
let UserInfo = this.getLocalStorage();
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: UserInfo.RB_Group_id,
Status: 0,
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.companyList = res.data.data; this.dataList = res.data.data.pageData;
this.total = res.data.data.count
this.isShow = true;
} else {
this.Error(res.data.message);
} }
}, err => {}) },
}, err => {}
);
},
//获取酒店列表
GetHotelList() {
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;
}
},
err => {}
);
},
//格式化返回显示日期
getDateList(dateStr) {
var str = dateStr.split('-');
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
},
//获取星期几
getWeek(dateStr) {
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return weekDay[myDate.getDay()]
},
//获取颜色状态
getClass(Status, InventoryType) {
var classStr = "";
if (Status == 0) {
classStr = 'noKucun';
}
switch (InventoryType) {
case 1:
classStr = "classHong";
break;
case 2:
classStr = "classWang";
break;
case 3:
classStr = "classPing";
break;
case 4:
classStr = "classDan";
break;
case 5:
classStr = "classTe";
break;
case 6:
classStr = "hotelQueryListclass6"
break;
}
return classStr;
}, },
mounted() { handleCurrentChange(val) {
this.getBranchList(); this.msg.pageIndex = val;
this.getProvinceList("651", 1);
this.GetHotelList();
this.getList(); this.getList();
this.GetHotelTipList(); },
this.com_onresize(); resetPageIndex() {
window.onresize = () => { this.queryMsg.pageIndex = 1;
this.com_onresize(); this.queryMsg.currentPage = 1;
},
//获取酒店列表
GetHotelTipList() {
this.apipost(
"hoteltip_get_GetPageList", this.queryMsg,
res => {
if (res.data.resultCode == 1) {
this.HotelTipList = res.data.data.pageData;
this.queryMsg.total = res.data.data.count;
}
},
err => {}
);
},
GetHotelTip(Id) {
this.apipost(
"hoteltip_get_GetHotelTip", {
ID: Id
},
res => {
if (res.data.resultCode == 1) {
this.postMsg.Id = res.data.data.Id;
this.postMsg.TipContent = res.data.data.TipContent;
} else {
this.Error("获取数据失败!");
}
},
err => {}
);
},
getCityList(ID) {
//根据省份获取城市
let msg = {
Id: ID
};
this.cityList = [];
this.apipost(
"dict_post_Destination_GetChildList",
msg,
res => {
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;
},
);
},
getBranchList() {
this.apipost('admin_get_BranchGetList', {
RB_Group_Id: this.userInfo.RB_Group_id,
Status: 0,
}, res => {
if (res.data.resultCode == 1) {
this.companyList = res.data.data;
}
}, 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.GetHotelList();
this.getList();
this.GetHotelTipList();
this.com_onresize();
window.onresize = () => {
this.com_onresize();
} }
};
</script>
<style scoped>
.Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
.classHong {
background-color: rgb(255, 55, 55);
color: #fff;
}
.classWang {
background-color: rgb(255, 153, 204);
}
.classPing {
background-color: rgb(188, 214, 238);
}
.classDan {
background-color: rgb(221, 221, 221);
}
.classTe {
background-color: rgb(2, 247, 142);
}
.hotelQueryListclass6 {
background-color:#808000;
}
.HouseTypeList {
background: #ccc;
width: 100%;
margin-top: 20px;
}
.Com_hoteldiv {
min-width: 70px;
white-space: nowrap;
}
.noKucun {
background-color: black !important;
}
.Hotel_kong {
width: 100%;
height: 25px;
text-align: center;
line-height: 25px;
border-bottom: 1px solid #d1d1d1;
}
.Hotel_kong:last-child {
border: 0;
}
.HouseTypeList tr th {
background: #e6e6e6;
height: 25px;
font-size: 12px;
color: #333;
}
.HouseTypeList tr {
background: #fff;
text-align: center;
height: 25px;
}
.HouseTypeList tr td {
font-size: 12px;
}
.hotelProductManage2_tableBox span {
margin: 0 10px 10px 0;
}
.Hq_addDetail {
margin-top: 20px;
}
.Hq_addDetail .el-textarea__inner {
resize: none;
}
.Hq_addTable .el-button.is-circle {
padding: 5px;
}
.HqCom_bottom .el-form-item {
margin-bottom: 0
}
.HqCom_bottom {
height: 350px;
padding-top: 35px;
}
.HQ_miaoshu {
color: #E95252;
font-size: 12px;
}
.HQ_miaoshu:first-child {
margin-top: 10px;
}
.HotelQueryList .has-gutter tr th,
.el-table th.is-leaf {
background: #EAEAEA !important;
}
.HotelQueryList .el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #ebeef5;
}
.HotelQueryList .el-table .cell {
padding: 0;
}
.HotelQueryList .el-table td {
padding: 0;
}
.CostPriceHover{
height:100%;
float:left;
width:100%;
cursor: pointer;
}
.query-box li{
margin: 0 0 10px 0;
}
.query-box li span>em{
min-width: 58px;
}
/deep/.query-box .option .el-input{
width: 120px !important;
}
/deep/.query-box .HotelChooseArray .el-input{
width: 200px !important;
}
/deep/.query-box .Star .el-input{
width: 100px !important;
}
/deep/.el-table td{
padding: 0;
}
/deep/.el-table .cell{
padding-left: 0;
padding-right: 0;
}
.choose-hotel{
display: flex;
align-items: center;
justify-content: center;
padding: 10px 0;
}
.choose-hotel span{
padding: 0 15px;
border-radius: 5px;
border: 1px solid #009EF7;
color: #009EF7;
font-size: 12px;
cursor: pointer;
} }
};
</script>
</style>
<style scoped>
\ No newline at end of file .Hq_duoge {
cursor: pointer;
text-decoration: underline;
}
.HqCom_bottom .ql-container {
min-height: 100px;
}
.classHong {
background-color: rgb(255, 55, 55);
color: #fff;
}
.classWang {
background-color: rgb(255, 153, 204);
}
.classPing {
background-color: rgb(188, 214, 238);
}
.classDan {
background-color: rgb(221, 221, 221);
}
.classTe {
background-color: rgb(2, 247, 142);
}
.hotelQueryListclass6 {
background-color: #808000;
}
.HouseTypeList {
background: #ccc;
width: 100%;
margin-top: 20px;
}
.Com_hoteldiv {
min-width: 70px;
white-space: nowrap;
}
.noKucun {
background-color: black !important;
}
.Hotel_kong {
width: 100%;
height: 25px;
text-align: center;
line-height: 25px;
border-bottom: 1px solid #d1d1d1;
}
.Hotel_kong:last-child {
border: 0;
}
.HouseTypeList tr th {
background: #e6e6e6;
height: 25px;
font-size: 12px;
color: #333;
}
.HouseTypeList tr {
background: #fff;
text-align: center;
height: 25px;
}
.HouseTypeList tr td {
font-size: 12px;
}
.hotelProductManage2_tableBox span {
margin: 0 10px 10px 0;
}
.Hq_addDetail {
margin-top: 20px;
}
.Hq_addDetail .el-textarea__inner {
resize: none;
}
.Hq_addTable .el-button.is-circle {
padding: 5px;
}
.HqCom_bottom .el-form-item {
margin-bottom: 0
}
.HqCom_bottom {
height: 350px;
padding-top: 35px;
}
.HQ_miaoshu {
color: #E95252;
font-size: 12px;
}
.HQ_miaoshu:first-child {
margin-top: 10px;
}
.HotelQueryList .has-gutter tr th,
.el-table th.is-leaf {
background: #EAEAEA !important;
}
.HotelQueryList .el-table td,
.el-table th.is-leaf {
border-bottom: 1px solid #ebeef5;
}
.HotelQueryList .el-table .cell {
padding: 0;
}
.HotelQueryList .el-table td {
padding: 0;
}
.CostPriceHover {
height: 100%;
float: left;
width: 100%;
cursor: pointer;
}
.query-box li {
margin: 0 0 10px 0;
}
.query-box li span>em {
min-width: 58px;
}
/deep/.query-box .option .el-input {
width: 120px !important;
}
/deep/.query-box .HotelChooseArray .el-input {
width: 200px !important;
}
/deep/.query-box .Star .el-input {
width: 100px !important;
}
/deep/.el-table td {
padding: 0;
}
/deep/.el-table .cell {
padding-left: 0;
padding-right: 0;
}
.choose-hotel {
display: flex;
align-items: center;
justify-content: center;
padding: 10px 0;
}
.choose-hotel span {
padding: 0 15px;
border-radius: 5px;
border: 1px solid #009EF7;
color: #009EF7;
font-size: 12px;
cursor: pointer;
}
</style>
src/components/scenicSpot/reservation/OrderList.vue
View file @ 215beb5e
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
</el-tooltip> </el-tooltip>
</div> </div>
</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="fz12">{{$t('objFill.invoicedocument')}}</div>
<div class="row wrap orderNo fz12 py"> <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, <span class="cursor-pointer radius5 mr px5" :class="{'bgD9F3FF':x.InvoiceApplyState===6,'bgFAEAED':x.InvoiceApplyState===1||x.InvoiceApplyState===3,
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
<span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span> <span class="c059FF6">{{$t('pub.edit')}}{{$t('fnc.a_zongjine')}}</span>
</div> </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"> <!-- <template v-if="item.OrderStatus==2">
<div class="column-jac fz12 flex-s c20C997"> <div class="column-jac fz12 flex-s c20C997">
<div class="mb5">已支付</div> <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