Skip to content

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

新增日志显示

parent 5d814738
Hide whitespace changes
Inline Side-by-side
Showing with 124 additions and 54 deletions
src/components/Supplier/HotelQueryList.vue
View file @ 81c13ab8
......@@ -71,7 +71,8 @@
<input type="button" class="normalBtn" style="padding:0 12px;margin-left:0" value="温馨提示"
@click="showNotice=true,resetPageIndex(),GetHotelTipList()" />
<input type="button" class="normalBtn" value="查询" style="padding:0 12px;margin-left:5px" @click="getList()" />
<input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px" @click="DownLoadHotelQuery()" />
<input type="button" class="normalBtn" value="下载" style="padding:0 12px;margin-left:5px"
@click="DownLoadHotelQuery()" />
</li>
</ul>
</div>
......@@ -86,13 +87,15 @@
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<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">
<template slot-scope="scope">
<div>
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;" @click="getLogsList(scope.row.HotelId)" value="操作日志"/>
<input type="button" class="normalBtn" style="margin-left:0;height:22px;padding:0 10px;"
@click="getLogsList(scope.row.HotelId)" value="操作日志" />
</template>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
......@@ -116,8 +119,7 @@
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv"
>
<div class="Hotel_kong Com_hoteldiv">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}
</div>
<div class="Hotel_kong Com_hoteldiv">
......@@ -236,7 +238,8 @@
<el-dialog custom-class="w800" title="操作日志" :visible.sync="showLogInfo" center :before-close="closeChangeMachie">
<el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable logsTable" style="width:100%;">
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable logsTable"
style="width:100%;">
<tr>
<th width="50">操作人</th>
<th>日期</th>
......@@ -248,7 +251,7 @@
<td width="50">{{item.CreateByName}}</td>
<td width="50">{{item.UseTimeStr}}</td>
<td width="80">
{{item.CreateTimeStr}}
{{item.CreateTimeStr}}
</td>
<td>{{item.Remarks}}</td>
</tr>
......@@ -287,7 +290,7 @@
//价格等级
PriceLevel: 0,
},
tableHeight:0,
tableHeight: 0,
beforeCheck: {
disabledDate: time => {
if (this.msg.StartDate) {
......@@ -323,25 +326,25 @@
pageSize: 5,
currentPage: 1,
total: 0,
OpType:1,
OpType: 1,
},
postMsg: {
Id: 0,
TipContent: '',
OpType:1
OpType: 1
},
queryLogMsg:{
queryLogMsg: {
pageIndex: 1,
pageSize: 6,
currentPage: 1,
total: 0,
HotelId:0
HotelId: 0
},
//默认显示弹窗信息
showHQinfo: true,
showLogInfo: false,
LogsList:[],
HotelId:0,
LogsList: [],
HotelId: 0,
//酒店温馨提示列表
HotelTipList: [],
HotelList: [],
......@@ -486,7 +489,7 @@
this.queryMsg.pageIndex = val;
this.GetHotelTipList();
},
handleCurrentChange2(val){
handleCurrentChange2(val) {
this.queryLogMsg.pageIndex = val;
this.getLogsList(this.HotelId);
},
......@@ -608,31 +611,29 @@
this.loading = false;
});
},
com_onresize(){
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 134 - 50;
if(h < 110){
return;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
//设置table的行高
this.tableHeight = h;
},
//获取日志
getLogsList(HotelId){
getLogsList(HotelId) {
this.showLogInfo = true;
this.HotelId = HotelId;
this.queryLogMsg.HotelId = HotelId;
this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
console.log(res,'ressss');
if (res.data.resultCode == 1) {
this.LogsList = res.data.data.pageData;
console.log(this.LogsList,'loglist');
this.queryLogMsg.total = res.data.data.count;
this.LogsList = res.data.data.pageData;
this.queryLogMsg.total = res.data.data.count;
}
}, err => {})
},
closeChangeMachie(){
closeChangeMachie() {
this.showLogInfo = false;
this.queryLogMsg.pageIndex = 1;
}
......@@ -645,7 +646,7 @@
this.GetHotelTipList();
this.com_onresize();
window.onresize = () => {
this.com_onresize();
this.com_onresize();
}
},
};
......@@ -659,7 +660,7 @@
.classHong {
background-color: rgb(255, 55, 55);
color:#fff;
color: #fff;
}
.classWang {
......@@ -773,10 +774,13 @@
.HotelQueryList .el-table td {
padding: 0;
}
.hotelQury2 .w150 .el-input{
width:150px;
.hotelQury2 .w150 .el-input {
width: 150px;
}
.HQ_em{
min-width: 75px!important;
.HQ_em {
min-width: 75px !important;
}
</style>
src/components/Supplier/roomQuery.vue
View file @ 81c13ab8
......@@ -104,10 +104,11 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<div style="font-size:12px;padding:2px 4px 3px 20px;">
<div style="display:inline-block;color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span class="rq_span4">机位数和人数不相符</span>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">未操作</span><span class="rq_span2">操作中</span><span class="rq_span3">操作完成</span><span
class="rq_span4">机位数和人数不相符</span>
</div>
</div><br/>
</div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
<tr>
<th width="100">序号</th>
......@@ -136,7 +137,8 @@
<td v-if="childIndex==0" :rowspan="subItem.hotelList.length">
{{subItem.TCNUMS}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<span v-if="subItem.TCState==3&&subItem.Status==1">正常</span>
<span v-else>取消</span>
</td>
......@@ -185,7 +187,7 @@
<template v-else-if="childItem.SupplierHotelStatus==2"><a style="color:blue">操作完成</a></template>
</template>
</td>
<td v-if="childIndex==0"
:rowspan="subItem.SupplierRemarks!=''?subItem.hotelList.length+1:subItem.hotelList.length">
<el-tooltip class="item" effect="dark" content="操作信息" placement="top-start">
......@@ -239,6 +241,37 @@
@click="GetItemHotelData(subItem.hotelList)">操作</a>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="日志信息" placement="top-start">
<el-popover placement="bottom" width="500" trigger="click">
<table border="0" cellspacing="1" cellpadding="0" class="queryLogTable" style=" border-collapse:collapse;">
<tr>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">操作人</th>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">日期</th>
<th width="100" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">操作时间</th>
<th width="190" style="background: #e6e6e6; height: 35px; font-size: 12px;color: #333;text-align:center;border:1px solid #d1d1d1;">内容</th>
</tr>
<template v-if="LogsList.length>0">
<tr v-for="(item,index) in LogsList">
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">{{item.CreateByName}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">{{item.UseTimeStr}}</td>
<td style="height: 35px; font-size: 12px;text-align:center;border:1px solid #d1d1d1;">
{{item.CreateTimeStr}}
</td>
<td style="height: 35px; font-size: 12px;text-align:left;border:1px solid #d1d1d1;">{{item.Remarks}}</td>
</tr>
</template>
<tr v-else>
<td colspan="5">暂无数据...</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange2"
:current-page.sync="queryLogMsg.currentPage" :page-size="queryLogMsg.pageSize"
layout="total,prev, pager, next, jumper" :total="queryLogMsg.total">
</el-pagination>
<a style="text-decoration:underline;color:blue;cursor:pointer" slot="reference" @click="getLogsList(subItem.TCID)">日志</a>
</el-popover>
</el-tooltip>
<a style="text-decoration:underline;color:blue;cursor:pointer"
@click="AddSupplierComplain(subItem.Complain_Extend.Id,subItem.Complain_Extend.TCID)">
<template v-if="subItem.Complain_Extend.Id>0">编辑投诉</template>
......@@ -301,6 +334,16 @@
LineTeamList: [],
thLengthTitle: [],
dataList: [],
//日志信息
LogsList: [],
queryLogMsg: {
pageIndex: 1,
pageSize: 5,
currentPage: 1,
total: 0,
HotelId: 0,
TCID: 0
},
queryCommonData: {
//公司数据
BranchList: [],
......@@ -332,6 +375,22 @@
}
},
methods: {
handleCurrentChange2(val) {
this.queryLogMsg.pageIndex = val;
this.getLogsList();
},
//获取日志
getLogsList(TCID) {
if (TCID) {
this.queryLogMsg.TCID = TCID;
}
this.ApiPost2('DmcInfoChangeLog_get_GetHotelLogList', this.queryLogMsg, res => {
if (res.data.resultCode == 1) {
this.LogsList = res.data.data.pageData;
this.queryLogMsg.total = res.data.data.count;
}
}, err => {})
},
GetItemHotelData(hotelList) {
this.CurrentHotelList = JSON.parse(JSON.stringify(hotelList));
},
......@@ -636,28 +695,35 @@
color: red;
padding-left: 5px;
}
.roomQuery .rq_comSpan{
font-size:14px;
.roomQuery .rq_comSpan {
font-size: 14px;
margin-left: 20px;
}
.roomQuery .rq_comSpan>span{
}
.roomQuery .rq_comSpan>span {
display: inline-block;
padding:2px 4px;
color:#fff;
border-radius:5px;
margin-right:10px;
padding: 2px 4px;
color: #fff;
border-radius: 5px;
margin-right: 10px;
}
.roomQuery .rq_span1{
background-color: #333;
.roomQuery .rq_span1 {
background-color: #333;
}
.roomQuery .rq_span2{
background-color: #7abd53;
.roomQuery .rq_span2 {
background-color: #7abd53;
}
.roomQuery .rq_span3{
background-color: blue;
.roomQuery .rq_span3 {
background-color: blue;
}
.roomQuery .rq_span4{
background-color: red;
.roomQuery .rq_span4 {
background-color: red;
}
</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