Skip to content

S
SuperMan
Commit 66404f54 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

添加优惠

parent e56fbee4
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 7 deletions
src/components/SalesModule/enrollTotal.vue
View file @ 66404f54
......@@ -169,6 +169,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>
......@@ -214,10 +215,13 @@
<td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td>
<td>
<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 v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
......@@ -261,7 +265,7 @@
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div>收款单据：</div>
<div>
......@@ -532,6 +536,7 @@
"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/TravelManager/TravelList/RegistrationList.vue
View file @ 66404f54
......@@ -1470,6 +1470,7 @@
<th width="110" class="nowrap">成交单价</th>
<th width="110" class="nowrap">应收总额</th>
<th width="110" class="nowrap">实收</th>
<th width="110" class="nowrap">优惠</th>
<th width="110" class="nowrap">退款</th>
<th width="110" class="nowrap">平台税金</th>
<th width="110" class="nowrap">平台在途</th>
......@@ -1483,7 +1484,7 @@
</tr>
<tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
<td colspan="14">
<td colspan="15">
订单类型：<span class="RL-redType">领队</span>
</td>
</tr>
......@@ -1539,6 +1540,7 @@
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
<td>{{moneyFormat(item.DiscountMoney)}}</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -1590,7 +1592,7 @@
</td>
</tr>
<tr>
<td colspan="12" class="RL_Order">
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList" @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
......@@ -1632,7 +1634,7 @@
<!-- 其他类型 -->
<template v-for="(subItem,subIndex) in OrderDataList.OtherOrderList">
<tr>
<td colspan="14">
<td colspan="15">
订单类型：<span class="RL-redType">{{subItem.GroupTypeName}}</span>
</td>
</tr>
......@@ -1724,6 +1726,7 @@
@click="getOrderDetail(childItem)" slot="reference">{{childItem.Income}}</span>
</el-popover>
</td>
<td class="nowrap">{{moneyFormat(childItem.DiscountMoney)}}</td>
<td class="nowrap">{{childItem.Refund}}</td>
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
......@@ -1782,7 +1785,7 @@
</td>
</tr>
<tr>
<td colspan="12" class="RL_Order">
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0">
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList" @click="goUrl('TravelPassengerList',msg.TCID,fourthItem.OrderId,'旅客名单')">{{fourthItem.userName}}</span>
......@@ -1857,7 +1860,7 @@
<!-- 取消订单 -->
<tr v-if="OrderDataList.cancelList!=null && OrderDataList.cancelList.length>0">
<td colspan="14">
<td colspan="15">
<span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer" title="点击查看">取消订单（<span
style="color:blue;">{{!isShowCancelOrder?"展开":"收起"}}</span>）</span>
</td>
......@@ -1949,6 +1952,7 @@
slot="reference">{{item.Income}}</span>
</el-popover>
</td>
<td class="nowrap">{{moneyFormat(item.DiscountMoney)}}</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -2005,7 +2009,7 @@
</td>
</tr>
<tr>
<td colspan="12" class="RL_Order">
<td colspan="13" class="RL_Order">
<span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList" @click="goUrl('TravelPassengerList',msg.TCID,childItem.OrderId,'旅客名单')">{{childItem.userName}}</span>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 66404f54
......@@ -187,6 +187,18 @@
</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>优惠
</div>
<div class="Team_Incontent">
<div>金&nbsp;&nbsp;&nbsp;额<span>￥{{DataList.TeamBalance.DiscountMoney}}</span></div>
</div>
</div>
</el-col>
</el-row>
</div>
</div>
......@@ -989,6 +1001,64 @@
</tr>
</template>
</table>
<div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">优惠金额：</div>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="180">单号</th>
<th width="200">客户名</th>
<th width="200">联系电话</th>
<th width="200">创建日期</th>
<th width="250">优惠金额</th>
</tr>
<template v-for="item in DataList.CouponOrderData">
<tr :key="item.OrderId">
<td>
<!-- <el-checkbox v-model="item.checked"></el-checkbox> -->
<!-- @click="goUrl('FinancialDocumentsDetail',item.OrderId)" -->
<span>{{item.OrderId}}</span>
</td>
<td>{{item.ContactName}}</td>
<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>
</td>
</tr>
</template>
</table>
</div>
</div>
<div class="Team_BtnList">
......@@ -1015,6 +1085,7 @@
export default {
data() {
return {
gridData:[],
TCID: 0,
//数据列表
DataList: "",
......@@ -1111,6 +1182,7 @@
TCID: this.TCID
};
this.apipost("travel_get_GetTeamBalanceSheet", msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
let data = res.data.data;
......@@ -1118,6 +1190,7 @@
x.checked = false;
})
this.DataList = data;
// console.log("resa",this.DataList)
}
});
},
......
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