Skip to content

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

页面修改

parent 5f2d66b6
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 33 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ b793ed3a
......@@ -236,7 +236,7 @@
</td>
<td style="white-space:nowrap; ">
<span v-if="childItem.HouseType != 5">
{{subItem.PayStyle === 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
</span>
<span v-else>
{{subItem.PayStyle === 1 && subItem.DMCPayType == 1 ? moneyFormat(childItem.UnitPrice*(childItem.BookNum-childItem.HotelDiscount)) : 0}}
......@@ -309,7 +309,7 @@
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="6">
{{GetCurrency(subItem.CurrencyId)}}
{{GetCurrency(subItem.CurrencyId)}}
</td>
<td v-if="childIndex==0" :rowspan="6">
<span v-if="subItem.DMCPayType === 1">现付</span>
......@@ -354,7 +354,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -403,7 +402,7 @@
</p>
</td>
<td>
{{subItem.PayStyle === 1 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
{{subItem.PayStyle === 1||subItem.PayStyle === 11 ? moneyFormat((childItem.PeopleNum-childItem.Discount)*childItem.PeoplePrice) : 0}}
</td>
<td>
{{childItem.DiscountPrice}}%
......@@ -421,8 +420,8 @@
</br>
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{GetCurrency(subItem.CurrencyId)}}
<td v-if="childIndex==0" :rowspan="3">
{{GetCurrency(subItem.CurrencyId)}}
</td>
<td v-if="childIndex==0" :rowspan="3">
{{subItem.Remarks}}
......@@ -436,7 +435,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.IncomeTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -512,7 +510,6 @@
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span>
</span>
<!-- {{moneyFormat(TotalNav.reimburseTotalPrice.OtherTotalPrice)}} -->
</td>
</tr>
</table>
......@@ -565,7 +562,7 @@
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span>
</br></span>
</td>
<td style="padding: 5px 20px;" >
<td style="padding: 5px 20px;">
<div style="margin:10px 0" v-for="cur in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<p style="padding-left:20px;display:inline-block">
......@@ -582,16 +579,19 @@
</td>
<td>
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)" :style="{'color': subItem.Status == 3 ? 'red' : ''}">
@click="goFncUrl('FinancialDocumentsDetail', subItem.FinanceId)"
:style="{'color': subItem.Status == 3 ? 'red' : ''}">
{{subItem.FinanceId}}({{subItem.Status == 3 ? '驳回' : subItem.Status == 2 ? '通过' : '审核中'}})</span>&nbsp;&nbsp;
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration" @click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)" style="color: red;">重新发起</span>&nbsp;&nbsp;<span
class="cursorpointer text-decoration" @click="goFncUrl('Application', subItem.FinanceId)"
v-if="subItem.IsPublic === 4">申请书</span> &nbsp;&nbsp;<span class="cursorpointer text-decoration"
<span v-if="subItem.Status == 3" class="cursorpointer text-decoration"
@click="goFncEditUrl('addFinancialDocuments', subItem.CurrencyId, subItem.FinanceId)"
style="color: red;">重新发起</span>&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('Application', subItem.FinanceId)" v-if="subItem.IsPublic === 4">申请书</span>
&nbsp;&nbsp;<span class="cursorpointer text-decoration"
@click="goFncUrl('DebitNote', subItem.FinanceId)">借支单</span></p>
</td>
<td width="80" class="_zhidan">
<div style="margin:10px 0" v-for="(cur,index2) in CurrencyListMoney">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<input type="button" v-if="item.TeamType == 1 && index2==0" value="日当费" class="normalBtn"
@click="goZhiDan(item, 2)" />
<el-tooltip class="item" effect="dark" :content="currencyTypeObj[leadr.CurrencyId]" placement="top">
......@@ -610,7 +610,8 @@
</th>
<th :colspan="1" width="200">
<div v-for="item in nav" style="margin: 10px 0;">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn" @click="ZhuiJiaTuanKuan(item.OutBranchId)">
<input type="button" :value="`${item.TCNUMS} 制单`" class="leader2Btn"
@click="ZhuiJiaTuanKuan(item.OutBranchId)">
</div>
</th>
</tr>
......@@ -626,7 +627,7 @@
</tr>
<tr class="_item_list" v-for="(item,index) in zhuijiaList">
<td class="Bill_par">
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC" >{{item.FrID}}</span>
<span @click="goFncUrl('FinancialDocumentsDetail', item.FrID)" class="text_d PingFangSC">{{item.FrID}}</span>
</td>
<td>{{item.BranchName}}</td>
<td><span class="_bg__" :class="item.Type==1 || item.Type==5?'_bg_green':'_bg_red'">{{item.TypeName}}</span>
......@@ -653,10 +654,9 @@
</template>
</td>
<td>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
<p>{{item.Type==1 ? $t('fnc.yingshou') : $t('fnc.yingfu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span>
</p>
<!-- <p>{{item.Type==1 ? $t('fnc.shishou') : $t('fnc.shifu') }}：<span
class="">{{moneyFormat(item.OriginalMoneyTotal)}}</span></p> -->
</td>
<td>
<template v-if='item.Type===1'>
......@@ -686,7 +686,6 @@
</el-carousel-item>
</el-carousel>
</div>
</div>
</template>
......@@ -740,9 +739,9 @@
},
methods: {
// 20190815 新增领款单据重新生成自动带上计算后的金额
goFncEditUrl(url, crId, frId){
goFncEditUrl(url, crId, frId) {
let obj = {}
this.CurrencyListMoney.map(x=>{
this.CurrencyListMoney.map(x => {
if (x.CurrencyId == crId) {
obj = x
}
......@@ -750,13 +749,13 @@
let price = obj.money * 0.95
let calcPrice = 0
if (crId == 1) { //人民币
calcPrice = parseInt(price/1000) > 0 ? parseInt(price/1000) * 1000 : parseInt(price)
calcPrice = parseInt(price / 1000) > 0 ? parseInt(price / 1000) * 1000 : parseInt(price)
} else { // 其他
calcPrice = parseInt(price/10000) > 0 ? parseInt(price/10000) * 10000 : parseInt(price)
calcPrice = parseInt(price / 10000) > 0 ? parseInt(price / 10000) * 10000 : parseInt(price)
}
this.$router.push({
this.$router.push({
name: url,
query:{
query: {
"FrID": frId,
"blank": 'y',
"edit": true,
......@@ -838,7 +837,8 @@
Obj: {},
SourceID: 0,
TCIDList: TCIDARR,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this.$routequery.id,
TravelReplenish: this.$route.query.NewCombinationNum ? this.$route.query.NewCombinationNum : this
.$routequery.id,
OtherType: 1
}
this.$router.push({
......@@ -932,7 +932,7 @@
},
goZhiDan: function (obj, num, leadr, cur) {
if (!num) {
let totailMoney = Number(leadr.LeaderGetPriceT) + Number(cur.yiLing);
let totailMoney = Number(leadr.LeaderGetPriceT) + Number(cur.yiLing);
if (totailMoney > leadr.PlanPrice) return this.$message.error('最大领款为预付合计金额的95%！')
if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0) return this.$message.error('请输入金额！')
}
......@@ -1025,7 +1025,7 @@
if (obj.TaxType == 2) {
coefficient = 1 + 0.08;
}
if (obj.PayStyle === 1) {
if (obj.PayStyle === 1 || obj.PayStyle === 11) {
if (index == 4 && obj.DMCPayType !== 1) {
totalPrice += 0;
} else {
......@@ -1044,7 +1044,7 @@
obj.forEach(x => {
totalPrice += x.PeoplePrice * (x.PeopleNum - x.Discount) * (1 - x.DiscountPrice / 100)
})
if (sObj.PayStyle !== 1) {
if (!(sObj.PayStyle == 1 || sObj.PayStyle == 11)) {
totalPrice = 0
}
return this.moneyFormat(totalPrice)
......@@ -1136,7 +1136,7 @@
if (this.TotalNav.planPriceList) {
this.TotalNav.planPriceList.forEach(item => {
if (CurrencyIdArr.indexOf(item.CurrencyId) < 0) {
CurrencyIdArr.push(item.CurrencyId)
CurrencyIdArr.push(item.CurrencyId)
}
})
CurrencyIdArr.forEach(id => {
......@@ -1155,7 +1155,7 @@
}
this.CurrencyListMoney.forEach((cur, i) => {
cur.yiLing = 0
cur.LeaderGetPriceArr = [];
cur.LeaderGetPriceArr = [];
nav.forEach(x => {
let obj = {
CurrencyId: cur.CurrencyId,
......@@ -1191,7 +1191,6 @@
this.apipost('dmcstatistics_post_GetNewPlanTotalPrice_V2', {
TCIDs: this.$route.query.id
}, res => {
// console.log("111",res);
if (res.data.resultCode == 1) {
this.TotalNav = res.data.data;
this.getNav();
......
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