Commit 37963fe8 by yuzhenWang

出账检核修改发布测试

parent f51c60b8
...@@ -363,12 +363,13 @@ const getOperateItems = row => { ...@@ -363,12 +363,13 @@ const getOperateItems = row => {
if (!(row.isPart == 1)) { if (!(row.isPart == 1)) {
items.push({ label: '分期出账', value: 'billInstallments' }) items.push({ label: '分期出账', value: 'billInstallments' })
} }
// 出账状态不为已出帐的都可以修改结算汇率
if (row.status !== '2') {
items.push({ label: '修改结算汇率', value: 'editExchangeRate' })
}
// 始终显示的菜单项(保持原始顺序) // 始终显示的菜单项(保持原始顺序)
items.push( items.push({ label: '设置出账年月(实)', value: 'settingBillYearMonth' })
{ label: '设置出账年月(实)', value: 'settingBillYearMonth' },
{ label: '修改结算汇率', value: 'editExchangeRate' }
)
return items return items
} }
...@@ -805,12 +806,14 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -805,12 +806,14 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
let needUpdate = false let needUpdate = false
const updatedRow = { ...currentRow } const updatedRow = { ...currentRow }
// 联动规则1:计算原币种金额 应出账比例*应出账金额(HKD) // 联动规则1:计算原币种金额 应出账比例*应出账金额(HKD)
if (prop === 'splitRatio' && selectedRow.value.hkdAmount) { if (prop === 'splitRatio' && selectedRow.value.originalAmount) {
let ratio = prop === 'splitRatio' ? newValue : currentRow.splitRatio let ratio = prop === 'splitRatio' ? newValue : currentRow.splitRatio
if (ratio) { if (ratio) {
ratio = ratio / 100 ratio = ratio / 100
} }
const originalAmount = multiply(selectedRow.value.hkdAmount, ratio, 2) console.log('出账', selectedRow.value.originalAmount, ratio)
const originalAmount = multiply(selectedRow.value.originalAmount, ratio, 2)
updatedRow.originalAmount = originalAmount updatedRow.originalAmount = originalAmount
// 原币种金额发生变化更新港币金额 // 原币种金额发生变化更新港币金额
if (updatedRow.originalToHkdRate) { if (updatedRow.originalToHkdRate) {
...@@ -859,11 +862,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop }) ...@@ -859,11 +862,7 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
updatedRow.ruleAmount = ruleAmount updatedRow.ruleAmount = ruleAmount
needUpdate = true needUpdate = true
} }
//出账比例发生变化,一系列得金额都会变化
// if (prop === 'splitRatio' && updatedRow.splitRatio) {
// needUpdate = true
// }
// 如果用户手动修改了 hkdAmount,不做反向联动(符合需求) // 如果用户手动修改了 hkdAmount,不做反向联动(符合需求)
if (needUpdate) { if (needUpdate) {
// 更新表格数据(整体替换,触发视图更新) // 更新表格数据(整体替换,触发视图更新)
...@@ -1275,18 +1274,19 @@ const handleSelect = (e, row) => { ...@@ -1275,18 +1274,19 @@ const handleSelect = (e, row) => {
settingBillYearMonthFlag.value = true settingBillYearMonthFlag.value = true
} else if (e == 'editExchangeRate') { } else if (e == 'editExchangeRate') {
rateExchangeForm.value = { rateExchangeForm.value = {
originalAmount: row.originalAmount ? formatCurrency(row.originalAmount) : '', originalAmount: row.originalAmount ? row.originalAmount : '',
ruleCurrency: row.ruleCurrency, ruleCurrency: row.ruleCurrency,
originalCurrency: row.originalCurrency, originalCurrency: row.originalCurrency,
payoutCurrency: row.payoutCurrency, payoutCurrency: row.payoutCurrency,
hkdToPayoutRate: row.hkdToPayoutRate ? row.hkdToPayoutRate : '', hkdToPayoutRate: row.hkdToPayoutRate ? row.hkdToPayoutRate : '',
exchangeRate: row.exchangeRate ? row.exchangeRate : '', exchangeRate: row.exchangeRate ? row.exchangeRate : '',
originalToHkdRate: row.originalToHkdRate ? row.originalToHkdRate : '', originalToHkdRate: row.originalToHkdRate ? row.originalToHkdRate : '',
payoutAmount: row.payoutAmount ? formatCurrency(row.payoutAmount) : '', payoutAmount: row.payoutAmount ? row.payoutAmount : '',
ruleAmount: row.ruleAmount ? formatCurrency(row.ruleAmount) : '', ruleAmount: row.ruleAmount ? row.ruleAmount : '',
hkdAmount: row.hkdAmount ? formatCurrency(row.hkdAmount) : '' hkdAmount: row.hkdAmount ? row.hkdAmount : ''
} }
rateExchangeFlag.value = true rateExchangeFlag.value = 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