Skip to content

S
SuperMan
Commit 42326f40 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents c7ab8592 59b5e94e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 80 deletions
src/components/Hotel/HotelProductManage2.vue
View file @ 42326f40
......@@ -63,19 +63,31 @@
<div class="triangle_border_up"></div>
<div class="popContent">
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template v-for="(childItem,childIndex) in subItem.data.SubList">
<div class="popList">
<label>批次：{{childItem.BatchNumber}}</label>
<label>价格：{{childItem.CostPrice}}</label>
<table style="margin-left:3px;padding-top:2px;">
<tr>
<th width="50">批次</th>
<th width="50">价格</th>
<th width="50">库存</th>
</tr>
<tr v-for="(childItem,childIndex) in subItem.data.SubList">
<td>
{{childItem.BatchNumber}}
</td>
<td>
{{childItem.CostPrice}}
</td>
<td>
{{childItem.Inventory}}
</td>
</tr>
</table>
</div>
</template>
</template>
</div>
</div>
<template v-if="subItem.data&&subItem.data.SubList && subItem.data.SubList[0]">
<template v-for="(childItem,childIndex) in subItem.data.SubList">
<span v-if="childItem.BatchNumber>1"> {{childItem.BatchNumber}} </span>
</template>
<span v-if="subItem.data.SubList.length>1"> {{subItem.data.SubList.length}} </span>
</template>
</div>
</div>
......
src/components/Hotel/HotelQueryList.vue
View file @ 42326f40
......@@ -74,57 +74,53 @@
<div style="width: 100%;min-height:200px; overflow-x: auto;padding-bottom: 10px; " class="HotelQueryList"
v-loading="loading">
<div class="hotelProductManage2_tableBox">
<div class="hotelProductManage2_tableBox" style="margin-bottom:20px;">
<span style="color:#000000;background-color: #ff3737;padding:2px 4px;border-radius:5px">红日</span>
<span style="color:#000000;background-color: #ff99cc;padding:2px 4px;border-radius:5px">旺季</span>
<span style="color:#000000;background-color: #bcd6ee;padding:2px 4px;border-radius:5px">平季</span>
<span style="color:#000000;background-color: #DDDDDD;padding:2px 4px;border-radius:5px">淡季</span>
<span style="color:#000000;background-color: #02F78E;padding:2px 4px;border-radius:5px">特别价</span>
</div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList" v-if="isShow">
<tr>
<th width="300">酒店名称</th>
<th width="80">价格&库存</th>
<template v-if="dataList.length>0">
<th v-for="item in dataList[0].subList">
{{getDateList(item.DateStr)}}<br/>
{{getWeek(item.DateStr)}}
</th>
</template>
</tr>
<tr v-for="item in dataList">
<td>
<div style="min-width:140px; text-align:left;padding-left:5px;cursor:pointer;" >
<span title="点击跳转到酒店查询页面" @click="GotoHotel(item.HotelId)" style="text-decoration: underline;min-width:140px; ">{{item.HotelName}}</span>
<br/>（总库存:{{item.TotalInventory}}）</div>
</td>
<td>
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</td>
<td v-for="(subItem,subIndex) in item.subList">
<div class="Hotel_kong Com_hoteldiv" >
<template v-if="subItem.PriceList&&subItem.PriceList.length>0">
<template v-for="childItem in subItem.PriceList">
<div :class="getClass(1,childItem.InventoryType)" style="height:100%;float:left;"
:style="{width:(98/subItem.PriceList.length)+'%'}">{{childItem.CostPrice}}</div>
</template>
<template v-if="isShow">
<el-table :data="dataList" style="width:100%" border v-loading='loading' height="500">
<el-table-column fixed label="酒店名称" min-width="180">
<template slot-scope="scope">
<div style="text-decoration: underline;cursor:pointer" @click="GotoHotel(scope.row.HotelId)">{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</el-table-column>
<el-table-column label="价格&库存" fixed min-width="120">
<template slot-scope="scope">
<div class="Hotel_kong">价格</div>
<div class="Hotel_kong" style="min-width:60px;">总/用/剩</div>
<div class="Hotel_kong">超定</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(item,subIndex,subItem.UseInventory)">
{{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
{{subItem.UseInventory-subItem.Inventory}}
</span>
</div>
</td>
</tr>
</table>
</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 class="Hotel_kong Com_hoteldiv">
<template v-if="scope.row.subList[index].PriceList.length>0">
<template v-for="childItem in scope.row.subList[index].PriceList">
<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>
</template>
</template>
<template v-else>
<div :class="getClass(0,0)" style="width:100%;height:100%">&nbsp;</div>
</template>
</div>
<div class="Hotel_kong Com_hoteldiv Hq_duoge" @click="GotoUrl(scope.row,index,scope.row.subList[index].UseInventory)">
{{scope.row.subList[index].Inventory}}/{{scope.row.subList[index].UseInventory}}/{{scope.row.subList[index].RemainingInventory}}</div>
<div class="Hotel_kong Com_hoteldiv">
<span v-if="scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory>0" style="color:red;">
{{scope.row.subList[index].UseInventory-scope.row.subList[index].Inventory}}
</span>
</div>
</template>
</el-table-column>
</el-table>
</template>
</div>
<div class="combottomDiv HqCom_bottom" v-if="showNotice">
......@@ -159,11 +155,11 @@
<div>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:97%;">
<tr>
<th>编号</th>
<th width="50">编号</th>
<th>内容</th>
<th>操作人</th>
<th>操作时间</th>
<th>操作</th>
<th width="70">操作人</th>
<th width="150">操作时间</th>
<th width="80">操作</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
......@@ -194,15 +190,15 @@
<el-form>
<table border="0" cellspacing="1" cellpadding="0" class="HouseTypeList Hq_addTable" style="width:100%;">
<tr>
<th>编号</th>
<th width="50">编号</th>
<th>内容</th>
<th>操作人</th>
<th>操作时间</th>
<th width="70">操作人</th>
<th width="140">操作时间</th>
</tr>
<template v-if="queryMsg.total>0">
<tr v-for="(item,index) in HotelTipList">
<td>{{item.Id}}</td>
<td><p style="text-align:left;padding-left:5px;" v-html="item.TipContent"></p></td>
<td><p style="text-align:left;padding:0 5px;" v-html="item.TipContent"></p></td>
<td>{{item.CreateByName}}</td>
<td>{{item.CreateTimeStr}}</td>
</tr>
......@@ -289,7 +285,7 @@
['blockquote', 'code-block','align']
]
}
},
},
};
},
methods: {
......@@ -365,7 +361,10 @@
//格式化返回显示日期
getDateList(dateStr) {
var str = dateStr.split('-');
return str[1] + '/' + str[2];
var weekDay = ["天", "一", "二", "三", "四", "五", "六"];
var myDate = new Date(Date.parse(dateStr));
return str[1] + '/' + str[2] + "（"+weekDay[myDate.getDay()]+"）";
},
//获取星期几
getWeek(dateStr) {
......@@ -514,7 +513,7 @@
this.GetHotelList();
this.getList();
this.GetHotelTipList();
}
},
};
</script>
......@@ -567,6 +566,7 @@
.Hotel_kong {
width: 100%;
height: 35px;
text-align: center;
line-height: 35px;
border-bottom: 1px solid #d1d1d1;
}
......@@ -623,4 +623,16 @@
.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;
}
</style>
src/components/Hotel/HotelSalesBoard.vue
View file @ 42326f40
......@@ -199,6 +199,12 @@
background-color: #02F78E;
}
.hotelSalesBoard .stock1 {
color: red;
}
.hotelSalesBoard .stock2 {
color: white;
}
/* 日期样式结束*/
</style>
......@@ -291,7 +297,7 @@
(总: {{subItem.Inventory}} &nbsp;&nbsp;
<a title="点击跳转到订房管理" v-if="subItem.UseInventory>0"
@click="goUrl('roomReservations',subItem,dayItem.DayStr,'订房管理')"
style="cursor:pointer;text-decoration:underline;color:red;">已用:{{subItem.UseInventory}}</a>
style="cursor:pointer;text-decoration:underline;" :class="subItem.InventoryType==4 ? 'stock1' : 'stock2'">已用:{{subItem.UseInventory}}</a>
<span v-else>已用:{{subItem.UseInventory}}</span>
)
</p>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 42326f40
......@@ -275,10 +275,10 @@
<div class="comSearchDiv">
<span>{{$t('Operation.Op_TransportState')}}</span>
<span>
<el-select class="w180 multiple_input" v-model="queryMsg.IsShowUnion">
<el-option :key="1" :label="$t('system.table_isShows')" :value="1"></el-option>
<el-option :key="0" :label="$t('Operation.Op_hide')" :value="0"></el-option>
</el-select>
<el-checkbox-group v-model="queryCommonData.IsUnionCked" style="margin-left:0;">
<el-checkbox v-for="state in unionStatus" :label="state.Id" :checked="state.Checked"
@change="checkedUnion(state)" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
<button class="normalBtn TC_SearchBtn"
......@@ -874,6 +874,7 @@
singleTCID: 0,
outerVisible: false,
flightCKed: [],
IsUnionCked:[],
loading: false,
checkCompanyAll: true,
//本团卖点
......@@ -956,12 +957,26 @@
Checked: false
}
],
//联运状态
unionStatus:[{
Id:1,
Name:'主团',
Checked: true
},{
Id:0,
Name:'分销团',
Checked: false
}],
//当前登录用户信息
CurrentUserInfo: {},
pickerBeginDateBefore: {
disabledDate: time => {
let endTime = new Date(this.queryMsg.EndGroupDate)
return endTime.getTime() < time.getTime()
if(this.queryMsg.EndGroupDate==null){
return false;
}else{
let endTime = new Date(this.queryMsg.EndGroupDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
......@@ -1495,6 +1510,11 @@
this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(item.Id)
},
checkedUnion(item){
this.queryMsg.IsShowUnion = item.Id
this.queryCommonData.IsUnionCked = []
this.queryCommonData.IsUnionCked.push(item.Id)
},
//点击选取出团公司
getCompanyCheck(item) {
item.isShow = !item.isShow
......
src/components/busManagement/BusInfo.vue
View file @ 42326f40
This diff is collapsed.
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