Commit 8f3a7211 authored by 黄奎's avatar 黄奎

页面修改

parent 434c1c55
...@@ -299,11 +299,13 @@ ...@@ -299,11 +299,13 @@
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
currentPage: 1, currentPage: 1,
total: 0 total: 0,
OpType:0
}, },
postMsg: { postMsg: {
Id: 0, Id: 0,
TipContent: '' TipContent: '',
OpType:0,
}, },
//默认显示弹窗信息 //默认显示弹窗信息
showHQinfo: true, showHQinfo: true,
......
...@@ -288,11 +288,13 @@ ...@@ -288,11 +288,13 @@
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
currentPage: 1, currentPage: 1,
total: 0 total: 0,
OpType:1,
}, },
postMsg: { postMsg: {
Id: 0, Id: 0,
TipContent: '' TipContent: '',
OpType:1
}, },
//默认显示弹窗信息 //默认显示弹窗信息
showHQinfo: true, showHQinfo: true,
......
...@@ -63,7 +63,8 @@ ...@@ -63,7 +63,8 @@
<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')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="请选择"></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')">
<el-option :key="0" :value="0" label="请选择"></el-option> <el-option :key="0" :value="0" label="请选择"></el-option>
...@@ -107,17 +108,19 @@ ...@@ -107,17 +108,19 @@
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"> <el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck">
</el-date-picker> </el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"> <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date"
:picker-options="afterCheck">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>酒店</em> <em>酒店</em>
<el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300" <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')"
filterable multiple :multiple-limit="3"> class="multiple_input w300" filterable multiple :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>
...@@ -141,7 +144,8 @@ ...@@ -141,7 +144,8 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span> <span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div> </div>
<template v-if="isShow"> <template v-if="isShow">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading' :height="tableHeight"> <el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
:height="tableHeight">
<el-table-column fixed label="酒店名称" min-width="180"> <el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer"> <div style="text-decoration: underline;cursor:pointer">
...@@ -156,22 +160,22 @@ ...@@ -156,22 +160,22 @@
<div class="Hotel_kong">超定</div> <div class="Hotel_kong">超定</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' <el-table-column v-for='(item,index) in dataList[0].subList' :label="getDateList(item.DateStr)"
min-width="120"> :key='index' min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<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)" style="height:100%;float:left;width:100%" <div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;width:100%"
:style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}</div> :style="{width:(100/scope.row.subList[index].PriceList.length)+'%'}">{{childItem.CostPrice}}
</div>
</template> </template>
</template> </template>
<template v-else> <template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div> <div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template> </template>
</div> </div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" <div class="Hotel_kong Com_hoteldiv Hq_duoge">
>
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}} {{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div> </div>
<div class="Hotel_kong Com_hoteldiv"> <div class="Hotel_kong Com_hoteldiv">
...@@ -242,7 +246,8 @@ ...@@ -242,7 +246,8 @@
<el-button type="primary" icon="el-icon-edit" circle @click="GetHotelTip(item.Id)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="GetHotelTip(item.Id)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="el-icon-delete" circle @click="RemoveHotelTip(item.Id)"></el-button> <el-button type="danger" icon="el-icon-delete" circle @click="RemoveHotelTip(item.Id)">
</el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
...@@ -315,8 +320,8 @@ ...@@ -315,8 +320,8 @@
icon: 'this.src="' + require("../assets/img/NotificationIcon.png") + '"', icon: 'this.src="' + require("../assets/img/NotificationIcon.png") + '"',
allWindowWidth: '', allWindowWidth: '',
showPage:true, showPage: true,
tableHeight:0, tableHeight: 0,
msg: { msg: {
//酒店选择数组 //酒店选择数组
HotelChooseArray: [], HotelChooseArray: [],
...@@ -366,7 +371,8 @@ ...@@ -366,7 +371,8 @@
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
currentPage: 1, currentPage: 1,
total: 0 total: 0,
OpType: 1,
}, },
postMsg: { postMsg: {
Id: 0, Id: 0,
...@@ -402,13 +408,10 @@ ...@@ -402,13 +408,10 @@
] ]
} }
}, },
}; };
}, },
created() { created() {
this.userInfo = this.getLocalStorageSupplier(); this.userInfo = this.getLocalStorageSupplier();
console.log("userInfo",this.userInfo);
let language = localStorage.language; let language = localStorage.language;
if (!language) { if (!language) {
this.language = 'zh-CN'; this.language = 'zh-CN';
...@@ -446,7 +449,9 @@ ...@@ -446,7 +449,9 @@
this.$store.dispatch("logout") this.$store.dispatch("logout")
localStorage.removeItem("userInfo"); localStorage.removeItem("userInfo");
localStorage.removeItem("previousPathInfo"); localStorage.removeItem("previousPathInfo");
this.$router.push({ path: "/SupplierLogin" }); this.$router.push({
path: "/SupplierLogin"
});
}, },
settingSys: function () { settingSys: function () {
this.MsgBus.$emit('settingOpen') this.MsgBus.$emit('settingOpen')
...@@ -682,11 +687,11 @@ ...@@ -682,11 +687,11 @@
this.loading = false; this.loading = false;
}); });
}, },
com_onresize(){ com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定, //clientHeight的值由DIV内容的实际高度和CSS中的padding值决定,
var contentsHeight = document.body.clientHeight; var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 80; var h = contentsHeight - 50 - 80;
if(h < 110){ if (h < 110) {
return; return;
} }
//设置table的行高 //设置table的行高
...@@ -702,20 +707,20 @@ ...@@ -702,20 +707,20 @@
this.GetHotelList(); this.GetHotelList();
this.getList(); this.getList();
this.GetHotelTipList(); this.GetHotelTipList();
  var url = window.location.href; var url = window.location.href;
if(String(url).indexOf('SupplierIndex') >= 0){ if (String(url).indexOf('SupplierIndex') >= 0) {
this.showPage=true; this.showPage = true;
}else{ } else {
this.showPage =false; this.showPage = false;
}; };
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
this.com_onresize(); this.com_onresize();
} }
}, },
watch:{ watch: {
$route(val){ $route(val) {
this.showPage =false; this.showPage = false;
} }
} }
}; };
...@@ -1065,7 +1070,7 @@ ...@@ -1065,7 +1070,7 @@
.classHong { .classHong {
background-color: rgb(255, 55, 55); background-color: rgb(255, 55, 55);
color:#fff; color: #fff;
} }
.classWang { .classWang {
...@@ -1180,5 +1185,4 @@ ...@@ -1180,5 +1185,4 @@
padding: 0; padding: 0;
} }
</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