Skip to content

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

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

parents 11878386 b505a8bd
Hide whitespace changes
Inline Side-by-side
Showing with 844 additions and 593 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 0a83fa59
<template> <template>
<div class="mb30" v-loading='loading'> <div class="mb30" v-loading='loading'>
<table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
<th width="8%">出发地</th> <th width="8%">出发地</th>
<th width="30%">行程名称</th> <th width="30%">行程名称</th>
...@@ -34,413 +34,417 @@ ...@@ -34,413 +34,417 @@
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody> <tbody>
<tr class="title"> <tr class="title">
<td width="80" class="bgwhite" :rowspan="list.BusList.length+1">车辆使用</td> <td width="80" class="bgwhite" :rowspan="list.BusList.length+1">车辆使用</td>
<td width="100">使用时间</td> <td width="100">使用时间</td>
<td width="80">司机姓名</td> <td width="80">司机姓名</td>
<td width="80">司机电话</td> <td width="80">司机电话</td>
<td width="100">车配号</td> <td width="100">车配号</td>
<td width="100">车辆号</td> <td width="100">车辆号</td>
<td width="60">用车方式</td> <td width="60">用车方式</td>
<td width="60">车费</td> <td width="60">车费</td>
<td width="120">车费付款方式</td> <td width="120">车费付款方式</td>
<td width="80">高速公路费</td> <td width="80">高速公路费</td>
<td width="120">高速费用付款方式</td> <td width="120">高速费用付款方式</td>
<td width="60">停车费</td> <td width="60">停车费</td>
<td width="60">金额小计</td> <td width="60">金额小计</td>
<td width="60">总金额</td> <td width="60">总金额</td>
<td width="100">备注</td> <td width="100">备注</td>
<td width="60">凭证</td> <td width="60">凭证</td>
</tr> </tr>
<tr v-for='(item,index) in list.BusList'> <tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td> <td>{{item.PlanDateStr}}</td>
<td>{{item.DriverName}}</td> <td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td> <td>{{item.DriverTel}}</td>
<td>{{item.BusCode}}</td> <td>{{item.BusCode}}</td>
<td>{{item.BusNum}}</td> <td>{{item.BusNum}}</td>
<td> <td>
<span v-if='index==0'>接机</span> <span v-if='index==0'>接机</span>
<span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span> <span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==list.BusList.length-1'>送机</span> <span v-if='index==list.BusList.length-1'>送机</span>
</td> </td>
<td> <td>
{{moneyFormat(item.CostPrice)}} {{moneyFormat(item.CostPrice)}}
</td> </td>
<td> <td>
<span v-if="item.PayType === 1">现付</span> <span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span> <span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span> <span v-else-if="item.PayType === 3">预付</span>
<span v-else>暂无</span> <span v-else>暂无</span>
</td> </td>
<td> <td>
{{moneyFormat(item.HighSpeedPrice)}} {{moneyFormat(item.HighSpeedPrice)}}
</td> </td>
<td> <td>
<span v-if="item.HighSpeedPayType === 1">现付</span> <span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span> <span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span> <span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else>暂无</span> <span v-else>暂无</span>
</td> </td>
<td> <td>
{{moneyFormat(item.StopPrice)}} {{moneyFormat(item.StopPrice)}}
</td> </td>
<td> <td>
{{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}} {{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}}
</td> </td>
<td v-if='index==0' :rowspan='list.BusList.length'> <td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}} {{busTotalPrice(list.BusList)}}
</td> </td>
<td> <td>
{{item.Remarks}} {{item.Remarks}}
</td> </td>
<td> <td>
<div class="uploadListDiv ownScrollbarStyle"> <div class="uploadListDiv ownScrollbarStyle">
<p v-for="(img,index) in item.VoucherPicList" @click="analyzeItem(item.VoucherPicList,index)"> <p v-for="(img,index) in item.VoucherPicList" @click="analyzeItem(item.VoucherPicList,index)">
{{img.FileName}} {{img.FileName}}
</p> </p>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>总金额</td> <td>总金额</td>
<td colspan="7"> <td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}} {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td> </td>
<td>签单/预付/抵扣总金额</td> <td>签单/预付/抵扣总金额</td>
<td colspan="7"> <td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}} {{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody> <tbody>
<tr class="title"> <tr class="title">
<td width="80" class="bgwhite" :rowspan="list.HotelOrderListReport.length+1">酒店使用</td> <td width="80" class="bgwhite" :rowspan="list.HotelOrderListReport.length+1">酒店使用</td>
<td width="100">使用时间</td> <td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">酒店名称</td> <td width="180" style="line-height: inherit;">酒店名称</td>
<td width="100">占床/不占床</td> <td width="100">占床/不占床</td>
<td width="80">实际用房数</td> <td width="80">实际用房数</td>
<td width="">房间类型</td> <td width="">房间类型</td>
<td width="">房间数</td> <td width="">房间数</td>
<td width="80">预定人数</td> <td width="80">预定人数</td>
<td width="80">免费人数</td> <td width="80">免费人数</td>
<td width="">单价/人</td> <td width="">单价/人</td>
<td width="">金额小计</td> <td width="">金额小计</td>
<td width="">返佣</td> <td width="">返佣</td>
<td width="">总金额</td> <td width="">总金额</td>
<td width="">付款方式</td> <td width="">付款方式</td>
<td width="100">备注</td> <td width="100">备注</td>
</tr> </tr>
<tr class="HotelTr" v-for='(outItem,outIndex) in list.HotelOrderListReport'> <tr class="HotelTr" v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<td>{{outItem.UseTimeStr}}</td> <td>{{outItem.UseTimeStr}}</td>
<td> <td>
<div v-for="subItem in outItem.HotelOrderList" style="line-height: inherit;"> <div v-for="subItem in outItem.HotelOrderList" style="line-height: inherit;">
{{subItem.HotelName}} {{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;"> <p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a> <a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
{{subItem.HouseStatistics.RealityRoomNum}}
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.HouseStatistics.HouseTypeList">
{{childItem.HouseTypeName}}
</p> </p>
</div> </div>
</div> </td>
</td> <td>
<td> <div v-for="subItem in outItem.HotelOrderList">
<div class="alcenter"> {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
{{subItem.HouseStatistics.RealityRoomNum}}
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.HouseStatistics.HouseTypeList">
{{childItem.HouseTypeName}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.HouseTypeCount}}
</p>
</div>
</div>
</div>
</td>
<td>
<div class="alcenter"> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList"> <p v-for="childItem in subItem.OrderDetailsList">
{{childItem.HouseTypeCount}} {{childItem.BookNum}}
</p> </p>
</div> </div>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div class="alcenter"> <div v-for="subItem in outItem.HotelOrderList">
<div v-for="subItem in outItem.HotelOrderList"> <p v-for="childItem in subItem.OrderDetailsList">
<p v-for="childItem in subItem.OrderDetailsList"> {{childItem.HotelDiscount}}
{{childItem.BookNum}} </p>
</p> </div>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div class="alcenter"> <div v-for="subItem in outItem.HotelOrderList">
<div v-for="subItem in outItem.HotelOrderList"> <p v-for="childItem in subItem.OrderDetailsList" class="cursorpointer text-decoration"
<p v-for="childItem in subItem.OrderDetailsList"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{childItem.HotelDiscount}} {{moneyFormat(childItem.UnitPrice)}}
</p> </p>
</div>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div class="alcenter"> <div v-for="subItem in outItem.HotelOrderList">
<div v-for="subItem in outItem.HotelOrderList"> <p v-for="childItem in subItem.OrderDetailsList">
<p v-for="childItem in subItem.OrderDetailsList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')"> {{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
{{moneyFormat(childItem.UnitPrice)}} </p>
</p> </div>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div class="alcenter"> <div v-for="subItem in outItem.HotelOrderList">
<div v-for="subItem in outItem.HotelOrderList"> <p v-for="childItem in subItem.OrderDetailsList">
<p v-for="childItem in subItem.OrderDetailsList"> {{childItem.RebateRatio}}%
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}} </p>
</p> </div>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div class="alcenter"> <div v-for="subItem in outItem.HotelOrderList">
<div v-for="subItem in outItem.HotelOrderList"> {{hotelTotalPrice(subItem.OrderDetailsList)}}
<p v-for="childItem in subItem.OrderDetailsList"> </div>
{{childItem.RebateRatio}}%
</p>
</div> </div>
</div> </td>
</td> <td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
{{hotelTotalPrice(subItem.OrderDetailsList)}} <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else>暂无</span>
</div> </div>
</div> </td>
</td> <td>
<td> <div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<span v-if="subItem.PayStyle === 1">现付</span> <p>
<span v-else-if="subItem.PayStyle === 2">签单</span> {{subItem.Remarks}}
<span v-else-if="subItem.PayStyle === 4">预付</span> </p>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span> </div>
<span v-else>暂无</span>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p>
{{subItem.Remarks}}
</p>
</div> </div>
</div> </td>
</td> </tr>
</tr> <tr>
<tr> <td>总金额</td>
<td>总金额</td> <td colspan="6">
<td colspan="6"> {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} </td>
</td> <td>签单/预付/抵扣总金额</td>
<td>签单/预付/抵扣总金额</td> <td colspan="7">
<td colspan="7"> {{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
{{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}} </td>
</td> </tr>
</tr>
</tbody> </tbody>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody> <tbody>
<tr class="title"> <tr class="title">
<td width="80" class="bgwhite" :rowspan="list.DiningList.length+1">餐食使用</td> <td width="80" class="bgwhite" :rowspan="list.DiningList.length+1">餐食使用</td>
<td width="100">使用时间</td> <td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">餐厅名称</td> <td width="180" style="line-height: inherit;">餐厅名称</td>
<td width="100">类别</td> <td width="100">类别</td>
<td width="">用餐人数</td> <td width="">用餐人数</td>
<td width="80">免费人数</td> <td width="80">免费人数</td>
<td width="">单价</td> <td width="">单价</td>
<td width="">金额小计</td> <td width="">金额小计</td>
<td width="">返佣</td> <td width="">返佣</td>
<td width="">总金额</td> <td width="">总金额</td>
<td width="">付款方式</td> <td width="">付款方式</td>
<td width="100">备注</td> <td width="100">备注</td>
</tr> </tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.DiningList'> <tr class="splitP ScenicTr" v-for='(item,index) in list.DiningList'>
<td>{{item.UseTimeStr}}</td> <td>{{item.UseTimeStr}}</td>
<td> <td>
<p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;" v-for="subItem in item.DiningSummaryList"> <p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;"
{{subItem.RealName? subItem.RealName : subItem.DiningName}} v-for="subItem in item.DiningSummaryList">
</p> {{subItem.RealName? subItem.RealName : subItem.DiningName}}
</td>
<td>
<p style="height: 60px!important; line-height: 60px;" v-for="subItem in item.DiningSummaryList">
{{subItem.UseDinnerTypeStr}}
</p>
</td>
<td valign="top">
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</p> </p>
</div> </td>
</td> <td>
<td> <p style="height: 60px!important; line-height: 60px;" v-for="subItem in item.DiningSummaryList">
<div v-for="subItem in item.DiningSummaryList"> {{subItem.UseDinnerTypeStr}}
<p v-for="childItem in subItem.DiningPriceList" >
{{childItem.Discount}}
</p> </p>
</div> </td>
</td> <td valign="top">
<td> <div v-for="subItem in item.DiningSummaryList">
<div v-for="subItem in item.DiningSummaryList"> <p v-for="childItem in subItem.DiningPriceList">
<p v-for="childItem in subItem.DiningPriceList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')"> {{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
{{moneyFormat(childItem.PeoplePrice)}} </p>
</p> </div>
</div> </td>
</td> <td>
<td> <div v-for="subItem in item.DiningSummaryList">
<div v-for="subItem in item.DiningSummaryList"> <p v-for="childItem in subItem.DiningPriceList">
<p v-for="childItem in subItem.DiningPriceList"> {{childItem.Discount}}
{{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}} </p>
</p> </div>
</div> </td>
</td> <td>
<td> <div v-for="subItem in item.DiningSummaryList">
<div v-for="subItem in item.DiningSummaryList"> <p v-for="childItem in subItem.DiningPriceList" class="cursorpointer text-decoration"
<p v-for="childItem in subItem.DiningPriceList"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{childItem.DiscountPrice}}% {{moneyFormat(childItem.PeoplePrice)}}
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.DiningSummaryList"> <div v-for="subItem in item.DiningSummaryList">
{{diningTotalPrice(subItem.DiningPriceList)}} <p v-for="childItem in subItem.DiningPriceList">
</div> {{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
</td> </p>
<td> </div>
<div v-for="subItem in item.DiningSummaryList"> </td>
<span v-if="subItem.PayStyle === 1">现付</span> <td>
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <div v-for="subItem in item.DiningSummaryList">
<span v-else-if="subItem.PayStyle === 3">预付</span> <p v-for="childItem in subItem.DiningPriceList">
<span v-else>暂无</span> {{childItem.DiscountPrice}}%
</div> </p>
</td> </div>
<td> </td>
{{item.Remarks}} <td>
</td> <div v-for="subItem in item.DiningSummaryList">
</tr> {{diningTotalPrice(subItem.DiningPriceList)}}
<tr> </div>
<td>总金额</td> </td>
<td colspan="5"> <td>
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} <div v-for="subItem in item.DiningSummaryList">
</td> <span v-if="subItem.PayStyle === 1">现付</span>
<td>签单/预付/抵扣总金额</td> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<td colspan="5"> <span v-else-if="subItem.PayStyle === 3">预付</span>
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}} <span v-else>暂无</span>
</td> </div>
</tr> </td>
<td>
{{item.Remarks}}
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
</td>
</tr>
</tbody> </tbody>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody> <tbody>
<tr class="title"> <tr class="title">
<td width="80" class="bgwhite" :rowspan="list.ScenicList.length+1">门票使用</td> <td width="80" class="bgwhite" :rowspan="list.ScenicList.length+1">门票使用</td>
<td width="100">使用时间</td> <td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">景点名称</td> <td width="180" style="line-height: inherit;">景点名称</td>
<td width="100">总人数</td> <td width="100">总人数</td>
<td width="">门票类别</td> <td width="">门票类别</td>
<td width="80">免费人数</td> <td width="80">免费人数</td>
<td width="">单价</td> <td width="">单价</td>
<td width="">金额小计</td> <td width="">金额小计</td>
<td width="">返佣</td> <td width="">返佣</td>
<td width="">总金额</td> <td width="">总金额</td>
<td width="">付款方式</td> <td width="">付款方式</td>
<td width="100">备注</td> <td width="100">备注</td>
</tr> </tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.ScenicList'> <tr class="splitP ScenicTr" v-for='(item,index) in list.ScenicList'>
<td>{{item.UseTimeStr}}</td> <td>{{item.UseTimeStr}}</td>
<td> <td>
<div style="line-height: inherit; height: auto;" v-for="subItem in item.ScenicStatisticsList"> <div style="line-height: inherit; height: auto;" v-for="subItem in item.ScenicStatisticsList">
{{subItem.ScenicName}} {{subItem.ScenicName}}
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
{{subItem.UseAccount}} {{subItem.UseAccount}}
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList"> <p v-for="o in subItem.TicketPriceList">
{{peopleStrToWord(o.PeopleType)}}:{{o.PeopleNum}} {{peopleStrToWord(o.PeopleType)}}:{{o.PeopleNum}}
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList"> <p v-for="o in subItem.TicketPriceList">
{{o.Discount}} {{o.Discount}}
</p> </p>
</div> </div>
</td> </td>
<td> <td>
<div v-for="subItem in item.ScenicStatisticsList"> <div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList" class="cursorpointer text-decoration" @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')"> <p v-for="o in subItem.TicketPriceList" class="cursorpointer text-decoration"
{{moneyFormat(o.PeoplePrice)}} @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
</p> {{moneyFormat(o.PeoplePrice)}}
</div> </p>
</td> </div>
<td> </td>
<div v-for="subItem in item.ScenicStatisticsList"> <td>
<p v-for="o in subItem.TicketPriceList"> <div v-for="subItem in item.ScenicStatisticsList">
{{moneyFormat((o.UsePeopleNum-o.Discount)*o.PeoplePrice)}} <p v-for="o in subItem.TicketPriceList">
</p> {{moneyFormat((o.UsePeopleNum-o.Discount)*o.PeoplePrice)}}
</div> </p>
</td> </div>
<td> </td>
<div v-for="subItem in item.ScenicStatisticsList"> <td>
<p v-for="o in subItem.TicketPriceList"> <div v-for="subItem in item.ScenicStatisticsList">
{{o.DiscountPrice}}% <p v-for="o in subItem.TicketPriceList">
</p> {{o.DiscountPrice}}%
</div> </p>
</td> </div>
<td> </td>
<div v-for="subItem in item.ScenicStatisticsList"> <td>
{{scenicTotalPrice(subItem.TicketPriceList)}} <div v-for="subItem in item.ScenicStatisticsList">
</div> {{scenicTotalPrice(subItem.TicketPriceList)}}
</td> </div>
<td> </td>
<div v-for="subItem in item.ScenicStatisticsList"> <td>
<span v-if="subItem.PayStyle === 1">现付</span> <div v-for="subItem in item.ScenicStatisticsList">
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else>暂无</span> <span v-else-if="subItem.PayStyle === 3">预付</span>
</div> <span v-else>暂无</span>
</td> </div>
<td> </td>
<div style="padding: 0 10px;" v-for="subItem in item.ScenicStatisticsList"> <td>
{{item.Remarks}} <div style="padding: 0 10px;" v-for="subItem in item.ScenicStatisticsList">
</div> {{item.Remarks}}
</td> </div>
</tr> </td>
<tr> </tr>
<td>总金额</td> <tr>
<td colspan="5"> <td>总金额</td>
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} <td colspan="5">
</td> {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
<td>签单/预付/抵扣总金额</td> </td>
<td colspan="5"> <td>签单/预付/抵扣总金额</td>
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}} <td colspan="5">
</td> {{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</tr> </td>
</tr>
</tbody> </tbody>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
...@@ -451,25 +455,34 @@ ...@@ -451,25 +455,34 @@
<th>财务单号</th> <th>财务单号</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for='(item, index) in nav' > <tr v-for='(item, index) in nav'>
<td :rowspan="nav.length" width="180" v-if="index===0">总金额： {{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td> <td :rowspan="nav.length" width="180" v-if="index===0">总金额：
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanPrice)}}</td>
<td>{{item.TCNUMS}}</td> <td>{{item.TCNUMS}}</td>
<td style="display: flex;align-items: center;padding: 5px 20px; height: 40px;"> <td style="display: flex;align-items: center;padding: 5px 20px; height: 40px;">
<p style="padding-right: 20px;" v-if="item.LeaderGetPrice>0">已领款：<span style="color: red;">{{moneyFormat(item.LeaderGetPrice)}}</span></p> <p style="padding-right: 20px;" v-if="item.LeaderGetPrice>0">已领款：<span
<el-input v-if="item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" class="w300" type="number" v-model="item.LeaderGetPriceT"></el-input> style="color: red;">{{moneyFormat(item.LeaderGetPrice)}}</span></p>
<el-input v-if="item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" class="w300"
type="number" v-model="item.LeaderGetPriceT"></el-input>
</td> </td>
<td> <td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration" @click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p> <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;<span
class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<input type="button" v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单" class="normalBtn" @click="goZhiDan(item)" /> <input type="button"
v-if="isUpdate=='true' && item.LeaderGetPrice < (TotalNav.reimburseTotalPrice.PlanPrice * 0.95)" value="制单"
class="normalBtn" @click="goZhiDan(item)" />
</td> </td>
</tr> </tr>
</table> </table>
<div v-if='picIsShow' class="viewBigPicLayer"> <div v-if='picIsShow' class="viewBigPicLayer">
<i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i> <i class="el-icon-circle-close-outline clolseViewBigPicLayer" @click="picIsShow=false,picObj=[]"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div> <div class="inlineDiv ownScrollbarStyle"><img :src="item" /></div>
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
...@@ -480,38 +493,44 @@ ...@@ -480,38 +493,44 @@
<script> <script>
export default { export default {
data () { data() {
return { return {
isUpdate:'false', isUpdate: 'false',
loading:false, loading: false,
defaultSelectValue:0, defaultSelectValue: 0,
initialIndex:0, initialIndex: 0,
picIsShow:false, picIsShow: false,
picObj:[], picObj: [],
TemporaryItem:{}, TemporaryItem: {},
msg:{ msg: {
TCIDs:'', TCIDs: '',
NewCombinationNum:'' NewCombinationNum: ''
}, },
list:[], list: [],
nav:[], nav: [],
TravelDayNum:0, TravelDayNum: 0,
RealityNum:0, RealityNum: 0,
UseCount:'', UseCount: '',
//定团号 //定团号
NewCombinationNum:'', NewCombinationNum: '',
TotalNav: [], TotalNav: [],
LeaderGetPrice: 0, LeaderGetPrice: 0,
} }
}, },
methods: { methods: {
goFncUrl: function (path, id) { goFncUrl: function (path, id) {
this.$router.push({ name: path,query:{"id":id,blank:'y'} }) this.$router.push({
name: path,
query: {
"id": id,
blank: 'y'
}
})
}, },
goHotelDetail: function (id, num, TCNUM, path) { goHotelDetail: function (id, num, TCNUM, path) {
this.$router.push({ this.$router.push({
name: path, name: path,
query:{ query: {
"id": id, "id": id,
"NewCombinationNum": num, "NewCombinationNum": num,
"TCNUM": TCNUM, "TCNUM": TCNUM,
...@@ -522,17 +541,16 @@ ...@@ -522,17 +541,16 @@
goZhiDan: function (obj) { goZhiDan: function (obj) {
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95 let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let totailMoney = 0 let totailMoney = 0
this.nav.forEach(x=>{ this.nav.forEach(x => {
totailMoney += parseFloat(x.LeaderGetPriceT) totailMoney += parseFloat(x.LeaderGetPriceT)
totailMoney += x.LeaderGetPrice totailMoney += x.LeaderGetPrice
}) })
console.log(allMoney, totailMoney) if ((allMoney - totailMoney) < 0) return this.$message.error('最大领款为预付合计金额的95%！')
if ((allMoney - totailMoney)<0) return this.$message.error('最大领款为预付合计金额的95%！') if (!obj.LeaderGetPriceT || obj.LeaderGetPriceT <= 0) return this.$message.error('请输入金额！')
if (!obj.LeaderGetPriceT || obj.LeaderGetPriceT<=0) return this.$message.error('请输入金额！')
let TCIDARR = [obj.TCIDS] let TCIDARR = [obj.TCIDS]
let orderObj = { let orderObj = {
OrderID: 0, OrderID: 0,
OrderSource:8, OrderSource: 8,
Obj: {}, Obj: {},
SourceID: 0, SourceID: 0,
TCIDList: TCIDARR, TCIDList: TCIDARR,
...@@ -540,10 +558,10 @@ ...@@ -540,10 +558,10 @@
Money: obj.LeaderGetPriceT, Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUMS TCNUMS: obj.TCNUMS
} }
let id = [43,48] let id = [43, 48]
this.$router.push({ this.$router.push({
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query: {
"Type": 2, "Type": 2,
"templateID": JSON.stringify(id), "templateID": JSON.stringify(id),
"companyID": obj.OutBranchId, "companyID": obj.OutBranchId,
...@@ -553,10 +571,10 @@ ...@@ -553,10 +571,10 @@
} }
}); });
}, },
addOtherList(index,id) { addOtherList(index, id) {
this.list.OtherOrderReportList.OtherList.push({ this.list.OtherOrderReportList.OtherList.push({
OrderType: '1', OrderType: '1',
ID:0, ID: 0,
UseDate: '', UseDate: '',
CostProject: '0', CostProject: '0',
TotalNum: '0', TotalNum: '0',
...@@ -564,19 +582,19 @@ ...@@ -564,19 +582,19 @@
Rebate: '0', Rebate: '0',
TotalPrice: '0', TotalPrice: '0',
Remark: '', Remark: '',
TCIDs:this.$route.query.id, TCIDs: this.$route.query.id,
TCID:id, TCID: id,
UseCount:this.UseCount, UseCount: this.UseCount,
VoucherPicList: [] VoucherPicList: []
}) })
}, },
deleteOtherListItem(outIndex,index) { deleteOtherListItem(outIndex, index) {
this.list.OtherOrderReportList.OtherList.splice(index, 1) this.list.OtherOrderReportList.OtherList.splice(index, 1)
}, },
addSelfPlayingIncomeList(index,id) { addSelfPlayingIncomeList(index, id) {
this.list.OtherOrderReportList.SelfPlayingIncomeList.push({ this.list.OtherOrderReportList.SelfPlayingIncomeList.push({
OrderType: '4', OrderType: '4',
ID:0, ID: 0,
UseDate: '', UseDate: '',
CostProject: 0, CostProject: 0,
TotalNum: '0', TotalNum: '0',
...@@ -584,19 +602,19 @@ ...@@ -584,19 +602,19 @@
Rebate: '0', Rebate: '0',
TotalPrice: '0', TotalPrice: '0',
Remark: '', Remark: '',
TCID:id, TCID: id,
UseCount:this.UseCount, UseCount: this.UseCount,
TCIDs:this.$route.query.id, TCIDs: this.$route.query.id,
VoucherPicList: [] VoucherPicList: []
}) })
}, },
deleteSelfPlayingIncomeListItem(outIndex,index) { deleteSelfPlayingIncomeListItem(outIndex, index) {
this.list.OtherOrderReportList.SelfPlayingIncomeList.splice(index, 1) this.list.OtherOrderReportList.SelfPlayingIncomeList.splice(index, 1)
}, },
addSelfPlayingExpendList(index,id) { addSelfPlayingExpendList(index, id) {
this.list.OtherOrderReportList.SelfPlayingExpendList.push({ this.list.OtherOrderReportList.SelfPlayingExpendList.push({
OrderType: '5', OrderType: '5',
ID:0, ID: 0,
UseDate: '', UseDate: '',
CostProject: '', CostProject: '',
TotalNum: '0', TotalNum: '0',
...@@ -604,53 +622,53 @@ ...@@ -604,53 +622,53 @@
Rebate: '0', Rebate: '0',
TotalPrice: '0', TotalPrice: '0',
Remark: '', Remark: '',
TCID:id, TCID: id,
UseCount:this.UseCount, UseCount: this.UseCount,
TCIDs:this.$route.query.id, TCIDs: this.$route.query.id,
VoucherPicList: [] VoucherPicList: []
}) })
}, },
deleteSelfPlayingExpendList(outIndex,index) { deleteSelfPlayingExpendList(outIndex, index) {
this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1) this.list.OtherOrderReportList.SelfPlayingExpendList.splice(index, 1)
}, },
busTotalPrice(obj){ busTotalPrice(obj) {
let totalPrice=0 let totalPrice = 0
obj.forEach(item=>{ obj.forEach(item => {
totalPrice+=Number(item.CostPrice)+Number(item.HighSpeedPrice)+Number(item.StopPrice) totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
hotelTotalPrice(obj){ hotelTotalPrice(obj) {
let totalPrice=0 let totalPrice = 0
obj.forEach(x=>{ obj.forEach(x => {
totalPrice+=x.UnitPrice*(x.BookNum-x.HotelDiscount)*(1-x.RebateRatio/100) totalPrice += x.UnitPrice * (x.BookNum - x.HotelDiscount) * (1 - x.RebateRatio / 100)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
diningTotalPrice(obj){ diningTotalPrice(obj) {
let totalPrice=0 let totalPrice = 0
obj.forEach(x=>{ obj.forEach(x => {
totalPrice+=x.PeoplePrice*(x.PeopleNum-x.Discount)*(1-x.DiscountPrice/100) totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
scenicTotalPrice(obj){ scenicTotalPrice(obj) {
let totalPrice=0 let totalPrice = 0
obj.forEach(x=>{ obj.forEach(x => {
totalPrice+=x.PeoplePrice*(x.UsePeopleNum-x.Discount)*(1-x.DiscountPrice/100) totalPrice += x.PeoplePrice * (x.UsePeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
otherTotalPrice(obj){ otherTotalPrice(obj) {
let totalPrice=0 let totalPrice = 0
obj.forEach(item=>{ obj.forEach(item => {
totalPrice+=item.TotalNum*item.UnitPrice*(1-item.Rebate/100) totalPrice += item.TotalNum * item.UnitPrice * (1 - item.Rebate / 100)
}) })
return this.moneyFormat(totalPrice) return this.moneyFormat(totalPrice)
}, },
saveData() { saveData() {
this.apipost('dmcstatistics_post_SetOtherOrderList', this.list.OtherOrderReportList, res => { this.apipost('dmcstatistics_post_SetOtherOrderList', this.list.OtherOrderReportList, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.$message.success(res.data.message) this.$message.success(res.data.message)
this.getNav() this.getNav()
this.getList() this.getList()
...@@ -659,146 +677,301 @@ ...@@ -659,146 +677,301 @@
} }
}, err => {}) }, err => {})
}, },
saveitem(obj){ saveitem(obj) {
this.TemporaryItem=obj this.TemporaryItem = obj
}, },
analyzeItem(obj,index){ //预览 analyzeItem(obj, index) { //预览
this.picObj=[] this.picObj = []
obj.forEach(item=>{ obj.forEach(item => {
this.picObj.push(item.url) this.picObj.push(item.url)
}) })
this.initialIndex=index this.initialIndex = index
this.picIsShow=true this.picIsShow = true
}, },
peopleStrToWord(str){ peopleStrToWord(str) {
if(str=='1') if (str == '1')
return '成人' return '成人'
if(str=='2') if (str == '2')
return '儿童' return '儿童'
if(str=='3') if (str == '3')
return '婴儿' return '婴儿'
}, },
UseDinnerTypeToWord(str){ UseDinnerTypeToWord(str) {
if(str==1) if (str == 1)
return '早餐' return '早餐'
if(str==2) if (str == 2)
return '午餐' return '午餐'
if(str==3) if (str == 3)
return '晚餐' return '晚餐'
}, },
getNav(){ getNav() {
let _this = this let _this = this
this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs',{TCIDs:this.$route.query.id},res=>{ this.apipost('dmcstatistics_post_GetHotelStaticsByTCIDs', {
if(res.data.resultCode==1){ TCIDs: this.$route.query.id
}, res => {
if (res.data.resultCode == 1) {
let nav = res.data.data let nav = res.data.data
let num = 0; let num = 0;
nav.forEach(x=>{ nav.forEach(x => {
nav.LeaderGetPriceT = 0; nav.LeaderGetPriceT = 0;
num += x.LeaderGetPrice num += x.LeaderGetPrice
}) })
nav.forEach((x, i)=>{ nav.forEach((x, i) => {
if (i === 0) { if (i === 0) {
x.LeaderGetPriceT = Math.floor(((_this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num) *100) / 100; x.LeaderGetPriceT = Math.floor(((_this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num) *
100) / 100;
} else { } else {
x.LeaderGetPriceT = 0 x.LeaderGetPriceT = 0
} }
}) })
this.nav = nav this.nav = nav
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
},err=>{}) }, err => {})
}, },
getTotalNav(){ getTotalNav() {
this.apipost('dmcstatistics_post_GetNewPlanTotalPrice',{TCIDs:this.$route.query.id},res=>{ this.apipost('dmcstatistics_post_GetNewPlanTotalPrice', {
if(res.data.resultCode==1){ TCIDs: this.$route.query.id
this.TotalNav=res.data.data }, res => {
if (res.data.resultCode == 1) {
this.TotalNav = res.data.data
this.getNav() this.getNav()
}else{ } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
},err=>{}) }, err => {})
}, },
getList(){ getList() {
this.loading=true this.loading = true
this.apipost('dmcstatistics_post_GetGroupLeaderUserMoneyPlan',this.msg,res=>{ this.apipost('dmcstatistics_post_GetGroupLeaderUserMoneyPlan', this.msg, res => {
if(res.data.resultCode==1){ this.loading = false
console.log(res.data.data) if (res.data.resultCode == 1) {
this.loading=false this.list = res.data.data;
this.list=res.data.data this.UseCount = this.list.UseCount;
this.UseCount=this.list.UseCount this.list.OtherOrderReportList.OtherList.forEach(x => {
this.list.OtherOrderReportList.OtherList.forEach(x=>{ x.CostProject = x.CostProject.toString();
x.CostProject=x.CostProject.toString() });
}) } else {
// this.list.OtherOrderReportList.forEach(item=>{ this.$message.error(res.data.message);
// item.OtherList.forEach(x=>{
// x.CostProject=x.CostProject.toString()
// })
// })
}else{
this.loading=false
this.$message.error(res.data.message)
} }
},err=>{}) }, err => {})
}, },
}, },
mounted() { mounted() {
this.isUpdate=this.$route.query.isUpdate; this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs=this.$route.query.id; this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum; this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList() this.getList()
this.getTotalNav() this.getTotalNav()
} }
} }
</script> </script>
<style> <style>
.leaderReimbursementTableNav{background: #d6cece; width: 100%;margin: 20px 0;} .leaderReimbursementTableNav {
.leaderReimbursementTableNav tr th{background: #E6E6E6;height:40px; font-size: 12px; color: #333;} background: #d6cece;
.leaderReimbursementTableNav tr{background: #fff;text-align: center; height: 40px; font-size: 12px;} width: 100%;
.leaderReimbursementTableNav tr td{background: #fff;text-align: center; height: 40px; font-size: 12px; padding: 0 10px;} margin: 20px 0;
.leaderReimbursementTable{ background: #d6cece; width: 100%; margin:20px 0;} }
.leaderReimbursementTable tbody{margin: 10px 0;}
.leaderReimbursementTable tr th{background: #E6E6E6;height:40px; font-size: 12px; color: #333;} .leaderReimbursementTableNav tr th {
.leaderReimbursementTable tr{background: #fff;text-align: center; height: 40px;} background: #E6E6E6;
.leaderReimbursementTable tr.title td{background: #E6E6E6;} height: 40px;
.leaderReimbursementTable tr td div{word-break: normal;} font-size: 12px;
.leaderReimbursementTable tr td.bgwhite{background:#fff!important; font-weight: bold;} color: #333;
.leaderReimbursementTable tr td{font-size: 12px;} }
.leaderReimbursementTable tr td .pDateStyle{border-bottom: 1px solid #E6E6E6; min-height: 24px; line-height: 24px; margin-top: 0; box-sizing: content-box; padding: 0 10px;}
.leaderReimbursementTable tr td .pDateStyle:last-child{border-bottom: none;} .leaderReimbursementTableNav tr {
.leaderReimbursementTable tr td .pDateStyle>span:after{content: '/';} background: #fff;
.leaderReimbursementTable tr td .pDateStyle>span:last-child:after{content:''} text-align: center;
.leaderReimbursementTable tr td .link p:hover{text-decoration: underline; cursor: pointer;} height: 40px;
.leaderReimbursementTable tr td .phoverStype:hover{text-decoration: underline; cursor: pointer;} font-size: 12px;
.leaderReimbursementTable tr td input[type='text']{height: 20px!important; padding: 0; text-align: center;} }
.leaderReimbursementTable tr td .sel input{height: 34px!important;}
.leaderReimbursementTable .splitP td>p{height: 20px; line-height: 20px; border-bottom: 1px solid #ccc;} .leaderReimbursementTableNav tr td {
.leaderReimbursementTable .splitP td>p:last-child{border-bottom: none;} background: #fff;
.leaderReimbursementTable .ScenicTr td>div{height: 60px; line-height: 60px; border-bottom: 1px solid #ccc;} text-align: center;
.leaderReimbursementTable .ScenicTr td>div:last-child{border-bottom: none;} height: 40px;
.leaderReimbursementTable .ScenicTr td>div p{line-height: 20px; border-bottom: 1px solid #ccc;} font-size: 12px;
.leaderReimbursementTable .ScenicTr td>div p:last-child{border-bottom: none;} padding: 0 10px;
}
.leaderReimbursementTable .HotelTr td>div{/*height:100px*/ line-height: 100px; border-bottom: 1px solid #ccc;}
.leaderReimbursementTable .HotelTr td>div:last-child{border-bottom: none;} .leaderReimbursementTable {
.leaderReimbursementTable .HotelTr td>div p{line-height: 19px; border-bottom: 1px solid #ccc;} background: #d6cece;
.leaderReimbursementTable .HotelTr td>div p:last-child{border-bottom: none;} width: 100%;
.leaderReimbursementTable tr td .el-upload-list{display: none;} margin: 20px 0;
.leaderReimbursementTable .uploadListDiv{height: 100%!important; overflow-y: auto; width: 100%;} }
.leaderReimbursementTable .uploadListDiv>p{border-bottom: 1px solid #ccc; cursor: pointer; width:100%!important;}
.leaderReimbursementTable .uploadListDiv>p:last-child{border-bottom: none;} .leaderReimbursementTable tbody {
.leaderReimbursementTable .uploadListDiv>p i{color: #999; vertical-align: sub; margin: 3px;} margin: 10px 0;
.leaderReimbursementTable .jdtd>div{height: auto!important; padding: 0 10px;} }
.leaderReimbursementTable .leaderPayTable .el-input__prefix{display: none;}
.leaderReimbursementTable .HotelTr td div.alcenter>div:nth-child(2) { border-top: 1px solid #ccc;} .leaderReimbursementTable tr th {
.leaderReimbursementTable td._zhidan{ background: #E6E6E6;
height: 40px;
font-size: 12px;
color: #333;
}
.leaderReimbursementTable tr {
background: #fff;
text-align: center;
height: 40px;
}
.leaderReimbursementTable tr.title td {
background: #E6E6E6;
}
.leaderReimbursementTable tr td div {
word-break: normal;
}
.leaderReimbursementTable tr td.bgwhite {
background: #fff !important;
font-weight: bold;
}
.leaderReimbursementTable tr td {
font-size: 12px;
}
.leaderReimbursementTable tr td .pDateStyle {
border-bottom: 1px solid #E6E6E6;
min-height: 24px;
line-height: 24px;
margin-top: 0;
box-sizing: content-box;
padding: 0 10px;
}
.leaderReimbursementTable tr td .pDateStyle:last-child {
border-bottom: none;
}
.leaderReimbursementTable tr td .pDateStyle>span:after {
content: '/';
}
.leaderReimbursementTable tr td .pDateStyle>span:last-child:after {
content: ''
}
.leaderReimbursementTable tr td .link p:hover {
text-decoration: underline;
cursor: pointer; cursor: pointer;
} }
.leaderReimbursementTableNav ._go_detail p{
.leaderReimbursementTable tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.leaderReimbursementTable tr td input[type='text'] {
height: 20px !important;
padding: 0;
text-align: center;
}
.leaderReimbursementTable tr td .sel input {
height: 34px !important;
}
.leaderReimbursementTable .splitP td>p {
height: 20px;
line-height: 20px;
border-bottom: 1px solid #ccc;
}
.leaderReimbursementTable .splitP td>p:last-child {
border-bottom: none;
}
.leaderReimbursementTable .ScenicTr td>div {
height: 60px;
line-height: 60px;
border-bottom: 1px solid #ccc;
}
.leaderReimbursementTable .ScenicTr td>div:last-child {
border-bottom: none;
}
.leaderReimbursementTable .ScenicTr td>div p {
line-height: 20px;
border-bottom: 1px solid #ccc;
}
.leaderReimbursementTable .ScenicTr td>div p:last-child {
border-bottom: none;
}
.leaderReimbursementTable .HotelTr td>div {
line-height: 100px;
border-bottom: 1px solid #ccc;
}
.leaderReimbursementTable .HotelTr td>div:last-child {
border-bottom: none;
}
.leaderReimbursementTable .HotelTr td>div p {
line-height: 19px;
border-bottom: 1px solid #ccc;
}
.leaderReimbursementTable .HotelTr td>div p:last-child {
border-bottom: none;
}
.leaderReimbursementTable tr td .el-upload-list {
display: none;
}
.leaderReimbursementTable .uploadListDiv {
height: 100% !important;
overflow-y: auto;
width: 100%;
}
.leaderReimbursementTable .uploadListDiv>p {
border-bottom: 1px solid #ccc;
cursor: pointer;
width: 100% !important;
}
.leaderReimbursementTable .uploadListDiv>p:last-child {
border-bottom: none;
}
.leaderReimbursementTable .uploadListDiv>p i {
color: #999;
vertical-align: sub;
margin: 3px;
}
.leaderReimbursementTable .jdtd>div {
height: auto !important;
padding: 0 10px;
}
.leaderReimbursementTable .leaderPayTable .el-input__prefix {
display: none;
}
.leaderReimbursementTable .HotelTr td div.alcenter>div:nth-child(2) {
border-top: 1px solid #ccc;
}
.leaderReimbursementTable td._zhidan {
cursor: pointer;
}
.leaderReimbursementTableNav ._go_detail p {
cursor: pointer; cursor: pointer;
line-height: 25px; line-height: 25px;
} }
</style> </style>
\ No newline at end of file
src/components/Ticketing/TicketManager.vue
View file @ 0a83fa59
...@@ -2209,7 +2209,8 @@ ...@@ -2209,7 +2209,8 @@
FlyState: "0", FlyState: "0",
LineId: 0, //线路编号 LineId: 0, //线路编号
ID: 0, ID: 0,
TicketType: 0 //定金类型(1定，2定等) TicketType: 0, //定金类型(1定，2定等)
IsLimit:1
}, },
addMsg: { addMsg: {
ID: "0", ID: "0",
...@@ -2610,7 +2611,6 @@ ...@@ -2610,7 +2611,6 @@
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.noData = !this.total > 0; this.noData = !this.total > 0;
console.log(this.dataList,'datalist');
} }
if (this.msg.ID == 0) { if (this.msg.ID == 0) {
this.msg.ID = ""; this.msg.ID = "";
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 0a83fa59
...@@ -1062,6 +1062,7 @@ ...@@ -1062,6 +1062,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0"> <!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice"> <el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
...@@ -1243,14 +1244,14 @@ ...@@ -1243,14 +1244,14 @@
@input='getNumber();getHouseNo();getTotalPrice()'></el-input> @input='getNumber();getHouseNo();getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单地接数量" prop="AirticketNum"> <el-form-item label="单地接数量" prop="AirticketNum">
<el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"
@input='getNumber();getTotalPrice();getHouseNo()'></el-input> @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单房数量" prop="SingleRoomNum"> <el-form-item label="单房数量" prop="SingleRoomNum">
<el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
...@@ -1274,12 +1275,6 @@ ...@@ -1274,12 +1275,6 @@
<el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')" <el-input v-model='addMsg.VisaNum' @keyup.native="checkInteger(addMsg,'VisaNum')"
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;"> <el-form-item label="拒签人数" prop="RefuseVisaNum" style="display:none;">
...@@ -1287,11 +1282,14 @@ ...@@ -1287,11 +1282,14 @@
@input='getTotalPrice()'></el-input> @input='getTotalPrice()'></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4">
&nbsp;
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4">
<el-form-item label="保险数量" prop="SaleNum">
<el-input v-model='addMsg.SafeNum' @keyup.native="checkInteger(addMsg,'SafeNum')"
@input='getTotalPrice()'></el-input>
</el-form-item>
</el-col>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="预计用房" prop="PredictRoomNum"> <el-form-item label="预计用房" prop="PredictRoomNum">
<el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input> <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
...@@ -1402,8 +1400,13 @@ ...@@ -1402,8 +1400,13 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4" style="display:none;">
&nbsp; <el-form-item label="是否可清位">
<el-select v-model='addMsg.IsCanClear' :placeholder="$t('pub.pleaseSel')">
<el-option label='可以清位' :value='0' :key='0'></el-option>
<el-option label='不可以清位' :value='1' :key='1'></el-option>
</el-select>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -1445,6 +1448,7 @@ ...@@ -1445,6 +1448,7 @@
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0"> <!-- <el-col :span="4" v-show="addMsg.TradeWay==1&&addMsg.PlatformOrder!='' && isAllowUpdate!==0">
<el-form-item label="定金" prop="MinOrderPrice"> <el-form-item label="定金" prop="MinOrderPrice">
<el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input> <el-input v-model='addMsg.MinOrderPrice' @keyup.native="checkPrice(addMsg,'MinOrderPrice')"></el-input>
...@@ -2768,6 +2772,7 @@ ...@@ -2768,6 +2772,7 @@
//订单归属【HK新加，报名清单页面修改使用】 //订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0, CreateBy: 0,
RefuseVisaNum:0,//拒签人数 RefuseVisaNum:0,//拒签人数
IsCanClear:0 //是否可清位
}, },
//行程下载使用 //行程下载使用
travelControlTripLayerShow: false, travelControlTripLayerShow: false,
...@@ -3082,6 +3087,7 @@ ...@@ -3082,6 +3087,7 @@
}, },
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
console.log(res,'data');
this.IsUnion = res.data.data.IsUnion this.IsUnion = res.data.data.IsUnion
this.isAllowUpdate = res.data.data.IsUpdatePlatOrder; this.isAllowUpdate = res.data.data.IsUpdatePlatOrder;
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
...@@ -3108,6 +3114,8 @@ ...@@ -3108,6 +3114,8 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString(); this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString(); this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString(); this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
this.addMsg.IsCanClear=x.IsCanClear;
this.IsChildrenTour = x.IsChildrenTour; this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount; this.IsBirdDiscount = x.IsBirdDiscount;
this.OpSetLossPeople = x.OpSetLossPeople; this.OpSetLossPeople = x.OpSetLossPeople;
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 0a83fa59
...@@ -264,8 +264,8 @@ ...@@ -264,8 +264,8 @@
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">收入</div> <div class="TB_comtitle TB-Title">收入</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn"
@click="AddIncomeDetail" /> @click="AddIncomeDetail" />
</template> </template>
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
...@@ -578,7 +578,7 @@ ...@@ -578,7 +578,7 @@
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">成本</div> <div class="TB_comtitle TB-Title">成本</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template> </template>
</div> </div>
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
...@@ -1062,7 +1062,7 @@ ...@@ -1062,7 +1062,7 @@
<div class="clearfix TB_PrintDiv"> <div class="clearfix TB_PrintDiv">
<div class="TB_comtitle TB-Title">非成本</div> <div class="TB_comtitle TB-Title">非成本</div>
<template v-if="IsHaveAuth"> <template v-if="IsHaveAuth">
<input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" /> <input type="button" value="新增" class="hollowFixedBtn TeamAddBtn" v-show="ishowBtn" @click="AddOutDetail" />
</template> </template>
</div> </div>
...@@ -1269,11 +1269,11 @@ ...@@ -1269,11 +1269,11 @@
</div> </div>
</div> </div>
<div class="Team_BtnList" v-if="IsHaveAuth"> <div class="Team_BtnList" v-if="IsHaveAuth">
<input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" /> <input type="button" @click="zhaunBox" value="单据转团" class="hollowFixedBtn" />
<input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus" <input type="button" v-if="!CloseIncomeBtn" @click="UpdateBrakeAccountStatus"
:value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'" :value="(DataList&&DataList.TeamBalance&&DataList.TeamBalance.BrakeAccountStatus === 0) ? '关闭收支操作' : '开启收支操作'"
class="hollowFixedBtn" /> class="hollowFixedBtn" />
<input type="button" value="导出" @click="ExportExcle" class="normalBtn" /> <input type="button" value="导出" @click="ExportExcle" class="normalBtn" />
<input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" /> <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn" />
</div> </div>
<el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg"> <el-dialog custom-class='w350' title="合并单据" :visible.sync="zhuanLoading" center :before-close="initZhuanMsg">
...@@ -1306,7 +1306,7 @@ ...@@ -1306,7 +1306,7 @@
TCNUM: '', TCNUM: '',
FrIds: '', FrIds: '',
}, },
IsHaveAuth:false,//权限判断按钮是否显示 IsHaveAuth: false, //权限判断按钮是否显示
zhuanLoading: false, zhuanLoading: false,
moneyAll: { moneyAll: {
Moneyall: 0, Moneyall: 0,
...@@ -1724,27 +1724,32 @@ ...@@ -1724,27 +1724,32 @@
}, },
//权限验证 //权限验证
checkHasAuth() { checkHasAuth() {
this.apipost( // this.apipost(
'travel_get_CheckBalancePaymentAuth', { // 'travel_get_CheckBalancePaymentAuth', {
TCID: this.TCID // TCID: this.TCID
}, // },
res => { // res => {
if (res.data.resultCode == 1) { // if (res.data.resultCode == 1) {
this.IsHaveAuth=true; // this.IsHaveAuth=true;
} // }
else // else
{ // {
this.IsHaveAuth=false; // this.IsHaveAuth=false;
} // }
}, // },
err => {} // err => {}
) // )
} }
}, },
mounted() { mounted() {
this.TCID = this.$route.query.id; this.TCID = this.$route.query.id;
this.OutBranchId = this.$route.query.OutBranchId; this.OutBranchId = this.$route.query.OutBranchId;
this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn; this.CloseIncomeBtn = this.$route.query.CloseIncomeBtn;
if (this.$route.query.IsHaveAuth) {
this.IsHaveAuth = true;
} else {
this.IsHaveAuth = false;
}
this.checkHasAuth(); this.checkHasAuth();
this.getList(); this.getList();
this.getAllCont(); this.getAllCont();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 0a83fa59
...@@ -1473,7 +1473,8 @@ ...@@ -1473,7 +1473,8 @@
name: 'TeamBalancePayment', name: 'TeamBalancePayment',
query: { query: {
id: id, id: id,
OutBranchId: OutBranchId, OutBranchId:OutBranchId,
IsHaveAuth:true,
blank: 'y', blank: 'y',
tab: '团队收支明细' tab: '团队收支明细'
} }
......
src/components/activity/CouponList.vue
View file @ 0a83fa59
...@@ -82,6 +82,20 @@ ...@@ -82,6 +82,20 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>使用范围</em>
<el-select filterable v-model="msg.couponsUseScope">
<el-option :label="$t('active.cl_tongyong')" :value="1"></el-option>
<el-option :label="$t('active.cl_team')" :value="2"></el-option>
<el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
<el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
<el-option label="门票" :value="5"></el-option>
<el-option label="车辆" :value="6"></el-option>
</el-select>
</span>
</li>
<li> <li>
<input <input
type="button" type="button"
...@@ -116,6 +130,7 @@ ...@@ -116,6 +130,7 @@
<th>{{$t('active.cl_sxriqi')}}</th> <th>{{$t('active.cl_sxriqi')}}</th>
<th>{{$t('active.cl_sxzhuangtai')}}</th> <th>{{$t('active.cl_sxzhuangtai')}}</th>
<th>{{$t('active.cl_gqriqi')}}</th> <th>{{$t('active.cl_gqriqi')}}</th>
<th>使用范围</th>
<th>{{$t('admin.admin_status')}}</th> <th>{{$t('admin.admin_status')}}</th>
<th>{{$t('active.cl_addPp')}}</th> <th>{{$t('active.cl_addPp')}}</th>
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
...@@ -141,7 +156,16 @@ ...@@ -141,7 +156,16 @@
<span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span> <span v-if="item.couponEffectStatus === 2" style="color: gray">{{$t('active.cl_wsxiao')}}</span>
<span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span> <span v-if="item.couponEffectStatus === 3" style="color: red">{{$t('active.cl_ygqi')}}</span>
</td> </td>
<td>{{item.expirationDate}}</td> <td>{{item.expirationDate}}</td>
<td>
<span v-if="item.couponsUseScope == 1">全场通用</span>
<span v-if="item.couponsUseScope == 2">团队</span>
<span v-if="item.couponsUseScope == 3">签证</span>
<span v-if="item.couponsUseScope == 4">机票</span>
<span v-if="item.couponsUseScope == 5">门票</span>
<span v-if="item.couponsUseScope == 6">车辆</span>
</td>
<td> <td>
<span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span> <span v-if="item.couponStatus == 1" style="color: green">{{$t('pub.normalSel')}}</span>
<span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span> <span v-if="item.couponStatus == 2" style="color: gray">{{$t('active.ld_jinyong')}}</span>
...@@ -343,6 +367,8 @@ ...@@ -343,6 +367,8 @@
<el-option :label="$t('active.cl_team')" :value="2"></el-option> <el-option :label="$t('active.cl_team')" :value="2"></el-option>
<el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option> <el-option :label="$t('active.cl_qianzheng')" :value="3"></el-option>
<el-option :label="$t('active.cl_jipiao')" :value="4"></el-option> <el-option :label="$t('active.cl_jipiao')" :value="4"></el-option>
<el-option label="门票" :value="5"></el-option>
<el-option label="车辆" :value="6"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</td> </td>
...@@ -384,6 +410,7 @@ export default { ...@@ -384,6 +410,7 @@ export default {
couponStatus: -1, couponStatus: -1,
groupId: '', groupId: '',
branchId: '', branchId: '',
couponsUseScope:"",
}, },
rules: { rules: {
branchId: [{ required: true, message: this.$t('rule.company'), trigger: "change" }], branchId: [{ required: true, message: this.$t('rule.company'), trigger: "change" }],
...@@ -471,7 +498,8 @@ export default { ...@@ -471,7 +498,8 @@ export default {
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
// this.currentPage = res.data.data.pageCount // this.currentPage = res.data.data.pageCount
this.total = res.data.data.count this.total = res.data.data.count
this.DataList = res.data.data.pageData this.DataList = res.data.data.pageData;
console.log("DataList",this.DataList);
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/busManagement/busHandBook.vue
View file @ 0a83fa59
...@@ -9,7 +9,9 @@ ...@@ -9,7 +9,9 @@
text-align: center; text-align: center;
height: 40px; height: 40px;
} }
.busManagerTalbe tr td{
padding:0 5px;
}
.commonBackColor { .commonBackColor {
background-color: #E6E6E6; background-color: #E6E6E6;
color: #333; color: #333;
...@@ -25,7 +27,15 @@ ...@@ -25,7 +27,15 @@
color: #fff; color: #fff;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
} }
.addHandBook{
margin-right: 5px;
color: seagreen;
cursor: pointer;
visibility: hidden;
}
.addHandBookDIS{
visibility: visible!important;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -73,9 +83,10 @@ ...@@ -73,9 +83,10 @@
<td class="commonBackColor">ホテル</td> <td class="commonBackColor">ホテル</td>
<td class="commonBackColor">ホテルTEL</td> <td class="commonBackColor">ホテルTEL</td>
</tr> </tr>
<tr v-for="subItem in DataObj.Details_Extends"> <tr v-for="(subItem,index) in DataObj.Details_Extends">
<td> <td>
{{subItem.UseDate}} <i class="iconfont icon-bumenguanli-tianjia addHandBook" :class="{'addHandBookDIS':index==0||index==DataObj.Details_Extends.length-1}" @click="addHand(index)"></i>
<el-date-picker v-model='subItem.UseDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</td> </td>
<td> <td>
<el-input type="text" v-model="subItem.BusType" /> <el-input type="text" v-model="subItem.BusType" />
...@@ -163,6 +174,7 @@ ...@@ -163,6 +174,7 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.DataObj = res.data.data; this.DataObj = res.data.data;
console.log(this.DataObj,'dataObj');
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
...@@ -182,6 +194,30 @@ ...@@ -182,6 +194,30 @@
this.isSave = false; this.isSave = false;
}, err => {}) }, err => {})
} }
},
//添加
addHand(index){
var obj = {
BusContent:'',
BusType:'',
FlightNum:'',
HotelName:'',
HotelTel:'',
Id:0,
MainId:0,
UseDate:''
}
var date = new Date();
var year = date.getFullYear();
var month = date.getMonth() + 1;
var day = date.getDate();
var UseDate = year+'-'+month+"-"+day;
obj.UseDate = UseDate
if(index==0){
this.DataObj.Details_Extends.unshift(obj)
}else{
this.DataObj.Details_Extends.push(obj);
}
} }
}, },
mounted() { mounted() {
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 0a83fa59
...@@ -92,11 +92,11 @@ ...@@ -92,11 +92,11 @@
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'> <td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
{{outItem.NewCombinationNum}} {{outItem.NewCombinationNum}}
</td> </td>
<td> <td>
{{item.StartCityNames}} {{item.OutBranchName}}
</td> </td>
<td> <td>
{{item.OutBranchName}} {{item.StartCityNames}}
</td> </td>
<td> <td>
<div class="w120"> <div class="w120">
......
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