government completed

Chuiantw1212 · May 9, 2024 · 220d29d · 220d29d
1 parent 1ab3a33
commit 220d29d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/components/calculator/career/government.vue b/components/calculator/career/government.vue
@@ -64,8 +64,8 @@
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="本俸額">
-                        <el-text>{{ Number(civilServantPension.salary).toLocaleString() }}</el-text>
+                    <el-form-item label="= 奉給">
+                        <el-text>{{ Number(career.monthlyTotalSalary).toLocaleString() }}</el-text>
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -201,6 +201,7 @@ function calculateCareer(options: any = { propagate: true }) {
     try {
         calculateMonthlyBasic()
         calculateAllowance()
+        calculateMonthlyTotal()
         calculateHealthInsurance()
         calculateCareerInsurance()
         calculatePension()
@@ -232,6 +233,10 @@ function calculateMonthlyBasic() {
         career.value.monthlyBasicSalary = 0
     }
 }
+function calculateMonthlyTotal() {
+    const { monthlyBasicSalary, insurance, pension, supervisorAllowance, professionalAllowance } = career.value
+    career.value.monthlyTotalSalary = monthlyBasicSalary + supervisorAllowance + professionalAllowance
+}
 function calculateCareerInsurance() {
     const { monthlyBasicSalary, } = career.value
     const { premiumRate, employeeContributionRate } = civilServantInsurance
@@ -308,7 +313,7 @@ function drawChartAndCalculateIncome(propagate = false) {
     const dataAndDataIndex: any[] = []
     fv = monthlyBasicSalary + supervisorAllowance + professionalAllowance
     dataAndDataIndex.push({
-        label: '本薪',
+        label: '奉給',
         data: [pv, fv],
         datasetIndex: 0,
     })