Skip to content

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

页面修改

parent f0fe5de3
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 114 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ b7113c5f
...@@ -373,12 +373,10 @@ ...@@ -373,12 +373,10 @@
<span class="mr" v-if="scope.row.OpName&&pagesTitle=='OP'">{{$t('objFill.guanlian')}}OP：{{ scope.row.OpName }}</span> <span class="mr" v-if="scope.row.OpName&&pagesTitle=='OP'">{{$t('objFill.guanlian')}}OP：{{ scope.row.OpName }}</span>
<span class="mr" v-if="scope.row.CustomerName">{{$t('active.cl_addPp')}}：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}/{{ <span class="mr" v-if="scope.row.CustomerName">{{$t('active.cl_addPp')}}：{{ scope.row.CustomerName }} ({{ scope.row.CustomerContact }}/{{
scope.row.CustomerTel scope.row.CustomerTel
}}</span> }})</span>
<span class="mr">{{$t('restaurant.res_oderTime')}}：{{ scope.row.CreateTime }}</span> <span class="mr">{{$t('restaurant.res_oderTime')}}：{{ scope.row.CreateTime }}</span>
<div class=""> <div class="">
<i <i class="mx5" :class="{
class="mx5"
:class="{
'el-icon-alarm-clock c20C997': scope.row.OrderStatus == 1, 'el-icon-alarm-clock c20C997': scope.row.OrderStatus == 1,
'el-icon-check cblack': scope.row.OrderStatus == 2, 'el-icon-check cblack': scope.row.OrderStatus == 2,
'el-icon-warning cff9800': scope.row.OrderStatus == 3, 'el-icon-warning cff9800': scope.row.OrderStatus == 3,
...@@ -537,21 +535,6 @@ ...@@ -537,21 +535,6 @@
<span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span> <span class="fz15 fbold">{{ scope.row.Refund ? scope.row.Refund : "-" }}</span>
</template> </template>
</el-table-column> </el-table-column>
<!-- <el-table-column :label="$t('objFill.shoupeifeiyinshou')" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{
scope.row.HandFittingIncome ? scope.row.HandFittingIncome : "-"
}}</span>
</template>
</el-table-column> -->
<!-- <el-table-column :label="$t('objFill.shoupeifeipintaisj')" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{
scope.row.HandFittingTax ? scope.row.HandFittingTax : "-"
}}</span>
</template>
</el-table-column> -->
<el-table-column :label="$t('Operation.Op_daishou')" min-width="100"> <el-table-column :label="$t('Operation.Op_daishou')" min-width="100">
<template slot-scope="scope"> <template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span> <span class="fz15 fbold">{{ scope.row.DueInMoney || '-' }}</span>
......
src/components/Hotel/singleProduct/HotelQueryList.vue
View file @ b7113c5f
...@@ -6,11 +6,11 @@ ...@@ -6,11 +6,11 @@
<span> <span>
<em>{{$t('system.quety_area')}}</em> <em>{{$t('system.quety_area')}}</em>
<el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)" <el-select v-model="msg.Province" filterable @change="getProvinceList(msg.Province,2)"
: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 v-model="msg.City" filterable :placeholder="$t('hotel.hotel_city')"> <el-select 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 :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-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
...@@ -46,10 +46,8 @@ ...@@ -46,10 +46,8 @@
<span> <span>
<em>{{$t('hotel.hotel')}}</em> <em>{{$t('hotel.hotel')}}</em>
<el-input type="" v-model="msg.HotelName" :placeholder="$t('hotel.table_hotelname')"></el-input> <el-input type="" v-model="msg.HotelName" :placeholder="$t('hotel.table_hotelname')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<input v-if="HOTEL_memorandum&&!pagesTitle" type="button" class="normalBtn" :value="$t('objFill.beiwanglv')" <input v-if="HOTEL_memorandum&&!pagesTitle" type="button" class="normalBtn" :value="$t('objFill.beiwanglv')"
@click="goUrl('memorandumList')" /> @click="goUrl('memorandumList')" />
...@@ -159,7 +157,7 @@ ...@@ -159,7 +157,7 @@
StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),
EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))), EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))),
//只查询日本 //只查询日本
Country: "651", Country: "0",
Province: 0, Province: 0,
City: 0, City: 0,
OutBranchId: -1, OutBranchId: -1,
...@@ -249,7 +247,8 @@ ...@@ -249,7 +247,8 @@
} }
}, },
HOTEL_memorandum: false, HOTEL_memorandum: false,
crmOrderObj: null crmOrderObj: null,
userinfo: {}
}; };
}, },
watch: { watch: {
...@@ -318,6 +317,7 @@ ...@@ -318,6 +317,7 @@
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.dataList=[];
if (this.msg.StartDate == null) { if (this.msg.StartDate == null) {
this.msg.StartDate = this.getBeforeDate(-20, new Date().Format("yyyy-MM-dd")); this.msg.StartDate = this.getBeforeDate(-20, new Date().Format("yyyy-MM-dd"));
} }
...@@ -340,11 +340,15 @@ ...@@ -340,11 +340,15 @@
}, },
//获取酒店列表 //获取酒店列表
GetHotelList() { GetHotelList() {
var postMsg = {
QCountry: "0",
IsMoreThanZero: 1
}
if (this.userinfo && this.userinfo.RB_Group_id == 2) {
postMsg.QCountry = "651";
}
this.apipost( this.apipost(
"hotel_post_GetHasStockHotelList", { "hotel_post_GetHasStockHotelList", postMsg,
QCountry: "651",
IsMoreThanZero: 1
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.HotelList = res.data.data; this.HotelList = res.data.data;
...@@ -357,31 +361,36 @@ ...@@ -357,31 +361,36 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
getProvinceList(ID, type) { getCityList(ID) {
//根据省份获取城市 //根据省份获取城市
let msg = { let msg = {
Id: ID Id: ID
}; };
if (type == 1) { this.cityList = [];
this.msg.Province = 0;
this.msg.City = 0;
this.provinceList = [];
this.cityList = [];
} else if (type == 2) {
this.msg.City = 0;
this.cityList = [];
}
this.apipost( this.apipost(
"dict_post_Destination_GetChildList", "dict_post_Destination_GetChildList",
msg, msg,
res => { res => {
if (type == 1) { this.cityList = res.data.data;
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 => {}
); );
}, },
//Excel下载 //Excel下载
...@@ -398,6 +407,9 @@ ...@@ -398,6 +407,9 @@
}); });
}, },
}, },
created() {
this.userinfo = this.getLocalStorage();
},
mounted() { mounted() {
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) { if (this.$route.query.crmOrderObj) {
...@@ -405,12 +417,19 @@ ...@@ -405,12 +417,19 @@
} }
this.HotelLength = localStorage.getItem("HotelLength") ? localStorage.getItem("HotelLength") : 0 this.HotelLength = localStorage.getItem("HotelLength") ? localStorage.getItem("HotelLength") : 0
let userinfo = this.getLocalStorage();
let ActionMenuCode = userinfo.ActionMenuCode; let ActionMenuCode = this.userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf("HOTEL_memorandum") != -1) { if (ActionMenuCode.indexOf("HOTEL_memorandum") != -1) {
this.HOTEL_memorandum = true; this.HOTEL_memorandum = true;
} }
this.getProvinceList("651", 1); if (this.userinfo && this.userinfo.RB_Group_id == 2) {
this.getProvinceList(651, 1);
this.msg.Country = "651";
} else {
this.getProvinceList(0, 1);
this.msg.Country = "0";
}
this.getList(); this.getList();
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
......
src/components/Hotel/singleProduct/components/hotelTableList.vue
View file @ b7113c5f
<template> <template>
<div> <div>
<el-table :data="dataList" <el-table :data="dataList" style="width:100%" border ref="mytable" key="HotelId" :height="tableHeight">
style="width:100%" border
ref="mytable" key="HotelId" :height="tableHeight">
<el-table-column fixed :label="$t('hotel.hotel_name')" min-width="180"> <el-table-column fixed :label="$t('hotel.hotel_name')" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="showHotelDetailHandler(scope.row.HotelId)"> <div style="text-decoration: underline;cursor:pointer" @click="showHotelDetailHandler(scope.row.HotelId)">
...@@ -18,54 +16,54 @@ ...@@ -18,54 +16,54 @@
<div class="Hotel_kong">{{$t('objFill.chaodin')}}</div> <div class="Hotel_kong">{{$t('objFill.chaodin')}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index' <template v-if="dataList&&dataList.length>0">
min-width="120"> <el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)" :key='index'
<template slot-scope="scope"> min-width="120">
<div @click="showOrderSubmitHandler(scope.row,index,0)"> <template slot-scope="scope">
<div class="Hotel_kong Com_hoteldiv"> <div @click="showOrderSubmitHandler(scope.row,index,0)">
<template v-if="scope.row.subList[index].PriceList.length>0"> <div class="Hotel_kong Com_hoteldiv">
<template v-for="childItem in scope.row.subList[index].PriceList"> <template v-if="scope.row.subList[index].PriceList.length>0">
<div :class="getClass(1,childItem.InventoryType)" <template v-for="childItem in scope.row.subList[index].PriceList">
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover"> <div :class="getClass(1,childItem.InventoryType)"
<el-popover :style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}" class="CostPriceHover">
placement="bottom" <el-popover placement="bottom" width="300" trigger="hover">
width="300" <SamplePriceList v-if="
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]">
<div v-else style="text-align: center;width: 100%;">{{$t('objFill.wuqitafangxingbj')}}</div> </SamplePriceList>
<span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span> <div v-else style="text-align: center;width: 100%;">{{$t('objFill.wuqitafangxingbj')}}</div>
</el-popover> <span slot="reference" class="CostPriceHover">{{childItem.CostPrice}}</span>
</el-popover>
</div>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div> </div>
</template> <div class="Hotel_kong Com_hoteldiv Hq_duoge">
</template> {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
<template v-else> </div>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div> <div class="Hotel_kong Com_hoteldiv">
</template> {{scope.row.subList[index].ConfirmNum}}/{{scope.row.subList[index].ReserveNum}}
</div> </div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge"> <div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}} <span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0"
</div> style="color:red;">
<div class="Hotel_kong Com_hoteldiv"> {{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
{{scope.row.subList[index].ConfirmNum}}/{{scope.row.subList[index].ReserveNum}} </span>
</div> </div>
<div class="Hotel_kong Com_hoteldiv"> </div>
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0" </template>
style="color:red;"> </el-table-column>
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}} </template>
</span>
</div>
</div>
</template>
</el-table-column>
</el-table> </el-table>
<!-- 酒店详情信息 --> <!-- 酒店详情信息 -->
<el-dialog custom-class="w800" :title="$t('objFill.jiudianxiangqing')" :visible.sync="showHotelDetails" center @close="close"> <el-dialog custom-class="w800" :title="$t('objFill.jiudianxiangqing')" :visible.sync="showHotelDetails" center
@close="close">
<hotelDetails :hotelId="HotelDetailId"></hotelDetails> <hotelDetails :hotelId="HotelDetailId"></hotelDetails>
</el-dialog> </el-dialog>
</div> </div>
...@@ -74,8 +72,11 @@ ...@@ -74,8 +72,11 @@
import SamplePriceList from './SamplePriceList' import SamplePriceList from './SamplePriceList'
import hotelDetails from './hotelDetails' import hotelDetails from './hotelDetails'
export default { export default {
components: { SamplePriceList,hotelDetails }, components: {
props:['list','tableHeight'], SamplePriceList,
hotelDetails
},
props: ['list', 'tableHeight'],
data() { data() {
return { return {
showHotelDetails: false, showHotelDetails: false,
...@@ -84,15 +85,15 @@ ...@@ -84,15 +85,15 @@
}; };
}, },
watch: { watch: {
list:{ list: {
handler(val, oldVal){ handler(val, oldVal) {
this.dataList = val this.dataList = val
let _this = this let _this = this
setTimeout(()=>{ setTimeout(() => {
this.$nextTick(() => { this.$nextTick(() => {
_this.$refs.mytable.doLayout(); _this.$refs.mytable.doLayout();
}) })
},200) }, 200)
}, },
deep: true, deep: true,
immediate: true, immediate: true,
...@@ -100,29 +101,31 @@ ...@@ -100,29 +101,31 @@
}, },
methods: { methods: {
// 酒店信息详情 // 酒店信息详情
showHotelDetailHandler(hotelId){ showHotelDetailHandler(hotelId) {
this.HotelDetailId = hotelId this.HotelDetailId = hotelId
this.showHotelDetails = true this.showHotelDetails = true
}, },
// 取消 // 取消
close(){ close() {
this.showHotelDetails = false this.showHotelDetails = false
}, },
// 加入购物车 // 加入购物车
showOrderSubmitHandler(row,index,type){ showOrderSubmitHandler(row, index, type) {
this.$emit('showOrderSubmitHandler',row,index,type) this.$emit('showOrderSubmitHandler', row, index, type)
}, },
//格式化返回显示日期 //格式化返回显示日期
getDateList(dateStr) { getDateList(dateStr) {
var str = dateStr.split('-'); var str = dateStr.split('-');
var weekDay = [this.$t('objFill.Sunday'), this.$t('objFill.Monday'), this.$t('objFill.Tuesday'), this.$t('objFill.Wednesday'), this.$t('objFill.Thursday'), this.$t('objFill.Friday'), this.$t('objFill.Saturday')]; var weekDay = [this.$t('objFill.Sunday'), this.$t('objFill.Monday'), this.$t('objFill.Tuesday'), this.$t(
'objFill.Wednesday'), this.$t('objFill.Thursday'), this.$t('objFill.Friday'), this.$t('objFill.Saturday')];
var myDate = new Date(Date.parse(dateStr)); var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）"; return str[1] + '/' + str[2] + "（" + weekDay[myDate.getDay()] + "）";
}, },
//获取星期几 //获取星期几
getWeek(dateStr) { getWeek(dateStr) {
var weekDay = [this.$t('objFill.Sunday'), this.$t('objFill.Monday'), this.$t('objFill.Tuesday'), this.$t('objFill.Wednesday'), this.$t('objFill.Thursday'), this.$t('objFill.Friday'), this.$t('objFill.Saturday')]; var weekDay = [this.$t('objFill.Sunday'), this.$t('objFill.Monday'), this.$t('objFill.Tuesday'), this.$t(
'objFill.Wednesday'), this.$t('objFill.Thursday'), this.$t('objFill.Friday'), this.$t('objFill.Saturday')];
var myDate = new Date(Date.parse(dateStr)); var myDate = new Date(Date.parse(dateStr));
return weekDay[myDate.getDay()] return weekDay[myDate.getDay()]
}, },
...@@ -156,7 +159,7 @@ ...@@ -156,7 +159,7 @@
}, },
}, },
mounted() { mounted() {
} }
}; };
...@@ -192,9 +195,11 @@ ...@@ -192,9 +195,11 @@
.classTe { .classTe {
background-color: rgb(2, 247, 142); background-color: rgb(2, 247, 142);
} }
.hotelQueryListclass6 { .hotelQueryListclass6 {
background-color:#808000; background-color: #808000;
} }
.HouseTypeList { .HouseTypeList {
background: #ccc; background: #ccc;
width: 100%; width: 100%;
...@@ -290,12 +295,12 @@ ...@@ -290,12 +295,12 @@
.HotelQueryList .el-table td { .HotelQueryList .el-table td {
padding: 0; padding: 0;
} }
.CostPriceHover{
height:100%; .CostPriceHover {
float:left; height: 100%;
width:100%; float: left;
width: 100%;
cursor: pointer; cursor: pointer;
} }
</style> </style>
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