Merge branch 'wyz' into 'test'

出账检核发测试

See merge request !115

src/views/financialCenter/financialBilling.vue

@@ -582,7 +582,7 @@ const confirmRateExchange = async () => {
 const handleInputChange = async (formType, prop, value, item) => {
 const handleInputChange = async (formType, prop, value, item) => {
   if (formType == 'rateExchange') {
   if (formType == 'rateExchange') {
     if (prop === 'exchangeRate' && value && rateExchangeForm.value.originalAmount) {
     if (prop === 'exchangeRate' && value && rateExchangeForm.value.originalAmount) {
-      // 计算港币金额
+      // 计算本次出账原币种金额
       const originalAmount = rateExchangeForm.value.originalAmount
       const originalAmount = rateExchangeForm.value.originalAmount
       const exchangeRate = value
       const exchangeRate = value
       const hkdAmount = multiply(originalAmount, exchangeRate, 2)
       const hkdAmount = multiply(originalAmount, exchangeRate, 2)
@@ -639,8 +639,11 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
 
 
   // 联动规则1：出账比例 或 原币种金额 变化 → 重算 本次出账原币种金额
   // 联动规则1：出账比例 或 原币种金额 变化 → 重算 本次出账原币种金额
   if (prop === 'splitRatio' || prop === 'amount') {
   if (prop === 'splitRatio' || prop === 'amount') {
-    const ratio = prop === 'splitRatio' ? newValue : currentRow.splitRatio
+    let ratio = prop === 'splitRatio' ? newValue : currentRow.splitRatio
     const amount = prop === 'amount' ? newValue : currentRow.amount
     const amount = prop === 'amount' ? newValue : currentRow.amount
+    if (ratio) {
+      ratio = ratio / 100
+    }
     const newChuAmount = multiply(amount, ratio, 2)
     const newChuAmount = multiply(amount, ratio, 2)
     updatedRow.originalAmount = newChuAmount
     updatedRow.originalAmount = newChuAmount
     needUpdate = true
     needUpdate = true
@@ -1002,14 +1005,17 @@ const submitSettingBillYearMonth = async () => {
     //等后端接口
     //等后端接口
     try {
     try {
       const res = await downloadPolicyFortuneAccount({
       const res = await downloadPolicyFortuneAccount({
-        fortuneBizIdList: multipleSelection.value.map(item => item.fortuneBizId)
+        fortuneBizIdList: multipleSelection.value.map(item => item.fortuneBizId),
+        actualPayoutDate: settingBillTimeForm.value.actualPayoutDate
       })
       })
       if (res.code === 200) {
       if (res.code === 200) {
+        settingBillYearMonthFlag.value = false
         ElMessage.success('完成检核，等待关账')
         ElMessage.success('完成检核，等待关账')
         loadTableData()
         loadTableData()
       }
       }
     } catch (error) {
     } catch (error) {
       console.error('检核失败:', error)
       console.error('检核失败:', error)
+      settingBillYearMonthFlag.value = true
       ElMessage.error(error.response?.data?.msg || '检核失败')
       ElMessage.error(error.response?.data?.msg || '检核失败')
     }
     }
   } else if (billTimeType.value == 'single') {
   } else if (billTimeType.value == 'single') {

src/views/financialCenter/financialIncome.vue

@@ -1007,6 +1007,7 @@ const handleSelect = (e, row) => {
   } else if (e === 'syncToReceivable') {
   } else if (e === 'syncToReceivable') {
     return
     return
   } else if (e === 'editCheckRecord') {
   } else if (e === 'editCheckRecord') {
+    updateDataFormModel.value = { ...selectedRow.value }
     recordCheckDialogFlag.value = true
     recordCheckDialogFlag.value = true
     return
     return
   }
   }