From 12258e20bdeb6b8716f3b0e06a6c41bd7d525e8f Mon Sep 17 00:00:00 2001
From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" <nicey2t1096@gmail.com>
Date: Fri, 11 Oct 2024 13:04:13 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/DialogAddEmployee.vue          |  2 +-
 .../components/DialogSendOrder.vue            |  7 +-
 .../components/Step/2_ListPersons.vue         | 16 ++-
 .../components/Step/Dialog2_Salary.vue        | 99 ++++++++++++++-----
 4 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/src/modules/08_registryEmployee/components/DialogAddEmployee.vue b/src/modules/08_registryEmployee/components/DialogAddEmployee.vue
index 92293ff14..c3b3b0a01 100644
--- a/src/modules/08_registryEmployee/components/DialogAddEmployee.vue
+++ b/src/modules/08_registryEmployee/components/DialogAddEmployee.vue
@@ -414,7 +414,7 @@ watch(
                     "
                     label="วัน/เดือน/ปี เกิด"
                     :rules="[
-                      (val) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`,
+                      (val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี เกิด'}`,
                     ]"
                   >
                     <template v-slot:prepend>
diff --git a/src/modules/08_registryEmployee/components/DialogSendOrder.vue b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
index 7357fd9fd..9863af5e1 100644
--- a/src/modules/08_registryEmployee/components/DialogSendOrder.vue
+++ b/src/modules/08_registryEmployee/components/DialogSendOrder.vue
@@ -223,13 +223,14 @@ watch(
 
 <template>
   <q-dialog v-model="modal">
-    <q-card style="min-width: 80%">
+    <q-card style="min-width: 70%">
       <DialogHeader tittle="ส่งรายชื่อไปออกคำสั่ง" :close="closeDialog" />
       <q-separator />
       <q-card-section class="q-pt-none">
-        <div class="row q-col-gutter-sm">
+        <div class="row">
           <div class="col-12">
             <q-toolbar style="padding: 0">
+              <q-space />
               <q-input
                 borderless
                 outlined
@@ -238,7 +239,7 @@ watch(
                 v-model="filter"
                 ref="filterRef"
                 placeholder="ค้นหา"
-                style="width: 850px; max-width: auto"
+                style="max-width: auto"
               >
                 <template v-slot:append>
                   <q-icon name="search" />
diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue
index a9464e53a..ee3c6cb9b 100644
--- a/src/modules/18_command/components/Step/2_ListPersons.vue
+++ b/src/modules/18_command/components/Step/2_ListPersons.vue
@@ -95,8 +95,20 @@ const columns = ref<QTableProps["columns"]>([
       return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
     },
   },
+  {
+    name: "amount",
+    align: "left",
+    label: "เงินเดือน",
+    field: "amount",
+    format(val) {
+      return val ? val.toLocaleString() : "-";
+    },
+    sortable: true,
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
 ]);
-const visibleColumns = ref<String[]>(["no", "citizenId", "fullName"]);
+const visibleColumns = ref<String[]>(["no", "citizenId", "fullName", "amount"]);
 
 const modalSalary = ref<boolean>(false);
 const titleName = ref<string>("");
@@ -221,8 +233,6 @@ async function getCommandSalaryList(type: string) {
     });
 }
 
