Skip to content

S
SuperMan
Commit 5c44ec94 authored by Mac's avatar Mac
Browse files
Options

增加了报名统计页面的房间信息和名单

parent ad25c8fc
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 151 deletions
src/components/SalesModule/enrollTotal.vue
View file @ 5c44ec94
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<li v-show="!isOwn"> <li v-show="!isOwn">
<span><em class="fl" style="margin-top: 10px!important;">部门选择</em> <span><em class="fl" style="margin-top: 10px!important;">部门选择</em>
<treeselect class='w200 fl' :options="departmentList" v-model="msg.RB_Department_Id" placeholder="不限" <treeselect class='w200 fl' :options="departmentList" v-model="msg.RB_Department_Id" placeholder="不限"
:normalizer="normalizer" @select='linkageEmployeeMsg' /> :normalizer="normalizer" @select='linkageEmployeeMsg' />
</span> </span>
</li> </li>
<li><span><em>参团类型</em> <li><span><em>参团类型</em>
...@@ -182,174 +182,182 @@ ...@@ -182,174 +182,182 @@
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td> <td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in list" :key="index"> <tbody v-for="(item,index) in list" :key="index">
<tr> <tr>
<td rowspan="2"> <td rowspan="3">
<p v-if="item.isChargeLossOrders==1" style="color:red">损</p> <p v-if="item.isChargeLossOrders==1" style="color:red">损</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}} <p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单', 'groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}
<el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip> <el-tooltip class="item" effect="dark" content="通过小程序确认单报名" placement="top" v-show="item.orderForm==4"> <i class="iconfont icon-xiaochengxu" style="font-size:22px;color:red;"></i></el-tooltip>
</p> </p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" <p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName"
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p> @click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p> <p>发团：{{item.startDate}}</p>
<p v-if="item.tradeWay ==1">{{item.platformOrder}}</p> <p v-if="item.tradeWay ==1">{{item.platformOrder}}</p>
<p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p> <p v-if='item.commissionMoney' style="color:red">提成：{{item.commissionMoney}}</p>
<p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p> <p v-else-if="item.latestCommissionMoney" style="color:red">提成：{{item.latestCommissionMoney}}</p>
<div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div> <div v-if="item.extraRewardMoney!=null&&item.extraRewardMoney>0">奖励金额：<span style="color:#e95252">{{item.extraRewardMoney}}</span></div>
<div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div> <div v-if="item.extraDeductMoney!=null&&item.extraDeductMoney>0">扣除金额：<span style="color:#e95252">{{item.extraDeductMoney}}</span></div>
</td> </td>
<td> <td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p> <p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p> <p>{{item.contactMobile}}</p>
</td> </td>
<td> <td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p> <p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td> </td>
<td class="fz12"> <td class="fz12">
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName"> <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
<span>{{item.lineName}}</span> <span>{{item.lineName}}</span>
</p> </p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p> <p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td> </td>
<td> <td>
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}} {{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
</td> </td>
<td style="color:#FF9C00">{{item.tC_Price}}</td> <td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td> <td style="color:#FF9C00">￥{{item.unit_Price}}</td>
<td> <td>
<p style="color:#FF9C00">￥{{item.preferPrice}}</p> <p style="color:#FF9C00">￥{{item.preferPrice}}</p>
</td> </td>
<td> <td>
<span v-if='item.isEnd==0' style="cursor: pointer;">{{item.income}}</span> <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> <span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;">{{item.income}}</span>
</td> </td>
<!-- 优惠 --> <!-- 优惠 -->
<td> <td>
<el-popover style='padding: 0;' width="600" trigger="click"> <el-popover style='padding: 0;' width="600" trigger="click">
<div class="personNolayer"> <div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1"> <table border="0" cellspacing="1" cellpadding="1">
<tr> <tr>
<th>优惠券名称</th> <th>优惠券名称</th>
<th>优惠券类型</th> <th>优惠券类型</th>
<th>抵扣金额/折扣</th> <th>抵扣金额/折扣</th>
<th>使用条件</th> <th>使用条件</th>
<th>获取方式</th> <th>获取方式</th>
<th>获取日期</th> <th>获取日期</th>
</tr> </tr>
<tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2"> <tr v-if='item.couponAllotList.length>0' v-for="(item2,index2) in item.couponAllotList" :key="index2">
<td>{{item2.couponsName}}</td> <td>{{item2.couponsName}}</td>
<td> <td>
<span v-if="item2.couponsType==1">抵用券</span> <span v-if="item2.couponsType==1">抵用券</span>
<span v-if="item2.couponsType==2">折扣卷</span> <span v-if="item2.couponsType==2">折扣卷</span>
</td> </td>
<td>{{item2.denomination}}</td> <td>{{item2.denomination}}</td>
<td>满{{item2.useCondition}}可用</td> <td>满{{item2.useCondition}}可用</td>
<td> <td>
<span v-if="item2.accessType==1">抽奖</span> <span v-if="item2.accessType==1">抽奖</span>
<span v-else></span> <span v-else></span>
</td> </td>
<td>{{item2.acessDate}}</td> <td>{{item2.acessDate}}</td>
</tr> </tr>
<tr v-if='item.couponAllotList.length==0'> <tr v-if='item.couponAllotList.length==0'>
<td colspan="6" align="center">暂无数据</td> <td colspan="6" align="center">暂无数据</td>
</tr> </tr>
</table> </table>
</div> </div>
<span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.discountMoney)}}</span> <span style="cursor: pointer;color: #e95252;" slot="reference">{{moneyFormat(item.discountMoney)}}</span>
</el-popover> </el-popover>
</td> </td>
<td v-if="item.tipMoney">{{item.tipMoney}}</td> <td v-if="item.tipMoney">{{item.tipMoney}}</td>
<td v-else>0.00</td> <td v-else>0.00</td>
<td>{{item.refund}}</td> <td>{{item.refund}}</td>
<td>{{item.platformTax}}</td> <td>{{item.platformTax}}</td>
<td>{{item.zaiTuMoney}}</td> <td>{{item.zaiTuMoney}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td> <td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td> <td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td> <td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="userId==1"> <td v-if="userId==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button> <button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
</td> </td>
</tr> </tr>
<tr> <tr style="height:20px">
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;"> <td colspan="15" class="RL_Order" style="height:20px">
<div> <span style="font-size: 14px;color: #333333">名单:</span>
<div><span>备注：</span> <span v-for="(childItem) in item.guestList" >{{childItem.userName}}&nbsp;&nbsp;</span>
<span v-if="item.tsIdList.length>0">投诉单号： <!-- <span v-else>暂无名单</span>-->
<span style="display: block;font-size: 14px;color: #333333">房间信息：{{item.orderGuestHouseStr}}</span>
</td>
</tr>
<tr>
<td colspan="3" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span>
<span v-if="item.tsIdList.length>0">投诉单号：
<a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ; <a class="underline" v-for="ts in item.tsIdList" href="javascript:void(0);" @click="goUrlTS('ComplaintsDetail',ts,item.orderId,'投诉详情')">{{ts}} </a> ;
</span> </span>
<p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p> <p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p>
</div>
<div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div> </div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div> <div>
<div> <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<span>OP备注:</span> <el-popover width="600" placement="bottom-end" trigger="click">
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p> <div class="groupTourOrder_remarks_popover">
</div> <div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;"
class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
</td>
<td colspan="4" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div>
<span>OP备注:</span>
<p>{{item.oP_Remarks ? item.oP_Remarks : '无'}}</p>
</div> </div>
</td> </div>
<td colspan="9" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;"> </td>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <td colspan="9" class="groupTourOrder_tickets" style="height: 40px;cursor: pointer;">
<div>收款单据：</div> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>收款单据：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2"> <span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span> <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span> <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span> <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span> </span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div> </div>
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> </div>
<div>付款单据：</div> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div> <div>付款单据：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2"> <span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span> <span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span> <span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span> <span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span> <span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black">{{item2.frID}}</span>
</span> </span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div> </div>
</div>
<div>
<div>发票单据：</div>
<div> <div>
<div>发票单据：</div>
<div>
<span v-for="(item2,index2) in item.invoiceApplyList" :key="index2"> <span v-for="(item2,index2) in item.invoiceApplyList" :key="index2">
<span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-if="item2.invoiceApplyState === 6" class="groupTourOrder_tickets_blue" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-else-if="item2.invoiceApplyState === 1 || item2.invoiceApplyState === 3 || item2.invoiceApplyState === 6" class="groupTourOrder_tickets_green" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-else-if="item2.invoiceApplyState === 5 || item2.invoiceApplyState === 4 " class="groupTourOrder_tickets_red" @click="goIisDetail(item2.id)">{{item2.id}}</span>
<span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span> <span v-else-if="item2.invoiceApplyState === 2" class="groupTourOrder_tickets_black" @click="goIisDetail(item2.id)">{{item2.id}}</span>
</span> </span>
<span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span> <span v-if="item.invoiceApplyList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div> </div>
</td> </div>
</tr> </td>
</tr>
</tbody> </tbody>
</table> </table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total></el-pagination> :page-size=msg.pageSize :total=total></el-pagination>
<div class="combottomDiv" v-if="showChangeSales" style="height:200px;"> <div class="combottomDiv" v-if="showChangeSales" style="height:200px;">
<updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan> <updateSalesMan @closeUpdiv="closeSalseDiv" @getList="getList" :subInfo="subInfo"></updateSalesMan>
</div> </div>
...@@ -456,7 +464,7 @@ ...@@ -456,7 +464,7 @@
}; };
}, },
methods: { methods: {
//跳转 //跳转
goUrlTS (path, id, orderId, title) { goUrlTS (path, id, orderId, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -577,7 +585,7 @@ ...@@ -577,7 +585,7 @@
linkageDepartment() { //联动部门 linkageDepartment() { //联动部门
this.msg.RB_Department_Id = null; this.msg.RB_Department_Id = null;
if(this.msg.BranchId!=0){ if(this.msg.BranchId!=0){
this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId; this.getDepartmentMsg.RB_Branch_Id = this.msg.BranchId;
} }
this.getDepartment(); this.getDepartment();
}, },
...@@ -687,14 +695,14 @@ ...@@ -687,14 +695,14 @@
</script> </script>
<style> <style>
.groupts .underline{ .groupts .underline{
text-decoration: underline; text-decoration: underline;
margin: 5px; margin: 5px;
text-align: center; text-align: center;
} }
.color_red_order{ .color_red_order{
color: #e95252 !important; color: #e95252 !important;
} }
.enrollTotalSearch { .enrollTotalSearch {
width: 100%; width: 100%;
min-height: auto; min-height: auto;
...@@ -764,12 +772,12 @@ ...@@ -764,12 +772,12 @@
background: #fff; background: #fff;
text-align: left; text-align: left;
} }
.enrollTotalSearchTable tbody tr:last-child { .enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr:first-child td:first-child { .enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333; border-bottom: 2px solid #333;
} }
.enrollTotalSearchTable tr td { .enrollTotalSearchTable tr td {
height: 80px; height: 80px;
padding: 10px; padding: 10px;
......
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