Commit ec7b01a1 authored by 黄奎's avatar 黄奎

111

parent b4b645fc
......@@ -407,7 +407,7 @@
<template v-for="(subItem,subIndex) in item.data">
<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">
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{subItem.ScenicName}}
</td>
<td>
......@@ -432,14 +432,15 @@
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
{{scenicTotalPrice(subItem, subItem.TicketPriceList)}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<td v-if="childIndex==0&&subIndex==0" :rowspan="getTicketSubRowSpan(item.data)">
{{subItem.TradingTotalPrice}}
</td>
<td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
<td v-if="childIndex==0&&subIndex==0" :rowspan="getTicketSubRowSpan(item.data)">
{{subItem.Remarks}}
</td>
<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>
</tr>
</template>
......@@ -539,7 +540,8 @@
{{subItem.Remarks}}
</td>
<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>
</tr>
</template>
......@@ -639,7 +641,7 @@
</template>
</template>
</table>
<template v-if="LeaderOtherExpensesList&&LeaderOtherExpensesList.length>0" >
<template v-if="LeaderOtherExpensesList&&LeaderOtherExpensesList.length>0">
<table border="0" cellspacing="1" class="leaderPayTable leaderPayTable2">
<tr>
<th colspan="5" class="bgwhite">{{$t('objFill.qitazhichu')}}</th>
......@@ -656,7 +658,7 @@
<td>
{{item.OtherPrice }}
</td>
<td >
<td>
{{item.CurrencyName}}
</td>
<td>
......@@ -859,7 +861,9 @@
</p>
</template>
<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>
</div>
</td>
......@@ -879,12 +883,15 @@
<input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
type="button" :value="$t('objFill.dijiefeijszd')" style="" class="leader2Btn" @click="goZhiDan(item)">
<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">
<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)"
style="color:red;text-decoration: underline;padding-top:5px;font-size:13px;cursor: pointer;">
{{$t('objFill.v101.qiyemdijiefjs')}}</span>
</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)">
<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>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
......@@ -925,8 +932,8 @@
<td>{{item.Time}}</td>
<td>{{item.FinanceId}}</td>
<td>
<input style="margin-top:15px" v-if="item.FinanceId==0" type="button" :value="$t('objFill.shoujutkzd')" class="leader2Btn"
@click="gofzZd2(item)">
<input style="margin-top:15px" v-if="item.FinanceId==0" type="button" :value="$t('objFill.shoujutkzd')"
class="leader2Btn" @click="gofzZd2(item)">
</td>
</tr>
<tr v-if="dataDocList.length==0">
......@@ -943,7 +950,8 @@
<th>{{$t('objFill.preparedocument')}}</th>
</tr>
<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>{{moneyFormat(item.UnitPrice)}}</td>
<td>
......@@ -951,11 +959,13 @@
</td>
<td v-if="index == 0" :rowspan="listCost.length">
<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"
@click="goFncUrl('FinancialDocumentsDetail', i)">{{i}} {{d == item.FrId.length-1 ? '' : '、'}}</span></p>
<p>{{$t('objFill.caiwufanhao')}}:<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>
<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>
</tr>
<tr v-if="!listCost.length">
......@@ -985,7 +995,8 @@
{{Math.round(f.OriginalMoney * (f.Rate - f.Fee) * 100) / 100}}</p>
</td>
<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>
</tr>
<tr v-if="!TotalNav && !TotalNav.length">
......@@ -1095,8 +1106,8 @@
</table>
<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"
class="wLeader2" />
<el-input type="textarea" :placeholder="$t('objFill.qingshurbzxx')"
v-model="dataList.LeaderApply.AccountForReason" class="wLeader2" />
</template>
<div class="btnListDiv">
<input type="button" class="leader2Btn" @click="AuditOrder(2)" :value="$t('objFill.shenhetongguo')"
......@@ -1104,13 +1115,13 @@
<input type="button" class="leader2Btn" @click="AuditOrder(1)" :value="$t('objFill.shenhebtg')"
v-show="dataList.LeaderApply.Status==1">
<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')"
@click="CancelLeaderApply()">
<input v-if="EditBtn && dataList.LeaderApply.Status==2" type="button" class="leader2Btn"
:value="$t('objFill.quxiaoshenhe')" @click="CancelLeaderApply()">
</div>
</div>
<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"
v-loading="dialogFormVisibleLoding">
<el-dialog :title="$t('objFill.xuanzhezh')" width="400px" :visible.sync="dialogFormVisible" center
:before-close="closeChangeMachie" v-loading="dialogFormVisibleLoding">
<el-form label-width="110px">
<el-form-item :label="$t('objFill.fukuantype')">
<el-select filterable v-model='lingjiandiMsg.IsPublic' class="">
......@@ -1405,10 +1416,21 @@
},
checkList2: [],
cdState2: false,
LeaderOtherExpensesList:[],
LeaderOtherExpensesList: [],
};
},
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() {
let obj = this.fzObj2;
let that = this;
......@@ -1971,11 +1993,13 @@
Money: obj.LeaderGetPriceT,
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();
if(userInfo&&userInfo.RB_Group_id!=2){
orderObj.CostType=0;
fullPath =`/ChoiceAddFinancialDocuments?Type=${2}&searchTitle=报账&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
if (userInfo && userInfo.RB_Group_id != 2) {
orderObj.CostType = 0;
fullPath =
`/ChoiceAddFinancialDocuments?Type=${2}&searchTitle=报账&companyID=${obj.OutBranchId}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
}
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
......@@ -2093,13 +2117,13 @@
err => {}
);
},
GoCompanyAlipay(obj){
GoCompanyAlipay(obj) {
let routeData = this.$router.resolve({
name: 'AlipayManagementDetail',
query: {
Id: obj.TCID,
searchTitle: '费控制度详情',
IsDiJi:1,
IsDiJi: 1,
}
})
window.open(routeData.href, '_blank')
......@@ -2210,7 +2234,7 @@
this.loading = false;
if (res.data.resultCode == 1) {
this.list = res.data.data;
this.LeaderOtherExpensesList=res.data.data.leaderOtherExpensesList;
this.LeaderOtherExpensesList = res.data.data.leaderOtherExpensesList;
// 预计金额
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