From be2a9a8ca68467dc150e44924d05d7d3c373f75a Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Wed, 28 Aug 2024 10:06:10 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=9C=E0=B8=B1=E0=B8=87=E0=B8=9A=E0=B8=B1=E0=B8=8D?=
 =?UTF-8?q?=E0=B8=8A=E0=B8=B5=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?=
 =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D>=20=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=20form=20dailog?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/SalaryChart/DialogFormMain.vue |   9 +-
 .../components/SalaryChart/DialogFormRate.vue | 231 +++++++++---------
 src/modules/13_salary/views/salaryChart.vue   |   4 +-
 3 files changed, 121 insertions(+), 123 deletions(-)

diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
index 5fa81ff11..56cee398d 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
@@ -122,8 +122,8 @@ function fetchSalaryDetail(id: string) {
   showLoader();
   http
     .get(config.API.salaryChartByid(id))
-    .then((res) => {
-      const data = res.data.result;
+    .then(async (res) => {
+      const data = await res.data.result;
       formData.name = data.name;
       formData.posTypeId = data.posTypeId;
       formData.posLevelId = data.posLevelId;
@@ -159,9 +159,8 @@ watch(
             salaryId.value = props.data.id;
             fetchPosLevel(props?.data?.posTypeId);
             fetchSalaryDetail(props.data.id);
-            hideLoader();
           }
-        }, 2000);
+        }, 1000);
       }
     }
   }
@@ -269,7 +268,7 @@ const getClass = (val: boolean) => {
 
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card class="col-12" style="width: 80%">
+    <q-card class="col-12" style="width: 55%">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <Header :tittle="title" :close="closeDialog" />
         <q-separator />
diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
index c7c6f4f19..af9d1090f 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
@@ -1,3 +1,4 @@
+divdivdiv
 <script setup lang="ts">
 import { computed, ref, reactive, watch } from "vue";
 import { useQuasar } from "quasar";
@@ -189,132 +190,130 @@ const getClass = (val: boolean) => {
 
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card style="width: 700px; max-width: 80vw">
+    <q-card style="width: 650px; max-width: 80vw">
       <q-form greedy @submit.prevent @validation-success="onSubmit">
         <Header :tittle="title" :close="closeDialog" />
         <q-separator />
 
         <q-card-section>
-          <div class="row q-gutter-sm q-pa-sm">
-            <div class="row col-xs-12 col-md-12 q-col-gutter-sm">
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryRef"
-                  dense
-                  outlined
-                  v-model="formData.salary"
-                  label="เงินเดือนฐาน"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือนฐาน'}`]"
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6 row items-center">
-                <q-checkbox dense v-model="formData.isNext" label="ทะลุขั้น" />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryHalfRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryHalf"
-                  label="เลื่อน 0.5 ขั้น"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 0.5 ขั้น'}`]"
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryHalfSpecialRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryHalfSpecial"
-                  label="เงินพิเศษ"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryFullRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryFull"
-                  label="เลื่อน 1 ขั้น"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 1 ขั้น'}`]"
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryFullSpecialRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryFullSpecial"
-                  label="เงินพิเศษ"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryFullHalfRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryFullHalf"
-                  label="เลื่อน 1.5 ขั้น"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 1.5 ขั้น'}`]"
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
-              <div class="col-6">
-                <q-input
-                  :readonly="isReadonly"
-                  :class="getClass(!isReadonly)"
-                  ref="salaryFullHalfSpecialRef"
-                  dense
-                  outlined
-                  v-model="formData.salaryFullHalfSpecial"
-                  label="เงินพิเศษ"
-                  mask="###,###,###,###"
-                  reverse-fill-mask
-                  lazy-rules
-                  hide-bottom-space
-                />
-              </div>
+          <div class="row col-xs-12 col-md-12 q-col-gutter-sm">
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryRef"
+                dense
+                outlined
+                v-model="formData.salary"
+                label="เงินเดือนฐาน"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                :rules="[(val) => !!val || `${'กรุณากรอกเงินเดือนฐาน'}`]"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6 row items-center">
+              <q-checkbox dense v-model="formData.isNext" label="ทะลุขั้น" />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryHalfRef"
+                dense
+                outlined
+                v-model="formData.salaryHalf"
+                label="เลื่อน 0.5 ขั้น"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 0.5 ขั้น'}`]"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryHalfSpecialRef"
+                dense
+                outlined
+                v-model="formData.salaryHalfSpecial"
+                label="เงินพิเศษ"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryFullRef"
+                dense
+                outlined
+                v-model="formData.salaryFull"
+                label="เลื่อน 1 ขั้น"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 1 ขั้น'}`]"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryFullSpecialRef"
+                dense
+                outlined
+                v-model="formData.salaryFullSpecial"
+                label="เงินพิเศษ"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryFullHalfRef"
+                dense
+                outlined
+                v-model="formData.salaryFullHalf"
+                label="เลื่อน 1.5 ขั้น"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                :rules="[(val) => !!val || `${'กรุณากรอกเลื่อน 1.5 ขั้น'}`]"
+                lazy-rules
+                hide-bottom-space
+              />
+            </div>
+            <div class="col-6">
+              <q-input
+                :readonly="isReadonly"
+                :class="getClass(!isReadonly)"
+                ref="salaryFullHalfSpecialRef"
+                dense
+                outlined
+                v-model="formData.salaryFullHalfSpecial"
+                label="เงินพิเศษ"
+                mask="###,###,###,###"
+                reverse-fill-mask
+                lazy-rules
+                hide-bottom-space
+              />
             </div>
           </div>
         </q-card-section>
         <q-separator />
 
-        <q-card-actions align="right" class="bg-white text-teal">
+        <q-card-actions align="right">
           <q-btn label="บันทึก" color="secondary" type="submit"
             ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
           >
diff --git a/src/modules/13_salary/views/salaryChart.vue b/src/modules/13_salary/views/salaryChart.vue
index f574352c9..68cbfe455 100644
--- a/src/modules/13_salary/views/salaryChart.vue
+++ b/src/modules/13_salary/views/salaryChart.vue
@@ -159,7 +159,7 @@ function onClickCoppy(id: string) {
     .post(config.API.salaryChartCopy, { id: id })
     .then(async () => {
       await fetchListSalaly();
-      await success($q, "คัดลอกข้อมูลสำเร็จ");
+      success($q, "คัดลอกข้อมูลสำเร็จ");
     })
     .catch((err) => {
       messageError($q, err);
@@ -180,7 +180,7 @@ function onClickDelete(id: string) {
       .delete(config.API.salaryChartByid(id))
       .then(async () => {
         await fetchListSalaly();
-        await success($q, "ลบข้อมูลสำเร็จ");
+        success($q, "ลบข้อมูลสำเร็จ");
       })
       .catch((err) => {
         messageError($q, err);