修改出账检核2

src/views/financialCenter/financialBilling.vue

@@ -98,13 +98,13 @@
             sortable
             sortable
             :formatter="row => `${row.commissionPaidRatio ? row.commissionPaidRatio : 0}%`"
             :formatter="row => `${row.commissionPaidRatio ? row.commissionPaidRatio : 0}%`"
           /> -->
           /> -->
-          <el-table-column
+          <!-- <el-table-column
             prop="commissionPaidRatio"
             prop="commissionPaidRatio"
             label="达成率缺口"
             label="达成率缺口"
             width="120"
             width="120"
             sortable
             sortable
             :formatter="row => `${row.commissionPaidRatio ? row.commissionPaidRatio : 0}%`"
             :formatter="row => `${row.commissionPaidRatio ? row.commissionPaidRatio : 0}%`"
-          />
+          /> -->
           <el-table-column prop="fortuneName" label="出账项目" width="130" sortable />
           <el-table-column prop="fortuneName" label="出账项目" width="130" sortable />
           <el-table-column prop="fortunePeriod" label="出账期数" width="130" sortable />
           <el-table-column prop="fortunePeriod" label="出账期数" width="130" sortable />
           <el-table-column prop="fortuneTotalPeriod" label="总期数" width="120" sortable />
           <el-table-column prop="fortuneTotalPeriod" label="总期数" width="120" sortable />
@@ -868,19 +868,28 @@ const handleSplitCellChange = ({ row, col, newValue, oldValue, rowIndex, prop })
     }
     }
     console.log('出账', selectedRow.value.originalAmount, ratio)
     console.log('出账', selectedRow.value.originalAmount, ratio)
 
 
-    const originalAmount = multiply(selectedRow.value.originalAmount, ratio, 2)
+    const originalAmount = calculateAmount(selectedRow.value.originalAmount, ratio, 2)
     updatedRow.originalAmount = originalAmount
     updatedRow.originalAmount = originalAmount
     // 原币种金额发生变化更新港币金额
     // 原币种金额发生变化更新港币金额
     if (updatedRow.originalToHkdRate) {
     if (updatedRow.originalToHkdRate) {
-      updatedRow.hkdAmount = multiply(updatedRow.originalAmount, updatedRow.originalToHkdRate, 2)
+      updatedRow.hkdAmount = calculateAmount(
+        updatedRow.originalAmount,
+        updatedRow.originalToHkdRate,
+        2
+      )
     }
     }
     //港币金额发生变化 更新实际发放金额
     //港币金额发生变化 更新实际发放金额
     if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
     if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
-      updatedRow.payoutAmount = multiply(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2)
+      updatedRow.payoutAmount = calculateAmount(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2)
     }
     }
     //港币金额发生变化 更新保单币种金额
     //港币金额发生变化 更新保单币种金额
     if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
     if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
-      updatedRow.ruleAmount = multiply(updatedRow.hkdAmount, updatedRow.exchangeRate, 2, 'Divided')
+      updatedRow.ruleAmount = calculateAmount(
+        updatedRow.hkdAmount,
+        updatedRow.exchangeRate,
+        2,
+        'Divided'
+      )
     }
     }
     needUpdate = true
     needUpdate = true
   }
   }
@@ -889,15 +898,20 @@ 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 = multiply(originalAmount, originalToHkdRate, 2)
+    const hkdAmount = calculateAmount(originalAmount, originalToHkdRate, 2)
     updatedRow.hkdAmount = hkdAmount
     updatedRow.hkdAmount = hkdAmount
     //港币金额发生变化 更新实际发放金额
     //港币金额发生变化 更新实际发放金额
     if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
     if (updatedRow.hkdToPayoutRate && updatedRow.hkdAmount) {
-      updatedRow.payoutAmount = multiply(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2)
+      updatedRow.payoutAmount = calculateAmount(updatedRow.hkdAmount, updatedRow.hkdToPayoutRate, 2)
     }
     }
     //港币金额发生变化 更新保单币种金额
     //港币金额发生变化 更新保单币种金额
     if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
     if (updatedRow.exchangeRate && updatedRow.hkdAmount) {
-      updatedRow.ruleAmount = multiply(updatedRow.hkdAmount, updatedRow.exchangeRate, 2, 'Divided')
+      updatedRow.ruleAmount = calculateAmount(
+        updatedRow.hkdAmount,
+        updatedRow.exchangeRate,
+        2,
+        'Divided'
+      )
     }
     }
     needUpdate = true
     needUpdate = true
   }
   }
@@ -905,7 +919,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 = multiply(hkdAmount, hkdToPayoutRate, 2)
+    const payoutAmount = calculateAmount(hkdAmount, hkdToPayoutRate, 2)
     updatedRow.payoutAmount = payoutAmount
     updatedRow.payoutAmount = payoutAmount
     needUpdate = true
     needUpdate = true
   }
   }
@@ -913,7 +927,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 = multiply(hkdAmount, exchangeRate, 2, 'Divided')
+    const ruleAmount = calculateAmount(hkdAmount, exchangeRate, 2, 'Divided')
     updatedRow.ruleAmount = ruleAmount
     updatedRow.ruleAmount = ruleAmount
     needUpdate = true
     needUpdate = true
   }
   }