Commit b508a24e by yuzhenWang

优化3

parent 09009814
...@@ -348,6 +348,7 @@ import { ...@@ -348,6 +348,7 @@ import {
statisticsFortune statisticsFortune
} from '@/api/financial/commission' } from '@/api/financial/commission'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const spiltDigit = ref(2)
const rateExchangeFormRef = ref(null) const rateExchangeFormRef = ref(null)
const rateExchangeFlag = ref(false) const rateExchangeFlag = ref(false)
const rateExchangeForm = ref({}) const rateExchangeForm = ref({})
...@@ -374,7 +375,7 @@ const getOperateItems = row => { ...@@ -374,7 +375,7 @@ const getOperateItems = row => {
const items = [] const items = []
// 条件:isPart == 1 时不显示分期出账(使用宽松相等,兼容字符串 '1') // 条件:isPart == 1 时不显示分期出账(使用宽松相等,兼容字符串 '1')
if (!(row.isPart == 1)) { if (!(row.isPart == 1 || row.status == '2')) {
items.push({ label: '分期出账', value: 'billInstallments' }) items.push({ label: '分期出账', value: 'billInstallments' })
} }
// 出账状态不为已出帐的都可以修改结算汇率 // 出账状态不为已出帐的都可以修改结算汇率
...@@ -932,26 +933,34 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -932,26 +933,34 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
} }
console.log('出账', selectedRow.value.originalAmount, ratio) console.log('出账', selectedRow.value.originalAmount, ratio)
const originalAmount = calculateAmount(selectedRow.value.originalAmount, ratio, 2) const originalAmount = calculateAmount(
selectedRow.value.originalAmount,
ratio,
spiltDigit.value
)
updatedRow.originalAmount = originalAmount updatedRow.originalAmount = originalAmount
// 原币种金额发生变化更新港币金额 // 原币种金额发生变化更新港币金额
if (updatedRow.originalToHkdRate) { if (updatedRow.originalToHkdRate) {
updatedRow.hkdAmount = calculateAmount( updatedRow.hkdAmount = calculateAmount(
updatedRow.originalAmount, updatedRow.originalAmount,
updatedRow.originalToHkdRate, updatedRow.originalToHkdRate,
2 spiltDigit.value
) )
} }
//港币金额发生变化 更新实际发放金额 //港币金额发生变化 更新实际发放金额
if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) { if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
updatedRow.payoutAmount = calculateAmount(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2) updatedRow.payoutAmount = calculateAmount(
updatedRow.hkdAmount,
updatedRow.hkdToPayoutRate,
spiltDigit.value
)
} }
//港币金额发生变化 更新保单币种金额 //港币金额发生变化 更新保单币种金额
if (updatedRow.exchangeRate && updatedRow.hkdAmount) { if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
updatedRow.ruleAmount = calculateAmount( updatedRow.ruleAmount = calculateAmount(
updatedRow.hkdAmount, updatedRow.hkdAmount,
updatedRow.exchangeRate, updatedRow.exchangeRate,
2, spiltDigit.value,
'Divided' 'Divided'
) )
} }
...@@ -962,18 +971,22 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -962,18 +971,22 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
if (prop === 'originalToHkdRate' || prop === 'originalAmount') { if (prop === 'originalToHkdRate' || prop === 'originalAmount') {
const originalToHkdRate = prop === 'originalToHkdRate' ? newValue : currentRow.originalToHkdRate const originalToHkdRate = prop === 'originalToHkdRate' ? newValue : currentRow.originalToHkdRate
const originalAmount = prop === 'originalAmount' ? newValue : currentRow.originalAmount const originalAmount = prop === 'originalAmount' ? newValue : currentRow.originalAmount
const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, 2) const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, spiltDigit.value)
updatedRow.hkdAmount = hkdAmount updatedRow.hkdAmount = hkdAmount
//港币金额发生变化 更新实际发放金额 //港币金额发生变化 更新实际发放金额
if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) { if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
updatedRow.payoutAmount = calculateAmount(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2) updatedRow.payoutAmount = calculateAmount(
updatedRow.hkdAmount,
updatedRow.hkdToPayoutRate,
spiltDigit.value
)
} }
//港币金额发生变化 更新保单币种金额 //港币金额发生变化 更新保单币种金额
if (updatedRow.exchangeRate && updatedRow.hkdAmount) { if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
updatedRow.ruleAmount = calculateAmount( updatedRow.ruleAmount = calculateAmount(
updatedRow.hkdAmount, updatedRow.hkdAmount,
updatedRow.exchangeRate, updatedRow.exchangeRate,
2, spiltDigit.value,
'Divided' 'Divided'
) )
} }
...@@ -983,7 +996,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -983,7 +996,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
if (prop === 'hkdToPayoutRate' || prop === 'hkdAmount') { if (prop === 'hkdToPayoutRate' || prop === 'hkdAmount') {
const hkdToPayoutRate = prop === 'hkdToPayoutRate' ? newValue : currentRow.hkdToPayoutRate const hkdToPayoutRate = prop === 'hkdToPayoutRate' ? newValue : currentRow.hkdToPayoutRate
const hkdAmount = prop === 'hkdAmount' ? newValue : currentRow.hkdAmount const hkdAmount = prop === 'hkdAmount' ? newValue : currentRow.hkdAmount
const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2) const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, spiltDigit.value)
updatedRow.payoutAmount = payoutAmount updatedRow.payoutAmount = payoutAmount
needUpdate = true needUpdate = true
} }
...@@ -991,7 +1004,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -991,7 +1004,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
if (prop === 'exchangeRate' || prop === 'hkdAmount') { if (prop === 'exchangeRate' || prop === 'hkdAmount') {
const exchangeRate = prop === 'exchangeRate' ? newValue : currentRow.exchangeRate const exchangeRate = prop === 'exchangeRate' ? newValue : currentRow.exchangeRate
const hkdAmount = prop === 'hkdAmount' ? newValue : currentRow.hkdAmount const hkdAmount = prop === 'hkdAmount' ? newValue : currentRow.hkdAmount
const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided') const ruleAmount = calculateAmount(hkdAmount, exchangeRate, spiltDigit.value, 'Divided')
updatedRow.ruleAmount = ruleAmount updatedRow.ruleAmount = ruleAmount
needUpdate = true needUpdate = true
} }
......
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