master
271556543@qq.com 3 years ago
parent 0283fbf9a5
commit ee2b8ab26a

@ -2,9 +2,9 @@
ENV = 'development' ENV = 'development'
# base api # base api
#VUE_APP_DOMIAN=http://192.168.60.99:9003/ VUE_APP_DOMIAN=http://192.168.60.99:9003/
VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/ #VUE_APP_DOMIAN=http://hdcontract.ali251.langye.net/
VUE_APP_BASE_API = '' #VUE_APP_BASE_API = ''
VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net #VUE_APP_OUT_URL = http://suzhouhedaooa.langye.net
#VUE_APP_OUT_URL = http://192.168.60.18:2021 VUE_APP_OUT_URL = http://192.168.60.18:2021

@ -68,18 +68,18 @@
</div> </div>
</div> </div>
</template> </template>
<template v-slot:is_end> <!-- <template v-slot:is_end>-->
<div class="xy-table-item"> <!-- <div class="xy-table-item">-->
<div class="xy-table-item-label" style="width: 200px;"> <!-- <div class="xy-table-item-label" style="width: 200px;">-->
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目 <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目-->
</div> <!-- </div>-->
<div class="xy-table-item-content"> <!-- <div class="xy-table-item-content">-->
<el-switch v-model="form.is_end" /> <!-- <el-switch v-model="form.is_end" />-->
<!-- @change="toggleSelection"--> <!-- @change="toggleSelection"-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
<template v-slot:extraFormBottom v-if="false"> <template v-slot:extraFormBottom v-if="false">
<Input search enter-button=" " placeholder="搜索预算计划.." v-model="searchContent" @on-search="getBudgets"/> <Input search enter-button=" " placeholder="搜索预算计划.." v-model="searchContent" @on-search="getBudgets"/>
<xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;" ref="planTable" @select="selectPlan"> <xy-table :list="plans" :show-index="false" :table-item="planTable" :height="310" style="margin-top: 10px;" ref="planTable" @select="selectPlan">

@ -89,16 +89,16 @@
</div> </div>
</div> </div>
</template> </template>
<template v-slot:isLast> <!-- <template v-slot:isLast>-->
<div class="xy-table-item"> <!-- <div class="xy-table-item">-->
<div class="xy-table-item-label" style="width: 200px"> <!-- <div class="xy-table-item-label" style="width: 200px">-->
<span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目 <!-- <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>是否为预算内确定项目-->
</div> <!-- </div>-->
<div class="xy-table-item-content"> <!-- <div class="xy-table-item-content">-->
<el-switch disabled v-model="paymentRegistrationForm.isLast"/> <!-- <el-switch disabled v-model="paymentRegistrationForm.isLast"/>-->
</div> <!-- </div>-->
</div> <!-- </div>-->
</template> <!-- </template>-->
<template v-slot:actMoney> <template v-slot:actMoney>
<div class="xy-table-item"> <div class="xy-table-item">
<div class="xy-table-item-label"> <div class="xy-table-item-label">

@ -160,7 +160,7 @@ export default {
applyMoney:"", applyMoney:"",
deductionMoney:"", deductionMoney:"",
type:"", type:"",
isLast:false, //isLast:false,
plan:[] plan:[]
}, },
paymentRegistrationRules:{ paymentRegistrationRules:{
@ -247,19 +247,12 @@ export default {
}, },
submit(){ submit(){
let data = this.paymentRegistrationForm.isLast ? { let data = {
contract_id:this.contract.id, contract_id:this.contract.id,
apply_money:this.paymentRegistrationForm.applyMoney, apply_money:this.paymentRegistrationForm.applyMoney,
discount_money:this.paymentRegistrationForm.deductionMoney, discount_money:this.paymentRegistrationForm.deductionMoney,
type:this.paymentRegistrationForm.type, type:this.paymentRegistrationForm.type,
is_end:this.paymentRegistrationForm.isLast ? 1 : 0, //is_end:this.paymentRegistrationForm.isLast ? 1 : 0
contract_plan_links:this.paymentRegistrationForm.plan
} : {
contract_id:this.contract.id,
apply_money:this.paymentRegistrationForm.applyMoney,
discount_money:this.paymentRegistrationForm.deductionMoney,
type:this.paymentRegistrationForm.type,
is_end:this.paymentRegistrationForm.isLast ? 1 : 0
} }
addFundLog(data).then(res=>{ addFundLog(data).then(res=>{
this.isShowPaymentRegistration = false this.isShowPaymentRegistration = false

@ -108,7 +108,7 @@ export default {
return res.toString() return res.toString()
}, },
guaranteeRate(gua,money){ guaranteeRate(gua,money){
return ((moneyRecovery(gua) / money) * 100).toFixed(4) if(gua && money) return ((moneyRecovery(gua) / money) * 100).toFixed(4)
}, },
async getDetailFundLog(id){ async getDetailFundLog(id){

@ -184,7 +184,7 @@ export default {
applyMoney:"", applyMoney:"",
deductionMoney:"", deductionMoney:"",
type:"", type:"",
isLast:false, //isLast:false,
plan:[], plan:[],
actMoney:'', actMoney:'',
moneyWay:'',// moneyWay:'',//
@ -240,7 +240,7 @@ export default {
}, },
methods: { methods: {
inputMoney(e,row){ inputMoney(e,row){
row.useMoney = e row.use_money = e
this.paymentRegistrationForm.plan.forEach(item => { this.paymentRegistrationForm.plan.forEach(item => {
if(item.plan_id == row.id){ if(item.plan_id == row.id){
item.use_money = e item.use_money = e
@ -275,7 +275,7 @@ export default {
this.registrationId = id this.registrationId = id
const res = await detailFundLog({id}) const res = await detailFundLog({id})
this.paymentRegistrationForm.type = res.type this.paymentRegistrationForm.type = res.type
this.paymentRegistrationForm.isLast = res.is_end === 1 ? true : false //this.paymentRegistrationForm.isLast = res.is_end === 1 ? true : false
this.paymentRegistrationForm.deductionMoney = res.apply_money this.paymentRegistrationForm.deductionMoney = res.apply_money
this.paymentRegistrationForm.applyMoney = res.apply_money this.paymentRegistrationForm.applyMoney = res.apply_money
this.paymentRegistrationForm.plan = res.plan_link this.paymentRegistrationForm.plan = res.plan_link
@ -323,7 +323,7 @@ export default {
this.planTotal = res.list.total this.planTotal = res.list.total
this.toggleSelection(this.paymentRegistrationForm.plan.map(item => { this.toggleSelection(this.paymentRegistrationForm.plan.map(item => {
return item.value.plan_id return item.plan_id
})) }))
}, },
planPageChange(e){ planPageChange(e){
@ -335,7 +335,7 @@ export default {
this.paymentRegistrationForm.plan = sel.map(item => { this.paymentRegistrationForm.plan = sel.map(item => {
return { return {
plan_id:item.id, plan_id:item.id,
use_money:item.useMoney, use_money:item.use_money,
new_money:item.money new_money:item.money
} }
}) })
@ -348,7 +348,7 @@ export default {
if (plans) { if (plans) {
this.plans.filter(plan => { this.plans.filter(plan => {
if(plans.includes(plan.id)){ if(plans.includes(plan.id)){
plan.useMoney = this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].value.use_money plan.use_money = this.paymentRegistrationForm.plan[plans.indexOf(plan.id)].use_money
return true return true
} }
}).map(row => { }).map(row => {

Loading…
Cancel
Save