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