Commit ee68dc50 authored by 黄奎's avatar 黄奎

页面修改

parent 02d741a5
......@@ -371,7 +371,7 @@
<th width="110">{{$t('admin.admin_personNumber')}}</th>
<th width="110">领队</th>
</tr>
<tr v-for="item in nav">
<tr v-for="(item,index) in nav" :key='`nav`+index'>
<td>{{item.NewCombinationNum}}</td>
<td class="_Titles">{{item.Titles}}</td>
<td>{{item.StartDateStr}}</td>
......@@ -405,7 +405,7 @@
</tr>
<template v-for='(item,index) in ScenicDataList'>
<template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList" :key='`sd`+index+subIndex+childIndex'>
<td v-if="childIndex==0 &&subIndex==0" :rowspan="item.row">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0 " :rowspan="subItem.TicketPriceList.length">
{{subItem.ScenicName}}
......@@ -413,7 +413,6 @@
<td>
{{peopleStrToWord(childItem.PeopleType)}}:{{childItem.UsePeopleNum}}
</td>
<td>
{{childItem.TradingPrice}}
</td>
......@@ -458,7 +457,7 @@
<th width="40">{{$t('hotel.table_operat')}}</th>
</tr>
<template v-for='(item,index) in busDataList'>
<tr v-for='(item2,index2) in item.data'>
<tr v-for='(item2,index2) in item.data' :key="`bd`+index+index2">
<td>{{item.PlanDateStr}}</td>
<td>
{{item2.HighSpeedPrice >= 0 && item2.HighSpeedPrice !== null && item2.HighSpeedPayType > 0 ? (item2.HighSpeedPayType === 1 ? moneyFormat(item2.HighSpeedPrice) : 0) : ''}}
......@@ -469,8 +468,9 @@
<td>
{{item2.Remarks}}
</td>
<td v-if="index2 ==0" :rowspan="item.data.length"><span class="cursorpointer text-decoratio"
@click="godetail('bus', item2)">明细</span></td>
<td v-if="index2 ==0" :rowspan="item.data.length">
<span class="cursorpointer text-decoratio" @click="godetail('bus', item2)">明细</span>
</td>
</tr>
</template>
</table>
......@@ -494,7 +494,7 @@
</tr>
<template v-for='(item,index) in DiningDataList'>
<template v-for='(subItem,subIndex) in item.data'>
<tr v-for='(childItem,childIndex) in subItem.DiningPriceList'>
<tr v-for='(childItem,childIndex) in subItem.DiningPriceList' :key="`dp`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{item.UseTimeStr}}
</td>
......@@ -527,7 +527,6 @@
<br />
<span v-show="subItem.PayStyle==6">付款团号:{{subItem.PayTypeTCNUM}}</span>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
......@@ -538,14 +537,13 @@
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
{{subItem.Remarks}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length"><span
class="cursorpointer text-decoratio" @click="godetail('dining', subItem)">明细</span></td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span class="cursorpointer text-decoratio" @click="godetail('dining', subItem)">明细</span>
</td>
</tr>
</template>
</template>
</table>
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="13" class="bgwhite">酒店使用</th>
......@@ -567,7 +565,7 @@
</tr>
<template v-for='(item, index) in HotelDataList'>
<template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList">
<tr v-for="(childItem,childIndex) in subItem.OrderDetailsList" :key="`hd`+index+subIndex+childIndex">
<td v-if="childIndex==0" :rowspan="subItem.OrderDetailsList.length">
{{item.CheckInDateStr}}
</td>
......@@ -647,15 +645,17 @@
<th>实付金额</th>
<th width="40">{{$t('hotel.table_operat')}}</th>
</tr>
<tr v-if="list.otherList.length > 0" v-for="item in list.otherList">
<td>{{getOrderType(item.OrderType)}}</td>
<td>0</td>
<td>{{moneyFormat(item.TotalPrice)}}</td>
<td style="cursor: pointer;">
<span v-if="item.OrderType==1" @click="godetailAll('qitaF')">明细</span>
</td>
</tr>
<tr v-for="item in planPriceList">
<template v-if="list&&list.otherList&&list.otherList.length > 0">
<tr v-for="(item,index) in list.otherList" :key="`ot`+index">
<td>{{getOrderType(item.OrderType)}}</td>
<td>0</td>
<td>{{moneyFormat(item.TotalPrice)}}</td>
<td style="cursor: pointer;">
<span v-if="item.OrderType==1" @click="godetailAll('qitaF')">明细</span>
</td>
</tr>
</template>
<tr v-for="(item,index) in planPriceList" :key="`pp`+index">
<td>
<span v-if="item.UserType==3">景点门票</span>
<span v-if="item.UserType==1">酒店</span>
......@@ -687,7 +687,7 @@
<th>付款对象</th>
<th>{{$t('fnc.zdrenyuan')}}</th>
</tr>
<tr class="_item_list" v-for="(item,index) in zhuijiaList">
<tr class="_item_list" v-for="(item,index) in zhuijiaList" :key="`zjl`+index">
<td class="Bill_par">
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)"
class="text_d PingFangSC">{{item.FrID}}</span>
......@@ -698,12 +698,12 @@
</td>
<td>
<template v-for="(s,si) in item.CostTypeList">
<span class="_tag_span">{{s}}</span><br />
<span class="_tag_span" :key="`ctl`+si">{{s}}</span><br :key="`ctl`+si+10000" />
</template>
</td>
<td class="_number">
<template v-if="item.TradeWayList&&item.TradeWayList.length>0">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList">
<div class="_TradeWayList" v-for="(tw,twIn) in item.TradeWayList" :key="`twl`+twIn">
<p class="_fex_cen clearfix"><span class="_bold">{{tw.Alias}}</span><span
class="_bank_name">{{item.TradeWayList[0].TypeName}}</span><span class="_bank_type"
:class="tw.AccountType=='私'?'':'_bank_type2'">{{tw.AccountType==""?$t('fnc.no'):tw.AccountType}}</span>
......@@ -749,16 +749,17 @@
<th>实付合计</th>
<th>领队退款</th>
</tr>
<tr v-for="(item, index) in TotalPriceData"
v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice !== 0">
<td>{{item.CurrencyStr}}</td>
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>
{{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}
</td>
</tr>
<template v-for="(item, index) in TotalPriceData">
<tr v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice !== 0" :key="`tpd`+index">
<td>{{item.CurrencyStr}}</td>
<td>{{moneyFormat(item.PlanPrice)}}</td>
<td>{{moneyFormat(item.PlanTotalPrice)}}</td>
<td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
<td>
{{index == 0 ? moneyFormat(item.PlanTotalPrice - AllBZPrice): moneyFormat(item.PlanTotalPrice - item.ExpendTotalPrice)}}
</td>
</tr>
</template>
<tr v-if="!TotalPriceData.length">
<td colspan="5">{{$t('system.content_noData')}}</td>
</tr>
......@@ -774,7 +775,7 @@
<th>{{$t('active.cl_addPp')}}</th>
</tr>
<template v-for="(item, index) in TotalNav">
<tr v-for="(subItem, subIndex) in item.FinanceList">
<tr v-for="(subItem, subIndex) in item.FinanceList" :key="`tnfl`+index+subIndex">
<td>
<span>{{subItem.FrID}}</span>
</td>
......@@ -810,7 +811,7 @@
<th>结算财务单号</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<tr v-for="(item, index) in TotalNav" :key="`tnp`+index">
<td>{{item.TCNUMS}}</td>
<td style="padding: 5px 20px; height: 40px; border: none;">
<p style="margin: 0;text-align: left">
......@@ -820,7 +821,7 @@
<div style="margin: 0;text-align: left">
财务单号:
<template v-for="(subItem, subIndex) in item.FinanceIds">
<p style="margin: 0;text-align: left">
<p style="margin: 0;text-align: left" :key="`fid`+subIndex">
<span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;
<span class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
......@@ -837,7 +838,7 @@
<el-input size="mini" class="w150" type="number" v-model="item.LeaderGetPriceT"></el-input>
</td>
<td>
<p v-for="(subItem, subIndex) in item.FinanceCloseList" style=" margin: 0;">
<p v-for="(subItem, subIndex) in item.FinanceCloseList" style=" margin: 0;" :key="`fcl`+subIndex">
<span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)">{{subItem.FinanceId}}</span>&nbsp;&nbsp;
</p>
......@@ -908,7 +909,7 @@
<th>财务单号</th>
<th>制单</th>
</tr>
<tr v-for="(item, index) in listCost">
<tr v-for="(item, index) in listCost" :key="`lc`+index">
<td>{{item.Type == 1 ? "领兼地" : "领队"}}:{{item.LeaderOrGuidName}}</td>
<td>{{item.PeopleNum}}</td>
<td>{{moneyFormat(item.UnitPrice)}}</td>
......@@ -917,7 +918,7 @@
</td>
<td v-if="index == 0" :rowspan="listCost.length">
<span>已付款:{{moneyFormat(item.TotalPrice)}}</span>
<p>财务单号:<span v-for="(i, d) in item.FrId" class="cursorpointer text-decoration"
<p>财务单号:<span v-for="(i, d) in item.FrId" :key="`frid`+d" class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', i)">{{i}} {{d == item.FrId.length-1 ? '' : '、'}}</span></p>
</td>
<td>
......@@ -937,17 +938,18 @@
<th>汇兑损益金额</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<tr v-for="(item, index) in TotalNav" :key="`tnav`+index">
<td>{{item.TCNUMS}}</td>
<td>{{item.LeaderGetPrice}}</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{f.Fee}}</p>
<p v-for="(f, fd) in item.FinanceIds" :key="`tnav-fee`+fd">{{f.Fee}}</p>
</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{f.Rate}}</p>
<p v-for="(f, fd) in item.FinanceIds" :key="`tnav-rt`+fd">{{f.Rate}}</p>
</td>
<td>
<p v-for="(f, fd) in item.FinanceIds">{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
<p v-for="(f, fd) in item.FinanceIds" :key="`tnav-om`+fd">
{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
</td>
<td width="80" class="_zhidan">
<input type="button" value="制单" class="leader2Btn" @click="huiDuiShouYi(item, item.FinanceIds)">
......@@ -962,7 +964,7 @@
<th colspan="7">稽核单据
</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<tr v-for="(item, index) in TotalNav" :key="`tnavv`+index">
<td colspan="3">{{item.TCNUMS}}</td>
<td colspan="3">
<el-input size="mini" class="w150" type="number" v-model="item.price"></el-input>
......@@ -981,7 +983,7 @@
<th>业务员</th>
</tr>
<template v-for="(item, index) in TotalNav">
<tr v-for="(Sitem, Sindex) in item.FinanceAuditList">
<tr v-for="(Sitem, Sindex) in item.FinanceAuditList" :key="`tnav_fa`+index+Sindex">
<td>{{Sindex+1}}</td>
<td><span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', Sitem.FinanceId)">{{Sitem.FinanceId}}</span></td>
......@@ -999,7 +1001,7 @@
<th colspan="8">预付款冲抵
</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<tr v-for="(item, index) in TotalNav" :key="`tnav_yf`+index">
<td colspan="4">{{item.TCNUMS}}</td>
<td colspan="4">
<input type="button" value="制单" class="leader2Btn" @click="ZhiDanChongDi(item)">
......@@ -1014,7 +1016,7 @@
<th>{{$t('hotel.hotel_status')}}</th>
<th>付款对象</th>
</tr>
<tr v-for="(item,index) in czTableList" :key="index">
<tr v-for="(item,index) in czTableList" :key="`czt`+index">
<td>
<span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', item.FrID)">{{item.FrID}}</span>
......@@ -1046,7 +1048,7 @@
<th>已填写人数</th>
<th>明细</th>
</tr>
<tr v-for="(item, index) in TotalNav">
<tr v-for="(item, index) in TotalNav" :key="`tnav_yj`+index">
<td>{{item.TCNUMS}}</td>
<td>{{item.CommonReport.HouseStatistics.RealityNum}}</td>
<td>{{item.TotalGuestsurvey}}</td>
......@@ -1188,8 +1190,6 @@
<el-form-item>
<input type="button" :value="$t('pub.searchBtn')" class="leader2Btn" @click="fzgetList">
</el-form-item>
</el-form>
<table class="leaderPayTable" border="0" cellspacing="1" cellpadding="0">
<tr>
......@@ -1263,7 +1263,6 @@
export default {
data() {
return {
czdateList: [],
czMsg: {
pageIndex: 1,
......@@ -1312,7 +1311,6 @@
//合计交通
totalTrafficPrice: 0,
allTotal: 0,
totalList: [],
isShowRemark: false,
TotalPriceData: [],
......@@ -1363,7 +1361,6 @@
fzList: [],
fzObj: {},
dataDocList: [],
fzObj2: {},
fkZDmsg2: {
OtherType: 10,
......@@ -1383,7 +1380,6 @@
let obj = this.fzObj2;
let that = this;
let checkList = JSON.parse(JSON.stringify(this.checkList2))
if (this.checkList2.length > 1) {
this.Error(this.$t('objFill.onlyoneitem'));
return;
......@@ -1443,13 +1439,10 @@
this.checkList2 = [];
this.fzObj2 = item;
},
goUrlfk() {
let obj = this.fzObj;
let that = this;
let checkList = JSON.parse(JSON.stringify(this.checkList1))
if (this.checkList1.length > 1) {
this.Error(this.$t('objFill.onlyoneitem'));
return;
......@@ -1458,7 +1451,6 @@
this.Error(this.$t('objFill.atleastone'));
return;
}
let arr = [];
that.fkZDmsg.ReFinanceId = this.checkList1[0].FinanceId;
if (this.isNotCurrency) {
......@@ -1467,7 +1459,6 @@
that.fkZDmsg.Rate = this.checkList1[0].Rate;
}
var msg = JSON.stringify(that.fkZDmsg);
let id = [];
if (obj.LineId == this.LineId) {
id = [75]
......@@ -1520,7 +1511,6 @@
}
});
},
getczTableList(TCIDs) {
let msg = {
pageIndex: 1,
......@@ -1587,8 +1577,6 @@
this.Handmsg.TCNUM = item.TCIDS;
this.OutBranchId = item.OutBranchId;
this.checkList = [];
},
czgetList() {
if (this.czdateList && this.czdateList.length > 0) {
......@@ -1963,7 +1951,6 @@
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
},
getNavT() {
let _this = this
this.apipost(
......@@ -1971,7 +1958,6 @@
TCIDs: this.$route.query.id
},
res => {
if (res.data.resultCode == 1) {
let TotalNav = res.data.data.list;
let listCost = res.data.data.listCost;
......@@ -1982,20 +1968,17 @@
let Tcnums = '';
TotalNav.forEach((x, index) => {
TotalNav.LeaderGetPriceT = 0;
let str = ",";
if (index == 0) {
str = '';
}
Tcnums += str + x.TCIDS;
});
this.TotalNav = TotalNav;
this.dataDocList = [];
this.TotalNav.forEach(item => {
this.getDataDoc(item.TCNUMS, item.OutBranchId);
})
this.listCost = listCost;
if (Tcnums != '') {
this.getczTableList(Tcnums);
......@@ -2163,9 +2146,8 @@
);
},
Lookdetails() {
let fullPath = `/leaderPay?id=${this.$route.query.id}&NewCombinationNum=${
this.$route.query.NewCombinationNum
}&isUpdate=${true}&blank=y&tab=领队报账`;
let fullPath =
`/leaderPay?id=${this.$route.query.id}&NewCombinationNum=${this.$route.query.NewCombinationNum}&isUpdate=${true}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
......@@ -2457,7 +2439,6 @@
this.getzhuijiaList()
this.getCostTypeList();
this.czgetList();
}
};
......
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