优化

src/components/views/pricingView/InvestmentScalePricingPane.vue

@@ -3,13 +3,15 @@ import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { AgGridVue } from 'ag-grid-vue3'
 import type { ColDef } from 'ag-grid-community'
 import localforage from 'localforage'
-import { getBasicFeeFromScale, majorList } from '@/sql'
+import { majorList } from '@/sql'
 import { myTheme, gridOptions } from '@/lib/diyAgGridOptions'
-import { addNumbers, decimalAggSum, roundTo, sumByNumber, toDecimal } from '@/lib/decimal'
+import { decimalAggSum, roundTo, sumByNumber } from '@/lib/decimal'
 import { formatThousands } from '@/lib/numberFormat'
 import { syncPricingTotalToZxFw, ZXFW_RELOAD_SERVICE_KEY } from '@/lib/zxFwPricingSync'
 import { usePricingPaneReloadStore } from '@/pinia/pricingPaneReload'
 import { loadConsultCategoryFactorMap, loadMajorFactorMap } from '@/lib/xmFactorDefaults'
+import { parseNumberOrNull } from '@/lib/number'
+import { getBenchmarkBudgetByScale, getScaleBudgetFee } from '@/lib/pricingScaleFee'
 import { Button } from '@/components/ui/button'
 import {
   AlertDialogAction,
@@ -250,12 +252,6 @@ const mergeWithDictRows = (
   })
 }
 
-const parseNumberOrNull = (value: unknown) => {
-  if (value === '' || value == null) return null
-  const v = Number(value)
-  return Number.isFinite(v) ? v : null
-}
-
 const formatEditableNumber = (params: any) => {
   if (!params.node?.group && !params.node?.rowPinned && (params.value == null || params.value === '')) {
     return '点击输入'
@@ -285,15 +281,15 @@ const formatReadonlyMoney = (params: any) => {
   return formatThousands(roundTo(params.value, 2))
 }
 
-const getBenchmarkBudgetByAmount = (row?: Pick<DetailRow, 'amount'>) => {
-  const result = getBasicFeeFromScale(row?.amount, 'cost')
-  return result ? roundTo(addNumbers(result.basic, result.optional), 2) : null
-}
+const getBenchmarkBudgetByAmount = (row?: Pick<DetailRow, 'amount'>) =>
+  getBenchmarkBudgetByScale(row?.amount, 'cost')
 
 const getBudgetFee = (row?: Pick<DetailRow, 'amount' | 'majorFactor' | 'consultCategoryFactor'>) => {
-  const benchmarkBudget = getBenchmarkBudgetByAmount(row)
-  if (benchmarkBudget == null || row?.majorFactor == null || row?.consultCategoryFactor == null) return null
-  return roundTo(toDecimal(benchmarkBudget).mul(row.majorFactor).mul(row.consultCategoryFactor), 2)
+  return getScaleBudgetFee({
+    benchmarkBudget: getBenchmarkBudgetByAmount(row),
+    majorFactor: row?.majorFactor,
+    consultCategoryFactor: row?.consultCategoryFactor
+  })
 }
 
 const columnDefs: ColDef<DetailRow>[] = [