-function onSubmit() {}
-
 /** ดึงข้อมูล บุคคล */
 async function getPersonList() {
   showLoader();
diff --git a/src/modules/18_command/components/Step/Dialog2_Salary.vue b/src/modules/18_command/components/Step/Dialog2_Salary.vue
index 30d130c91..4567f115c 100644
--- a/src/modules/18_command/components/Step/Dialog2_Salary.vue
+++ b/src/modules/18_command/components/Step/Dialog2_Salary.vue
@@ -7,10 +7,10 @@ import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 
 import DialogHeader from "@/components/DialogHeader.vue";
-import CurruncyInput from "@/components/CurruncyInput.vue";
 
 const $q = useQuasar();
-const { dialogConfirm, messageError, success } = useCounterMixin();
+const { showLoader, hideLoader, dialogConfirm, messageError, success } =
+  useCounterMixin();
 
 const props = defineProps({
   getData: Function,
@@ -22,41 +22,53 @@ const commandEditRecive = defineModel<string>("commandEditRecive", {
   required: true,
 });
 
-const formData = reactive({
-  salaryAmount: 0,
-  positionSalaryAmount: 0,
-  monthSalaryAmount: 0,
+const formData = reactive<any>({
+  amount: null,
+  positionSalaryAmount: null,
+  mouthSalaryAmount: null,
   remarkVertical: null,
   remarkHorizontal: null,
 });
 
 function onSubmit() {
   dialogConfirm($q, () => {
+    showLoader();
     http
       .put(config.API.commandEditRecive("tab2", commandEditRecive.value), {
-        mouthSalaryAmount: formData.salaryAmount, //เงินเดือน
-        positionSalaryAmount: formData.positionSalaryAmount, //เงินประจำตำแหน่ง
-        amount: formData.monthSalaryAmount, //เงินค่าตอบแทนรายเดือน
+        mouthSalaryAmount:
+          typeof formData.monthSalaryAmount === "string"
+            ? Number(formData.monthSalaryAmount?.replace(/,/g, ""))
+            : formData.monthSalaryAmount, //เงินเดือน
+        positionSalaryAmount:
+          typeof formData.positionSalaryAmount === "string"
+            ? Number(formData.positionSalaryAmount?.replace(/,/g, ""))
+            : formData.positionSalaryAmount, //เงินประจำตำแหน่ง
+        amount:
+          typeof formData.amount === "string"
+            ? Number(formData.amount?.replace(/,/g, ""))
+            : formData.amount, //เงินค่าตอบแทนรายเดือน
         remarkVertical: formData.remarkVertical, //หมายเหตุแนวตั้ง
         remarkHorizontal: formData.remarkHorizontal, //หมายเหตุแนวนอน
       })
-      .then((res) => {
+      .then(async () => {
+        await props.getData?.();
         success($q, "บันทึกข้อมูลสำเร็จ");
         onClose();
-        props.getData?.();
       })
       .catch((e) => {
         messageError($q, e);
       })
-      .finally(() => {});
+      .finally(() => {
+        hideLoader();
+      });
   });
 }
 
 function onClose() {
   modal.value = false;
-  formData.salaryAmount = 0;
-  formData.positionSalaryAmount = 0;
-  formData.monthSalaryAmount = 0;
+  formData.amount = null;
+  formData.positionSalaryAmount = null;
+  formData.monthSalaryAmount = null;
   formData.remarkVertical = null;
   formData.remarkHorizontal = null;
 }
@@ -67,9 +79,9 @@ watch(
     if (modal.value) {
       if (props.selectPersonData) {
         const list = props.selectPersonData;
-        formData.salaryAmount = list.mouthSalaryAmount;
+        formData.amount = list.amount;
         formData.positionSalaryAmount = list.positionSalaryAmount;
-        formData.monthSalaryAmount = list.amount;
+        formData.monthSalaryAmount = list.mouthSalaryAmount;
         formData.remarkVertical = list.remarkVertical;
         formData.remarkHorizontal = list.remarkHorizontal;
       }
@@ -80,41 +92,76 @@ watch(
 
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card style="width: 50vw; max-width: 50vw">
+    <q-card style="min-width: 40vw">
       <q-form q-form greedy @submit.prevent @validation-success="onSubmit">
         <DialogHeader :tittle="titleName" :close="onClose" />
         <q-separator />
         <q-card-section>
           <div class="row col-12 q-col-gutter-sm">
             <div class="col-xs-6 col-sm-6 col-md-6">
-              <CurruncyInput
+              <!-- <CurruncyInput
                 :edit="true"
                 :dense="true"
-                v-model="formData.salaryAmount"
+                v-model="formData.amount"
                 :label="`${'เงินเดือน'}`"
                 :rules="[(val: any) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
                 hide-bottom-space
+              /> -->
+
+              <q-input
+                dense
+                outlined
+                lazy-rules
+                hide-bottom-space
+                v-model="formData.amount"
+                class="inputgreen"
+                mask="###,###,###,###,###,###"
+                reverse-fill-mask
+                :label="`${'เงินเดือน'}`"
+                :rules="[(val: any) => !!val || `${'กรุณากรอกเงินเดือน'}`]"
               />
             </div>
 
             <div class="col-xs-6 col-sm-6 col-md-6">
-              <CurruncyInput
+              <q-input
+                dense
+                outlined
+                lazy-rules
+                hide-bottom-space
+                v-model="formData.positionSalaryAmount"
+                class="inputgreen"
+                mask="###,###,###,###,###,###"
+                reverse-fill-mask
+                :label="`${'เงินประจำตำแหน่ง'}`"
+              />
+              <!-- <CurruncyInput
                 :edit="true"
                 :dense="true"
                 v-model="formData.positionSalaryAmount"
                 :label="`${'เงินประจำตำแหน่ง'}`"
                 hide-bottom-space
-              />
+              /> -->
             </div>
 
             <div class="col-xs-6 col-sm-6 col-md-6">
-              <CurruncyInput
+              <q-input
+                dense
+                outlined
+                lazy-rules
+                hide-bottom-space
+                v-model="formData.monthSalaryAmount"
+                class="inputgreen"
+                mask="###,###,###,###,###,###"
+                reverse-fill-mask
+                :label="`${'เงินค่าตอบแทนรายเดือน'}`"
+              />
+              <!-- <CurruncyInput
                 :edit="true"
                 :dense="true"
                 v-model="formData.monthSalaryAmount"
                 :label="`${'เงินค่าตอบแทนรายเดือน'}`"
                 hide-bottom-space
-              />
+              /> -->
             </div>
             <div class="col-xs-6 col-sm-6 col-md-12">
               <q-input
@@ -123,7 +170,7 @@ watch(
                 v-model="formData.remarkVertical"
                 label="หมายเหตุแนวตั้ง"
                 type="textarea"
-                rows="2"
+                rows="5"
                 class="inputgreen"
               />
             </div>
@@ -134,7 +181,7 @@ watch(
                 v-model="formData.remarkHorizontal"
                 type="textarea"
                 label="หมายเหตุแนวนอน"
-                rows="2"
+                rows="5"
                 class="inputgreen"
               />
             </div>