Skip to content

S
SuperMan
Commit bfffc042 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents b34a5695 967a26d3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 430 additions and 137 deletions
src/assets/common/lang/zh.js
View file @ bfffc042
......@@ -629,3 +629,35 @@ export const advmanager = {
export const insManage = {
im_acc:'下属账号',
}
export const active = {
ld_name: '抽奖名称',
ld_name2: '抽奖名',
ld_status: '抽奖状态',
ld_jinyong: '禁用',
ld_addld: '新增抽奖',
ld_cjcs: '抽奖次数（每人）',
ld_editInfo: '修改抽奖信息',
ld_seeDr: '查看奖项',
ld_deletAC: '删除活动',
ld_noData: '没有找到你需要的数据',
ld_cjNum: '抽奖次数',
ld_cjRule: '抽奖规则',
ld_djscwj: '点击/拖拽上传',
ad_addad: '新增奖项',
ad_xuhao: '序号',
ad_adName: '奖项名',
ad_allNum: '奖项数量',
ad_num: '中奖数量',
ad_endNum: '剩余数量',
ad_status: '奖项状态',
ad_type: '奖项类型',
ad_thankCome: '谢谢参与',
}
export const rule = {
company: '请选择公司',
ldNmae: '请输入抽奖名称',
ldNum: '请输入抽奖次数',
startDate: '请选择开始日期',
endDate: '请选择结束日期',
}
\ No newline at end of file
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ bfffc042
......@@ -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 @ bfffc042
......@@ -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 @ bfffc042
......@@ -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 @ bfffc042
......@@ -1352,8 +1352,10 @@ export default {
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 +1366,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 +1805,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 @ bfffc042
......@@ -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 @ bfffc042
......@@ -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 @ bfffc042
......@@ -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 @ bfffc042
......@@ -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/TravelManager/TravelList/RegistrationList.vue
View file @ bfffc042
......@@ -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 @ bfffc042
......@@ -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/todayOrderTotal.vue
View file @ bfffc042
......@@ -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/activity/LuckyDraw.vue
View file @ bfffc042
This diff is collapsed.
src/components/activity/awardList.vue
View file @ bfffc042
......@@ -3,7 +3,7 @@
<div class="query-box">
<ul class="user_time_picker">
<li>
<input type="button" @click="outerVisible = true,dialogTitle='新增奖项',resetInfo()" class="normalBtn" value="新增">
<input type="button" @click="outerVisible = true,dialogTitle=$t('active.ad_addad'),resetInfo()" class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -11,14 +11,14 @@
<div class="clearfix"></div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
<tr>
<th>序号</th>
<th>奖项名</th>
<th>奖项数量</th>
<th>中奖数量</th>
<th>剩余数量</th>
<th>奖项状态</th>
<th>奖项类型</th>
<th>操作</th>
<th>{{$t('active.ad_xuhao')}}</th>
<th>{{$t('active.ad_adName')}}</th>
<th>{{$t('active.ad_allNum')}}</th>
<th>{{$t('active.ad_num')}}</th>
<th>{{$t('active.ad_endNum')}}</th>
<th>{{$t('active.ad_status')}}</th>
<th>{{$t('active.ad_type')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.rank}}</td>
......@@ -26,7 +26,7 @@
<td>{{item.awardCount}}</td>
<td>{{item.awardWinningCount}}</td>
<td>{{item.awardCount-item.awardWinningCount>=0?item.awardCount-item.awardWinningCount:0}}</td>
<td>{{item.awardStatus==1?'正常':'禁用'}}</td>
<td>{{item.awardStatus==1? $t('pub.normalSel') : $t('active.ld_jinyong')}}</td>
<td v-if="item.awardType==1">谢谢参与</td>
<td v-if="item.awardType==2">一般奖项</td>
<td v-if="item.awardType==3">优惠券</td>
......@@ -44,7 +44,7 @@
</table>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>没有找到你需要的数据</p>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w800"
......
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