Skip to content

S
SuperMan
Commit 2e1672dd authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 55008db6 a8d74d6b
Show whitespace changes
Inline Side-by-side
Showing with 374 additions and 313 deletions
src/components/Hotel/HotelInfo.vue
View file @ 2e1672dd
...@@ -42,7 +42,8 @@ ...@@ -42,7 +42,8 @@
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')" :disabled="IsHaveAuth==1?false:true"> <el-select v-model="addMsg.PayStyle" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')"
:disabled="IsHaveAuth==1?false:true">
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in PayList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
...@@ -214,6 +215,29 @@ ...@@ -214,6 +215,29 @@
<el-form-item label="停车场"> <el-form-item label="停车场">
<el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch> <el-switch v-model="addMsg.IsHavearking" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="停车费" v-if="addMsg.IsHavearking==1">
<el-input type="text" v-model="addMsg.ParkFee" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'ParkFee')"></el-input>
</el-form-item>
<el-form-item label="入汤税">
<el-input type="text" v-model="addMsg.InTangTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'InTangTax')"></el-input>
</el-form-item>
<el-form-item label="城市税">
<el-input type="text" v-model="addMsg.CityTax" class="w300" maxlength="10" @keyup.native="checkPrice(addMsg,'CityTax')"></el-input>
</el-form-item>
<el-form-item label="返佣类型">
<el-select v-model="addMsg.RebateType" class='multiple_input w300' :placeholder="$t('pub.pleaseSel')">
<el-option :key="0" label="不限" :value="0"> </el-option>
<el-option :key="1" label="含税返佣" :value="1"> </el-option>
<el-option :key="2" label="不含税返佣" :value="2"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="司导房是否返佣">
<el-select v-model="addMsg.DriverGuideIsRebate" class='multiple_input w300'
:placeholder="$t('pub.pleaseSel')">
<el-option :key="0" label="不返佣" :value="0"> </el-option>
<el-option :key="1" label="返佣" :value="1"> </el-option>
</el-select>
</el-form-item>
</div> </div>
<span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span> <span class="resource-lititle">{{$t('hotel.hotel_imgintroduce')}}</span>
<div class="resource-list"> <div class="resource-list">
...@@ -223,13 +247,6 @@ ...@@ -223,13 +247,6 @@
<div class="imgzhe"> <div class="imgzhe">
<div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div> <div class="re-delte"><i @click.stop="showImg(item.ShowPath)" class="iconfont icon-img_cz"></i></div>
<div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click="delImg(index)"><i class="iconfont icon-xingzhuang"></i></div>
<!-- <div class="re-delte" @click.stop="ExchangeImg(index,0)" v-if="index!=0&&item.ShowPath">
<i class="iconfont icon-zuoyi"></i>
</div>
<div class="re-delte" @click.stop="ExchangeImg(index,1)" v-if="index!=HotelImageArray.length-1&&item.ShowPath">
<i class="iconfont icon-youyi"></i>
</div> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -370,6 +387,16 @@ ...@@ -370,6 +387,16 @@
PayStyle: 0, PayStyle: 0,
//是否有停车场 //是否有停车场
IsHavearking: 0, IsHavearking: 0,
//入汤税
InTangTax: 0,
//城市税
CityTax: 0,
//停车费
ParkFee: 0,
//返佣类型：1-含税返佣，2-不含税返佣
RebateType: 0,
//司导房是否返佣：0-不返佣，1-返佣
DriverGuideIsRebate: 0,
}, },
DiscountList: { DiscountList: {
ID: 0, ID: 0,
...@@ -426,7 +453,6 @@ ...@@ -426,7 +453,6 @@
obj.Path = str; obj.Path = str;
obj.ShowPath = imgUrl; obj.ShowPath = imgUrl;
this.HotelImageArray.push(obj); this.HotelImageArray.push(obj);
//this.updatePic();
}); });
}, },
//更新酒店图片 //更新酒店图片
...@@ -455,7 +481,6 @@ ...@@ -455,7 +481,6 @@
var item = this.HotelImageArray[index]; var item = this.HotelImageArray[index];
this.DeleteImageArray.push(item); this.DeleteImageArray.push(item);
this.HotelImageArray.splice(index, 1); this.HotelImageArray.splice(index, 1);
//this.updatePic();
}, },
inited(viewer) { inited(viewer) {
this.$viewer = viewer this.$viewer = viewer
......
src/components/Hotel/roomQuery.vue
View file @ 2e1672dd
...@@ -119,66 +119,98 @@ ...@@ -119,66 +119,98 @@
<div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div> <div style="font-size:12px;padding:2px 4px 3px 4px; color:red">注意事项:每次导出数据最好不要超过一个月。</div>
<table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomQueryTalbe" v-loading='loading'>
<tr> <tr>
<th width="w100">序号</th> <th width="120">序号</th>
<th width="120">出发地</th> <th width="100">出发地</th>
<th width="80">公司团号</th> <th width="80">公司团号</th>
<th width="150">航班</th>
<th width="100">系列</th> <th width="100">系列</th>
<th width="120">机位总数<br />(Y/E/F)</th> <th width="80">机位总数<br />(Y/E/F)</th>
<th>使用时间&酒店情况</th> <th width="100">使用时间</th>
<th width="120">酒店名称</th>
<th width="120">更换酒店</th>
<th width="100">OP状态</th>
<th width="100">地接状态</th>
</tr> </tr>
<tr v-if="dataList.length==0"> <tr v-if="dataList.length==0">
<td colspan="10">暂无数据</td> <td colspan="11">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in dataList" :class="{roomQuerySplitTrCss:outindex%2!=0}"> <template v-for="(outItem,outindex) in dataList">
<template v-for="(item,index) in outItem.StaticsReportList"> <tbody :class="{roomQuerySplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.PriceCommonList">
<template v-for="(subItem,subIndex) in item.PriceHotelResult">
<template v-for="(thirdItem,thirdIndex) in subItem.SubList">
<tr> <tr>
<td :rowspan="outItem.StaticsReportList.length" v-if='index==0'> <td :rowspan="outItem.rootRowspan" v-if='index==0&&subIndex==0&&thirdIndex==0'>
<div style="max-width: 100px; min-width: 50px;margin:auto;">{{outindex+1}}</div> {{outItem.NewCombinationNum}}
<div v-if='outItem.StaticsReportList.length>0' class="w150">{{outItem.NewCombinationNum}}</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w80"> {{item.StartCityName}}
{{item.StartCityNames}}
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w120 link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p>
</div> </div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0' style="white-space:nowrap;">
<div class="w120 link"> <template v-for="(fItem,fIndex) in item.FlightList">
{{item.LineteamIdNames}} <span style="height:25px; line-height:25px;">
</div> <a style="color: #ff0066;font-weight: bold;">{{fItem.Flight_number}}</a>
{{fItem.FlightDateStr}}
{{fItem.Departure_time}} {{fItem.dName}} {{fItem.TicketArrivalTime}} {{fItem.aName}}
</span><br />
</template>
</td> </td>
<td> <td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
{{item.LineteamName}}
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="w120 link"> <div class="w120 link">
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"> <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}} {{item.TotalSeat}}/{{item.YSeatNum}}/{{item.ESeatNum}}/{{item.FSeatNum}}
</p> </p>
</div> </div>
</td> </td>
<td style="vertical-align: top;"> <td :rowspan="subItem.SubList.length" v-if='thirdIndex==0'>
<div :style="{width:150*item.CommonReport.newHotel.length+'px'}"> {{subItem.UseDay}}
<div class="w150" v-for="childItem in item.CommonReport.newHotel" </td>
style="float:left;border-right:1px solid #d1d1d1;"> <td style="text-align:left;padding-left:2px;">
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p> <template v-if="thirdItem.HotelName!=thirdItem.NewHotelName && thirdItem.NewHotelName!=''">
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')" <span style="text-decoration:line-through"> {{thirdItem.HotelName}}</span>
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> </template>
{{childItem.NewHotelName}} <template v-else>
<span class="colorE95252"> {{thirdItem.HotelName}}
<template v-if="childItem.OPState==1">[OP-指定]</template> </template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">[OP-暂定]</template> </td>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[地接-未操作]":"[地接-暂定]")}} <td style="text-align:left;padding-left:2px;">
<template v-if="thirdItem.HotelName!=thirdItem.NewHotelName">
<span style="color:red;">{{thirdItem.NewHotelName}}</span>
</template>
</td>
<td>
<template v-if="thirdItem.OPState==1">
<span style="color: green;">OP-指定</span>
</template>
<template v-else-if="thirdItem.OPState==2">
<span style="color:red;">OP-暂定</span>
</template>
</td>
<td>
<template v-if="thirdItem.DMCState==1">
<span style="color: green;">地接-OK</span>
</template>
<template v-else-if="thirdItem.DMCState==2">
<span style="color:red;">地接-暂定</span>
</template>
<template v-else-if="thirdItem.DMCState==0">
<span style="color:red;">地接-未操作</span>
</template> </template>
</span>
</p>
</div>
</div>
</td> </td>
</tr> </tr>
</template> </template>
</template>
</template>
</tbody> </tbody>
</template>
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
...@@ -194,7 +226,7 @@ ...@@ -194,7 +226,7 @@
total: 0, total: 0,
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 8, pageSize: 5,
SelectType: 1, SelectType: 1,
StartDate: '', StartDate: '',
EndDate: '', EndDate: '',
...@@ -319,29 +351,28 @@ ...@@ -319,29 +351,28 @@
}, },
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_get_GetDmcHotelPageList', this.msg, res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData.data; var sourceData = res.data.data.pageData;
this.thLengthTitle = []; if (sourceData) {
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) { sourceData.forEach(rootItem => {
this.thLengthTitle.push('第' + i + '晚') var rootRowspan = 0; //合团跨行
} rootItem.PriceCommonList.forEach(subItem => {
this.dataList.forEach(x => { var itemRowSpan = 0; //酒店跨行
x.StaticsReportList.forEach(y => { subItem.PriceHotelResult.forEach(thirdItem => {
y.CommonReport.newHotel = []; thirdItem.SubList.forEach(lastItem => {
if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport rootRowspan++;
.length > 0) { itemRowSpan++;
y.CommonReport.HotelOrderListReport.forEach(z => {
z.HotelOrderList.forEach(q => {
y.CommonReport.newHotel.push(q);
})
})
}
y.colNum = 9 + y.CommonReport.newHotel.length;
}); });
}) });
subItem.itemRowSpan = itemRowSpan;
});
rootItem.rootRowspan = rootRowspan;
});
}
this.dataList = sourceData;
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/Hotel/roomReservations.vue
View file @ 2e1672dd
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" <el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option> :key="item.LtID"></el-option>
...@@ -18,7 +17,8 @@ ...@@ -18,7 +17,8 @@
<em>系列</em> <em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option> <el-option label="不限" :value='0'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID'
:key='item.LtID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -30,16 +30,19 @@ ...@@ -30,16 +30,19 @@
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateBefore"></el-date-picker> <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateBefore"></el-date-picker>
- -
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker> <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li><span> <li><span>
<em>状态</em> <em>状态</em>
<el-select v-model='msg.PriceStatus'> <el-select v-model='msg.PriceStatus'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id" :value="team.Id" v-if="team.Id==1 || team.Id==3"></el-option> <el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id"
:value="team.Id" v-if="team.Id==1 || team.Id==3"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -49,8 +52,8 @@ ...@@ -49,8 +52,8 @@
<el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')"> <el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
<el-option :label="$t('system.ph_buxian')" :value="0"> <el-option :label="$t('system.ph_buxian')" :value="0">
</el-option> </el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName"
:label="item.AlName" :value="item.AirLineId"></el-option> :value="item.AirLineId"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -60,8 +63,8 @@ ...@@ -60,8 +63,8 @@
<el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0"> <el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option> </el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option> :key="item.EmployeeId"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -74,7 +77,8 @@ ...@@ -74,7 +77,8 @@
<li> <li>
<span> <span>
<em>出团公司</em> <em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input" :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'> <el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -101,37 +105,46 @@ ...@@ -101,37 +105,46 @@
</li> </li>
</ul> </ul>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle" :style="{height: boxHeight + 'px'}"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"
:style="{height: boxHeight + 'px'}">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<tr> <tr>
<th width="w100">序号</th> <th width="120">序号</th>
<th width="120">出发地</th> <th width="80">出发地</th>
<th width="120">航班时间</th> <th width="90">航班时间</th>
<th width="80">公司团号</th> <th width="145">公司团号</th>
<th width="120">机位总数/(Y/E/F)</th> <th width="100">机位总数<br />(Y/E/F)</th>
<th width="120">占床/不占床</th> <th width="80">占床<br />不占床</th>
<th width="80">实际用房数</th> <th width="80">实际用房数</th>
<th>操作</th> <th width="100">操作</th>
<th></th> <th width="110">时间</th>
<th></th> <th width="120">酒店名称</th>
<th>备注</th> <th width="120">更换酒店</th>
<th width="100">OP状态</th>
<th width="100">地接状态</th>
<th width="150">房间预订数<br />单间/标准双人间/大床房/三人间/司导间</th>
</tr> </tr>
<tr v-if="list.length==0"> <tr v-if="DataList.length==0">
<td colspan="11">暂无数据</td> <td colspan="14">暂无数据</td>
</tr> </tr>
<tbody v-for="(outItem,outindex) in list" :class="{roomReservationsSplitTrCss:outindex%2!=0}"> <template v-for="(outItem,outindex) in DataList">
<tbody :class="{roomReservationsSplitTrCss:outindex%2!=0}">
<template v-for="(item,index) in outItem.StaticsReportList"> <template v-for="(item,index) in outItem.StaticsReportList">
<template v-for="(subItem,subIndex) in item.CommonReport.HotelOrderListReport"
v-if="subItem.HotelOrderList.length>0">
<template v-for="(thirdItem,thirdIndex) in subItem.HotelOrderList">
<tr> <tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td
<div style="max-width: 100px; min-width: 50px;margin:auto;">{{outindex+1}}</div> :rowspan="outItem.rootRowspan"
<div v-if='outItem.StaticsReportList.length>0' class="w150">{{outItem.NewCombinationNum}}</div> v-if='index==0&&subIndex==0&&thirdIndex==0'>
{{outItem.NewCombinationNum}}
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w80"> v-if='subIndex==0&&thirdIndex==0'>
{{item.StartCityNames}} {{item.StartCityNames}}
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
v-if='subIndex==0&&thirdIndex==0'>
<div class="w150"> <div class="w150">
{{item.FlightDate}} {{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click"> <el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
...@@ -146,7 +159,8 @@ ...@@ -146,7 +159,8 @@
<tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;"> <tr v-for="(ds,din) in item.FlightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="din==0">{{$t('Airticket.Air_go')}}</span> <span v-if="din==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span
v-else-if="din==item.FlightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span <span
v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span> v-else-if="din>0 && din!=item.FlightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
...@@ -166,92 +180,90 @@ ...@@ -166,92 +180,90 @@
</tr> </tr>
</table> </table>
<el-button slot="reference" class="normalBtn mt5" <el-button slot="reference" class="normalBtn mt5"
style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情</el-button> style='height:24px; padding: 0 10px; background: #2AAEF2; border-color: #2AAEF2;'>详情
</el-button>
</el-popover> </el-popover>
</div> </div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w120 link"> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.TCNUMS}}</p> <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')"
</div> style="cursor:pointer;text-decoration:underline;">
{{item.TCNUMS}}({{item.TCIDS}})
</p>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w120 link"> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"> <p @click="goUrlT('RegistrationList',item.TCIDS,'报名清单')"
style="cursor:pointer;text-decoration:underline;">
{{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}} {{item.TotalSeat}}/{{item.CommonReport.HouseStatistics.RealityYSeatNum}}/{{item.CommonReport.HouseStatistics.RealityESeatNum}}/{{item.CommonReport.HouseStatistics.RealityFSeatNum}}
</p> </p>
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w80 link"> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"> <p @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')"
{{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}</p> style="cursor:pointer;text-decoration:underline;">
</div> {{item.CommonReport.HouseStatistics.NeedBed}}/{{item.CommonReport.HouseStatistics.NoNeedBed}}
</p>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w80"> v-if='subIndex==0&&thirdIndex==0'>
{{item.CommonReport.HouseStatistics.RealityRoomNum}} {{item.CommonReport.HouseStatistics.RealityRoomNum}}
</div>
</td> </td>
<td> <td :rowspan="item.itemRowSpan"
<div class="w80 link" style="margin:auto;"> v-if='subIndex==0&&thirdIndex==0'>
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p> <p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')"
</div> style="cursor:pointer;text-decoration:underline;">详情</p>
</td> </td>
<td style="vertical-align: top;"> <td :rowspan="subItem.HotelOrderList.length" v-if='thirdIndex==0'>
<div class="w260"> {{subItem.UseTimeStr}}
<p class="pDateStyle">时间</p>
<p class="pDateStyle" style="height: 50px!important; line-height: 50px;">酒店名称</p>
<p class="pDateStyle">用房数</p>
<p class="pDateStyle">房间预定数</p>
<p class="pDateStyle">
<span v-show="item.CommonReport.HouseStatistics.HouseTypeList.length==0">房型</span>
<span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeName}}</span>
</p>
</div>
</td> </td>
<td style="vertical-align: top;"> <td style="text-align:left;padding-left:2px;">
<div :style="{width:150*item.CommonReport.newHotel.length+'px'}"> <template v-if="thirdItem.HotelName!=thirdItem.NewHotelName && thirdItem.NewHotelName!=''">
<div class="w150" v-for="childItem in item.CommonReport.newHotel" <span style="text-decoration:line-through"> {{thirdItem.HotelName}}</span>
style="float:left;border-right:1px solid #d1d1d1;"> </template>
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p> <template v-else>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')" {{thirdItem.HotelName}}
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;"> </template>
<span class="colorE95252"> </td>
<template v-if="childItem.OPState==1">[OP选房-OK]</template> <td style="text-align:left;padding-left:2px;">
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}} <template v-if="thirdItem.HotelName!=thirdItem.NewHotelName">
<span style="color:red;">{{thirdItem.NewHotelName}}</span>
</template> </template>
</span>{{childItem.NewHotelName}}
</p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle">
<span v-for="q in childItem.OrderDetailsList">{{q.HouseTypeCount}}</span>
</p>
<p class="pDateStyle">
<span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span>
<span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span>
</p>
</div>
</div>
</td> </td>
<td> <td>
<div class="w200"> <template v-if="thirdItem.OPState==1">
{{item.Remarks}} <span style="color: green;">OP-指定</span>
</div> </template>
<template v-else-if="thirdItem.OPState==2">
<span style="color:red;">OP-暂定</span>
</template>
</td> </td>
</tr> <td>
<tr> <template v-if="thirdItem.DMCState==1">
<td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;"> <span style="color: green;">地接-OK</span>
<div class="link"> </template>
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p> <template v-else-if="thirdItem.DMCState==2">
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252"> 地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div> <span style="color:red;">地接-暂定</span>
<div v-show="item.CommonReport.Complain_Extend.Id>0" class="colorE95252">供应商投诉:{{item.CommonReport.Complain_Extend.ComplainContent}}</div> </template>
</div> <template v-else-if="thirdItem.DMCState==0">
<span style="color:red;">地接-未操作</span>
</template>
</td>
<td>
<span v-for="(lastItem,lastIndex) in thirdItem.OrderDetailsList">
{{lastItem.HouseTypeCount}}
<template v-if="lastIndex!=thirdItem.OrderDetailsList.length-1">
/
</template>
</span>
</td> </td>
</tr> </tr>
</template> </template>
</template>
</template>
</tbody> </tbody>
</template>
</table> </table>
</div> </div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
...@@ -281,26 +293,24 @@ ...@@ -281,26 +293,24 @@
PlaceID: 0, PlaceID: 0,
LineteamId: 0, LineteamId: 0,
//航空公司 //航空公司
AirLineId:0, AirLineId: 0,
CreateBy:0, CreateBy: 0,
TCNUM: '', TCNUM: '',
PriceStatus: 0, PriceStatus: 0,
CombinationNum:'', CombinationNum: '',
HotelStatus:0 HotelStatus: 0
}, },
thLengthTitle: [], DataList: [], //数据列表
list: [],
colspanTotal: 0,
boxHeight: 0, boxHeight: 0,
queryCommonData:{ queryCommonData: {
//公司数据 //公司数据
BranchList: [], BranchList: [],
//国家 //国家
PlaceList: [], PlaceList: [],
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
AirlineList:[], AirlineList: [],
EmployeeList:[], EmployeeList: [],
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -364,36 +374,31 @@ ...@@ -364,36 +374,31 @@
this.currentPage = 1; this.currentPage = 1;
}, },
getList() { getList() {
this.loading = true this.loading = true;
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => { this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.loading = false
this.total = res.data.data.count; this.total = res.data.data.count;
this.list = res.data.data.pageData.data; var sourceData = res.data.data.pageData.data;
this.thLengthArr = [] if (sourceData) {
this.thLengthTitle = [] sourceData.forEach(rootItem => {
this.colspanTotal = res.data.data.pageData.columnsCount + 9 var rootRowspan = 0; //合团跨行
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) { rootItem.StaticsReportList.forEach(subItem => {
this.thLengthTitle.push('第' + i + '晚') var itemRowSpan = 0; //酒店跨行
} subItem.CommonReport.HotelOrderListReport.forEach(thirdItem => {
this.list.forEach(x => { thirdItem.HotelOrderList.forEach(lastItem => {
x.StaticsReportList.forEach(y => { rootRowspan++;
y.CommonReport.newHotel = []; itemRowSpan++;
if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport });
.length > 0) { });
y.CommonReport.HotelOrderListReport.forEach(z => { subItem.itemRowSpan = itemRowSpan;
z.HotelOrderList.forEach(q => { });
y.CommonReport.newHotel.push(q); rootItem.rootRowspan = rootRowspan;
}) });
})
} }
this.DataList = sourceData;
y.colNum = 9 + y.CommonReport.newHotel.length;
})
})
this.$forceUpdate() this.$forceUpdate()
} else { } else {
this.loading = false
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
}, err => {}) }, err => {})
...@@ -404,7 +409,6 @@ ...@@ -404,7 +409,6 @@
this.queryCommonData.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = [] this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = [] this.queryCommonData.LineTeamList = []
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -511,10 +515,11 @@ ...@@ -511,10 +515,11 @@
} else { } else {
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
} }
let width = window.innerWidth - 50 let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 164 let height = window.innerHeight - 65 - 164;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width this.offsetwidth = width;
//this.msg.CombinationNum = "HP20190713TN07A1";
this.getLinePlaceList(); this.getLinePlaceList();
this.getAirlineList(); this.getAirlineList();
this.getEmployeeList(); this.getEmployeeList();
......
src/components/ShoppingStore/ShoppingReimbursement.vue
View file @ 2e1672dd
...@@ -137,8 +137,8 @@ ...@@ -137,8 +137,8 @@
<p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)" <p v-for="(img, imgIndex) in subItem.dmcImageList" title="点击下载" @click="downLoadPZ(img)"
v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p> v-if="img !== ''" style="cursor: pointer;color:blue;">{{ '凭证' + (imgIndex + 1)}}</p>
</td> </td>
<td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0'> <td :rowspan="item.ShopDetailsList.length" v-if='subIndex==0' style="">
<div> <div style="display:none;">
<p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p> <p style="cursor: pointer;color:blue;" @click="CreateBill(item.ShopDetailsList)">生成单据</p>
<p style="cursor: pointer;color:blue;" @click="CreateHandBill(outItem)">手动生成单据</p> <p style="cursor: pointer;color:blue;" @click="CreateHandBill(outItem)">手动生成单据</p>
</div> </div>
...@@ -404,8 +404,6 @@ ...@@ -404,8 +404,6 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
// this.msg.StartDate = '2019-01-01';
// this.msg.EndDate = '2019-02-01'
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
......
src/components/busManagement/BusInfo.vue
View file @ 2e1672dd
...@@ -195,13 +195,17 @@ ...@@ -195,13 +195,17 @@
<tfoot> <tfoot>
<tr> <tr>
<td>车辆类型</td> <td>车辆类型</td>
<td colspan="7" align="left" style="padding-left:5px;"> <td align="left" style="padding-left:5px;">
<el-select class="w150" placeholder="请选择" v-model="PostData.BusType"> <el-select class="w150" placeholder="请选择" v-model="PostData.BusType">
<el-option :key="0" :value="0" label="请选择"></el-option> <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 v-for="item in BusTypeList" :key="item.Id" :label="item.newName" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
<td>回送费</td>
<td colspan="4" align="left" style="padding-left:5px;">
<el-input v-model="PostData.BackFee" @keyup.native="checkPrice(PostData,'BackFee')" placeholder="请输入回送费" maxlength="10" class='w135'></el-input>
</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
...@@ -432,7 +436,7 @@ ...@@ -432,7 +436,7 @@
DayNum: 0, DayNum: 0,
TotalNumber: 0 TotalNumber: 0
}, },
PostData: [], PostData: {},
//公用信息 //公用信息
CommonList: [], CommonList: [],
//禁用文本框 //禁用文本框
......
src/components/commonPage/commonHotelInfo.vue
View file @ 2e1672dd
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th> <th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
<th width="130" v-if="showHotelObj.showZhan">占房时间</th> <th width="130" v-if="showHotelObj.showZhan">占房时间</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th> <th width="100" v-if="showHotelObj.showZhan">确认时间</th>
<th width="100" v-if="showHotelObj.showZhan">供应商</th>
<th width="70" v-if="showHotelObj.showPrice"> <th width="70" v-if="showHotelObj.showPrice">
日志 日志
</th> </th>
...@@ -120,6 +121,9 @@ ...@@ -120,6 +121,9 @@
<td v-if="showHotelObj.showZhan"> <td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}} {{hotelSubItem.SureTimeStr}}
</td> </td>
<td v-if="showHotelObj.showZhan">
{{hotelSubItem.SupplierName}}
</td>
<td v-if="showHotelObj.showPrice"> <td v-if="showHotelObj.showPrice">
<el-popover width="200" trigger="click" popper-class="Bus_HotelPop"> <el-popover width="200" trigger="click" popper-class="Bus_HotelPop">
<commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog> <commonHotelLog :ref="'comHotelLog'+index+hotelSubIndex+''"> </commonHotelLog>
......
src/components/confirmationOrderDownLoad.vue
View file @ 2e1672dd
...@@ -942,6 +942,8 @@ ...@@ -942,6 +942,8 @@
isPc: 2, isPc: 2,
//模板参数 //模板参数
templateId: this.showType, templateId: this.showType,
//用户Id
UId:this.getLocalStorage().EmployeeId
}; };
this.$http({ this.$http({
headers: { headers: {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 2e1672dd
...@@ -1053,6 +1053,7 @@ ...@@ -1053,6 +1053,7 @@
var objItem = ""; var objItem = "";
if (this.returnPriceList.length > 0) { if (this.returnPriceList.length > 0) {
objItem = JSON.parse(JSON.stringify(this.returnPriceList[0])); objItem = JSON.parse(JSON.stringify(this.returnPriceList[0]));
console.log("objItem",objItem);
objItem.OPRemark = ""; objItem.OPRemark = "";
objItem.AirTicketId = 0; objItem.AirTicketId = 0;
objItem.AirticketBindList = []; objItem.AirticketBindList = [];
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ 2e1672dd
...@@ -161,16 +161,9 @@ ...@@ -161,16 +161,9 @@
</template> </template>
<script> <script>
import trifficTrip from "../oldTravelGroupControl/trifficTrip"; import trifficTrip from "../oldTravelGroupControl/trifficTrip";
import scienTrip from "../oldTravelGroupControl/scienTrip_Direct"; import scienTrip from "../oldTravelGroupControl/scienTrip_Direct";
import hotelTrip from "../oldTravelGroupControl/hotelTrip_Direct"; import hotelTrip from "../oldTravelGroupControl/hotelTrip_Direct";
import dinnerTrip from "../oldTravelGroupControl/dinnerTrip_Direct"; import dinnerTrip from "../oldTravelGroupControl/dinnerTrip_Direct";
import freedomTrip from "../oldTravelGroupControl/freedomTrip"; import freedomTrip from "../oldTravelGroupControl/freedomTrip";
import warmtipTrip from "../oldTravelGroupControl/warmtipTrip"; import warmtipTrip from "../oldTravelGroupControl/warmtipTrip";
import titleTrip from "../oldTravelGroupControl/titleTrip"; import titleTrip from "../oldTravelGroupControl/titleTrip";
......
src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue
View file @ 2e1672dd
...@@ -392,8 +392,6 @@ ...@@ -392,8 +392,6 @@
TripFeature.ConfigId = res.data.data TripFeature.ConfigId = res.data.data
TripFeature.isfromManager = true TripFeature.isfromManager = true
this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType) this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType)
// this.$refs.TravelPrice.closeHotelDialog();
// this.$refs.TravelPrice.initStatus();
} else if (res.data.resultCode == 10009) { } else if (res.data.resultCode == 10009) {
this.FeatureData.IsSave = false this.FeatureData.IsSave = false
//表单重复提交 //表单重复提交
...@@ -487,7 +485,6 @@ ...@@ -487,7 +485,6 @@
if (uploadConfig != undefined) { if (uploadConfig != undefined) {
var configData = JSON.parse(uploadConfig) var configData = JSON.parse(uploadConfig)
//基础数据组装 //基础数据组装
//this.PostConfig.Title = "";
this.PostConfig.IsDirect = 0 this.PostConfig.IsDirect = 0
//线路行程组装 //线路行程组装
let dayList = [] let dayList = []
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ 2e1672dd
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span>入住酒店</span> <span>入住酒店</span>
<span> <span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId"> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId">
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId" <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId"
@visible-change="getHotelList($event)" @change="changeHotelList()"> @visible-change="getHotelList($event)" @change="changeHotelList()">
......
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