Skip to content

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

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

parents 4d429809 bcea1811
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 40 deletions
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 979b8e32
......@@ -1052,6 +1052,16 @@ export default {
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "RedEnvelopeMoney",
formatter: this.moneyFormat,
title: "幸福存折",
width: 100,
titleAlign: "left",
columnAlign: "right",
isResize: true,
componentName: "TCIDJumpWang"
},
{
field: "DaiShou",
formatter: this.moneyFormat,
......
src/components/SalesModule/enrollTotal.vue
View file @ 979b8e32
......@@ -177,10 +177,11 @@
<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>
<th width="70">优惠</th>
<th width="70">幸福存折</th>
<th width="70">小费</th>
<th width="70">退款</th>
<th width="70">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
......@@ -279,6 +280,7 @@
</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.redEnvelopeMoney}}</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
......@@ -290,7 +292,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 style="font-size: 14px;color: #333333">名单:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<!-- <span v-else>暂无名单</span>-->
......@@ -298,7 +300,7 @@
</td>
</tr>
<tr>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span>
<span v-if="item.tsIdList.length>0">投诉单号：
......
src/components/SalesModule/groupTourOrder.vue
View file @ 979b8e32
......@@ -1500,9 +1500,10 @@
<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="70">优惠</th>
<th width="70">幸福存折</th>
<th width="70">退款</th>
<th width="70">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th>
<th width="80">状态</th>
......@@ -1655,6 +1656,7 @@
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>{{item.redEnvelopeMoney}}</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td>
......@@ -1751,7 +1753,7 @@
</td>
</tr>
<tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<td colspan="17" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle" v-if="item.guestList.length>0">名单:</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>
......@@ -1764,7 +1766,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span>
<p><span v-if="item.tsIdList.length>0">投诉单号：
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 979b8e32
......@@ -1494,9 +1494,10 @@
<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="70">优惠</th>
<th width="70">幸福存折</th>
<th width="70">退款</th>
<th width="70">平台税金</th>
<th width="80">平台在途</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
......@@ -1510,7 +1511,7 @@
<template v-for="op in list">
<tbody class="not_border">
<tr>
<td colspan="16">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
<td colspan="17">类型：<span style="color: #e95252;">{{op.groupName}}</span></td>
</tr>
</tbody>
<tbody v-for="(item,index) in op.list" :key="index">
......@@ -1656,6 +1657,10 @@
slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.redEnvelopeMoney}}</span>
<span v-else>******</span>
</td>
<td>
<span v-if="item.isOwn==1 || userId==1||userId==5 || isUpdateOrder">{{item.refund}}</span>
<span v-else>******</span>
......@@ -1752,7 +1757,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" v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.guestList.length>0 && (item.isOwn==1||userId==1||userId==5||positionId==168||isUpdateOrder) ">
<span v-for="(childItem) in item.guestList">{{childItem.userName}}&nbsp;&nbsp;</span>
......@@ -1765,7 +1770,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span><p>
<span v-if="item.tsIdList.length>0">投诉单号：
......@@ -1848,7 +1853,7 @@
<tbody v-show="list.length!==0">
<tr>
<td></td>
<td colspan="15" class="groupTourOrderByTuan_seat">
<td colspan="16" 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>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 979b8e32
......@@ -1522,9 +1522,10 @@
<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="90" class="nowrap">优惠</th>
<th width="90" class="nowrap">幸福存折</th>
<th width="90" class="nowrap">退款</th>
<th width="90" class="nowrap">平台税金</th>
<th width="110" class="nowrap">平台在途</th>
<th width="110" class="nowrap">待收金额</th>
<th width="100" class="nowrap">状态</th>
......@@ -1536,7 +1537,7 @@
</tr>
<tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
<td colspan="15">
<td colspan="16">
订单类型：<span class="RL-redType">领队</span>
</td>
</tr>
......@@ -1641,6 +1642,7 @@
slot="reference">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
</td>
<td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -1700,7 +1702,7 @@
</td>
</tr>
<tr>
<td colspan="13" class="RL_Order">
<td colspan="14" class="RL_Order">
<span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
......@@ -1714,7 +1716,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon">{{item.Remarks}}</p>
......@@ -1745,7 +1747,7 @@
<!-- 其他类型 -->
<template v-for="(subItem,subIndex) in OrderDataList.OtherOrderList">
<tr>
<td colspan="15">
<td colspan="16">
订单类型：<span class="RL-redType">{{subItem.GroupTypeName}}</span>
</td>
</tr>
......@@ -1891,6 +1893,7 @@
</el-popover>
</td>
<td class="nowrap">{{childItem.RedEnvelopeMoney}}</td>
<td class="nowrap">{{childItem.Refund}}</td>
<td class="nowrap">{{childItem.PlatformTax}}</td>
<td class="nowrap">{{childItem.ZaiTuMoney}}</td>
......@@ -1975,7 +1978,7 @@
</td>
</tr>
<tr>
<td colspan="13" class="RL_Order">
<td colspan="14" class="RL_Order">
<span class="RL-remarkTitle" v-if="childItem.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="childItem.GuestList.length>0">
<span style="color:blue !important" v-for="(fourthItem) in childItem.GuestList"
......@@ -1989,7 +1992,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<p class="RL-redType RL-remarkCon">
......@@ -2061,7 +2064,7 @@
<tbody>
<tr>
<td></td>
<td colspan="14"> 本团机位: <span class="RL-redType">{{ConfigData.Config.YSeat}}Y +
<td colspan="15"> 本团机位: <span class="RL-redType">{{ConfigData.Config.YSeat}}Y +
{{ConfigData.Config.CSeat}}E + {{ConfigData.Config.FSeat}}F
</span>&nbsp;
剩余机位: <span class="RL-redType">
......@@ -2091,7 +2094,7 @@
<!-- 取消订单 -->
<tr v-if="OrderDataList.cancelList!=null && OrderDataList.cancelList.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>
......@@ -2233,6 +2236,7 @@
slot="reference">{{moneyFormat(item.DiscountMoney)}}</span>
</el-popover>
</td>
<td>{{item.RedEnvelopeMoney}}</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.ZaiTuMoney}}</td>
......@@ -2296,7 +2300,7 @@
</td>
</tr>
<tr>
<td colspan="13" class="RL_Order">
<td colspan="14" class="RL_Order">
<span class="RL-remarkTitle" v-if="item.GuestList.length>0">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span style="color:blue !important" v-for="(childItem) in item.GuestList"
......@@ -2309,7 +2313,7 @@
</td>
</tr>
<tr>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px;">
<div class="clearfix RL-MARK">
<span class="RL-remarkTitle">备注:</span>
<span class="RL-redType RL-remarkCon">
......@@ -3315,7 +3319,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.Error(res.data.message);
......@@ -4327,14 +4331,15 @@
);
}
},
getKhmdList(id, lineId, employeeId) {
getKhmdList(id, lineId, employeeId,CustomerId) {
var qMsg = {
typeId: id,
lineId: lineId,
EmoloyeeId: employeeId
EmoloyeeId: employeeId,
customerId:CustomerId
};
this.apipost(
"app_today_visit_GetOrderMyCustomerList",
"app_today_visit_GetNewOrderMyCustomerList",
qMsg,
res => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 979b8e32
......@@ -194,10 +194,11 @@
<th width="80">{{$t('fnc.cjdanjia')}}</th>
<th width="80">{{$t('fnc.yszonge')}}</th>
<th width="80">{{$t('fnc.shishou')}}</th>
<th width="80">{{$t('fnc.youhui')}}</th>
<th width="60">{{$t('fnc.xiaofei')}}</th>
<th width="80">{{$t('fnc.tuikuan')}}</th>
<th width="80">{{$t('fnc.ptshuijin')}}</th>
<th width="70">{{$t('fnc.youhui')}}</th>
<th width="70">幸福存折</th>
<th width="70">{{$t('fnc.xiaofei')}}</th>
<th width="70">{{$t('fnc.tuikuan')}}</th>
<th width="70">{{$t('fnc.ptshuijin')}}</th>
<th width="80">{{$t('Operation.Op_platZaitu')}}</th>
<th width="80">{{$t('Operation.Op_daishou')}}</th>
<th width="60">{{$t('admin.admin_status')}}</th>
......@@ -281,6 +282,7 @@
<span style="cursor: pointer;color: #e95252;" slot="reference">{{item.discountMoney}}</span>
</el-popover>
</td>
<td>{{item.redEnvelopeMoney}}</td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td>
<td>{{item.refund}}</td>
......@@ -298,7 +300,7 @@
</td>
</tr>
<tr>
<td colspan="7" class="groupTourOrder_remarks" style="height: 20px;">
<td colspan="8" class="groupTourOrder_remarks" style="height: 20px;">
<div>
<div>
<span>{{$t('hotel.hotel_remark')}}：</span>
......
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