Skip to content

S
SuperMan
Commit bcea1811 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents fdc9b56c 87034bfe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 853 additions and 643 deletions
src/components/FinancialModule/BasicDocuments.vue
View file @ bcea1811
......@@ -1292,6 +1292,7 @@
<viewer :images="images" :options='imageOptions' @inited="inited" class="viewer" ref="viewer">
<img v-for="src in images" :src="src" :key="src">
</viewer>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
<script>
......@@ -1807,6 +1808,9 @@ export default {
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Content)
}else{
let dom = document.querySelector("#groupTourOrder_DownLoad");
dom.href = i.Content;
dom.click();
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
}
}
......@@ -2328,13 +2332,15 @@ export default {
let data=res.data.data;
console.log(1);
if(this.RB_Post_Id!=5&&this.userId!=1648){
console.log(2);
data.forEach(item=>{
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="老挝购物店资金池"){
this.AccList.push(item);
}
})
if(this.userId==1918){
this.AccList = res.data.data;
}else{
data.forEach(item=>{
if(item.Name!="公社资金池" && item.Name!="水口资金池" && item.Name!="橡胶资金池" && item.Name!="老挝购物店资金池"){
this.AccList.push(item);
}
})
}
}else{
this.AccList = res.data.data;
}
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ bcea1811
......@@ -799,7 +799,7 @@
</div>
</template>
</el-dialog>
<a id='groupTourOrder_DownLoad' target="_blank" style="display:none">1不要删除</a>
</div>
</template>
<script>
......@@ -1171,7 +1171,10 @@ export default {
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Url)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
let dom = document.querySelector("#groupTourOrder_DownLoad");
dom.href = i.Url;
dom.click();
// window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Url)
}
}
},
......@@ -1180,7 +1183,10 @@ export default {
if(i.Content.substring(i.Content.lastIndexOf('.')+1,i.Content.length).toUpperCase()=='PDF'){
this.previewPDF(i.Content)
}else{
window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
let dom = document.querySelector("#groupTourOrder_DownLoad");
dom.href = i.Content;
dom.click();
// window.open("https://view.officeapps.live.com/op/view.aspx?src="+i.Content)
}
},
FinancialFlowTemplate_post_GetProcessList(id,tid){
......
src/components/Hotel/ChangeHotel.vue
View file @ bcea1811
......@@ -18,7 +18,6 @@
</tr>
<tr>
<th width="120">入住时间</th>
<th width="200">选择酒店</th>
<th width="120">机位数(Y/E/F)</th>
<th width="120">占床/不占床</th>
......@@ -38,9 +37,6 @@
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*item.HotelOrderList.length" class="tdCenter">
{{item.UseTimeStr}}
</td>
<!-- <td v-if="childIndex==0" :rowspan="5" class="tdCenter">
<el-checkbox v-model='subItem.IsChecked'></el-checkbox>
</td> -->
<td v-if="childIndex==0" :rowspan="5" class="tdLeft">
<p class="link" style="word-break: normal;" @click="goUrlR('HotelManagement',HotelId.HotelId,'酒店管理')">
{{subItem.HotelName}}</p>
......@@ -67,7 +63,9 @@
{{subItem.HouseStatistics.HouseTypeList[childIndex].HouseGuestNum}}
</td>
<td v-if="childIndex==0" :rowspan="5" class="tdLeft">
{{subItem.NewHotelName}}
<template v-if="subItem.HotelName!=subItem.NewHotelName" ><span style="color:red;">{{subItem.NewHotelName}}</span></template>
<template v-else>{{subItem.NewHotelName}}</template>
</td>
<td class="tdCenter">
{{childItem.HouseTypeCount}}
......@@ -153,6 +151,7 @@
this.Loading = false;
if (res.data.resultCode == 1) {
this.DataList = res.data.data.HotelOrderListReport;
console.log("this.DataList",this.DataList)
} else {
this.Error(res.data.message);
}
......
src/components/Hotel/HotelProductManage.vue
View file @ bcea1811
This diff is collapsed.
src/components/Hotel/HotelProductManage2.vue
View file @ bcea1811
......@@ -73,13 +73,13 @@
<td style="text-align:center">
{{childItem.BatchNumber}}
</td>
<td style="text-align:center">
<td style="text-align:center;white-space:nowrap; ">
{{childItem.CostPrice}}
</td>
<td style="text-align:center">
<td style="text-align:center;white-space:nowrap; ">
{{childItem.Inventory}}
</td>
<td style="text-align:center">
<td style="text-align:center;white-space:nowrap; ">
{{childItem.RemainingInventory}}
</td>
<td style="text-align:left">
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ bcea1811
......@@ -3139,7 +3139,7 @@
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy,x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType);
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.Unit_PriceList=[];
......@@ -3260,7 +3260,7 @@
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy,x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType);
} else {
this.$message.error(res.data.message);
......@@ -4001,11 +4001,12 @@
err => {}
);
},
getKhmdList(id, lineId,employeeId) {
getKhmdList(id, lineId,employeeId,CustomerId) {
this.apipost(
"app_today_visit_GetNewOrderMyCustomerList",
{ typeId: id, lineId: lineId,
EmoloyeeId: employeeId
EmoloyeeId: employeeId,
customerId:CustomerId
},
res => {
if (res.data.resultCode == 1) {
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ bcea1811
......@@ -1914,7 +1914,7 @@
<tr>
<td rowspan="2" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId">{{item.orderId}}
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}
<span style="font-weight: 100;" v-if="item.scoreNum >= 0">(评分{{item.scoreNum}})</span>
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p>
......@@ -3151,7 +3151,7 @@
this.isShowLayer = false;
this.isShowLayer2 = true;
}
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy,x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType);
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
this.apipost('sellorder_post_GetLessPrice', {"TCID":obj.tcid, "MaxPeopleNum": maxPeopleNum}, res => {
......@@ -3273,7 +3273,7 @@
err => {}
);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy);
this.getKhmdList(this.addMsg.CustomerType, obj.lineId,this.addMsg.CreateBy,x.CustomerId);
this.getDdlyList(this.addMsg.CustomerType);
} else {
this.$message.error(res.data.message);
......@@ -4014,11 +4014,12 @@
err => {}
);
},
getKhmdList(id, lineId,employeeId) {
getKhmdList(id, lineId,employeeId,CustomerId) {
this.apipost(
"app_today_visit_GetNewOrderMyCustomerList",
{ typeId: id, lineId: lineId,
EmoloyeeId: employeeId
EmoloyeeId: employeeId,
customerId:CustomerId
},
res => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ bcea1811
......@@ -490,7 +490,7 @@
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="850" trigger="click" popper-class="TC_HotelPop">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
......@@ -1114,7 +1114,6 @@
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
};
console.log(ShouPeiStatus,'ShouPeiStatus');
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
......
src/components/commonPage/comCheckHotel.vue
View file @ bcea1811
......@@ -55,16 +55,16 @@
</div>
<div class="cm_hotelTitle clearfix">
<div style="float:left;">
地区筛选:
地区:
<el-select filterable v-model="qMsg.ProvinceId" class="w120" :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in ProvinceList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</div>
<div style="float:left;margin-left:15px;">
酒店名称:
<el-input type="text" v-model="qMsg.Name" class="w120" @keyup.native.enter="getCheckHotel()" placeholder="请输入关键字"></el-input>
<div style="float:left;margin-left:10px;">
酒店名称/电话:
<el-input type="text" v-model="qMsg.Name" class="w120" @keyup.native.enter="getCheckHotel()" placeholder="酒店名称或电话"></el-input>
<input type="button" class="normalBtn" value="查询" @click="getCheckHotel()" />
</div>
</div>
......@@ -73,10 +73,10 @@
<el-tab-pane :label="item.ProvinceName" v-for="(item,index) in dataList" :key="item.subCode">
<div class="clearfix comCheckHotel">
<div class="comCk_list" v-for="(subItem,subIndex) in item.HotelList">
<!-- "'comCheckHotel'+index+subIndex+''" -->
<input :id="'H'+index+'_'+subIndex" type="checkbox" v-model="subItem.isChecked" @click="getCheck(item.HotelList,subIndex)"/>
<label :for="'H'+index+'_'+subIndex" style="cursor: pointer">{{subItem.Name}}</label>
<span class="cm_Inventory">{{subItem.Inventory}}</span>
<span class="cm_Inventory">剩余:{{subItem.RemainingInventory}}</span>
<span class="ck_goUrl" @click="goUrl(subItem.ID)">新增库存</span>
</div>
</div>
......
src/components/commonPage/commonHotelInfo.vue
View file @ bcea1811
......@@ -30,80 +30,89 @@
<td>
公司团号
</td>
<td :colspan="4" style="text-align:left;">
<td :colspan="5" style="text-align:left;">
<span style="padding-left:5px;">{{TCNUM}} ({{TCID}})</span>
</td>
<td>
地接团号
</td>
<td :colspan="showHotelObj.ShowTaxType?5:3" style="text-align:left;">
<td :colspan="showHotelObj.ShowTaxType?6:4" style="text-align:left;">
<span style="padding-left:5px;">{{DMCNum}}</span>
</td>
</tr>
<tr>
<th width="120">日期</th>
<th style="width:150px;">酒店</th>
<th style="width:150px;">更换酒店</th>
<th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
<th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
<th style="width:130px" v-if="showHotelObj.showZhan">占房时间</th>
<th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
<th style="width:80px;" v-if="showHotelObj.showPrice">
<th width="150">酒店</th>
<th width="150">更换酒店</th>
<th width="120">酒店状态</th>
<th width="120">OP状态</th>
<th width="120">地接状态</th>
<th width="110" v-if="showHotelObj.showPrice">数量<br />价格</th>
<th width="120" v-if="showHotelObj.showPay">付款方式<br/>返佣比例</th>
<th width="130" v-if="showHotelObj.showZhan">占房时间</th>
<th width="100" v-if="showHotelObj.showZhan">确认时间</th>
<th width="70" v-if="showHotelObj.showPrice">
日志
</th>
</tr>
<template v-for="(hotelItem,index) in HotelObj">
<tr v-for="(hotelSubItem,hotelSubIndex) in hotelItem.SubList">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length">
<td width="120" v-if="hotelSubIndex==0" :rowspan="hotelItem.SubList.length" style="white-space:nowrap; ">
{{hotelItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{hotelSubItem.HotelName}}
<template v-if="hotelSubItem.HotelName!=hotelSubItem.NewHotelName && hotelSubItem.NewHotelName!=''">
<span style="text-decoration:line-through"> {{hotelSubItem.HotelName}}</span>
</template>
<template v-else>
{{hotelSubItem.HotelName}}
</template>
</td>
<td style="text-align:left;padding-left:3px;color:red">
{{hotelSubItem.HotelName!=hotelSubItem.NewHotelName?""+hotelSubItem.NewHotelName:""}}
</td>
<td style="text-align:left;padding-left:3px;">
<td>
<template v-if="hotelSubItem.OPState==1||hotelSubItem.DMCState==1">
<a style="color:green">保证入住</a>
</template>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.OPState==1">
<a style="color:green">OP-指定</a>
</template>
<template v-else-if="hotelSubItem.OPState==2 && hotelSubItem.DMCState==0 ">
<template v-else-if="hotelSubItem.OPState==2">
<a style="color:red">OP-暂定</a>
</template>
<template v-else>
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hotelSubItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</span>
</td>
<td>
<span v-if="hotelSubItem.HotelName!='温馨的家'">
<template v-if="hotelSubItem.DMCState==1">
<a style="color:green">地接-OK</a>
</template>
<template v-else-if="hotelSubItem.DMCState==2">
<a style="color:red">地接-暂定</a>
</template>
<template v-else-if="hotelSubItem.DMCState==0">
<a style="color:red">地接-未操作</a>
</template>
</span>
</td>
<td v-if="showHotelObj.showPrice">
<a v-if="(hotelSubItem.OPState==1|| hotelSubItem.OPState==2 || hotelSubItem.DMCState==1 )">
{{hotelSubItem.UseCount>0? hotelSubItem.UseCount+" 间" :""}}
<br />
{{hotelSubItem.CostPriceNew>0?" 价格:"+hotelSubItem.CostPriceNew:(hotelSubItem.CostPrice!=0?" 价格:"+hotelSubItem.CostPrice:"")}}
</a>
</td>
<td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}}
</td>
<td v-if="showHotelObj.ShowTaxType">
<template v-if="hotelSubItem.TaxType==1">税入</template>
{{hotelSubItem.PayTypeStr}} <template v-if="hotelSubItem.TaxType==1">税入</template>
<template v-if="hotelSubItem.TaxType==2">税别</template>
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.ShowRebateRatio">
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.showZhan">
<td v-if="showHotelObj.showZhan" style="white-space:nowrap; ">
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}}
</template>
......
src/components/commonPage/commonPriceHotelInfo.vue 0 → 100644
View file @ bcea1811
<style>
</style>
<template>
<div class="commonPriceHotelInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable" v-loading="loading">
<tr>
<th width="100">日期</th>
<th width="135">占房时间</th>
<th width="120">团期</th>
<th width="80">总库存</th>
<th width="80">使用库存</th>
<th width="80">状态</th>
</tr>
<template v-if="HotelPriceList.length>0">
<tr v-for="(item,index) in HotelPriceList">
<td>
{{item.UseTimeStr}}
</td>
<td>
{{item.CreateTimeStr}}
</td>
<td>
{{item.TCNUM}}
</td>
<td>
{{item.Inventory}}
</td>
<td>
{{item.LastUseNum}}
</td>
<td>
<template v-if="item.Status==1"><span style="color:green;">OK</span></template>
<template v-else><span style="color:red;">暂定</span></template>
</td>
</tr>
</template>
<template v-else>
<tr>
<td colspan="6">
<span style="color:red;"> 暂无库存使用记录.</span>
</td>
</tr>
</template>
</table>
</div>
</template>
<script>
export default {
data() {
return {
loading: false,
HotelPriceList: [],
queryMsg: {
HotelId: 0,
UseTime: "",
}
};
},
methods: {
//获取日志
getHotelPriceList(HotelId, timeStr) {
this.HotelPriceList = [];
this.loading = true;
if (HotelId) {
this.queryMsg.HotelId = HotelId;
}
if (timeStr) {
this.queryMsg.UseTime = timeStr;
}
this.apipost('travel_get_GetHotelUsePriceListService', this.queryMsg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.HotelPriceList = res.data.data;
}
}, err => {})
},
},
mounted() {}
};
</script>
src/components/confirmationOrderDownLoad.vue
View file @ bcea1811
......@@ -1007,6 +1007,8 @@
isPc: isPc,
//模板参数
templateId: this.showType,
//用户Id
UId:this.getLocalStorage().EmployeeId
};
this.GetLocalFile("DownLoadTripWord", msg, title + ".doc", res => {
this.pdfLoading = false
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ bcea1811
......@@ -305,7 +305,7 @@
<span class="colorE95252" v-else>{{item.HotelResult=='-1'?"x":"O"}}</span>
</div>
<p v-if="item.LineId==14 && item.PriceHotelResult && item.PriceHotelResult.length>0">
<el-popover width="920" trigger="click" popper-class="DMC_HotelPop">
<el-popover width="1100" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.PriceHotelResult" :showHotelObj="showHotelObj" :TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUMS"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ bcea1811
......@@ -810,7 +810,7 @@
<th width="240">酒店情况</th>
<th width="100">占房时间</th>
<th width="100">更换酒店</th>
<th width="60">操作</th>
<th width="120">操作</th>
</tr>
<template v-for="(subItem,subIndex) in priceData.PriceHotelList">
<tr v-for="(childItem,childIndex) in subItem.SubList">
......@@ -859,6 +859,12 @@
<span v-if="childItem.UseCount>0 && subItem.SubList.length==1">
<span style="color:red;white-space:nowrap;cursor:pointer;" @click="DeleteStock(subItem)">删除</span>
</span>
<span >
<el-popover width="700" trigger="click" popper-class="DMC_HotelPop">
<commonPHInfo :name='"comPriceHotelInfo"+subIndex+childIndex' :ref='"comPriceHotelInfo"+subIndex+childIndex' ></commonPHInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;" @click="GetHotelUsePriceList(childItem.HotelId,subItem.UseDay,subIndex,childIndex)">库存情况</span>
</el-popover>
</span>
</td>
</tr>
</template>
......@@ -913,6 +919,7 @@
</div>
</template>
<script>
import commonPHlInfo from "../../commonPage/commonPriceHotelInfo.vue";
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
......@@ -1008,6 +1015,12 @@
};
},
methods: {
//调用子组件方法
GetHotelUsePriceList(HotelId,UseDay,index,hotelSubIndex)
{
let str = `comPriceHotelInfo${index}${hotelSubIndex}`;
this.$refs[str][0].getHotelPriceList(HotelId, UseDay);
},
//点击折叠
fold() {
if (this.isFold == "") {
......@@ -1736,7 +1749,8 @@
}
},
components: {
TravelPriceFlightList: TravelPriceFlightList
TravelPriceFlightList: TravelPriceFlightList,
commonPHInfo:commonPHlInfo
}
};
......
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