Commit 36fa7efc authored by zhengke's avatar zhengke

修改

parent 6e8fa417
...@@ -363,7 +363,14 @@ ...@@ -363,7 +363,14 @@
<td>总金额</td> <td>总金额</td>
<td colspan="24"> <td colspan="24">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==1">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -455,7 +462,14 @@ ...@@ -455,7 +462,14 @@
<td>总金额</td> <td>总金额</td>
<td colspan="12"> <td colspan="12">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==2">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -530,7 +544,14 @@ ...@@ -530,7 +544,14 @@
<td>总金额</td> <td>总金额</td>
<td colspan="11"> <td colspan="11">
<span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3"> <span v-for="plan in TotalNav.planPriceList" v-if="plan.UserType==3">
{{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> ({{plan.CurrencyName}}) </span> {{plan.PlanTotalPrice}} <span v-if="plan.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{plan.CurrencyName}}
</template>
) </span>
</span> </span>
</td> </td>
</tr> </tr>
...@@ -581,7 +602,14 @@ ...@@ -581,7 +602,14 @@
<td>{{item.TCNUMS}}</td> <td>{{item.TCNUMS}}</td>
<td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额: <td :rowspan="nav.length * CurrencyListMoney.length" width="180" v-if="index===0">总金额:
<span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}} <span v-for="(cur,index) in CurrencyListMoney" :key="index+5000">{{moneyFormat(cur.money)}}
<span v-if="cur.CurrencyId>0"> ({{currencyTypeObj[cur.CurrencyId]}}) </span> <span v-if="cur.CurrencyId>0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{currencyTypeObj[cur.CurrencyId]}}
</template>
) </span>
</br></span> </br></span>
</td> </td>
<td style="padding: 5px 20px;"> <td style="padding: 5px 20px;">
...@@ -591,7 +619,14 @@ ...@@ -591,7 +619,14 @@
已领款: 已领款:
<span style="color: red;"> <span style="color: red;">
{{moneyFormat(leadr.LeaderGetPrice)}} {{moneyFormat(leadr.LeaderGetPrice)}}
<span v-if="cur.CurrencyId > 0"> ({{currencyTypeObj[leadr.CurrencyId]}}) </span> <span v-if="cur.CurrencyId > 0"> (
<template v-if="IsShowRMB">
<span>人民币</span>
</template>
<template v-else>
{{currencyTypeObj[leadr.CurrencyId]}}
</template>
) </span>
</span> </span>
</p> </p>
<el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number" <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
...@@ -1144,9 +1179,6 @@ ...@@ -1144,9 +1179,6 @@
}, res => { }, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let nav = res.data.data.list; let nav = res.data.data.list;
if(nav[0].OutBranchId==1216){
this.IsShowRMB=true;
}
let num = 0; let num = 0;
nav.forEach(x => { nav.forEach(x => {
x.CurrencyIdArr = []; x.CurrencyIdArr = [];
...@@ -1253,6 +1285,9 @@ ...@@ -1253,6 +1285,9 @@
this.isUpdate = this.$route.query.isUpdate; this.isUpdate = this.$route.query.isUpdate;
this.msg.TCIDs = this.$route.query.id; this.msg.TCIDs = this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum; this.NewCombinationNum = this.$route.query.NewCombinationNum;
if(this.$route.query.OutBranchId==1216){
this.IsShowRMB=true;
}
this.getList(); this.getList();
this.getTotalNav(); this.getTotalNav();
this.getHangingAccountByTCIDList() this.getHangingAccountByTCIDList()
......
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')"> <div class="fz16 fbold linkspan" @click="goUrlYongKuan('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.UseMoney==1"></span> <span style="color: #4BCA81;" v-if="item.UseMoney==1"></span>
<span class="colorE95252" v-else>{{item.UseMoney=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.UseMoney=='-1'?"x":"O"}}</span>
</div> </div>
...@@ -911,6 +911,20 @@ ...@@ -911,6 +911,20 @@
} }
}) })
}, },
//跳转用款计划
goUrlYongKuan(path, obj, outItem, title){
this.$router.push({
name: path,
query: {
"id": outItem.TCIDS,
NewCombinationNum: outItem.NewCombinationNum,
isUpdate: true,
OutBranchId:obj.OutBranchId,
blank: 'y',
tab: title
}
})
},
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
......
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