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
Show 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 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>
</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>
</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>
</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>
</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(item,subIndex,subItem.UseInventory)">
{{subItem.Inventory}}/{{subItem.UseInventory}}/{{subItem.RemainingInventory}}</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="subItem.UseInventory-subItem.Inventory>0" style="color:red;">
{{subItem.UseInventory-subItem.Inventory}}
<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>
</td>
</tr>
</table>
</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>
......@@ -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,13 +957,27 @@
Checked: false
}
],
//联运状态
unionStatus:[{
Id:1,
Name:'主团',
Checked: true
},{
Id:0,
Name:'分销团',
Checked: false
}],
//当前登录用户信息
CurrentUserInfo: {},
pickerBeginDateBefore: {
disabledDate: time => {
if(this.queryMsg.EndGroupDate==null){
return false;
}else{
let endTime = new Date(this.queryMsg.EndGroupDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
......@@ -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
......@@ -56,9 +56,12 @@
}
.busInfo .subName {
padding: 5px 10px;
padding: 0 10px;
border: 1px solid #d1d1d1;
border-radius: 14px;
height:30px;
display: inline-block;
line-height: 30px;
cursor: pointer;
}
......@@ -73,11 +76,6 @@
margin: 5px 4px 5px 0;
}
.busInfo .carPlanOne .el-input .el-input__inner,
.el-select .el-input {
height: 28px;
}
.busInfo .upBtnList {
margin: 20px 0 30px 20px;
}
......@@ -127,6 +125,11 @@
.busInfo .w200{
padding:10px 0;
}
.busInfo .has-gutter tr th, .el-table th.is-leaf{
background: #EAEAEA!important;
text-align: center;
}
</style>
<template>
<div class="flexOne busInfo">
......@@ -164,10 +167,10 @@
</table>
<div style="width: 100%; overflow-x: auto;margin-top:20px;" class="ownScrollbarStyle">
<el-form :model="PostData" :rules="rules" ref="PostData">
<table class="bo_bus" cellspacing="1">
<!-- <table class="bo_bus" cellspacing="1">
<tr>
<th width="100">日期</th>
<th width="100">酒店名称</th>
<th width="80">酒店名称</th>
<th width="400">用车计划</th>
<th width="100">司机姓名</th>
<th width="280">联系电话</th>
......@@ -198,7 +201,6 @@
<td class="carPlanOne" :class="{'otherSpan':index!=0&&index!=PlanTableData.length-1}">
<div class="w320" v-for="(subItem,subIndex) in item.DetailList">
<em>
<!--接机送机-->
<el-select class="w150" placeholder="请选择" v-model="subItem.AirportPickUp" :disabled="forbidInput">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="childitem in BusAirportPickUpList" :key="childitem.Id" :label="childitem.Name"
......@@ -206,7 +208,6 @@
</el-option>
</el-select>
</em>
<!--用车类型-->
<span v-for="childItem in UseTypeArray" class="BusinfoSpan">
<span v-if="childItem.Id==1" class="subName"
:class="{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
......@@ -272,7 +273,6 @@
</div>
</td>
<td class="carPlanOne">
<!--司机住宿类型-->
<div class="w200">
<span v-for="subItem in AccommodationTypeArray">
<span class="subName" :class="{'spanCked':item.AccommodationType==subItem.Id}"
......@@ -330,7 +330,160 @@
</div>
</td>
</tr>
</table>
</table> -->
<el-table :data="PlanTableData" style="width:100%" border v-loading='loading'>
<el-table-column fixed label="日期" prop="PlanDateStr" min-width="120"></el-table-column>
<el-table-column fixed label="酒店名称" prop="HotelName" min-width="200"></el-table-column>
<el-table-column fixed label="用车计划" min-width="350">
<template slot-scope="scope">
<!-- {{scope.row}} -->
<div v-for="(subItem,subIndex) in scope.row.DetailList">
<em>
<!--接机送机-->
<el-select class="w150" placeholder="请选择" v-model="subItem.AirportPickUp" :disabled="forbidInput">
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="childitem in BusAirportPickUpList" :key="childitem.Id" :label="childitem.Name"
:value="childitem.Id">
</el-option>
</el-select>
</em>
<!--用车类型-->
<span v-for="childItem in UseTypeArray" class="BusinfoSpan">
<span v-if="childItem.Id==1" class="subName"
:class="{'spanCked':subItem.UseType==childItem.Id,'disSpan':forbidInput==true}"
@click="UseTypeClick(childItem.Id,scope.$index,subIndex);getBusPrice(subItem)">{{childItem.Name}}</span>
</span>
<span style="width:30px;display:inline-block;">
<a v-if="subIndex>0" @click="DeleteSubItem(scope.row,subIndex)" style="color:blue;cursor:pointer">删除</a>
</span>
<span style="display:inline-block;width:30px;margin-left:5px;">
<span class="busAddbtn" v-if="subIndex==scope.row.DetailList.length-1" @click="AddSubItem(scope.row)"
style="margin-bottom:10px;">
<i class="iconfont icon-img_haha"></i>
</span>
</span>
</div>
</template>
</el-table-column>
<el-table-column label="司机姓名" min-width="120">
<template slot-scope="scope">
<el-input v-model="scope.row.DriverName"></el-input>
</template>
</el-table-column>
<el-table-column label="联系电话" min-width="140">
<template slot-scope="scope">
<el-input v-model="scope.row.DriverTel"></el-input>
</template>
</el-table-column>
<el-table-column label="车牌号码" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.BusNum"></el-input>
</template>
</el-table-column>
<el-table-column label="供应商" min-width="150">
<template slot-scope="scope">
<el-select filterable placeholder="请选择" v-model="scope.row.BusCompany">
<el-option v-for="item in SupplierList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="车辆类型" min-width="150">
<template slot-scope="scope">
<el-select filterable placeholder="请选择" v-model="scope.row.BusType" :disabled="forbidInput"
@change='getBusPrice(item)'>
<el-option :key="0" :value="0" label="请选择"></el-option>
<el-option v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="150">
<template slot-scope="scope">
<el-select class='sel' v-model='scope.row.PayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
</el-select>
</template>
</el-table-column>
<el-table-column label="定团号" min-width="230">
<template slot-scope="scope">
<div :class="{'BusTyleFirst':scope.$index==0}">
<el-input class='w170' type="text" v-model="scope.row.BookGroup"></el-input>
<el-tooltip class="item" effect="dark" content="同上" placement="top">
<i class="iconfont icon-tongshang" style="cursor:pointer;" v-if="scope.$index!=0"
@click="getBeforeInfo(scope.$index)"></i>
</el-tooltip>
</div>
</template>
</el-table-column>
<el-table-column label="司机住宿" min-width="180">
<template slot-scope="scope">
<!--司机住宿类型-->
<span v-for="subItem in AccommodationTypeArray">
<span class="subName" :class="{'spanCked':scope.row.AccommodationType==subItem.Id}"
@click="AccommodationCLick(subItem.Id,scope.$index)">{{subItem.Name}}</span>
<span v-if="subItem.Id==1 && scope.row.AccommodationType==1">
<el-input style="margin-top:13px;" v-model="scope.row.AccommodationRemark" placeholder="请输入外宿地址"></el-input>
</span>
</span>
</template>
</el-table-column>
<el-table-column label="泊车说明" min-width="180">
<template slot-scope="scope">
<el-input v-model="scope.row.ParkExplain" placeholder="请输入说明"></el-input>
</template>
</el-table-column>
<el-table-column label="高速费用" min-width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.HighSpeedPrice" @keyup.native="checkPrice(scope.row,'HighSpeedPrice')" placeholder="请输入费用"></el-input>
</template>
</el-table-column>
<el-table-column label="高速费用付款方式" min-width="150">
<template slot-scope="scope">
<div>
<el-select class='sel' v-model='scope.row.HighSpeedPayType' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='公司结算' :value='2'></el-option>
<el-option label='预付' :value='3'></el-option>
</el-select>
</div>
</template>
</el-table-column>
<el-table-column label="使用人数" min-width="100">
<template slot-scope="scope">
<el-input v-model="scope.row.UseNum" @keyup.native="checkPrice(scope.row,'UseNum')"></el-input>
</template>
</el-table-column>
<el-table-column label="成本价" min-width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.CostPrice" @keyup.native="checkPrice(scope.row,'CostPrice')"
placeholder="请输入成本价"></el-input>
</template>
</el-table-column>
<el-table-column label="备注" min-width="180">
<template slot-scope="scope">
<el-input type="text" v-model="scope.row.Remarks"></el-input>
</template>
</el-table-column>
<el-table-column label="停车场" min-width="100">
<template slot-scope="scope">
{{scope.row.IsHavearking=='0'?'无':'有'}}
</template>
</el-table-column>
<el-table-column label="小计" min-width="100">
<template slot-scope="scope">
{{scope.row.CostPrice*(Number(scope.row.TransferNum)+1) + Number(scope.row.HighSpeedPrice)}}
</template>
</el-table-column>
</el-table>
<div class="upBtnList">
<input type="button" class="normalBtn" @click="SaveList(0)" :disabled="disButton" value="保存草稿" />
<input type="button" class="normalBtn" @click="SaveList(1)" :disabled="disButton" value="保存" />
......@@ -479,6 +632,7 @@
totalFlySeat: '',
LeaderName: '',
GuideName: '',
loading:false
};
},
methods: {
......@@ -536,11 +690,13 @@
},
/*生成表格数据*/
createTableData() {
this.loading = true;
this.apipost(
"bus_get_GetTravelBusDetailsTCIDs", {
TCIDs: this.parametersData.TCID
},
response => {
this.loading = false;
if (response.data.resultCode == 1) {
this.PlanTableData = response.data.data.PlanList;
this.PlanTableData.forEach(x => {
......@@ -548,6 +704,7 @@
x.BookGroup = this.$route.query.NewCombinationNum;
}
});
console.log(this.PlanTableData,'plantabledata');
this.PostData=response.data.data;
}
},
......
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