1

src/components/views/pricingView/WorkloadPricingPane.vue

@@ -21,6 +21,7 @@ interface DetailRow {
   unit: string
   conversion: number | null
   workload: number | null
+  basicFee: number | null
   budgetBase: string
   budgetReferenceUnitPrice: string
   budgetAdoptedUnitPrice: number | null
@@ -142,6 +143,7 @@ const buildDefaultRows = (): DetailRow[] => {
       unit: task.unit || '',
       conversion: typeof task.conversion === 'number' && Number.isFinite(task.conversion) ? task.conversion : null,
       workload: null,
+      basicFee: null,
       budgetBase: task.basicParam || '',
       budgetReferenceUnitPrice: formatTaskReferenceUnitPrice(task),
       budgetAdoptedUnitPrice:
@@ -171,6 +173,7 @@ const mergeWithDictRows = (rowsFromDb: DetailRow[] | undefined): DetailRow[] =>
     return {
       ...row,
       workload: typeof fromDb.workload === 'number' ? fromDb.workload : null,
+      basicFee: typeof fromDb.basicFee === 'number' ? fromDb.basicFee : null,
       budgetAdoptedUnitPrice:
         typeof fromDb.budgetAdoptedUnitPrice === 'number' ? fromDb.budgetAdoptedUnitPrice : null,
       consultCategoryFactor:
@@ -184,25 +187,36 @@ const mergeWithDictRows = (rowsFromDb: DetailRow[] | undefined): DetailRow[] =>
 const parseSanitizedNumberOrNull = (value: unknown) =>
   parseNumberOrNull(value, { sanitize: true })
 
-const calcServiceFee = (row: DetailRow | undefined) => {
+const calcBasicFee = (row: DetailRow | undefined) => {
   if (!row || isNoTaskRow(row)) return null
   const price = row.budgetAdoptedUnitPrice
   const conversion = row.conversion
   const workload = row.workload
-  const factor = row.consultCategoryFactor
   if (
     typeof price !== 'number' ||
     !Number.isFinite(price) ||
     typeof conversion !== 'number' ||
     !Number.isFinite(conversion) ||
     typeof workload !== 'number' ||
-    !Number.isFinite(workload) ||
+    !Number.isFinite(workload)
+  ) {
+    return null
+  }
+  return roundTo(toDecimal(price).mul(conversion).mul(workload), 2)
+}
+
+const calcServiceFee = (row: DetailRow | undefined) => {
+  if (!row || isNoTaskRow(row)) return null
+  const factor = row.consultCategoryFactor
+  const basicFee = calcBasicFee(row)
+  if (
+    basicFee == null ||
     typeof factor !== 'number' ||
     !Number.isFinite(factor)
   ) {
     return null
   }
-  return roundTo(toDecimal(price).mul(conversion).mul(workload).mul(factor), 2)
+  return roundTo(toDecimal(basicFee).mul(factor), 2)
 }
 
 const formatEditableNumber = (params: any) => {
@@ -368,6 +382,7 @@ const columnDefs: ColDef<DetailRow>[] = [
 ]
 
 const totalWorkload = computed(() => sumByNumber(detailRows.value, row => row.workload))
+const totalBasicFee = computed(() => sumByNumber(detailRows.value, row => calcBasicFee(row)))
 
 const totalServiceFee = computed(() => sumByNumber(detailRows.value, row => calcServiceFee(row)))
 const pinnedTopRowData = computed(() => [
@@ -378,6 +393,7 @@ const pinnedTopRowData = computed(() => [
     unit: '',
     conversion: null,
     workload: totalWorkload.value,
+    basicFee: totalBasicFee.value,
     budgetBase: '',
     budgetReferenceUnitPrice: '',
     budgetAdoptedUnitPrice: null,
@@ -390,12 +406,18 @@ const pinnedTopRowData = computed(() => [
 
 
 
+const buildPersistDetailRows = () =>
+  detailRows.value.map(row => ({
+    ...row,
+    basicFee: calcBasicFee(row),
+    serviceFee: calcServiceFee(row)
+  }))
 const saveToIndexedDB = async () => {
   if (!isWorkloadMethodApplicable.value) return
   if (shouldSkipPersist()) return
   try {
     const payload = {
-      detailRows: JSON.parse(JSON.stringify(detailRows.value))
+      detailRows: JSON.parse(JSON.stringify(buildPersistDetailRows()))
     }
     console.log('Saving to IndexedDB:', payload)
     await localforage.setItem(DB_KEY.value, payload)
@@ -537,3 +559,4 @@ const mydiyTheme = myTheme.withParams({
     </div>
   </div>
 </template>
+