wip

Chuiantw1212 · May 9, 2024 · 656c19f · 656c19f
1 parent 220d29d
commit 656c19f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/components/calculator/career/government.vue b/components/calculator/career/government.vue
@@ -66,6 +66,7 @@
                 <el-col :span="12">
                     <el-form-item label="= 奉給">
                         <el-text>{{ Number(career.monthlyTotalSalary).toLocaleString() }}</el-text>
+                        <!-- <el-text>{{ Number(civilServantPension.salary).toLocaleString() }}</el-text> -->
                     </el-form-item>
                 </el-col>
             </el-row>
@@ -318,6 +319,19 @@ function drawChartAndCalculateIncome(propagate = false) {
         datasetIndex: 0,
     })
 
+    pv = fv
+    if (pension.monthlyContributionEmployee) {
+        fv -= pension.monthlyContributionEmployee
+        dataAndDataIndex.push({
+            label: '退撫',
+            data: [pv, fv],
+            datasetIndex: 1,
+        })
+    }
+    if (monthlyBasicSalary) {
+        career.value.monthlyNetPayEstimated = fv
+    }
+
     pv = fv
     fv -= healInsurance.contribution
     dataAndDataIndex.push({
@@ -334,19 +348,6 @@ function drawChartAndCalculateIncome(propagate = false) {
         datasetIndex: 1,
     })
 
-    pv = fv
-    if (pension.monthlyContributionEmployee) {
-        fv -= pension.monthlyContributionEmployee
-        dataAndDataIndex.push({
-            label: '退撫',
-            data: [pv, fv],
-            datasetIndex: 1,
-        })
-    }
-    if (monthlyBasicSalary) {
-        career.value.monthlyNetPayEstimated = fv
-    }
-
     fv = career.value.monthlyNetPay || fv
     dataAndDataIndex.push({
         label: '月實領',

diff --git a/components/calculator/retirement.vue b/components/calculator/retirement.vue
@@ -32,9 +32,8 @@
                     </el-form-item>
                 </el-col>
             </el-row>
-            <el-collapse>
+            <el-collapse v-if="['employee', 'entrepreneur'].includes(profile.insuranceType)">
                 <el-collapse-item title="查詢勞保局E化服務系統後設定" :border="true" :disabled="isFormDisabled">
-
                     <el-row>
                         <el-col :span="12">
                             <el-form-item label="目前勞保投保年資">
@@ -136,8 +135,8 @@
                         <el-radio-group v-model="retirement.qualityLevel" @change="calculateRetirement($event)"
                             :disabled="isFormDisabled">
                             <el-radio v-for="(item, key) in config.retirementQuartile" :value="key + 1">{{
-                                item.label
-                                }}</el-radio>
+                item.label
+            }}</el-radio>
                         </el-radio-group>
                     </el-form-item>
                 </el-col>