Commit ec7b01a1 authored by 黄奎's avatar 黄奎

111

parent b4b645fc
...@@ -407,7 +407,7 @@ ...@@ -407,7 +407,7 @@
<template v-for="(subItem,subIndex) in item.data"> <template v-for="(subItem,subIndex) in item.data">
<tr v-for="(childItem,childIndex) in subItem.TicketPriceList" :key='`sd`+index+subIndex+childIndex'> <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 &&subIndex==0" :rowspan="item.row">{{item.UseTimeStr}}</td>
<td v-if="childIndex==0 " :rowspan="subItem.TicketPriceList.length"> <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.ScenicName}} {{subItem.ScenicName}}
</td> </td>
<td> <td>
...@@ -432,14 +432,15 @@ ...@@ -432,14 +432,15 @@
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"> <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}} {{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"> <td v-if="childIndex==0&&subIndex==0" :rowspan="getTicketSubRowSpan(item.data)">
{{subItem.TradingTotalPrice}} {{subItem.TradingTotalPrice}}
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length"> <td v-if="childIndex==0&&subIndex==0" :rowspan="getTicketSubRowSpan(item.data)">
{{subItem.Remarks}} {{subItem.Remarks}}
</td> </td>
<td v-if="childIndex==0 &&subIndex==0" :rowspan="item.row"> <td v-if="childIndex==0 &&subIndex==0" :rowspan="item.row">
<span class="cursorpointer text-decoratio" @click="godetail('ticket', subItem)">{{$t('ground.mx')}}</span> <span class="cursorpointer text-decoratio"
@click="godetail('ticket', subItem)">{{$t('ground.mx')}}</span>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -539,7 +540,8 @@ ...@@ -539,7 +540,8 @@
{{subItem.Remarks}} {{subItem.Remarks}}
</td> </td>
<td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length"> <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
<span class="cursorpointer text-decoratio" @click="godetail('dining', subItem)">{{$t('ground.mx')}}</span> <span class="cursorpointer text-decoratio"
@click="godetail('dining', subItem)">{{$t('ground.mx')}}</span>
</td> </td>
</tr> </tr>
</template> </template>
...@@ -639,24 +641,24 @@ ...@@ -639,24 +641,24 @@
</template> </template>
</template> </template>
</table> </table>
<template v-if="LeaderOtherExpensesList&&LeaderOtherExpensesList.length>0" > <template v-if="LeaderOtherExpensesList&&LeaderOtherExpensesList.length>0">
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2"> <table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr> <tr>
<th colspan="5" class="bgwhite">{{$t('objFill.qitazhichu')}}</th> <th colspan="5" class="bgwhite">{{$t('objFill.qitazhichu')}}</th>
</tr> </tr>
<tr> <tr>
<th width="">{{$t('objFill.v101.dmc.fieyongmc')}}</th> <th width="">{{$t('objFill.v101.dmc.fieyongmc')}}</th>
<th width="">{{$t('objFill.v101.dmc.feiyongjg')}}</th> <th width="">{{$t('objFill.v101.dmc.feiyongjg')}}</th>
<th width="">{{$t('hotel.hotel_Currency')}}</th> <th width="">{{$t('hotel.hotel_Currency')}}</th>
<th width="100">{{$t('fnc.fkfangshi')}}</th> <th width="100">{{$t('fnc.fkfangshi')}}</th>
</tr> </tr>
<tr v-for='(item,index) in LeaderOtherExpensesList' :key="index"> <tr v-for='(item,index) in LeaderOtherExpensesList' :key="index">
<td>{{item.OtherName}}</td> <td>{{item.OtherName}}</td>
<td> <td>
{{item.OtherPrice }} {{item.OtherPrice }}
</td> </td>
<td > <td>
{{item.CurrencyName}} {{item.CurrencyName}}
</td> </td>
<td> <td>
...@@ -664,8 +666,8 @@ ...@@ -664,8 +666,8 @@
</td> </td>
</tr> </tr>
</table> </table>
</template> </template>
<table border="0" cellspacing="1" class="leaderPayTable"> <table border="0" cellspacing="1" class="leaderPayTable">
<tr> <tr>
<th>{{$t('advmanager.v_type')}}</th> <th>{{$t('advmanager.v_type')}}</th>
...@@ -689,7 +691,7 @@ ...@@ -689,7 +691,7 @@
<span v-if="item.UserType==1">{{$t('hotel.hotel')}}</span> <span v-if="item.UserType==1">{{$t('hotel.hotel')}}</span>
<span v-if="item.UserType==2">{{$t('objFill.chanying')}}</span> <span v-if="item.UserType==2">{{$t('objFill.chanying')}}</span>
<span v-if="item.UserType==4">{{$t('objFill.jiaotong')}}</span> <span v-if="item.UserType==4">{{$t('objFill.jiaotong')}}</span>
<span v-if="item.UserType==5">{{$t('objFill.qitazhichu')}}</span> <span v-if="item.UserType==5">{{$t('objFill.qitazhichu')}}</span>
(<span style="color:red">{{item.CurrencyName}}</span>) (<span style="color:red">{{item.CurrencyName}}</span>)
</td> </td>
<td>{{item.PlanTotalPrice}}</td> <td>{{item.PlanTotalPrice}}</td>
...@@ -859,7 +861,9 @@ ...@@ -859,7 +861,9 @@
</p> </p>
</template> </template>
<template v-if="item.CompanyAlipay==1"> <template v-if="item.CompanyAlipay==1">
<span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > {{$t('objFill.v101.dmc.yikqqydf')}}</span> <span @click="GoCompanyAlipay(item)"
style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;">
{{$t('objFill.v101.dmc.yikqqydf')}}</span>
</template> </template>
</div> </div>
</td> </td>
...@@ -879,12 +883,15 @@ ...@@ -879,12 +883,15 @@
<input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2" <input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type="button" :value="$t('objFill.dijiefeijszd')" style="" class="leader2Btn" @click="goZhiDan(item)"> type="button" :value="$t('objFill.dijiefeijszd')" style="" class="leader2Btn" @click="goZhiDan(item)">
<span v-else style="color:red">{{$t('objFill.qingzappztjykxq')}}</span> <span v-else style="color:red">{{$t('objFill.qingzappztjykxq')}}</span>
<input style="margin-top:15px" type="button" :value="$t('objFill.dijiefeijszd')" class="leader2Btn" @click="goZhiDan(item)"> <input style="margin-top:15px" type="button" :value="$t('objFill.dijiefeijszd')" class="leader2Btn"
@click="goZhiDan(item)">
<template v-if="item.CompanyAlipay==1"> <template v-if="item.CompanyAlipay==1">
<span @click="GoCompanyAlipay(item)" style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;" > {{$t('objFill.v101.qiyemdijiefjs')}}</span> <span @click="GoCompanyAlipay(item)"
</template> style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;">
<input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" :value="$t('objFill.tuikuanzhidan')" {{$t('objFill.v101.qiyemdijiefjs')}}</span>
class="leader2Btn" @click="gofzZd(item)"> </template>
<input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button"
:value="$t('objFill.tuikuanzhidan')" class="leader2Btn" @click="gofzZd(item)">
</td> </td>
</tr> </tr>
<tr v-if="!TotalNav && !TotalNav.length"> <tr v-if="!TotalNav && !TotalNav.length">
...@@ -925,8 +932,8 @@ ...@@ -925,8 +932,8 @@
<td>{{item.Time}}</td> <td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td> <td>{{item.FinanceId}}</td>
<td> <td>
<input style="margin-top:15px" v-if="item.FinanceId==0" type="button" :value="$t('objFill.shoujutkzd')" class="leader2Btn" <input style="margin-top:15px" v-if="item.FinanceId==0" type="button" :value="$t('objFill.shoujutkzd')"
@click="gofzZd2(item)"> class="leader2Btn" @click="gofzZd2(item)">
</td> </td>
</tr> </tr>
<tr v-if="dataDocList.length==0"> <tr v-if="dataDocList.length==0">
...@@ -943,7 +950,8 @@ ...@@ -943,7 +950,8 @@
<th>{{$t('objFill.preparedocument')}}</th> <th>{{$t('objFill.preparedocument')}}</th>
</tr> </tr>
<tr v-for="(item, index) in listCost" :key="`lc`+index"> <tr v-for="(item, index) in listCost" :key="`lc`+index">
<td>{{item.Type == 1 ?$t('leader.leader_leaderDi') : $t('leader.leader_Leader')}}:{{item.LeaderOrGuidName}}</td> <td>{{item.Type == 1 ?$t('leader.leader_leaderDi') : $t('leader.leader_Leader')}}:{{item.LeaderOrGuidName}}
</td>
<td>{{item.PeopleNum}}</td> <td>{{item.PeopleNum}}</td>
<td>{{moneyFormat(item.UnitPrice)}}</td> <td>{{moneyFormat(item.UnitPrice)}}</td>
<td> <td>
...@@ -951,11 +959,13 @@ ...@@ -951,11 +959,13 @@
</td> </td>
<td v-if="index == 0" :rowspan="listCost.length"> <td v-if="index == 0" :rowspan="listCost.length">
<span>{{$t('objFill.yifukuan')}}:{{moneyFormat(item.TotalPrice)}}</span> <span>{{$t('objFill.yifukuan')}}:{{moneyFormat(item.TotalPrice)}}</span>
<p>{{$t('objFill.caiwufanhao')}}:<span v-for="(i, d) in item.FrId" :key="`frid`+d" class="cursorpointer text-decoration" <p>{{$t('objFill.caiwufanhao')}}:<span v-for="(i, d) in item.FrId" :key="`frid`+d"
@click="goFncUrl('FinancialDocumentsDetail', i)">{{i}} {{d == item.FrId.length-1 ? '' : '、'}}</span></p> class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', i)">{{i}}
{{d == item.FrId.length-1 ? '' : '、'}}</span></p>
</td> </td>
<td> <td>
<input type="button" :value="$t('objFill.rentoufzd')" class="leader2Btn" @click="opendialog(item, index, item.price)"> <input type="button" :value="$t('objFill.rentoufzd')" class="leader2Btn"
@click="opendialog(item, index, item.price)">
</td> </td>
</tr> </tr>
<tr v-if="!listCost.length"> <tr v-if="!listCost.length">
...@@ -985,7 +995,8 @@ ...@@ -985,7 +995,8 @@
{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p> {{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
</td> </td>
<td width="80" class="_zhidan"> <td width="80" class="_zhidan">
<input type="button" :value="$t('objFill.preparedocument')" class="leader2Btn" @click="huiDuiShouYi(item, item.FinanceIds)"> <input type="button" :value="$t('objFill.preparedocument')" class="leader2Btn"
@click="huiDuiShouYi(item, item.FinanceIds)">
</td> </td>
</tr> </tr>
<tr v-if="!TotalNav && !TotalNav.length"> <tr v-if="!TotalNav && !TotalNav.length">
...@@ -1095,8 +1106,8 @@ ...@@ -1095,8 +1106,8 @@
</table> </table>
<template v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1"> <template v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==1">
<el-input type="textarea" :placeholder="$t('objFill.qingshurbzxx')" v-model="dataList.LeaderApply.AccountForReason" <el-input type="textarea" :placeholder="$t('objFill.qingshurbzxx')"
class="wLeader2" /> v-model="dataList.LeaderApply.AccountForReason" class="wLeader2" />
</template> </template>
<div class="btnListDiv"> <div class="btnListDiv">
<input type="button" class="leader2Btn" @click="AuditOrder(2)" :value="$t('objFill.shenhetongguo')" <input type="button" class="leader2Btn" @click="AuditOrder(2)" :value="$t('objFill.shenhetongguo')"
...@@ -1104,13 +1115,13 @@ ...@@ -1104,13 +1115,13 @@
<input type="button" class="leader2Btn" @click="AuditOrder(1)" :value="$t('objFill.shenhebtg')" <input type="button" class="leader2Btn" @click="AuditOrder(1)" :value="$t('objFill.shenhebtg')"
v-show="dataList.LeaderApply.Status==1"> v-show="dataList.LeaderApply.Status==1">
<input type="button" class="leader2Btn" :value="$t('ground.dayin')" @click="printTable()"> <input type="button" class="leader2Btn" :value="$t('ground.dayin')" @click="printTable()">
<input v-if="EditBtn && dataList.LeaderApply.Status==2" type="button" class="leader2Btn" :value="$t('objFill.quxiaoshenhe')" <input v-if="EditBtn && dataList.LeaderApply.Status==2" type="button" class="leader2Btn"
@click="CancelLeaderApply()"> :value="$t('objFill.quxiaoshenhe')" @click="CancelLeaderApply()">
</div> </div>
</div> </div>
<a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a> <a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
<el-dialog :title="$t('objFill.xuanzhezh')" width="400px" :visible.sync="dialogFormVisible" center :before-close="closeChangeMachie" <el-dialog :title="$t('objFill.xuanzhezh')" width="400px" :visible.sync="dialogFormVisible" center
v-loading="dialogFormVisibleLoding"> :before-close="closeChangeMachie" v-loading="dialogFormVisibleLoding">
<el-form label-width="110px"> <el-form label-width="110px">
<el-form-item :label="$t('objFill.fukuantype')"> <el-form-item :label="$t('objFill.fukuantype')">
<el-select filterable v-model='lingjiandiMsg.IsPublic' class=""> <el-select filterable v-model='lingjiandiMsg.IsPublic' class="">
...@@ -1405,10 +1416,21 @@ ...@@ -1405,10 +1416,21 @@
}, },
checkList2: [], checkList2: [],
cdState2: false, cdState2: false,
LeaderOtherExpensesList:[], LeaderOtherExpensesList: [],
}; };
}, },
methods: { methods: {
getTicketSubRowSpan(rowList) {
var rowNum = 1;
var subNum = 1;
if (rowList && rowList.length > 0) {
subNum = 0;
rowList.forEach(subItem => {
subNum += subItem.TicketPriceList.length;
})
}
return rowNum * subNum;
},
goUrlfk2() { goUrlfk2() {
let obj = this.fzObj2; let obj = this.fzObj2;
let that = this; let that = this;
...@@ -1971,11 +1993,13 @@ ...@@ -1971,11 +1993,13 @@
Money: obj.LeaderGetPriceT, Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUMS TCNUMS: obj.TCNUMS
}; };
let fullPath =`/ChoiceAddFinancialDocuments?Type=${2}&templateID=${JSON.stringify(id)}&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`; let fullPath =
`/ChoiceAddFinancialDocuments?Type=${2}&templateID=${JSON.stringify(id)}&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
if(userInfo&&userInfo.RB_Group_id!=2){ if (userInfo && userInfo.RB_Group_id != 2) {
orderObj.CostType=0; orderObj.CostType = 0;
fullPath =`/ChoiceAddFinancialDocuments?Type=${2}&searchTitle=报账&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`; fullPath =
`/ChoiceAddFinancialDocuments?Type=${2}&searchTitle=报账&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
} }
let dom = document.querySelector("#blankLink"); let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`; dom.href = `http://${window.location.host}/#${fullPath}`;
...@@ -2093,13 +2117,13 @@ ...@@ -2093,13 +2117,13 @@
err => {} err => {}
); );
}, },
GoCompanyAlipay(obj){ GoCompanyAlipay(obj) {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
name: 'AlipayManagementDetail', name: 'AlipayManagementDetail',
query: { query: {
Id: obj.TCID, Id: obj.TCID,
searchTitle: '费控制度详情', searchTitle: '费控制度详情',
IsDiJi:1, IsDiJi: 1,
} }
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
...@@ -2210,7 +2234,7 @@ ...@@ -2210,7 +2234,7 @@
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.list = res.data.data; this.list = res.data.data;
this.LeaderOtherExpensesList=res.data.data.leaderOtherExpensesList; this.LeaderOtherExpensesList = res.data.data.leaderOtherExpensesList;
// 预计金额 // 预计金额
this.planPriceList = this.list.planPriceList; this.planPriceList = this.list.planPriceList;
// 车 // 车
......
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