ปรับ บัญชีเงินเดือน

src/modules/13_salary/components/SalaryChart/DialogFormRate.vue

@@ -23,7 +23,6 @@ const {
 } = useCounterMixin();
 
 const salaryId = ref<string>(route.params.id.toString());
-const salaryRateId = ref<string>("");
 
 const modal = defineModel<boolean>("modal", { required: true });
 const props = defineProps({
@@ -85,9 +84,23 @@ const title = computed(() => {
 
 function closeDialog() {
   modal.value = !modal.value;
+  clearFormData();
+}
+
+function clearFormData() {
+  formData.salaryId = "";
+  formData.salary = null;
+  formData.salaryHalf = null;
+  formData.salaryHalfSpecial = null;
+  formData.salaryFull = null;
+  formData.salaryFullSpecial = null;
+  formData.salaryFullHalf = null;
+  formData.salaryFullHalfSpecial = null;
+  formData.isNext = false;
 }
 
 function onClickSubmit() {
+  console.log(formData.salaryHalfSpecial);
   const hasError = [];
   for (const key in ObjectRef) {
     if (Object.prototype.hasOwnProperty.call(ObjectRef, key)) {
@@ -118,7 +131,9 @@ function createSalaryRate() {
           : Number(formData.salaryHalf.replace(/,/g, "")), //0.5 ขั้น
 
       salaryHalfSpecial:
-        typeof formData.salaryHalfSpecial === "number"
+        formData.salaryHalfSpecial === "" || formData.salaryHalfSpecial === null
+          ? null
+          : typeof formData.salaryHalfSpecial === "number"
           ? formData.salaryHalfSpecial
           : Number(formData.salaryHalfSpecial.replace(/,/g, "")), //0.5 ขั้น(เงินพิเศษ)
 
@@ -128,7 +143,9 @@ function createSalaryRate() {
           : Number(formData.salaryFull.replace(/,/g, "")), //1 ขั้น
 
       salaryFullSpecial:
-        typeof formData.salaryFullSpecial === "number"
+        formData.salaryFullSpecial === "" || formData.salaryFullSpecial === null
+          ? null
+          : typeof formData.salaryFullSpecial === "number"
           ? formData.salaryFullSpecial
           : Number(formData.salaryFullSpecial.replace(/,/g, "")), //1 ขั้น(เงินพิเศษ)
 
@@ -138,7 +155,10 @@ function createSalaryRate() {
           : Number(formData.salaryFullHalf.replace(/,/g, "")), //1.formData5 ขั้น
 
       salaryFullHalfSpecial:
-        typeof formData.salaryFullHalfSpecial === "number"
+        formData.salaryFullHalfSpecial === "" ||
+        formData.salaryFullHalfSpecial === null
+          ? null
+          : typeof formData.salaryFullHalfSpecial === "number"
           ? formData.salaryFullHalfSpecial
           : Number(formData.salaryFullHalfSpecial.replace(/,/g, "")), //1.5 ขั้น(เงินพิเศษ)
       isNext: formData.isNext, //*ทะลุขั้น
@@ -233,7 +253,6 @@ watch(
                 label="เงินพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val) => !!val || `${'เงินพิเศษ'}`]"
                 lazy-rules
                 hide-bottom-space
               />
@@ -261,7 +280,6 @@ watch(
                 label="เงินพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val) => !!val || `${'เงินพิเศษ'}`]"
                 lazy-rules
                 hide-bottom-space
               />
@@ -289,7 +307,6 @@ watch(
                 label="เงินพิเศษ"
                 mask="###,###,###,###"
                 reverse-fill-mask
-                :rules="[(val) => !!val || `${'เงินพิเศษ'}`]"
                 lazy-rules
                 hide-bottom-space
               />