Skip to content

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

页面修改

parent 8a674765
Show whitespace changes
Inline Side-by-side
Showing with 307 additions and 260 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ ab0f88f9
...@@ -472,6 +472,7 @@ ...@@ -472,6 +472,7 @@
<el-option :label="$t('ground.yuejie')" :value='9'></el-option> <el-option :label="$t('ground.yuejie')" :value='9'></el-option>
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
<el-option label="转账" :value='14'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
...@@ -493,6 +494,7 @@ ...@@ -493,6 +494,7 @@
<el-option :label="$t('ground.gongsihetzf')" :value='6'></el-option> <el-option :label="$t('ground.gongsihetzf')" :value='6'></el-option>
<el-option :label="$t('ground.lingduidydf')" :value='10'></el-option> <el-option :label="$t('ground.lingduidydf')" :value='10'></el-option>
<el-option :label="$t('ground.shuaka')" :value='11'></el-option> <el-option :label="$t('ground.shuaka')" :value='11'></el-option>
<el-option label="转账" :value='14'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ ab0f88f9
<template> <template>
<div class="mb30" v-loading='loading'> <div class="mb30" v-loading='loading'>
<div style="display: flex;justify-content: end;margin-top: 10px;margin-bottom: 10px;"> <div style="display: flex;justify-content: end;margin-top: 10px;margin-bottom: 10px;">
<p><span class="groupTourOrderByTuan_ico"><i style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span> <p><span class="groupTourOrderByTuan_ico"><i
<span class="groupTourOrderByTuan_ico"><i style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span> style="background-color:#3FC4FF"></i><span>{{$t('fnc.yidadan')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p> <span class="groupTourOrderByTuan_ico"><i
style="background-color:#F1416C"></i><span>{{$t('fnc.yhcnyshenhe')}}</span></span>
<span class="groupTourOrderByTuan_ico"><i
style="background-color:#ff9800"></i><span>{{$t('fnc.ytongguo')}}</span></span></p>
</div> </div>
<table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTableNav" border="0" cellspacing="1" cellpadding="0">
<tr> <tr>
...@@ -87,7 +90,10 @@ ...@@ -87,7 +90,10 @@
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="90">使用时间</th> <th width="90">使用时间</th>
<th width="55"><el-checkbox :indeterminate="isIndeterminate1" v-model="checkedAll1" @change="getCheckedAll(1)" :disabled="checkedDisabled1"></el-checkbox></th> <th width="55">
<el-checkbox :indeterminate="isIndeterminate1" v-model="checkedAll1" @change="getCheckedAll(1)"
:disabled="checkedDisabled1"></el-checkbox>
</th>
<th width="80">司机姓名</th> <th width="80">司机姓名</th>
<th width="80">司机电话</th> <th width="80">司机电话</th>
<th width="90">车牌号</th> <th width="90">车牌号</th>
...@@ -107,7 +113,9 @@ ...@@ -107,7 +113,9 @@
</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><el-checkbox v-model="item.checked" @change="getChecked(1)"></el-checkbox></td> <td>
<el-checkbox v-model="item.checked" @change="getChecked(1)"></el-checkbox>
</td>
<td>{{item.DriverName}}</td> <td>{{item.DriverName}}</td>
<td>{{item.DriverTel}}</td> <td>{{item.DriverTel}}</td>
<td>{{item.BusNum}}</td> <td>{{item.BusNum}}</td>
...@@ -167,7 +175,7 @@ ...@@ -167,7 +175,7 @@
<span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span> <span v-else-if="item.HighSpeedPayType === 7">自由活动-无用车</span>
<span v-else-if="item.HighSpeedPayType === 8">酒店接送</span> <span v-else-if="item.HighSpeedPayType === 8">酒店接送</span>
<span v-else></span> <span v-else></span>
<br/> <br />
<span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span> <span v-show="item.HighSpeedPayType==6">付款团号：{{item.PayTypeTCNUM}}</span>
</td> </td>
<td> <td>
...@@ -191,9 +199,8 @@ ...@@ -191,9 +199,8 @@
<td> <td>
<div class="row FrIDBox"> <div class="row FrIDBox">
<template v-for="(x, i) in item.FrList"> <template v-for="(x, i) in item.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -205,9 +212,8 @@ ...@@ -205,9 +212,8 @@
<td>成本单据</td> <td>成本单据</td>
<td colspan="28"> <td colspan="28">
<template v-for="(x, i) in FrListOthen2"> <template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -234,7 +240,8 @@ ...@@ -234,7 +240,8 @@
<input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" /> <input type="button" class="normalBtn" value="新增付款" @click="goUrl(1,2)" />
</span> </span>
</p> </p>
<table v-if="[131,14, 90].includes(myLineId)" class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table v-if="[131,14, 90].includes(myLineId)" class="leaderReimbursementTable" border="0" cellspacing="1"
cellpadding="0">
<tr> <tr>
<th colspan="28" class="bgwhite">酒店使用 </th> <th colspan="28" class="bgwhite">酒店使用 </th>
</tr> </tr>
...@@ -247,7 +254,10 @@ ...@@ -247,7 +254,10 @@
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="90">使用时间</th> <th width="90">使用时间</th>
<th><el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)" :disabled="checkedDisabled2"></el-checkbox></th> <th>
<el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)"
:disabled="checkedDisabled2"></el-checkbox>
</th>
<th width="150">酒店名称</th> <th width="150">酒店名称</th>
<th width="150">手配书</th> <th width="150">手配书</th>
<th width="150">更换酒店</th> <th width="150">更换酒店</th>
...@@ -282,7 +292,8 @@ ...@@ -282,7 +292,8 @@
style="white-space:nowrap; ">{{outItem.UseTimeStr}} style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td> </td>
<td> <td>
<el-checkbox :indeterminate="isIndeterminate2" v-model="subItem.checked" @change="getChecked(2)"></el-checkbox> <el-checkbox :indeterminate="isIndeterminate2" v-model="subItem.checked" @change="getChecked(2)">
</el-checkbox>
</td> </td>
<td v-if="childIndex==0" :rowspan="6" style="text-align:left; "> <td v-if="childIndex==0" :rowspan="6" style="text-align:left; ">
<template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''"> <template v-if="subItem.HotelName!=subItem.NewHotelName && subItem.NewHotelName!=''">
...@@ -411,6 +422,7 @@ ...@@ -411,6 +422,7 @@
<span v-else-if="subItem.PayStyle === 9">月结</span> <span v-else-if="subItem.PayStyle === 9">月结</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span> <span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else-if="subItem.PayStyle === 10">领队导游垫付</span> <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
<span v-else-if="subItem.PayStyle === 14">转账</span>
<span v-else></span> <span v-else></span>
<br /> <br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
...@@ -433,6 +445,7 @@ ...@@ -433,6 +445,7 @@
<span v-else-if="subItem.DMCPayType === 9">月结</span> <span v-else-if="subItem.DMCPayType === 9">月结</span>
<span v-else-if="subItem.DMCPayType === 11">刷卡</span> <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
<span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span> <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
<span v-else-if="subItem.DMCPayType === 14">转账</span>
<br /> <br />
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
...@@ -471,9 +484,8 @@ ...@@ -471,9 +484,8 @@
</td> </td>
<td> <td>
<template v-for="(x, i) in subItem.FrList"> <template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -486,9 +498,8 @@ ...@@ -486,9 +498,8 @@
<td>成本单据</td> <td>成本单据</td>
<td colspan="28"> <td colspan="28">
<template v-for="(x, i) in FrListOthen2"> <template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -524,7 +535,10 @@ ...@@ -524,7 +535,10 @@
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="90">使用时间</th> <th width="90">使用时间</th>
<th width="50"><el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)" :disabled="checkedDisabled2"></el-checkbox></th> <th width="50">
<el-checkbox :indeterminate="isIndeterminate2" v-model="checkedAll2" @change="getCheckedAll(2)"
:disabled="checkedDisabled2"></el-checkbox>
</th>
<th width="150">酒店名称</th> <th width="150">酒店名称</th>
<th width="150">手配书</th> <th width="150">手配书</th>
<th width="150">更换酒店</th> <th width="150">更换酒店</th>
...@@ -555,8 +569,7 @@ ...@@ -555,8 +569,7 @@
<template v-for='(outItem,outIndex) in list.HotelOrderListReport'> <template v-for='(outItem,outIndex) in list.HotelOrderListReport'>
<template v-for="(subItem,subIndex) in outItem.HotelOrderList"> <template v-for="(subItem,subIndex) in outItem.HotelOrderList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList"> <tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<td <td style="white-space:nowrap; ">{{outItem.UseTimeStr}}
style="white-space:nowrap; ">{{outItem.UseTimeStr}}
</td> </td>
<td> <td>
<el-checkbox v-model="subItem.checked" @change="getChecked(2)"></el-checkbox> <el-checkbox v-model="subItem.checked" @change="getChecked(2)"></el-checkbox>
...@@ -576,13 +589,13 @@ ...@@ -576,13 +589,13 @@
<td style="text-align:left;color:red; "> <td style="text-align:left;color:red; ">
{{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}} {{subItem.HotelName!=subItem.NewHotelName?""+subItem.NewHotelName:""}}
</td> </td>
<td > <td>
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}} {{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}
</td> </td>
<td > <td>
{{subItem.RealityHouseTypeCount}} {{subItem.RealityHouseTypeCount}}
</td> </td>
<td > <td>
<span v-if="childItem.HouseType === 1">单间</span> <span v-if="childItem.HouseType === 1">单间</span>
<span v-if="childItem.HouseType === 2">标准间</span> <span v-if="childItem.HouseType === 2">标准间</span>
<span v-if="childItem.HouseType === 3">大床间</span> <span v-if="childItem.HouseType === 3">大床间</span>
...@@ -602,25 +615,25 @@ ...@@ -602,25 +615,25 @@
不占床 不占床
</span> </span>
</td> </td>
<td > <td>
{{childItem.HouseTypeCount}} {{childItem.HouseTypeCount}}
</td> </td>
<td > <td>
{{childItem.BookNum}} {{childItem.BookNum}}
</td> </td>
<td > <td>
{{childItem.HotelDiscount}} {{childItem.HotelDiscount}}
</td> </td>
<td style="white-space:nowrap; " > <td style="white-space:nowrap; ">
<p class="cursorpointer text-decoration" <p class="cursorpointer text-decoration"
@click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetailsNew')"> @click="goHotelDetail(subItem.TCID, subItem.NewCombinationNum, subItem.TCNUM, 'roomReservationsDetailsNew')">
{{moneyFormat(childItem.UnitPrice)}} {{moneyFormat(childItem.UnitPrice)}}
</p> </p>
</td> </td>
<td style="white-space:nowrap; " > <td style="white-space:nowrap; ">
{{childItem.TotalPrice}} {{childItem.TotalPrice}}
</td> </td>
<td > <td>
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<span style="color:green">含税</span> <span style="color:green">含税</span>
</template> </template>
...@@ -628,10 +641,10 @@ ...@@ -628,10 +641,10 @@
<span style="color:red"> 不含税</span> <span style="color:red"> 不含税</span>
</template> </template>
</td> </td>
<td > <td>
{{childItem.RebateRatio}} % {{childItem.RebateRatio}} %
</td> </td>
<td style="white-space:nowrap; " > <td style="white-space:nowrap; ">
<!--含税--> <!--含税-->
<template v-if="subItem.RebateType==1"> <template v-if="subItem.RebateType==1">
<!--税别--> <!--税别-->
...@@ -653,16 +666,16 @@ ...@@ -653,16 +666,16 @@
</template> </template>
</template> </template>
</td> </td>
<td > <td>
{{subItem.InTangTax}} {{subItem.InTangTax}}
</td> </td>
<td > <td>
{{subItem.CityTax}} {{subItem.CityTax}}
</td> </td>
<td > <td>
{{subItem.ParkFee}} {{subItem.ParkFee}}
</td> </td>
<td > <td>
<template v-if="subItem.TaxType==1"> <template v-if="subItem.TaxType==1">
税入 税入
</template> </template>
...@@ -673,7 +686,7 @@ ...@@ -673,7 +686,7 @@
<td style="white-space:nowrap; "> <td style="white-space:nowrap; ">
{{childItem.TotalPrice}} {{childItem.TotalPrice}}
</td> </td>
<td > <td>
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span> <span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 3">实物抵扣</span> <span v-else-if="subItem.PayStyle === 3">实物抵扣</span>
...@@ -683,11 +696,12 @@ ...@@ -683,11 +696,12 @@
<span v-else-if="subItem.PayStyle === 9">月结</span> <span v-else-if="subItem.PayStyle === 9">月结</span>
<span v-else-if="subItem.PayStyle === 11">刷卡</span> <span v-else-if="subItem.PayStyle === 11">刷卡</span>
<span v-else-if="subItem.PayStyle === 10">领队导游垫付</span> <span v-else-if="subItem.PayStyle === 10">领队导游垫付</span>
<span v-else-if="subItem.PayStyle === 14">转账</span>
<span v-else></span> <span v-else></span>
<br /> <br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td > <td>
<template v-if="IsShowRMB"> <template v-if="IsShowRMB">
<span>人民币</span> <span>人民币</span>
</template> </template>
...@@ -695,7 +709,7 @@ ...@@ -695,7 +709,7 @@
{{GetCurrency(subItem.CurrencyId)}} {{GetCurrency(subItem.CurrencyId)}}
</template> </template>
</td> </td>
<td > <td>
<span v-if="subItem.DMCPayType === 1">现付</span> <span v-if="subItem.DMCPayType === 1">现付</span>
<span v-else-if="subItem.DMCPayType === 2">签单</span> <span v-else-if="subItem.DMCPayType === 2">签单</span>
<span v-else-if="subItem.DMCPayType === 3">实物抵扣</span> <span v-else-if="subItem.DMCPayType === 3">实物抵扣</span>
...@@ -705,10 +719,11 @@ ...@@ -705,10 +719,11 @@
<span v-else-if="subItem.DMCPayType === 9">月结</span> <span v-else-if="subItem.DMCPayType === 9">月结</span>
<span v-else-if="subItem.DMCPayType === 11">刷卡</span> <span v-else-if="subItem.DMCPayType === 11">刷卡</span>
<span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span> <span v-else-if="subItem.DMCPayType === 10">领队导游垫付</span>
<span v-else-if="subItem.DMCPayType === 14">转账</span>
<br /> <br />
<span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.DMCPayType==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td > <td>
<span> <span>
{{subItem.SupplierName}} {{subItem.SupplierName}}
<br /> <br />
...@@ -728,7 +743,7 @@ ...@@ -728,7 +743,7 @@
<div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div> <div v-if="subItem.IsHaveShouPeiFee==1" style="color:red;">手配费:{{subItem.ShouPeiMoney}}</div>
</td> </td>
<td > <td>
<template v-if="subItem.DMCState==1"> <template v-if="subItem.DMCState==1">
<span style="color: green;">地接-OK</span> <span style="color: green;">地接-OK</span>
</template> </template>
...@@ -739,14 +754,13 @@ ...@@ -739,14 +754,13 @@
<span style="color:red;">地接-未操作</span> <span style="color:red;">地接-未操作</span>
</template> </template>
</td> </td>
<td > <td>
{{subItem.Remarks}} {{subItem.Remarks}}
</td> </td>
<td> <td>
<template v-for="(x, i) in subItem.FrList"> <template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -759,9 +773,8 @@ ...@@ -759,9 +773,8 @@
<td>成本单据</td> <td>成本单据</td>
<td colspan="28"> <td colspan="28">
<template v-for="(x, i) in FrListOthen2"> <template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -796,7 +809,10 @@ ...@@ -796,7 +809,10 @@
</tr> </tr>
<tr class="title"> <tr class="title">
<th width="100">使用时间</th> <th width="100">使用时间</th>
<th width="55"><el-checkbox :indeterminate="isIndeterminate3" v-model="checkedAll3" @change="getCheckedAll(3)" :disabled="checkedDisabled3"></el-checkbox></th> <th width="55">
<el-checkbox :indeterminate="isIndeterminate3" v-model="checkedAll3" @change="getCheckedAll(3)"
:disabled="checkedDisabled3"></el-checkbox>
</th>
<th width="180">餐厅名称</th> <th width="180">餐厅名称</th>
<th width="100">类别</th> <th width="100">类别</th>
<th width="100">总人数</th> <th width="100">总人数</th>
...@@ -877,9 +893,8 @@ ...@@ -877,9 +893,8 @@
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<template v-for="(x, i) in subItem.FrList"> <template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -892,9 +907,8 @@ ...@@ -892,9 +907,8 @@
<td>成本单据</td> <td>成本单据</td>
<td colspan="28"> <td colspan="28">
<template v-for="(x, i) in FrListOthen2"> <template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)"placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -929,7 +943,10 @@ ...@@ -929,7 +943,10 @@
</tr> </tr>
<tr> <tr>
<th width="100">使用时间</th> <th width="100">使用时间</th>
<th width="55"><el-checkbox :indeterminate="isIndeterminate4" v-model="checkedAll4" @change="getCheckedAll(4)" :disabled="checkedDisabled4"></el-checkbox></th> <th width="55">
<el-checkbox :indeterminate="isIndeterminate4" v-model="checkedAll4" @change="getCheckedAll(4)"
:disabled="checkedDisabled4"></el-checkbox>
</th>
<th width="180">景点名称</th> <th width="180">景点名称</th>
<th width="100">总人数</th> <th width="100">总人数</th>
<th width="">门票类别</th> <th width="">门票类别</th>
...@@ -986,7 +1003,7 @@ ...@@ -986,7 +1003,7 @@
<span v-else-if="subItem.PayStyle === 6">公司合团支付</span> <span v-else-if="subItem.PayStyle === 6">公司合团支付</span>
<span v-else-if="subItem.PayStyle === 12">网订</span> <span v-else-if="subItem.PayStyle === 12">网订</span>
<span v-else></span> <span v-else></span>
<br/> <br />
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span> <span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td> </td>
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
...@@ -995,8 +1012,7 @@ ...@@ -995,8 +1012,7 @@
<td v-if="childIndex==0" :rowspan="3"> <td v-if="childIndex==0" :rowspan="3">
<template v-for="(x, i) in subItem.FrList"> <template v-for="(x, i) in subItem.FrList">
<el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -1010,8 +1026,7 @@ ...@@ -1010,8 +1026,7 @@
<td colspan="28"> <td colspan="28">
<template v-for="(x, i) in FrListOthen2"> <template v-for="(x, i) in FrListOthen2">
<el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom"> <el-tooltip class="item" effect="dark" :content="getTips(x)" placement="bottom">
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
:class="{'bgD9F3FF':x.Status==1,'bgFAEAED':x.Status==2,'bjFFF3E0':x.Status==3,
'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}" 'c3FC4FF':x.Status==1,'cF1416C':x.Status==2,'cff9800':x.Status==3}"
@click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span> @click="openDetails(x)">{{ x.FrID }}/{{x.RemitterName}}</span>
</el-tooltip> </el-tooltip>
...@@ -1053,8 +1068,7 @@ ...@@ -1053,8 +1068,7 @@
</tr> </tr>
<tr v-for="(item,index) in otherList"> <tr v-for="(item,index) in otherList">
<td> <td>
<span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" <span class="cursor-pointer radius5 mr mb px5" style="margin: 3px;white-space: nowrap;" :class="{'bgD9F3FF':item.Status==1,'bgFAEAED':item.Status==2,'bjFFF3E0':item.Status==3,
:class="{'bgD9F3FF':item.Status==1,'bgFAEAED':item.Status==2,'bjFFF3E0':item.Status==3,
'c3FC4FF':item.Status==1,'cF1416C':item.Status==2,'cff9800':item.Status==3}" 'c3FC4FF':item.Status==1,'cF1416C':item.Status==2,'cff9800':item.Status==3}"
@click="openDetails(item)">{{ item.FrID }}</span> @click="openDetails(item)">{{ item.FrID }}</span>
</td> </td>
...@@ -1370,15 +1384,15 @@ ...@@ -1370,15 +1384,15 @@
commonHotelInfo commonHotelInfo
}, },
methods: { methods: {
getTips(x){ getTips(x) {
let title = `付款账号：${x.AccountNumber},原币：${String(x.WBMoney)}` let title = `付款账号：${x.AccountNumber},原币：${String(x.WBMoney)}`
let text = [] let text = []
x.TradeWayList.forEach(childItem=>{ x.TradeWayList.forEach(childItem => {
let i = `支付方式：${childItem.Alias}币种：${childItem.CurrencyName} let i = `支付方式：${childItem.Alias}币种：${childItem.CurrencyName}
${childItem.OriginalMoney*childItem.Rate}汇率：${childItem.Rate}` ${childItem.OriginalMoney*childItem.Rate}汇率：${childItem.Rate}`
text.push(i) text.push(i)
}) })
return title+text.join(',') return title + text.join(',')
}, },
//其他支出跳转制单 //其他支出跳转制单
AddOutDetail() { AddOutDetail() {
...@@ -1394,69 +1408,70 @@ ...@@ -1394,69 +1408,70 @@
name: "ChoiceAddFinancialDocuments", name: "ChoiceAddFinancialDocuments",
query: { query: {
Type: 2, Type: 2,
companyID: this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId?this.msgList[0].OutBranchId:this.$route.query.OutBranchId, companyID: this.msgList && this.msgList.length > 0 && this.msgList[0].OutBranchId ? this.msgList[0]
.OutBranchId : this.$route.query.OutBranchId,
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj)
} }
}); });
}, },
goUrl(_orderSource, _type) { goUrl(_orderSource, _type) {
if(_orderSource==8){ if (_orderSource == 8) {
this.AddOutDetail() this.AddOutDetail()
return return
} }
let ids = [] let ids = []
let title let title
if(_orderSource==5){ if (_orderSource == 5) {
title = '车辆' title = '车辆'
this.list.BusList.forEach(x=>{ this.list.BusList.forEach(x => {
if(x.checked){ if (x.checked) {
ids.push(x.Id) ids.push(x.Id)
} }
}) })
}else if(_orderSource==1){ } else if (_orderSource == 1) {
title = '酒店' title = '酒店'
this.list.HotelOrderListReport.forEach(x=>{ this.list.HotelOrderListReport.forEach(x => {
x.HotelOrderList.forEach(y=>{ x.HotelOrderList.forEach(y => {
if(y.checked){ if (y.checked) {
ids.push(y.OrderID) ids.push(y.OrderID)
} }
}) })
}) })
}else if(_orderSource==2){ } else if (_orderSource == 2) {
title = '餐食' title = '餐食'
this.list.DiningList.forEach(x=>{ this.list.DiningList.forEach(x => {
x.DiningSummaryList.forEach(y=>{ x.DiningSummaryList.forEach(y => {
if(y.checked){ if (y.checked) {
ids.push(y.ID) ids.push(y.ID)
} }
}) })
}) })
}else if(_orderSource==3){ } else if (_orderSource == 3) {
title = '门票' title = '门票'
this.list.ScenicList.forEach(x=>{ this.list.ScenicList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{ x.ScenicStatisticsList.forEach(y => {
if(y.checked){ if (y.checked) {
ids.push(y.ID) ids.push(y.ID)
} }
}) })
}) })
}else if(_orderSource==4){//其他 } else if (_orderSource == 4) { //其他
this.list.ScenicList.forEach(x=>{ this.list.ScenicList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{ x.ScenicStatisticsList.forEach(y => {
if(y.checked){ if (y.checked) {
ids.push(y.ID) ids.push(y.ID)
} }
}) })
}) })
} }
if(ids.length==0){ if (ids.length == 0) {
this.Info(`请勾选${title}需要付款的数据！`) this.Info(`请勾选${title}需要付款的数据！`)
return return
} }
let TCIDARR = [] let TCIDARR = []
let id = []; let id = [];
if(this.msgList&&this.msgList.length>0&&this.msgList[0].LineId==this.myLineId){ if (this.msgList && this.msgList.length > 0 && this.msgList[0].LineId == this.myLineId) {
if (_orderSource === 1 && _type === 2) { if (_orderSource === 1 && _type === 2) {
id = [94] id = [94]
...@@ -1469,8 +1484,7 @@ ...@@ -1469,8 +1484,7 @@
else if (_orderSource === 3 && _type === 2) { else if (_orderSource === 3 && _type === 2) {
id = [97] id = [97]
} }
} } else {
else{
// _orderSource 1 酒店 2餐厅 5 车资 // _orderSource 1 酒店 2餐厅 5 车资
if (_orderSource === 1 && _type === 2) { if (_orderSource === 1 && _type === 2) {
...@@ -1502,7 +1516,8 @@ ...@@ -1502,7 +1516,8 @@
query: { query: {
'Type': _type, 'Type': _type,
'path': 'teamRevenueExpenditure', 'path': 'teamRevenueExpenditure',
'companyID': this.msgList&&this.msgList.length>0&&this.msgList[0].OutBranchId?this.msgList[0].OutBranchId:this.$route.query.OutBranchId, 'companyID': this.msgList && this.msgList.length > 0 && this.msgList[0].OutBranchId ? this.msgList[0]
.OutBranchId : this.$route.query.OutBranchId,
'templateID': id, 'templateID': id,
'blank': 'y', 'blank': 'y',
'orderObj': JSON.stringify(orderObj), 'orderObj': JSON.stringify(orderObj),
...@@ -2031,95 +2046,123 @@ ...@@ -2031,95 +2046,123 @@
err => {} err => {}
); );
}, },
getChecked(type){ getChecked(type) {
let checkeds = [] let checkeds = []
let checkedsAll = [] let checkedsAll = []
if(type==1){ if (type == 1) {
this.isIndeterminate1 = false this.isIndeterminate1 = false
this.list.BusList.forEach(x=>{ this.list.BusList.forEach(x => {
checkedsAll.push(x.checked) checkedsAll.push(x.checked)
if(x.checked){ if (x.checked) {
checkeds.push(x.checked) checkeds.push(x.checked)
} }
}) })
this.getNewChecked(checkeds,checkedsAll,type) this.getNewChecked(checkeds, checkedsAll, type)
}else if(type==2){ } else if (type == 2) {
this.isIndeterminate2 = false this.isIndeterminate2 = false
this.list.HotelOrderListReport.forEach(x=>{ this.list.HotelOrderListReport.forEach(x => {
x.HotelOrderList.forEach(y=>{ x.HotelOrderList.forEach(y => {
checkedsAll.push(y.checked) checkedsAll.push(y.checked)
if(y.checked){ if (y.checked) {
checkeds.push(y.checked) checkeds.push(y.checked)
} }
}) })
}) })
this.getNewChecked(checkeds,checkedsAll,type) this.getNewChecked(checkeds, checkedsAll, type)
}else if(type==3){ } else if (type == 3) {
this.isIndeterminate3 = false this.isIndeterminate3 = false
this.list.DiningList.forEach(x=>{ this.list.DiningList.forEach(x => {
x.DiningSummaryList.forEach(y=>{ x.DiningSummaryList.forEach(y => {
checkedsAll.push(y.checked) checkedsAll.push(y.checked)
if(y.checked){ if (y.checked) {
checkeds.push(y.checked) checkeds.push(y.checked)
} }
}) })
}) })
this.getNewChecked(checkeds,checkedsAll,type) this.getNewChecked(checkeds, checkedsAll, type)
}else if(type==4){ } else if (type == 4) {
this.isIndeterminate4 = false this.isIndeterminate4 = false
this.list.ScenicList.forEach(x=>{ this.list.ScenicList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{ x.ScenicStatisticsList.forEach(y => {
checkedsAll.push(y.checked) checkedsAll.push(y.checked)
if(y.checked){ if (y.checked) {
checkeds.push(y.checked) checkeds.push(y.checked)
} }
}) })
}) })
this.getNewChecked(checkeds,checkedsAll,type) this.getNewChecked(checkeds, checkedsAll, type)
} }
this.$forceUpdate() this.$forceUpdate()
}, },
getNewChecked(checkeds,checkedsAll,type){ getNewChecked(checkeds, checkedsAll, type) {
if(checkeds.length>0&&checkeds.length==checkedsAll.length){ if (checkeds.length > 0 && checkeds.length == checkedsAll.length) {
if(type==1){ this.checkedAll1 = true } if (type == 1) {
else if(type==2){ this.checkedAll2 = true } this.checkedAll1 = true
else if(type==3){ this.checkedAll3 = true } } else if (type == 2) {
else if(type==4){ this.checkedAll4 = true } this.checkedAll2 = true
}else if(checkeds.length>0&&checkeds.length<checkedsAll.length){ } else if (type == 3) {
if(type==1){ this.isIndeterminate1 = true } this.checkedAll3 = true
if(type==2){ this.isIndeterminate2 = true } } else if (type == 4) {
else if(type==3){ this.isIndeterminate3 = true } this.checkedAll4 = true
else if(type==4){this.isIndeterminate4 = true} }
}else if(checkeds.length==0){ } else if (checkeds.length > 0 && checkeds.length < checkedsAll.length) {
if(type==1){ this.checkedAll1 = false } if (type == 1) {
if(type==2){ this.checkedAll2 = false } this.isIndeterminate1 = true
else if(type==3){ this.checkedAll3 = false } }
else if(type==4){ this.checkedAll4 = false } if (type == 2) {
this.isIndeterminate2 = true
} else if (type == 3) {
this.isIndeterminate3 = true
} else if (type == 4) {
this.isIndeterminate4 = true
}
} else if (checkeds.length == 0) {
if (type == 1) {
this.checkedAll1 = false
}
if (type == 2) {
this.checkedAll2 = false
} else if (type == 3) {
this.checkedAll3 = false
} else if (type == 4) {
this.checkedAll4 = false
}
} }
}, },
// 全选 // 全选
getCheckedAll(type){ getCheckedAll(type) {
this.checkedType = type this.checkedType = type
if(type==1){ if (type == 1) {
this.isIndeterminate1 = false this.isIndeterminate1 = false
this.checkedList(this.list.BusList,type) this.checkedList(this.list.BusList, type)
}else if(type==2){ } else if (type == 2) {
this.isIndeterminate2 = false this.isIndeterminate2 = false
this.checkedList(this.list.HotelOrderListReport,type) this.checkedList(this.list.HotelOrderListReport, type)
}else if(type==3){ } else if (type == 3) {
this.isIndeterminate3 = false this.isIndeterminate3 = false
this.checkedList(this.list.DiningList,type) this.checkedList(this.list.DiningList, type)
}else if(type==4){ } else if (type == 4) {
this.isIndeterminate4 = false this.isIndeterminate4 = false
this.checkedList(this.list.ScenicList,type) this.checkedList(this.list.ScenicList, type)
} }
}, },
checkedList(arrList,type){ checkedList(arrList, type) {
arrList.forEach(x=>{ arrList.forEach(x => {
if(type==1){x.checked = this.checkedAll1} if (type == 1) {
else if(type==2){x.HotelOrderList.forEach(y=>{y.checked = this.checkedAll2})} x.checked = this.checkedAll1
else if(type==3){x.DiningSummaryList.forEach(y=>{y.checked = this.checkedAll3})} } else if (type == 2) {
else if(type==4){x.ScenicStatisticsList.forEach(y=>{y.checked = this.checkedAll4})} x.HotelOrderList.forEach(y => {
y.checked = this.checkedAll2
})
} else if (type == 3) {
x.DiningSummaryList.forEach(y => {
y.checked = this.checkedAll3
})
} else if (type == 4) {
x.ScenicStatisticsList.forEach(y => {
y.checked = this.checkedAll4
})
}
}) })
}, },
getList() { getList() {
...@@ -2131,27 +2174,27 @@ ...@@ -2131,27 +2174,27 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data let data = res.data.data
let arrList = function(arr){ let arrList = function (arr) {
arr.forEach(x=>{ arr.forEach(x => {
x.checked = false x.checked = false
x.FrList = [] x.FrList = []
}) })
} }
arrList(data.BusList)//车 arrList(data.BusList) //车
data.HotelOrderListReport.forEach(x=>{ data.HotelOrderListReport.forEach(x => {
arrList(x.HotelOrderList)//酒店 arrList(x.HotelOrderList) //酒店
}) })
data.DiningList.forEach(x=>{ data.DiningList.forEach(x => {
arrList(x.DiningSummaryList)//餐食 arrList(x.DiningSummaryList) //餐食
}) })
data.ScenicList.forEach(x=>{ data.ScenicList.forEach(x => {
arrList(x.ScenicStatisticsList)//门票 arrList(x.ScenicStatisticsList) //门票
}) })
arrList(data.OtherOrderReportList)//其它 arrList(data.OtherOrderReportList) //其它
this.list = data; this.list = data;
if(![131,14, 90].includes(this.myLineId)) { if (![131, 14, 90].includes(this.myLineId)) {
this.list.HotelOrderListReport.forEach(item => { this.list.HotelOrderListReport.forEach(item => {
item.HotelOrderList.forEach(item => { item.HotelOrderList.forEach(item => {
item.OrderDetailsList = item.OrderDetailsList.filter(item => item.HouseType === 2) item.OrderDetailsList = item.OrderDetailsList.filter(item => item.HouseType === 2)
...@@ -2168,10 +2211,10 @@ ...@@ -2168,10 +2211,10 @@
x.CostProject = x.CostProject.toString(); x.CostProject = x.CostProject.toString();
}); });
} }
this.checkedDisabled1 = this.list.BusList.length>0?false:true this.checkedDisabled1 = this.list.BusList.length > 0 ? false : true
this.checkedDisabled2 = this.list.HotelOrderListReport.length>0?false:true this.checkedDisabled2 = this.list.HotelOrderListReport.length > 0 ? false : true
this.checkedDisabled3 = this.list.DiningList.length>0?false:true this.checkedDisabled3 = this.list.DiningList.length > 0 ? false : true
this.checkedDisabled4 = this.list.ScenicList.length>0?false:true this.checkedDisabled4 = this.list.ScenicList.length > 0 ? false : true
this.GetDiJieScheduleFinanceList() this.GetDiJieScheduleFinanceList()
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
...@@ -2185,78 +2228,78 @@ ...@@ -2185,78 +2228,78 @@
TCID: this.$route.query.id TCID: this.$route.query.id
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
res.data.data.forEach(item=>{ res.data.data.forEach(item => {
if(item.EduCommissionEmp==null||item.EduCommissionEmp==""){ if (item.EduCommissionEmp == null || item.EduCommissionEmp == "") {
this.getOrderList('',item,2,item.OrderSource) this.getOrderList('', item, 2, item.OrderSource)
} }
if(item.OrderSource==5){ if (item.OrderSource == 5) {
this.list.BusList.forEach(x=>{ this.list.BusList.forEach(x => {
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[] let EduCommissionEmp = item.EduCommissionEmp ? item.EduCommissionEmp.split(',') : []
EduCommissionEmp.forEach(id=>{ EduCommissionEmp.forEach(id => {
if(x.Id==id){ if (x.Id == id) {
this.getOrderList(x,item,1) this.getOrderList(x, item, 1)
} }
}) })
}) })
}else if(item.OrderSource==1){ } else if (item.OrderSource == 1) {
this.list.HotelOrderListReport.forEach(x=>{ this.list.HotelOrderListReport.forEach(x => {
x.HotelOrderList.forEach(y=>{ x.HotelOrderList.forEach(y => {
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[] let EduCommissionEmp = item.EduCommissionEmp ? item.EduCommissionEmp.split(',') : []
EduCommissionEmp.forEach(id=>{ EduCommissionEmp.forEach(id => {
if(y.OrderID==id){ if (y.OrderID == id) {
this.getOrderList(y,item,1) this.getOrderList(y, item, 1)
} }
}) })
}) })
}) })
}else if(item.OrderSource==2){ } else if (item.OrderSource == 2) {
this.list.DiningList.forEach(x=>{ this.list.DiningList.forEach(x => {
x.DiningSummaryList.forEach(y=>{ x.DiningSummaryList.forEach(y => {
let state let state
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[] let EduCommissionEmp = item.EduCommissionEmp ? item.EduCommissionEmp.split(',') : []
EduCommissionEmp.forEach(id=>{ EduCommissionEmp.forEach(id => {
state = false state = false
if(y.ID==id){ if (y.ID == id) {
state = true state = true
this.getOrderList(y,item,1) this.getOrderList(y, item, 1)
}else{ } else {
if(!state){ if (!state) {
state = true state = true
this.getOrderList(y,item,2,item.OrderSource) this.getOrderList(y, item, 2, item.OrderSource)
} }
} }
}) })
}) })
}) })
}else if(item.OrderSource==3){ } else if (item.OrderSource == 3) {
this.list.ScenicList.forEach(x=>{ this.list.ScenicList.forEach(x => {
x.ScenicStatisticsList.forEach(y=>{ x.ScenicStatisticsList.forEach(y => {
let state let state
let EduCommissionEmp = item.EduCommissionEmp?item.EduCommissionEmp.split(','):[] let EduCommissionEmp = item.EduCommissionEmp ? item.EduCommissionEmp.split(',') : []
EduCommissionEmp.forEach(id=>{ EduCommissionEmp.forEach(id => {
state = false state = false
if(y.ID==id){ if (y.ID == id) {
state = true state = true
this.getOrderList(y,item,1) this.getOrderList(y, item, 1)
}else{ } else {
if(!state){ if (!state) {
state = true state = true
this.getOrderList(y,item,2,item.OrderSource) this.getOrderList(y, item, 2, item.OrderSource)
} }
} }
}) })
}) })
}) })
}else{ } else {
this.otherList.push(item) this.otherList.push(item)
} }
}) })
} else {} } else {}
}, err => {}) }, err => {})
}, },
getOrderList(x,item,type,OrderSource){ getOrderList(x, item, type, OrderSource) {
let obj= { let obj = {
FrID: item.FrID, FrID: item.FrID,
Status: item.Status, Status: item.Status,
DetailList: item.DetailList, DetailList: item.DetailList,
...@@ -2265,16 +2308,16 @@ ...@@ -2265,16 +2308,16 @@
AccountNumber: item.AccountNumber, AccountNumber: item.AccountNumber,
WBMoney: item.WBMoney WBMoney: item.WBMoney
} }
if(type==1){ if (type == 1) {
x.FrList.push(obj) x.FrList.push(obj)
}else if(type==2){ } else if (type == 2) {
if(OrderSource==1){ if (OrderSource == 1) {
this.FrListOthen2.push(obj) this.FrListOthen2.push(obj)
}else if(OrderSource==2){ } else if (OrderSource == 2) {
this.FrListOthen3.push(obj) this.FrListOthen3.push(obj)
}else if(OrderSource==3){ } else if (OrderSource == 3) {
this.FrListOthen4.push(obj) this.FrListOthen4.push(obj)
}else if(OrderSource==5){ } else if (OrderSource == 5) {
this.FrListOthen1.push(obj) this.FrListOthen1.push(obj)
} }
} }
...@@ -2356,6 +2399,7 @@ ...@@ -2356,6 +2399,7 @@
width: 100%; width: 100%;
margin-bottom: 30px; margin-bottom: 30px;
} }
.leaderReimbursementTableNav { .leaderReimbursementTableNav {
background: #d6cece; background: #d6cece;
width: 100%; width: 100%;
...@@ -2653,6 +2697,7 @@ ...@@ -2653,6 +2697,7 @@
.c3FC4FF { .c3FC4FF {
color: #3fc4ff; color: #3fc4ff;
} }
.mr { .mr {
margin-right: 5px; margin-right: 5px;
} }
...@@ -2705,4 +2750,4 @@ ...@@ -2705,4 +2750,4 @@
cursor: pointer; cursor: pointer;
} }
</style> </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