Skip to content

S
SuperMan
Commit d78e7967 authored by zhengke's avatar zhengke
Browse files
Options

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

parents f7506441 0ea56951
Hide whitespace changes
Inline Side-by-side
Showing with 324 additions and 550 deletions
src/components/FinancialModule/CapitalAllocationDetail.vue
View file @ d78e7967
......@@ -304,7 +304,10 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑收益</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
<td>{{item.TypeName}}</td>
......@@ -314,7 +317,12 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
<div class="clearfix Ca_comLinediv">
......@@ -356,6 +364,7 @@
<th width="110">{{$t('fnc.jine')}}</th>
<th width="90">{{$t('hotel.hotel_Currency')}}</th>
<th width="85">{{$t('hotel.hotel_CurrentRate')}}</th>
<th>汇兑损失</th>
<th>{{$t('fnc.bwbjine')}}</th>
</tr>
<tr>
......@@ -366,6 +375,10 @@
<td>{{item.OriginalMoney}}</td>
<td>{{item.CurrencyName}}</td>
<td>{{item.Rate}}</td>
<td>
<span v-if="item.IsExChange==1">是</span>
<span v-if="item.IsExChange==0">否</span>
</td>
<td>{{item.Money}}</td>
</tr>
</table>
......@@ -637,6 +650,7 @@ export default {
this.apipost('Financial_get_GetFundTransfer', this.msg, res => {
if(res.data.resultCode == 1) {
this.dataList = res.data.data;
console.log("this.dataList",this.dataList)
this.GetDetail = JSON.parse(JSON.stringify(this.dataList));
this.GetDetail.AuditSteps = [];
if(this.dataList.Status==2){
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ d78e7967
......@@ -428,10 +428,12 @@ export default {
this.loading = true
this.apipost('Financial_get_GetFundTransfer', {ID: id}, res=>{
if(res.data.resultCode==1){
let data = res.data.data
let data = res.data.data;
this.inList = data.SBankList;
this.outList = data.FBankList
this.outList = data.FBankList;
this.msg.FrID = data.FrID
this.msg.TemplateId = data.TemplateId
this.msg.Status = data.Status
......@@ -456,11 +458,17 @@ export default {
}, null)
},
AddFinancial: function () {
this.loading = true
this.msg.BankList.push(...this.inList,...this.outList)
let c = this.inList.concat(this.outList);
this.msg.BankList=c;
this.msg.BankList.forEach(x=>{
delete x.shouAccNumList
})
// return;
this.apipost('Financial_post_SetFundTransfer', this.msg, res=>{
if(res.data.resultCode==1){
this.$message.success(res.data.message);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ d78e7967
......@@ -11,7 +11,6 @@
<th width="">出团人数</th>
<th width="">领队</th>
<th width="">导游</th>
<!-- <th width="120">操作</th> -->
</tr>
<tr v-for='item in nav'>
<td>{{item.StartCityNames}}</td>
......@@ -25,427 +24,324 @@
<td>{{item.TotalSeat}}人</td>
<td>{{item.LeaderName}}</td>
<td>{{item.GuideName}}</td>
<!-- <td class="_go_detail">
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'roomReservationsDetails')">酒店</p>
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'bookDinnerStatisticsDetails')">餐食</p>
<p @click="goHotelDetail(item.TCIDS, item.NewCombinationNum, item.TCNUMS, 'admissionStatisticsDetails')">景点</p>
</td> -->
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.BusList.length+1">车辆使用</td>
<td width="100">使用时间</td>
<td width="80">司机姓名</td>
<td width="80">司机电话</td>
<td width="100">车配号</td>
<td width="100">车辆号</td>
<td width="60">用车方式</td>
<td width="60">车费</td>
<td width="120">车费付款方式</td>
<td width="80">高速公路费</td>
<td width="120">高速费用付款方式</td>
<td width="60">停车费</td>
<td width="60">金额小计</td>
<td width="60">总金额</td>
<td width="100">备注</td>
<td width="60">凭证</td>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
<td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td>
<td>{{item.BusCode}}</td>
<td>{{item.BusNum}}</td>
<td>
<span v-if='index==0'>接机</span>
<span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==list.BusList.length-1'>送机</span>
</td>
<td>
{{moneyFormat(item.CostPrice)}}
</td>
<td>
<span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span>
<span v-else>暂无</span>
</td>
<td>
{{moneyFormat(item.HighSpeedPrice)}}
</td>
<td>
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else>暂无</span>
</td>
<td>
{{moneyFormat(item.StopPrice)}}
</td>
<td>
{{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}}
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}}
</td>
<td>
{{item.Remarks}}
</td>
<td>
<div class="uploadListDiv ownScrollbarStyle">
<p v-for="(img,index) in item.VoucherPicList" @click="analyzeItem(item.VoucherPicList,index)">
{{img.FileName}}
</p>
</div>
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td>
</tr>
</tbody>
<tr>
<th colspan="15" class="bgwhite">车辆使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="80">司机姓名</th>
<th width="80">司机电话</th>
<th width="100">车配号</th>
<th width="100">车辆号</th>
<th width="60">用车方式</th>
<th width="60">车费</th>
<th width="120">车费付款方式</th>
<th width="80">高速公路费</th>
<th width="120">高速费用付款方式</th>
<th width="60">停车费</th>
<th width="60">金额小计</th>
<th width="60">总金额</th>
<th width="100">备注</th>
<th width="60">凭证</th>
</tr>
<tr v-for='(item,index) in list.BusList'>
<td>{{item.PlanDateStr}}</td>
<td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td>
<td>{{item.BusCode}}</td>
<td>{{item.BusNum}}</td>
<td>
<span v-if='index==0'>接机</span>
<span v-if='index!=0&&index!=list.BusList.length-1'>{{item.AirportPickUpStr}}</span>
<span v-if='index==list.BusList.length-1'>送机</span>
</td>
<td>
{{moneyFormat(item.CostPrice)}}
</td>
<td>
<span v-if="item.PayType === 1">现付</span>
<span v-else-if="item.PayType === 2">公司结算</span>
<span v-else-if="item.PayType === 3">预付</span>
<span v-else>暂无</span>
</td>
<td>
{{moneyFormat(item.HighSpeedPrice)}}
</td>
<td>
<span v-if="item.HighSpeedPayType === 1">现付</span>
<span v-else-if="item.HighSpeedPayType === 2">公司结算</span>
<span v-else-if="item.HighSpeedPayType === 3">预付</span>
<span v-else>暂无</span>
</td>
<td>
{{moneyFormat(item.StopPrice)}}
</td>
<td>
{{moneyFormat(Number(item.CostPrice)+Number(item.StopPrice))}}
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
{{busTotalPrice(list.BusList)}}
</td>
<td>
{{item.Remarks}}
</td>
<td>
<div class="uploadListDiv ownScrollbarStyle">
<p v-for="(img,index) in item.VoucherPicList" @click="analyzeItem(item.VoucherPicList,index)">
{{img.FileName}}
</p>
</div>
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.SelfPayingIncomeTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.HotelOrderListReport.length+1">酒店使用</td>
<td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">酒店名称</td>
<td width="100">占床/不占床</td>
<td width="80">实际用房数</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="100">备注</td>
</tr>
<tr class="HotelTr" v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<td>{{outItem.UseTimeStr}}</td>
<td>
<div v-for="subItem in outItem.HotelOrderList" style="line-height: inherit;">
{{subItem.HotelName}}
<tr>
<th colspan="14" class="bgwhite">酒店使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="180">酒店名称</th>
<th width="100">占床/不占床</th>
<th width="80">实际用房数</th>
<th width="">房间类型</th>
<th width="">房间数</th>
<th width="80">预定人数</th>
<th width="80">免费人数</th>
<th width="">单价/人</th>
<th width="">金额小计</th>
<th width="">返佣</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="100">备注</th>
</tr>
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="5*outItem.HotelOrderList.length">{{outItem.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="5">{{subItem.HotelName}}
<p class="cursorpointer" style="margin-top:5px;color: blue;">
<a v-if="subItem.ContractUrl" target="_blank" :href="subItem.ContractUrl">手配书</a>
</p>
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
</td>
<td v-if="childIndex==0" :rowspan="5">
{{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 v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.BookNum}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.HotelDiscount}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList" class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.RebateRatio}}%
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</div>
</div>
</td>
<td>
<div v-for="subItem in outItem.HotelOrderList">
</td>
<td>
<span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准双人间</span>
<span v-if="childItem.HouseType === 3">大床房</span>
<span v-if="childItem.HouseType === 4">三人间</span>
<span v-if="childItem.HouseType === 5">司导间</span>
</td>
<td>
{{childItem.HouseTypeCount}}
</td>
<td>
{{childItem.BookNum}}
</td>
<td>
{{childItem.HotelDiscount}}
</td>
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetails')">
{{moneyFormat(childItem.UnitPrice)}}
</p>
</td>
<td>
{{moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount))}}
</td>
<td>
{{childItem.RebateRatio}}%
</td>
<td v-if="childIndex==0" :rowspan="5">
{{hotelTotalPrice(subItem.OrderDetailsList)}}
</td>
<td v-if="childIndex==0" :rowspan="5">
<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>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p>
{{subItem.Remarks}}
</p>
</div>
</div>
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
</td>
</tr>
</tbody>
</td>
<td v-if="childIndex==0" :rowspan="5">
{{subItem.Remarks}}
</td>
</tr>
</template>
</template>
<tr>
<td>总金额</td>
<td colspan="6">
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.DiningList.length+1">餐食使用</td>
<td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">餐厅名称</td>
<td width="100">类别</td>
<td width="">用餐人数</td>
<td width="80">免费人数</td>
<td width="">单价</td>
<td width="">金额小计</td>
<td width="">返佣</td>
<td width="">总金额</td>
<td width="">付款方式</td>
<td width="100">备注</td>
</tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.DiningList'>
<td>{{item.UseTimeStr}}</td>
<td>
<p style="height: 60px!important; display: flex;align-items: center; padding:0 20px;"
v-for="subItem in item.DiningSummaryList">
<tr>
<th colspan="11" class="bgwhite">餐食使用</th>
</tr>
<tr class="title">
<th width="100">使用时间</th>
<th width="180">餐厅名称</th>
<th width="100">类别</th>
<th width="">用餐人数</th>
<th width="80">免费人数</th>
<th width="">单价</th>
<th width="">金额小计</th>
<th width="">返佣</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="100">备注</th>
</tr>
<template v-for='(item,index) in list.DiningList'>
<template v-for="(subItem,subIndex) in item.DiningSummaryList">
<tr v-for="(childItem,childIndex) in subItem.DiningPriceList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="3*item.DiningSummaryList.length">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.RealName? subItem.RealName : subItem.DiningName}}
</p>
</td>
<td>
<p style="height: 60px!important; line-height: 60px;" v-for="subItem in item.DiningSummaryList">
</td>
<td v-if="childIndex==0" :rowspan="3">
{{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>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{childItem.Discount}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList" class="cursorpointer text-decoration"
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
{{childItem.Discount}}
</td>
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'bookDinnerStatisticsDetails')">
{{moneyFormat(childItem.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
<p v-for="childItem in subItem.DiningPriceList">
{{childItem.DiscountPrice}}%
</p>
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
</td>
<td>
{{moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
</td>
<td>
{{childItem.DiscountPrice}}%
</td>
<td v-if="childIndex==0" :rowspan="3">
{{diningTotalPrice(subItem.DiningPriceList)}}
</div>
</td>
<td>
<div v-for="subItem in item.DiningSummaryList">
</td>
<td v-if="childIndex==0" :rowspan="3">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span>
</div>
</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>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
</td>
</tr>
</template>
</template>
<tr>
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.TipTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tbody>
<tr class="title">
<td width="80" class="bgwhite" :rowspan="list.ScenicList.length+1">门票使用</td>
<td width="100">使用时间</td>
<td width="180" style="line-height: inherit;">景点名称</td>
<td width="100">总人数</td>
<td width="">门票类别</td>
<td width="80">免费人数</td>
<td width="">单价</td>
<td width="">金额小计</td>
<td width="">返佣</td>
<td width="">总金额</td>
<td width="">付款方式</td>
<td width="100">备注</td>
</tr>
<tr class="splitP ScenicTr" v-for='(item,index) in list.ScenicList'>
<td>{{item.UseTimeStr}}</td>
<td>
<div style="line-height: inherit; height: auto;" v-for="subItem in item.ScenicStatisticsList">
<tr>
<th colspan="11" class="bgwhite">门票使用</th>
</tr>
<tr>
<th width="100">使用时间</th>
<th width="180">景点名称</th>
<th width="100">总人数</th>
<th width="">门票类别</th>
<th width="80">免费人数</th>
<th width="">单价</th>
<th width="">金额小计</th>
<th width="">返佣</th>
<th width="">总金额</th>
<th width="">付款方式</th>
<th width="100">备注</th>
</tr>
<template v-for='(item,index) in list.ScenicList'>
<template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<td v-if="childIndex==0&&subIndex==0" :rowspan="3*item.ScenicStatisticsList.length">{{item.UseTimeStr}}
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.ScenicName}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.UseAccount}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{peopleStrToWord(o.PeopleType)}}:{{o.PeopleNum}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{o.Discount}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList" class="cursorpointer text-decoration"
</td>
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.PeopleNum}}
</td>
<td>
{{childItem.Discount}}
</td>
<td>
<p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'admissionStatisticsDetails')">
{{moneyFormat(o.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{moneyFormat((o.UsePeopleNum-o.Discount)*o.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
<p v-for="o in subItem.TicketPriceList">
{{o.DiscountPrice}}%
{{moneyFormat(childItem.PeoplePrice)}}
</p>
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
</td>
<td>
{{moneyFormat((childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice)}}
</td>
<td>
{{childItem.DiscountPrice}}%
</td>
<td v-if="childIndex==0" :rowspan="3">
{{scenicTotalPrice(subItem.TicketPriceList)}}
</div>
</td>
<td>
<div v-for="subItem in item.ScenicStatisticsList">
</td>
<td v-if="childIndex==0" :rowspan="3">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else>暂无</span>
</div>
</td>
<td>
<div style="padding: 0 10px;" v-for="subItem in item.ScenicStatisticsList">
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
</div>
</td>
</tr>
<tr>
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</td>
</tr>
</tbody>
</td>
</tr>
</template>
</template>
<tr>
<td>总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="5">
{{moneyFormat(TotalNav.reimburseTotalPrice.PlanTotalPrice)}}
</td>
</tr>
</table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -749,9 +645,12 @@
if (res.data.resultCode == 1) {
this.list = res.data.data;
this.UseCount = this.list.UseCount;
this.list.OtherOrderReportList.OtherList.forEach(x => {
x.CostProject = x.CostProject.toString();
});
if (this.list.OtherOrderReportList.OtherList && this.list.OtherOrderReportList.OtherList.length > 0) {
this.list.OtherOrderReportList.OtherList.forEach(x => {
x.CostProject = x.CostProject.toString();
});
}
} else {
this.$message.error(res.data.message);
}
......@@ -793,184 +692,37 @@
.leaderReimbursementTableNav tr td {
background: #fff;
text-align: center;
height: 40px;
height: 20px;
font-size: 12px;
padding: 0 10px;
}
.leaderReimbursementTableNav ._go_detail p {
cursor: pointer;
line-height: 25px;
}
.leaderReimbursementTable {
background: #d6cece;
width: 100%;
margin: 20px 0;
}
.leaderReimbursementTable tbody {
margin: 10px 0;
border-collapse: collapse;
}
.leaderReimbursementTable tr th {
background: #E6E6E6;
height: 40px;
font-size: 12px;
font-size: 13px;
color: #333;
}
.leaderReimbursementTable tr {
background: #fff;
border: 1px solid #ccc;
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 {
border: 1px solid #ccc;
line-height: 25px;
height: 25px;
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;
}
.leaderReimbursementTable tr td .phoverStype:hover {
text-decoration: underline;
cursor: pointer;
}
.leaderReimbursementTable tr td input[type='text'] {
height: 20px !important;
padding: 0;
background: #fff;
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;
line-height: 25px;
}
</style>
\ No newline at end of file
</style>
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