Merge branch 'develop' into dev

src/modules/09_leave/components/07_LeaveHistory/DialogForm.vue

@@ -265,7 +265,6 @@ watch(modal, async (val) => {
       await Promise.all([
         filterLeaveTypeData(),
         isStatusEdit.value && defineDataLeaveBeginning(rowData.value),
-        console.log(rowData.value),
       ]);
     } finally {
       hideLoader();
@@ -463,6 +462,7 @@ watch(modal, async (val) => {
                     outlined
                     label="จำนวนสิทธิ์การลา"
                     hide-bottom-space
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
                   />
                 </div>
                 <div class="col-12">
@@ -473,8 +473,7 @@ watch(modal, async (val) => {
                     outlined
                     label="ที่ใช้ไป (วัน)"
                     hide-bottom-space
-                    mask="#"
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    reverse-fill-mask
                   />
                 </div>
                 <div class="col-12">
@@ -498,8 +497,7 @@ watch(modal, async (val) => {
                     outlined
                     label="ยกมา (วัน)"
                     hide-bottom-space
-                    mask="#"
+                    :rules="[(val: string) => !val || /^\d+(\.\d*)?$/.test(val) || 'กรุณากรอกเฉพาะตัวเลข']"
-                    reverse-fill-mask
                   />
                 </div>