Skip to content

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

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

parents 81c9a1e4 7976573f
Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 17 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ab2db09b
......@@ -208,9 +208,8 @@
<!--返佣-->
<td>
<p class="pHouseStyle link" @input="calculationPrice(subItem)">
<span class="spanlink" v-if='childItem.IsRebateRatio==0 '
@click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
<span v-if='childItem.IsRebateRatio!=0'>{{childItem.RebateRatio}}</span>
<span v-if='childItem.RebateRatio>0'>{{childItem.RebateRatio}} %</span>
<span class="spanlink" v-else @click="goUrl('HotelInfo',childItem,'酒店管理')">设置</span>
</p>
</td>
<!-- 金额总计 -->
......@@ -233,6 +232,15 @@
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">确认时间：</td>
<td>
<el-date-picker v-model='subItem.SureTime' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td>
</tr>
<tr>
<td colspan="2" style="height:5px;"></td>
</tr>
<tr>
<td width="70" style="text-align:right;">税入/税别</td>
<td>
......@@ -542,6 +550,7 @@
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
......
src/components/commonPage/commonHotelInfo.vue
View file @ ab2db09b
......@@ -8,6 +8,7 @@
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
<th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
</tr>
<template v-for="hotelItem in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
......@@ -52,14 +53,17 @@
{{hotelSubItem.CreateDateStr}}
</template>
</td>
<td v-if="showHotelObj.showZhan">
{{hotelSubItem.SureTimeStr}}
</td>
</tr>
</template>
<tfoot v-if="showHotelObj.showBtnList">
<tr>
<td colspan="7" style="padding:10px 0">
<td colspan="8" style="padding:10px 0">
<input type="button" class="normalBtn" value="确定" style="display:none;" />
<input type="button" class="normalBtn" value="暂定" style="display:none;" />
<input type="button" class="normalBtn" value="下载" style="display:none;" @click="DownLoadShouPeiShu()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadShouPeiShu()" />
</td>
</tr>
</tfoot>
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ ab2db09b
......@@ -95,7 +95,32 @@
</el-select>
</span>
</li>
<li>
<span>
<em>领队类型</em>
<el-select v-model="msg.LeaderType" class="multiple_input" :placeholder="$t('pub.pleaseSel')" @change="GetLeaderList()">
<el-option label='请选择' :value='0' :key='0'>
</el-option>
<el-option label='领队' :value='1' :key='1'>
</el-option>
<el-option label='领兼导' :value='2' :key='2'>
</el-option>
<el-option label='导游' :value='3' :key='3'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>领队/导游</em>
<el-select v-model="msg.QLeaderId" filterable class="multiple_input" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -266,7 +291,8 @@
<p
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="700" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</p>
......@@ -466,12 +492,14 @@
CombinationNum: "",
//出团公司
OutBranchIds: [],
LineId: 0,
LineId: 14,
PlaceID: 0,
LineteamId: 0,
//航空公司
AirLineId: 0,
CreateBy: 0,
LeaderType:0,//领队导游类型
QLeaderId:0,//领队导游编号
},
CheckedVaule: 1,
UnCheckedVaule: 0,
......@@ -493,7 +521,7 @@
TCIDs: "",
remarkString: '',
SupplierRemarks: '',
IsBookTeam:0,
IsBookTeam: 0,
},
queryCommonData: {
//公司数据
......@@ -511,11 +539,12 @@
cityId: 0,
orderId: 0
},
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true,
showBtnList:false
LeaderList: [],
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true,
showBtnList: true
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -568,7 +597,7 @@
this.NumObj.remarkString = obj.DMCRemark;
this.NumObj.DMCNum = obj.DMCNum;
this.NumObj.SupplierRemarks = obj.SupplierRemarks;
this.NumObj.IsBookTeam=obj.IsBookTeam;
this.NumObj.IsBookTeam = obj.IsBookTeam;
},
saveRemark() {
this.apipost('dmcstatistics_post_SetDMCRemark', this.NumObj, res => {
......@@ -831,8 +860,25 @@
},
hideTripDown() {
this.travelControlTripLayerShow = false;
},
//获取领队和导游
GetLeaderList() {
this.LeaderList=[];
this.msg.QLeaderId=0;
let msg = {
Type: this.msg.LeaderType,
}
this.apipost(
'leader_post_GetList', msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderList = res.data.data;
}
},
err => {}
)
},
},
mounted() {
let myDate = new Date();
let nowDate =
......
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