yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
ligaode 2 weeks ago
parent
330a0eb8f2 3d0fcc176b
commit
d497fad44f
2 changed files with 4 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
  2. 7
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue

7
anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
View File

@ -114,7 +114,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">资方未到期金额</div> <div class="span-sty">资方未到期金额</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="UpNumber" @input="notDuePriceInput" v-model="formobj.bankCostVo.notDuePrice" clearable placeholder=""/></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.bankCostVo.notDuePrice" clearable placeholder=""/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -303,7 +303,7 @@ export default {
}, },
// 结清利润计算 // 结清利润计算
calculateProfit() { calculateProfit() {
return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0 return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice)) || 0
} }
}, },
data() { data() {
@ -471,9 +471,6 @@ export default {
} }
}) })
}, },
notDuePriceInput(val) {
this.formobj.companyCostVo.bankNotPrice = val
},
bankInterestInput(val) { bankInterestInput(val) {
this.formobj.companyCostVo.bankOverInterest = val this.formobj.companyCostVo.bankOverInterest = val
}, },

7
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
View File

@ -113,7 +113,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<div class="span-sty">资方未到期金额</div> <div class="span-sty">资方未到期金额</div>
<el-form-item><el-input class="addinputInfo addinputw" @keyup.native="UpNumber" @input="notDuePriceInput" v-model="formobj.bankCostVo.notDuePrice" clearable placeholder=""/></el-form-item> <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="UpNumber" v-model="formobj.bankCostVo.notDuePrice" clearable placeholder=""/></el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
@ -302,7 +302,7 @@ export default {
}, },
// 结清利润计算 // 结清利润计算
calculateProfit() { calculateProfit() {
return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice))) || 0 return (parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice)) - (parseFloat(this.formobj.bankCostVo.bankInterest === '' ? 0 : this.formobj.bankCostVo.bankInterest) + parseFloat(this.formobj.bankCostVo.bankNominalPrice === '' ? 0 : this.formobj.bankCostVo.bankNominalPrice) + parseFloat(this.formobj.bankCostVo.bankContractLiquidated === '' ? 0 : this.formobj.bankCostVo.bankContractLiquidated) + parseFloat(this.formobj.bankCostVo.bankOtherReceivable === '' ? 0 : this.formobj.bankCostVo.bankOtherReceivable)) + (parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) - parseFloat(this.formobj.bankCostVo.notDuePrice === '' ? 0 : this.formobj.bankCostVo.notDuePrice)) || 0
} }
}, },
data() { data() {
@ -471,9 +471,6 @@ export default {
} }
}) })
}, },
notDuePriceInput(val) {
this.formobj.companyCostVo.bankNotPrice = val
},
bankInterestInput(val) { bankInterestInput(val) {
this.formobj.companyCostVo.bankOverInterest = val this.formobj.companyCostVo.bankOverInterest = val
}, },

Write Preview
Loading…
Cancel
Save