Skip to content

S
SuperMan
Commit fc4397ba authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

领队用款计划

parent bd215cac
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 48 deletions
src/components/FinancialModule/FinancialDocuments.vue
View file @ fc4397ba
......@@ -556,7 +556,7 @@
</td>
<td class="_icon_btn">
<el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top">
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex)"></i>
<i v-if="((msg.Conditon==1 ||msg.Conditon==7) && (item.InOrNotProcess==1 || item.Status==3 || item.Status==0))" class="edit el-icon-edit" @click="goEit(item.Type,item.FrID,true,active,msg.pageIndex, item)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top">
<i class="iconfont icon-sousuo" v-if='item.Type!==4' @click="goUrl('FinancialDocumentsDetail',item.FrID,active,msg.pageIndex)"></i>
......@@ -1521,14 +1521,18 @@ export default {
goUrlAdd(path){
this.$router.push({ name: path,query:{blank:'y',tab:'选择财务单据类型'} })
},
goEit(type,id,edit,Conditon,pageIndex){
goEit(type,id,edit,Conditon,pageIndex, item){
let path = '';
if (type === 1) {
path = 'addReceivablesDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
} else if (type === 2) {
path = 'addFinancialDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
if (item.Status == 3 && item.DMCUsePriceCount > 0) {
return this.$message.error('地接费领取被驳回单据无法修改，请到用款计划页面重新发起！')
} else {
path = 'addFinancialDocuments'
this.$router.push({ name: path,query:{"type":type,"FrID":id,"edit":edit,"Conditon":Conditon,"pageIndex":pageIndex,blank:'y',tab:'修改财务单据'} })
}
} else if (type === 4) {
path = 'addCapitalAllocation'
this.$router.push({ name: path,query:{"id":id,"edit":1,blank:'y',tab:'修改财务单据'} })
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ fc4397ba
......@@ -561,9 +561,9 @@
<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">
<template v-for="leadr in cur.LeaderGetPriceArr" v-if=" leadr.TCNUMS == item.TCNUMS">
<p style="padding-left:20px;display:inline-block">
已领款：
<span style="color: red;">
......@@ -580,19 +580,19 @@
<p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@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)">重新发起</span>&nbsp;&nbsp;<span
<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">
<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">
<input type="button" v-if="!item.hideZDBtn" value="制单" class="normalBtn"
@click="goZhiDan(item,0,leadr)" />
@click="goZhiDan(item,0,leadr,cur)" />
</el-tooltip>
</template>
</div>
......@@ -909,19 +909,7 @@
}
});
},
goZhiDan2: function (obj, type, leadr) {
if (leadr) {
// let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let allMoney = leadr.PlanPrice;
let totailMoney = 0;
totailMoney = Number(leadr.LeaderGetPriceT) + Number(leadr.LeaderGetPrice);
// this.nav.forEach(x => {
// totailMoney += parseFloat(x.LeaderGetPriceT)
// totailMoney += x.LeaderGetPrice
// })
if ((allMoney - totailMoney) < 0) return this.$message.error('最大领款为预付合计金额的95%！')
if (!leadr.LeaderGetPriceT || leadr.LeaderGetPriceT <= 0) return this.$message.error('请输入金额！')
}
goZhiDan2: function (obj, type, leadr, cur) {
let TCIDARR = [obj.TCIDS]
let orderObj = {
OrderID: 0,
......@@ -952,19 +940,24 @@
}
});
},
goZhiDan: function (obj, num, leadr) {
goZhiDan: function (obj, num, leadr, cur) {
if (!num) {
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('请输入金额！')
}
if (this.list.hotelNoSureInfo !== '') {
this.$confirm(`${this.list.hotelNoSureInfo},是否去制单？`, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.goZhiDan2(obj, num, leadr)
this.goZhiDan2(obj, num, leadr, cur)
}).catch(() => {
return false
});
} else {
this.goZhiDan2(obj, num, leadr)
this.goZhiDan2(obj, num, leadr, cur)
}
},
addOtherList(index, id) {
......@@ -1153,11 +1146,9 @@
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 => {
let obj = {
money: 0,
......@@ -1171,40 +1162,33 @@
})
this.CurrencyListMoney.push(obj);
})
}
this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr = [];
let obj = {
CurrencyId: cur.CurrencyId,
LeaderGetPrice: 0,
LeaderGetPriceT: 0,
};
cur.yiLing = 0
cur.LeaderGetPriceArr = [];
nav.forEach(x => {
let obj = {
CurrencyId: cur.CurrencyId,
LeaderGetPrice: 0,
LeaderGetPriceT: 0,
TCNUMS: x.TCNUMS,
TCIDS: x.TCIDS
};
x.LeaderGetPriceList.forEach(price => {
if (cur.CurrencyId == price.CurrencyId) {
obj.CurrencyId = price.CurrencyId;
obj.LeaderGetPrice += price.OrderMakingPrice;
cur.yiLing += price.OrderMakingPrice;
}
})
cur.LeaderGetPriceArr.push(obj);
})
cur.LeaderGetPriceArr.push(obj);
})
this.CurrencyListMoney.forEach((cur, i) => {
cur.LeaderGetPriceArr.forEach(lead => {
lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - cur.yiLing) * 100) / 100;
lead.PlanPrice = cur.money * 0.95;
// if (i === 0) {
// lead.LeaderGetPriceT = Math.floor(((cur.money * 0.95) - lead.LeaderGetPrice) * 100) / 100;
// lead.PlanPrice = cur.money * 0.95;
// } else {
// lead.LeaderGetPriceT = 0;
// lead.PlanPrice = cur.money * 0.95;
// }
})
})
// console.log("CurrencyListMoney",this.CurrencyListMoney)
this.nav = nav;
......
src/components/leaderPay2.vue
View file @ fc4397ba
......@@ -891,7 +891,7 @@ input[type="number"] {
v-show="dataList.LeaderApply.Status==1"
>
<input type="button" class="leader2Btn" value="打印" @click="printTable()">
<input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()">
<!-- <input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()"> -->
</div>
</div>
<a :href="blankUrl" id="blankLink" target="_blank" style="display:none">1</a>
......
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