Skip to content

S
SuperMan
Commit 2f1afcd6 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 3851a4b2 6f1a7d14
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 833 additions and 754 deletions
src/components/Hotel/ChangeHotel.vue
View file @ 2f1afcd6
......@@ -3,13 +3,13 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="changeHotelDetailsTalbe" v-loading="Loading">
<tr>
<th colspan="14">酒店信息</th>
<th colspan="13">酒店信息</th>
</tr>
<tr>
<th>
公司团号
</th>
<th colspan="12" class="tdLeft">
<th colspan="11" class="tdLeft">
<a class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</a>
</th>
<th>
......@@ -18,8 +18,8 @@
</tr>
<tr>
<th width="120">入住时间</th>
<th width="80">选择酒店</th>
<th width="200">原酒店名称</th>
<th width="200">选择酒店</th>
<th width="120">机位数(Y/E/F)</th>
<th width="120">占床/不占床</th>
<th width="80">实际用房数</th>
......@@ -38,9 +38,9 @@
<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">
<!-- <td v-if="childIndex==0" :rowspan="5" class="tdCenter">
<el-checkbox v-model='subItem.IsChecked'></el-checkbox>
</td>
</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>
......@@ -102,10 +102,18 @@
TCNUM: '',
TCIDs: "",
isShowBtn: 0,
isCheck: false,
Loading: false,
}
},
methods: {
UpdateCheck() {
this.DataList.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.IsChecked = this.isCheck;
});
})
},
goUrl(path, obj, name) {
this.$router.push({
path: path,
......
src/components/Hotel/HotelInfo.vue
View file @ 2f1afcd6
This diff is collapsed.
src/components/Hotel/roomReservationsDetails.vue
View file @ 2f1afcd6
......@@ -133,16 +133,16 @@
</el-upload>
</div>
</td>
<!-- 房间预定数 -->
<!-- 房间数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkPrice(childItem,'HouseTypeCount')"
v-model='childItem.HouseTypeCount'></el-input>
v-model='childItem.HouseTypeCount' :disabled="childIndex<4?true:false"></el-input>
</td>
<!-- 预定人数 -->
<td>
<el-input class='w40 tcenter' maxlength="2" @keyup.native="checkInteger(childItem,'BookNum')"
@input="calculationPrice(subItem)" v-model='childItem.BookNum'></el-input>
@input="calculationPrice(subItem)" v-model='childItem.BookNum' :disabled="childIndex<4?true:false">
</el-input>
</td>
<!-- 尚差房间数 -->
<td>
......@@ -200,10 +200,11 @@
<td>
<el-select class='w135 sel' v-model='subItem.PayStyle' :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='5'></el-option>
<el-option label='预付' :value='4'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
<el-option label='签单' :value='2' v-if="subItem.PayStyleExt==2"></el-option>
<el-option label='实物抵扣' :value='3' v-if="subItem.PayStyleExt==3"></el-option>
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option>
</el-select>
</td>
......@@ -240,6 +241,9 @@
<!-- 操作 -->
<td v-if="childIndex==0" :rowspan="5">
<!--v-if="subItem.OPState!=1"-->
<template v-if="subItem.OPState!=1">
<span class="Hotel_red">OP选房确认</span>
</template>
<template>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-baocun1" @click="SaveSingle(subItem)" type="primary"></el-button>
......@@ -253,7 +257,7 @@
</el-button>
</el-tooltip>
</template>
<!-- <template v-else>
<!--<template v-else>
<span class="Hotel_red">OP选房确认</span>
</template> -->
</td>
......@@ -466,6 +470,8 @@
obj.Address = ckedObj.Address;
obj.Tel = ckedObj.Tel;
obj.NewHotelName = ckedObj.Name;
obj.PayStyle = ckedObj.PayStyle;
obj.PayStyleExt=ckedObj.PayStyle;
} else {
obj.Address = '';
obj.Tel = '';
......@@ -509,11 +515,11 @@
})
this.loading = true;
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.getList();
this.Success(res.data.message);
} else {
this.loading = false
this.Error(res.data.message);
}
}, err => {})
......@@ -579,7 +585,7 @@
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 55;
this.boxHeight = height;
this.offsetwidth = width
this.offsetwidth = width;
this.getList();
}
}
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 2f1afcd6
......@@ -121,6 +121,7 @@
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='3'></el-option>
<el-option label='预付' value='4'></el-option>
<el-option label='公司合团支付' value='6'></el-option>
</el-select>
</td>
</tr>
......@@ -136,6 +137,14 @@
<el-option label='导游预订' value='2'></el-option>
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" >
付款团号:
</td>
<td style="text-align:left;">
<el-input class='w135' v-model='subItem.PayTypeTCNUM' type="text"></el-input>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 2f1afcd6
......@@ -1477,8 +1477,8 @@
<div>领队导游</div>
</div>
</div>
<!-- v-if="tuanInfo.config.IsOrder!=1" -->
<div style="float:right">
<!-- -->
<div v-if="tuanInfo.config.IsOrder!=1" style="float:right">
<span style="color:#f78989"> 订单操作已关闭，如需修改请联系OP.</span>
</div>
......
src/components/SalesModule/productQuery.vue
View file @ 2f1afcd6
......@@ -702,6 +702,49 @@
<p><span>出发城市</span>{{item.StartCityName}}</p>
<p><span>返回城市</span>{{item.ReturnArriveCityName}}</p>
<p><span>出团公司</span>{{item.OutBranchName}}</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
</p>
</div>
<div class="d4">
<p><i class="iconfont icon-jiage"></i>价格信息</p>
......@@ -782,51 +825,6 @@
<span slot="reference" class="price">查看价格明细</span>
</el-popover>
</p>
<!-- <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th width="100" style="border-right:1px solid #E5E5E5">占房时间</th>
</tr>
<tr v-for="subItem in item.HotelOrderListReports">
<td width="100">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding:3px 10px;">
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">{{subItem.SubList[0].Status==1?"【OK】":"【暂定】"}}</a>
【<a
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
<template v-else v-for="childItem in subItem.SubList">
<div>{{childItem.HotelName}} {{childItem.HotelName!="温馨的家"?"【暂定】":""}}</div>
</template>
</template>
</td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td>
</tr>
</table>
</div>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p> -->
</div>
<div class="d5">
<p><i class="iconfont icon-tuanwei"></i>团位信息</p>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 2f1afcd6
......@@ -2367,13 +2367,31 @@
</div>
<table class="RS_visaTable">
<tr>
<th>签发地</th>
<th>类型</th>
<th width=100>到期日</th>
<th colspan="3">请假信息</th>
</tr>
<tr>
<td colspan="3">无签证信息</td>
<th>姓名</th>
<th>类型</th>
<th width=100>时间</th>
</tr>
<template v-if="LeaderHolidyList&&LeaderHolidyList.length>0">
<tr v-for="(leaderItem,leaderIndex) in LeaderHolidyList">
<td>
{{LeaderInfoList.LeaderGuide.Surname}}{{LeaderInfoList.LeaderGuide.Name}}
</td>
<td>
请假
</td>
<td>
{{leaderItem.StartDateStr2}}到{{leaderItem.EndDateStr2}}
</td>
</tr>
</template>
<template v-else>
<tr>
<td colspan="3">暂无请假信息</td>
</tr>
</template>
</table>
</div>
<div>
......@@ -2966,6 +2984,8 @@
ScheduleArray: [],
ckedIndex: -1,
LeaderInfoList: [],
//领队请假信息
LeaderHolidyList: [],
beforeInfo: {
DuringHoliday: '',
date: '',
......@@ -3136,7 +3156,8 @@
this.isShowLayer = false;
this.isShowLayer2 = true;
}
let maxPeopleNum = (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNoNeedBedNum) + Number(this.addMsg.ChirdNeedBedNum) + Number(this.addMsg.OldPeopleNum) + Number(this.addMsg.AirticketNum) )
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 = [];
this.apipost('sellorder_post_GetLessPrice', {
"TCID": obj.TCID,
......@@ -4426,6 +4447,8 @@
},
//点击选中名单
getLeaderInfo(index, LeaderId) {
this.LeaderInfoList = {};
this.LeaderHolidyList = [];
this.ckedIndex = index;
let msg = {
ID: LeaderId,
......@@ -4435,6 +4458,7 @@
"leader_Get_GetPriceLeaderInfo", msg,
res => {
if (res.data.resultCode == 1) {
this.LeaderHolidyList=res.data.data.holidyList;
this.LeaderInfoList = res.data.data;
this.beforeInfo.DuringHoliday = "";
this.beforeInfo.date = "";
......
src/components/TravelManager/TravelList/RegistrationStatistics.vue
View file @ 2f1afcd6
......@@ -182,7 +182,7 @@
{{item.StartCityName}}</td>
<td>{{item.LtName}}</td>
<td>{{item.StartDateStr}} {{item.AlCode}}</td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrl('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
<td><span title="点击跳转到团控列表" :class="item.TCID>0?'RS_RedType PingFangSC Order_RS':'Order_RS'" @click="goUrlTCList('TravelControlList',item.TCNUM,'团控列表')">{{item.TCID}}</span></td>
<td>{{item.InOut}}</td>
<td>{{item.InOutTime}}</td>
<td>{{item.B2CMemberPrice}}</td>
......@@ -251,6 +251,16 @@
};
},
methods: {
goUrlTCList(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun: TCNUMS,
blank: 'y',
tab: title
}
})
},
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage();
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 2f1afcd6
......@@ -141,7 +141,11 @@
.span_all {
margin-left: 15px;
}
.TeamExpectList{
max-height:105px;
overflow:auto;
margin-bottom:0!important;
}
</style>
<template>
......@@ -233,26 +237,29 @@
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>其他
</span>提成
</div>
<div>提成：</div>
<div class="Team_Incontent" style="height:50px;overflow:auto;margin-bottom:10px;">
<div>
<div style="margin-bottom:6px;">
<div class="Team_Incontent" style="margin-bottom:0;">
<div class="TeamExpectList">
<template v-for="subItem in DataList.ExpectedCutList">
<div style="margin-bottom:5px;">{{subItem.BranchName}} ￥{{subItem.expectedCut}} </div>
</template>
</div>
</div>
<div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
</div>
</div>
</el-col>
<el-col :span="4">
<div class="Team_DList">
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>优惠
</span>挂账信息
</div>
<div class="Team_Incontent">
<div>金额：<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
<div>挂账总金额：<span>￥{{moneyFormat(AllCont.Income - AllCont.Expend)}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
</div>
</div>
</el-col>
......@@ -261,15 +268,14 @@
<div class="Team_firstTitle">
<span class="Team_comCoinType Team_lirun">
<i class="iconfont icon-qian"></i>
</span>挂账信息
</span>优惠
</div>
<div class="Team_Incontent">
<div>挂账总金额：<span>￥{{moneyFormat(AllCont.Income - AllCont.Expend)}}</span></div>
<div>挂账总支出：<span>￥{{moneyFormat(AllCont.Expend)}}</span></div>
<div>挂账总收入：<span>￥{{moneyFormat(AllCont.Income)}}</span></div>
<div>金额：<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2f1afcd6
......@@ -481,13 +481,56 @@
{{item.OutBranchName}}
</p>
<p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;"
<a style="cursor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
</p>
</div>
</div>
<div class="el-col" style="width:190px;">
......@@ -557,49 +600,7 @@
<span slot="reference" class="price">{{$t('Operation.Op_priceDetail')}}</span>
</el-popover>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="600" trigger="click" popper-class="TC_HotelPop">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="singeRowTable">
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5;width:150px;">酒店</th>
<th style="border-right:1px solid #E5E5E5;width:240px;">酒店情况</th>
<th style="border-right:1px solid #E5E5E5;width:100px">占房时间</th>
</tr>
<template v-for="subItem in item.HotelOrderListReports">
<tr v-for="(childItem,childIndex) in subItem.SubList">
<td width="100" v-if="childIndex==0" :rowspan="subItem.SubList.length">
{{subItem.UseDay}}
</td>
<td style="text-align:left;padding-left:3px;">
{{childItem.HotelName}}
</td>
<td style="text-align:left;padding-left:3px;">
<a style="color:green" v-if="childItem.HotelName!='温馨的家'">
【<template v-if="childItem.OPState==1">
OP-OK
</template>
<template v-else-if="childItem.OPState==2&&childItem.DMCState==0">
OP-暂定
</template>
<template v-else>
{{childItem.DMCState==1?"地接-OK":(childItem.DMCState==2?"地接-暂定":"地接-未操作")}}
</template>
】
</a>
<a v-if="(childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0))&& childItem.UseCount>0 " style="color:green">
【使用: {{childItem.UseCount}} 间 {{childItem.CostPrice!=0?"价格:"+childItem.CostPrice:""}} 】
</a>
</td>
<td>
<template v-if="childItem.OPState==1||(childItem.OPState==2 && childItem.DMCState==0)"> {{childItem.CreateDateStr}}</template>
</td>
</tr>
</template>
</table>
<span slot="reference" class="price">酒店信息</span>
</el-popover>
</p>
</div>
</div>
<div class="el-col" style="width:150px;">
......
src/components/busManagement/BusInfo.vue
View file @ 2f1afcd6
......@@ -542,7 +542,6 @@
{
obj.CostPrice = tempCostFee;
}
}
}else{
obj.PayType=null;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 2f1afcd6
......@@ -110,8 +110,17 @@
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='5'></el-option>
<el-option label='预付' value='4'></el-option>
<el-option label='公司合团支付' value='6'></el-option>
</el-select>
</td>
</tr>
<tr v-show="subItem.PayStyle==6">
<td width="60" style="text-align:right;" >
付款团号：
</td>
<td style="text-align:left;">
<el-input class='w135' v-model='subItem.PayTypeTCNUM' type="text"></el-input>
</td>
</tr>
<tr>
<td width="60" style="text-align:right;">
......@@ -121,6 +130,7 @@
<el-input class='w135' v-model='subItem.CombinationNum' type="text"></el-input>
</td>
</tr>
</table>
</td>
<td v-if="childIndex==0" :rowspan="3">
......
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