Skip to content

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

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

parents b79c218f 96c271c1
Hide whitespace changes
Inline Side-by-side
Showing with 482 additions and 103 deletions
src/assets/css/newTravelManager.css
View file @ b74f936d
......@@ -1647,7 +1647,6 @@
}
.TC_Content {
width: 100%;
height:100%;
min-height: 500px;
padding:0 10px;
background-color: #fff;
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ b74f936d
......@@ -722,7 +722,7 @@
</div>
</div>
<div style="padding-left: 75px;">
<button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">驳回</button>
<button class="hollowFixedBtn" v-if="(bossID===1 || bossID===5||bossID===1903) && (GetDetail.Status===2 || GetDetail.Status===5 || GetDetail.Status===1)" @click="bohui()">驳回</button>
<button class="hollowFixedBtn" @click="AuditOrRefund()">返回</button>
</div>
</div>
......
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ b74f936d
......@@ -250,6 +250,7 @@
<th>业务员</th>
<th>应收金额</th>
<th>实收金额</th>
<th>优惠金额</th>
<th>待收金额</th>
<th>已退款</th>
<th>平台税金</th>
......@@ -258,7 +259,7 @@
<tr v-for=" ( item , index ) in DataList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }} （{{ item.TCID }}） </span> </td>
<td> {{ item.StartDate }} </td>
<td colspan="9">
<td colspan="10">
<table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0" border="0">
<tbody>
<tr v-for=" ( son , sIndex ) in item.OrderList ">
......@@ -267,6 +268,7 @@
<td> {{ son.EmName }}<br/>{{son.CreateDate}} </td>
<td> {{ son.PreferPrice }} </td>
<td> <span :class="son.DaiShou != 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
<td>{{son.DiscountMoney}}</td>
<td>{{ son.DaiShou}} </td>
<td> {{ son.Refund }} </td>
<td> {{ son.PlatformTax }} </td>
......@@ -280,6 +282,7 @@
<td colspan="5">合计</td>
<td>{{Statistics.PreferPrice}}</td>
<td>{{Statistics.Income}}</td>
<td>{{Statistics.DiscountMoney}}</td>
<td>{{Statistics.DueinMoney}}</td>
<td>{{Statistics.Refund}}</td>
<td>{{Statistics.PlatformTax}}</td>
......@@ -457,7 +460,6 @@ export default {
if(res.data.resultCode == 1) {
this.startCityList1 = res.data.data;
} else {
console.log(res.data)
}
});
},
......
src/components/FinancialModule/ReportForm/MonthReport.vue
View file @ b74f936d
......@@ -986,7 +986,6 @@ export default {
},
// 数据筛选
filterMethod(filters) {
console.log("filters",filters)
this.total = tableData.length;
},
......@@ -996,10 +995,9 @@ export default {
"admin_get_BranchGetList",
this.getCompanyMsg,
res => {
console.log("出团公司",res)
if (res.data.resultCode == 1) {
this.CompanyList = res.data.data;
this.msg.OutBranchId=this.CompanyList[0].Id;
// this.msg.OutBranchId=this.CompanyList[0].Id;
} else {
}
},
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ b74f936d
......@@ -1346,14 +1346,19 @@ export default {
this.msg.startDate=this.$route.query.StartTime!=undefined?this.$route.query.StartTime:'';
this.msg.endDate=this.$route.query.EndTime!=undefined?this.$route.query.EndTime:'';
this.msg.LineId=this.$route.query.LineId!=undefined?Number(this.$route.query.LineId):'';
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
if(this.msg.endDate!=""){
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
}
if(this.msg.LineId>0){
this.msg.DataType="1";
}
if(this.msg.LineId==-1){
// 其余都是不限
this.msg.DataType="-1";
this.msg.OutBranchId=45;
this.msg.LineId=0;
}
if(this.msg.LineId==-2){
this.msg.DataType="2";
......@@ -1364,9 +1369,6 @@ export default {
if(this.msg.LineId==-4){
this.msg.DataType="3";
}
// startDate: "",
// endDate: "",
// this.msg.lineID=this.$route.query.lineID;
},
components: {},
mounted() {
......@@ -1806,7 +1808,7 @@ export default {
// 数据筛选
filterMethod(filters) {
console.log(filters);
// let tableData = this.DataList;
// if (filters.FrID && filters.FrID.length>0){
......
src/components/SalesModule/enrollTotal.vue
View file @ b74f936d
......@@ -221,7 +221,41 @@
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
</td>
<td>{{moneyFormat(item.discountMoney)}}</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.discountMoney)}}</span>
</el-popover>
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
......@@ -536,7 +570,6 @@
"sellorder_post_GetOrderList",
this.msg,
res => {
// console.log("list",res);
if (res.data.resultCode == 1) {
this.loading = false;
this.total = res.data.data.count;
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ b74f936d
......@@ -213,6 +213,7 @@
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">优惠</th>
<th width="60">小费</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
......@@ -262,6 +263,40 @@
<span v-if='item.isEnd==0' style="cursor: pointer;">{{moneyFormat(item.income)}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{moneyFormat(item.income)}}</span>
</td>
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
......@@ -540,6 +575,7 @@
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData;
this.getCount();
} else {
this.loading = false;
this.$message.error(res.data.message);
......@@ -547,7 +583,7 @@
},
err => {}
);
this.getCount();
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
......
src/components/SalesModule/groupTourOrder.vue
View file @ b74f936d
......@@ -1490,6 +1490,7 @@
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">优惠</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="80">平台在途</th>
......@@ -1597,6 +1598,41 @@
slot="reference">{{item.income}}</span>
</el-popover>
</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
......@@ -1684,7 +1720,7 @@
</td>
</tr>
<tr style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
......@@ -2488,7 +2524,6 @@
this.showID = data
},
getRemarks (obj) {
console.log(obj,'ssss');
this.isShowLayerRemarks = true
this.isShowLayer = false
this.$refs['addMsg'].resetFields()
......@@ -3356,6 +3391,7 @@
'sellorder_post_GetTravelOrderList',
this.msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false
this.total = res.data.data.count
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ b74f936d
......@@ -1512,6 +1512,7 @@
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">优惠</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="80">平台在途</th>
......@@ -1527,7 +1528,7 @@
<template v-for="op in list">
<tbody class="not_border">
<tr>
<td colspan="15">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
<td colspan="16">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
</tr>
</tbody>
<tbody v-for="(item,index) in op.list" :key="index">
......@@ -1628,6 +1629,43 @@
</el-popover>
<!-- <span v-if='item.isOwn!=1 && userId!=1&&userId!=5 && isUpdateOrder==false'>******</span> -->
</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)"
slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
<span v-else>******</span>
......@@ -1715,7 +1753,7 @@
</td>
</tr>
<tr style="height:20px">
<td colspan="14" class="RL_Order" style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
......@@ -1756,7 +1794,7 @@
</div>
</div>
</td>
<td colspan="5" class="groupTourOrder_tickets" style="height: 40px;">
<td colspan="6" class="groupTourOrder_tickets" style="height: 40px;">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>收款单据：</div>
<div>
......@@ -1788,7 +1826,7 @@
<tbody v-show="list.length!==0">
<tr>
<td></td>
<td colspan="14" class="groupTourOrderByTuan_seat">
<td colspan="15" class="groupTourOrderByTuan_seat">
<div>
<span>本团机位：</span>
<span>{{tuanInfo.config&&tuanInfo.config.YSeat}}Y + {{tuanInfo.config&&tuanInfo.config.CSeat}}E + {{tuanInfo.config&&tuanInfo.config.FSeat}}F</span>
......@@ -1821,7 +1859,7 @@
<!-- 取消订单 -->
<tr v-if="cancelRtData!=null && cancelRtData.length>0">
<td colspan="15">
<td colspan="16">
<span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer" title="点击查看">取消订单（<span
style="color:blue;">{{!isShowCancelOrder?"展开":"收起"}}</span>）</span>
</td>
......@@ -1845,35 +1883,7 @@
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td>
<td>
<!-- <el-popover style='padding: 0;' width="470" trigger="click" > -->
<!-- <div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
<span>老人：{{item.oldPeopleNum}}人</span>
<span>婴儿：{{item.babyNum}}人</span>
<span>单地接：{{item.airticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='memberList.length>0' v-for="(item2,index2) in memberList" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='memberList.length==0'>
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div> -->
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
......@@ -1917,6 +1927,10 @@
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
</el-popover>
</td>
<!-- 取消订单的优惠,金额直接为0-->
<td>
0.00
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.DueInMoney}}</td>
......@@ -2002,7 +2016,7 @@
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div>收款单据：</div>
<div>
......@@ -2644,7 +2658,6 @@ export default {
"travel_get_GetTravelConfigTCID",
{ TCID: this.$route.query.id },
res => {
console.log("111",res);
if (res.data.resultCode == 1) {
this.tuanInfo = res.data.data;
}
......@@ -3868,7 +3881,6 @@ submitYSZEForm(){
this.seat.leaderNum = res.data.data.pageData.leaderNum
this.seat.ownVisaNum = res.data.data.pageData.ownVisaNum
console.log("this.seat",this.seat)
} else {
this.$message.error(res.data.message);
}
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ b74f936d
......@@ -157,7 +157,7 @@
<el-tooltip v-else class="item" effect="dark" content="修改备注" placement="top-start">
<el-button type="primary" style='background:#409EFF; border-color:#409EFF' icon="iconfont icon-img_bianji_small" @click='getDetail(item,true)'></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="结算" placement="top-start">
<el-tooltip v-if="item.visaOrderStatus==1" effect="dark" content="结算" placement="top-start">
<el-button type="primary" style='background:#5EBB64; border-color:#5EBB64' @click='goUrl(item)' icon="iconfont icon-qian"></el-button>
</el-tooltip>
<el-tooltip v-if="item.visaOrderStatus==1&&item.visaStatus==1" effect="dark" content="旅客名单" placement="top-start">
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ b74f936d
......@@ -1540,7 +1540,41 @@
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
<td>{{moneyFormat(item.DiscountMoney)}}</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.CouponAllotList.length>0' v-for="(item2,index2) in item.CouponAllotList" :key="index2">
<td>{{item2.CouponsName}}</td>
<td>
<span v-if="item2.CouponsType==1">抵用券</span>
<span v-if="item2.CouponsType==2">折扣卷</span>
</td>
<td>{{item2.Denomination}}</td>
<td>满{{item2.UseCondition}}可用</td>
<td>
<span v-if="item2.AccessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.AcessDate}}</td>
</tr>
<tr v-if='item.CouponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -1726,7 +1760,42 @@
@click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
</el-popover>
</td>
<td class="nowrap">{{moneyFormat(childItem.DiscountMoney)}}</td>
<!-- 其他类型的优惠 -->
<td class="nowrap">
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='childItem.CouponAllotList.length>0' v-for="(item2,index2) in childItem.CouponAllotList" :key="index2">
<td>{{item2.CouponsName}}</td>
<td>
<span v-if="item2.CouponsType==1">抵用券</span>
<span v-if="item2.CouponsType==2">折扣卷</span>
</td>
<td>{{item2.Denomination}}</td>
<td>满{{item2.UseCondition}}可用</td>
<td>
<span v-if="item2.AccessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.AcessDate}}</td>
</tr>
<tr v-if='childItem.CouponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{childItem.DiscountMoney}}</span>
</el-popover>
</td>
<td class="nowrap">{{childItem.Refund}}</td>
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
......@@ -1952,7 +2021,40 @@
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
<td class="nowrap">{{moneyFormat(item.DiscountMoney)}}</td>
<td class="nowrap">
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.CouponAllotList.length>0' v-for="(item2,index2) in item.CouponAllotList" :key="index2">
<td>{{item2.CouponsName}}</td>
<td>
<span v-if="item2.CouponsType==1">抵用券</span>
<span v-if="item2.CouponsType==2">折扣卷</span>
</td>
<td>{{item2.Denomination}}</td>
<td>满{{item2.UseCondition}}可用</td>
<td>
<span v-if="item2.AccessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.AcessDate}}</td>
</tr>
<tr v-if='item.CouponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -3888,6 +3990,7 @@ submitYSZEForm(){
IsTravelMoney:1
},
res => {
if (res.data.resultCode == 1) {
this.orderList = res.data.data;
}
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ b74f936d
......@@ -1024,35 +1024,39 @@
<td>{{item.ContactMobile}}</td>
<td>{{item.CreateDate}}</td>
<td>
<el-popover
placement="right"
width="720"
trigger="hover">
<el-table :data="item.CouponAllotList">
<el-table-column width="120" property="CouponsName" label="优惠券名称"></el-table-column>
<!-- <el-table-column property="CouponId" label="优惠券id"></el-table-column> -->
<el-table-column width="120" label="优惠券类型">
<template slot-scope="scope">
<span v-if="scope.row.CouponsType==1">抵用券</span>
<span v-if="scope.row.CouponsType==2">折扣卷</span>
</template>
</el-table-column>
<el-table-column width="120" property="Denomination" label="抵扣金额/折扣"></el-table-column>
<el-table-column property="UseCondition" label="使用条件">
<template slot-scope="scope">
<span>满{{scope.row.UseCondition}}可用</span>
</template>
</el-table-column>
<el-table-column property="" label="获取方式">
<template slot-scope="scope">
<span v-if="scope.row.AccessType==1">抽奖</span>
<span v-else></span>
</template>
</el-table-column>
<el-table-column width="160" property="AcessDate" label="获取日期"></el-table-column>
</el-table>
<span slot="reference" style="cursor:pointer">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.CouponAllotList.length>0' v-for="(item2,index2) in item.CouponAllotList" :key="index2">
<td>{{item2.CouponsName}}</td>
<td>
<span v-if="item2.CouponsType==1">抵用券</span>
<span v-if="item2.CouponsType==2">折扣卷</span>
</td>
<td>{{item2.Denomination}}</td>
<td>满{{item2.UseCondition}}可用</td>
<td>
<span v-if="item2.AccessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.AcessDate}}</td>
</tr>
<tr v-if='item.CouponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
</td>
</tr>
</template>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ b74f936d
......@@ -1570,6 +1570,7 @@
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.flagWangYue = this.$route.query.flag
this.$route.query.tcmun = this.$route.query.tcmun
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun
}
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ b74f936d
......@@ -192,6 +192,7 @@
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">优惠</th>
<th width="60">小费</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
......@@ -249,10 +250,46 @@
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td>
<td>
<span v-if="item.isEnd==0" >{{item.income}}</span>
<span v-if="item.isEnd!=0" style="color: #e95252;">{{item.income}}</span>
</td>
<!-- 优惠 -->
<td>
<el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>优惠券名称</th>
<th>优惠券类型</th>
<th>抵扣金额/折扣</th>
<th>使用条件</th>
<th>获取方式</th>
<th>获取日期</th>
</tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td>
<td>
<span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span>
</td>
<td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td>
<td>
<span v-if="item2.accessType==1">抽奖</span>
<span v-else></span>
</td>
<td>{{item2.acessDate}}</td>
</tr>
<tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td>
</tr>
</table>
</div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
......@@ -312,7 +349,7 @@
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div style="white-space: nowrap">收款单据：<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
<span v-for="(item2,index2) in item.financeList" :key="index2">
......@@ -614,6 +651,7 @@ export default {
"sellorder_post_OP_GetOrderList",
this.msg,
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
......
src/components/busManagement/BusInfo.vue
View file @ b74f936d
......@@ -75,12 +75,29 @@
background-color: #e4e7ed;
color: #c0c4cc;
}
.busInfoDetailsDiv span{
display:inline-block;
margin-right: 20px;
}
.busInfoDetailsDiv p{
display:inline-block;
}
.busInfoDetailsDiv p:hover {
text-decoration: underline;
cursor: pointer;
}
</style>
<template>
<div class="flexOne busInfo">
<div class="bus_Notice">注：此处不和任何团队行程做绑定，如需下载车配表，请在车辆绑定团队以后再行下载</div>
<div style="margin-bottom:20px;">{{title}}</div>
<div style="width: 100%; overflow-x: auto;" class="ownScrollbarStyle">
<div class="busInfoDetailsDiv">
<span>进出点：{{InOut}}</span><span>订单人数：{{RealityNum}}</span>
<span>机位总数：{{totalFlySeat}}</span><span>领队：{{LeaderName}}</span><span>导游：{{GuideName}}</span>
<span>团号：<p @click="goUrlT('TravelControlList',TCNUMS,'团控列表')">{{TCNUMS}}</p></span>
</div>
<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">
<tr>
......@@ -369,6 +386,16 @@ export default {
},
//团名
title:'',
//团号
TCNUMS:'',
//进出点
InOut:'',
//订单人数
RealityNum:'',
//机位总数
totalFlySeat:'',
LeaderName:'',
GuideName:'',
};
},
methods: {
......@@ -473,7 +500,9 @@ export default {
if (response.data.resultCode == 1) {
this.PlanTableData = response.data.data;
this.PlanTableData.forEach(x=>{
x.BookGroup = this.$route.query.NewCombinationNum;
if(x.BookGroup==''||x.BookGroup==null){
x.BookGroup = this.$route.query.NewCombinationNum;
}
})
}
},
......@@ -622,6 +651,16 @@ export default {
path: path
});
},
goUrlT(path, TCNUMS, title) {
this.$router.push({
name: path,
query: {
tcmun:TCNUMS,
blank: 'y',
tab: title
}
})
},
submitForm(addMsg) {
//提交创建、修改表单
let that = this;
......@@ -653,6 +692,14 @@ export default {
this.GeAccommodationTypeList();
this.BusId = this.$route.query.id;
this.title = this.$route.query.title;
this.TCNUMS = this.$route.query.TCNUMS,
this.InOut = this.$route.query.InOut,
this.RealityNum = this.$route.query.RealityNum,
this.totalFlySeat = this.$route.query.TotalNumber+'/'+this.$route.query.RealityYSeatNum+'/'+
this.$route.query.RealityESeatNum+'/'+this.$route.query.RealityFSeatNum
this.LeaderName = this.$route.query.LeaderName,
this.GuideName = this.$route.query.GuideName
if (this.BusId > 0) {
this.getData();
// this.forbidInput = true;
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ b74f936d
......@@ -425,10 +425,18 @@
"TCID": obj.TCIDS,
StartDate: obj.StartDateStr,
DayNum: obj.DayNum,
TotalNumber: obj.TotalSeat,
TotalNumber: obj.TotalSeat, //机位总数
RealityYSeatNum:obj.CommonReport.HouseStatistics.RealityYSeatNum,
RealityESeatNum:obj.CommonReport.HouseStatistics.RealityESeatNum,
RealityFSeatNum:obj.CommonReport.HouseStatistics.RealityFSeatNum,
LeaderName:obj.LeaderName,
GuideName:obj.GuideName,
NewCombinationNum: outItem.NewCombinationNum,
blank: 'y',
title:obj.Titles,
TCNUMS:obj.TCNUMS,
InOut:obj.InOut,
RealityNum:obj.CommonReport.HouseStatistics.RealityNum,
tab: title
}
})
......
src/components/dmc/manager/teamReimbursement.vue
View file @ b74f936d
......@@ -557,7 +557,7 @@
name: path,
query: {
"id": obj.TCIDs,
'num': obj.CombinationNum,
NewCombinationNum: obj.TravelPriceList[0].CombinationNum,
isUpdate: true,
blank: 'y',
tab: title
......@@ -618,6 +618,7 @@
this.queryMsg.total = res.data.data.count;
this.queryMsg.noData = !this.queryMsg.total > 0;
this.queryCommonData.dataList = res.data.data.pageData;
console.log(this.queryCommonData.dataList,'datalist');
}
},
err => {}
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ b74f936d
......@@ -371,6 +371,7 @@
} else {
basicData.TeamType = 0;
}
console.log("basicData",basicData);
this.apipost(
"travel_post_SetTravelConfigInfo",
basicData,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ b74f936d
......@@ -398,9 +398,9 @@
<div class="TP_noneed">
<el-checkbox v-model="priceData.IsSupportChildren" :true-label="CheckedVaule" :false-label="UnCheckedVaule">支持儿童出游
</el-checkbox>
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule" style="display:none;">订团
<el-checkbox v-model="priceData.IsBookTeam" :true-label="CheckedVaule" :false-label="UnCheckedVaule">订团
</el-checkbox>
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" style="display:none;" />
<input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" />
</div>
<el-form-item prop="B2BMemberPrice">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice" @keyup.native="checkPrice(priceData,'B2BMemberPrice')">
......@@ -713,19 +713,28 @@
:AirTicketId="priceData.AirTicketId" :DeleteAirticketIds="priceData.DeleteAirticketIds" :selectFilghtList="selectFilghtList"></TravelPriceFlightList>
</div>
<el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
<!-- <table class="TphotelTable" border="0" cellspacing='1' v-if="returnPriceList.length>0">
<tr v-if="returnPriceList[0].PriceHotelList" v-for="item in returnPriceList[0].PriceHotelList">
<table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
<tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
<td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
<td>
<div class="tp_divList" v-for="(subItem,index) in item.SubList">
<div>
{{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;【<span style="color:#E95252;">库存：{{subItem.RemainingInventory}}</span>】&nbsp;&nbsp;
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index)"></el-checkbox>
<el-checkbox v-model="item.CheckList[index].CheckStatus" @change="changeHotelStatus(item,index),changeHotelList()"></el-checkbox>
</div>
</div>
</td>
<td>
<el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)" @change="changeHotelList()" filterable>
<el-option :key="0" label="请选择" :value="0"></el-option>
<el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
<span style="float: left">{{subItem.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{ subItem.Inventory }}</span>
</el-option>
</el-select>
</td>
</tr>
</table> -->
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
......@@ -762,8 +771,8 @@
SaleBranchIdArray: []
},
returnPriceList: this.priceList,
//选中的酒店数组
ChooseHotelArray:[],
//酒店列表
HotelList: [],
companyList: [],
offerList: [],
selectFilghtList: [],
......@@ -922,7 +931,9 @@
//是否订团，0-不订，1需要订
IsBookTeam: 0,
//是否重新生成行程数据
IsNew:false,
IsNew: false,
//选中的酒店数组
ChooseHotelArray: [],
};
}
this.returnPriceList.push(objItem);
......@@ -1351,6 +1362,53 @@
subItem.CheckStatus = false;
}
});
},
//获取选择的酒店
changeHotelList() {
this.priceData.ChooseHotelArray = [];
if (this.priceData.PriceHotelList != null && this.priceData.PriceHotelList.length > 0) {
this.priceData.PriceHotelList.forEach(x => {
var obj = {
HotelId: 0,
DayNum: 0
}
if (x.NewHotelId > 0) {
obj.HotelId = x.NewHotelId;
obj.DayNum = x.DayNum;
this.priceData.ChooseHotelArray.push(obj);
} else {
x.CheckList.forEach((y, index) => {
if (y.CheckStatus) {
obj.HotelId = x.SubList[index].HotelId;
obj.DayNum = x.SubList[index].DayNum
this.priceData.ChooseHotelArray.push(obj);
}
})
}
});
if (this.priceData.ChooseHotelArray != null && this.priceData.ChooseHotelArray.length > 0) {
this.priceData.IsNew = true;
}
}
},
//获取酒店信息
getHotelList(item, event) {
if (event) {
var msg = {
Country: 651,
sDate: item.UseDay,
IsMoreThanZero:1
};
this.apipost(
"hotel_post_GetHasStockHotelList", msg,
res => {
if (res.data.resultCode == 1) {
item.HotelList = res.data.data;
}
},
err => {}
);
}
}
},
mounted() {
......@@ -1417,4 +1475,4 @@
}
};
</script>
</script>
\ No newline at end of file
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