From fc55ffc9287e14e2d3e805e742c8e16cd9cedf93 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 27 Dec 2023 16:00:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=81?=
 =?UTF-8?q?=E0=B8=81=E0=B9=89=20=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=A2=20=E0=B8=AD=E0=B8=B5=E0=B8=81=E0=B8=99=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../3_InvestigateDisciplinary/Form.vue        | 187 +++++++++---------
 .../4_Result/DialogSendToCommand.vue          |  41 ++--
 2 files changed, 117 insertions(+), 111 deletions(-)

diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index e8448bd7a..3d468f536 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onMounted, reactive, watch,computed } from "vue";
+import { ref, onMounted, reactive, watch, computed } from "vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 import { useQuasar } from "quasar";
@@ -339,7 +339,7 @@ async function fetchDatadetail() {
       email: item.email,
       phone: item.phone,
       duty: item.duty,
-      check: 'props',
+      check: "props",
     }));
 
     rows.value = dataMap;
@@ -467,8 +467,8 @@ async function selectComplainant(val: string) {
 /** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
 function changeFormData() {
   isSave.value = true;
-  if(formData.disciplinaryFaultLevel !== 'อื่นๆ'){
-    formData.disciplinaryFaultLevelOther = ''
+  if (formData.disciplinaryFaultLevel !== "อื่นๆ") {
+    formData.disciplinaryFaultLevelOther = "";
   }
 }
 
@@ -1065,8 +1065,7 @@ onMounted(async () => {
 
                             <div class="col-3">
                               <datepicker
-                              :class="
-                                isReadonly ? '' : dateEndInputStyle "
+                                :class="isReadonly ? '' : dateEndInputStyle"
                                 menu-class-name="modalfix"
                                 v-model="formData.disciplinaryDateEnd"
                                 :readonly="
@@ -1323,7 +1322,9 @@ onMounted(async () => {
                             <q-td class="text-right">
                               <!-- แก้ไขกรรมการ -->
                               <q-btn
-                                v-if="!isReadonly && props.row.check ==='props'"
+                                v-if="
+                                  !isReadonly && props.row.check === 'props'
+                                "
                                 dense
                                 size="12px"
                                 flat
@@ -1366,95 +1367,99 @@ onMounted(async () => {
                     </div>
                   </q-card>
                 </div>
+                <div class="row col-12 q-col-gutter-sm">
+                  <div class="col-xs-12 col-sm-3">
+                    <q-input
+                      :class="inputEdit(isReadonly)"
+                      :readonly="isReadonly"
+                      dense
+                      outlined
+                      ref="disciplinaryCaseFaultRef"
+                      v-model="formData.disciplinaryCaseFault"
+                      for="#casefault"
+                      label="กรณีมีความผิด"
+                      hide-bottom-space
+                      :rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]"
+                      lazy-rules
+                      @update:model-value="changeFormData()"
+                    />
+                  </div>
 
-                <div class="col-xs-12 col-sm-3">
-                  <q-input
-                    :class="inputEdit(isReadonly)"
-                    :readonly="isReadonly"
-                    dense
-                    outlined
-                    ref="disciplinaryCaseFaultRef"
-                    v-model="formData.disciplinaryCaseFault"
-                    for="#casefault"
-                    label="กรณีมีความผิด"
-                    hide-bottom-space
-                    :rules="[(val) => !!val || `${'กรุณากรอกกรณีมีความผิด'}`]"
-                    lazy-rules
-                    @update:model-value="changeFormData()"
-                  />
-                </div>
+                  <div class="col-xs-12 col-sm-3">
+                    <q-input
+                      :class="inputEdit(isReadonly)"
+                      :readonly="isReadonly"
+                      dense
+                      hide-bottom-space
+                      outlined
+                      for="#whereInvestigate"
+                      ref="disciplinaryInvestigateAtRef"
+                      v-model="formData.disciplinaryInvestigateAt"
+                      label="สอบสวนที่"
+                      :rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
+                      lazy-rules
+                      @update:model-value="changeFormData()"
+                    />
+                  </div>
 
-                <div class="col-xs-12 col-sm-3">
-                  <q-input
-                    :class="inputEdit(isReadonly)"
-                    :readonly="isReadonly"
-                    dense
-                    hide-bottom-space
-                    outlined
-                    for="#whereInvestigate"
-                    ref="disciplinaryInvestigateAtRef"
-                    v-model="formData.disciplinaryInvestigateAt"
-                    label="สอบสวนที่"
-                    :rules="[(val) => !!val || `${'กรุณากรอกสอบสวนที่'}`]"
-                    lazy-rules
-                    @update:model-value="changeFormData()"
-                  />
-                </div>
-
-                <div class="col-xs-12 col-sm-3">
-                  <q-select
-                    :class="inputEdit(isReadonly)"
-                    :readonly="isReadonly"
-                    dense
-                    outlined
-                    for="#faultLevel"
-                    ref="disciplinaryFaultLevelRef"
-                    v-model="formData.disciplinaryFaultLevel"
-                    option-label="name"
-                    option-value="id"
-                    emit-value
-                    map-options
-                    hide-bottom-space
-                    :options="investigateDis.optionsfaultLevel"
-                    label="ระดับโทษความผิด"
-                    :rules="[
-                      (val) => !!val || `${'กรุณาเลือกระดับโทษความผิด'}`,
-                    ]"
-                    lazy-rules
-                    group-label="group"
-                    group-values="options"
-                    @update:model-value="changeFormData()"
+                  <div class="col-xs-12 col-sm-3">
+                    <q-select
+                      :class="inputEdit(isReadonly)"
+                      :readonly="isReadonly"
+                      dense
+                      outlined
+                      for="#faultLevel"
+                      ref="disciplinaryFaultLevelRef"
+                      v-model="formData.disciplinaryFaultLevel"
+                      option-label="name"
+                      option-value="id"
+                      emit-value
+                      map-options
+                      hide-bottom-space
+                      :options="investigateDis.optionsfaultLevel"
+                      label="ระดับโทษความผิด"
+                      :rules="[
+                        (val) => !!val || `${'กรุณาเลือกระดับโทษความผิด'}`,
+                      ]"
+                      lazy-rules
+                      group-label="group"
+                      group-values="options"
+                      @update:model-value="changeFormData()"
+                    >
+                    </q-select>
+                  </div>
+                  <div
+                    class="col-3"
+                    v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'"
                   >
-                  </q-select>
+                    <q-input
+                      :class="inputEdit(isReadonly)"
+                      outlined
+                      dense
+                      label="ระดับโทษความผิดอื่นๆ"
+                      v-model="formData.disciplinaryFaultLevelOther"
+                    />
+                  </div>
+                  <div class="col-xs-12 col-sm-3">
+                    <q-input
+                      :class="inputEdit(isReadonly)"
+                      :readonly="isReadonly"
+                      dense
+                      for="#refLaw"
+                      hide-bottom-space
+                      outlined
+                      ref="disciplinaryRefLawRef"
+                      v-model="formData.disciplinaryRefLaw"
+                      label="อ้างอิงมาตราตามกฎหมาย"
+                      :rules="[
+                        (val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
+                      ]"
+                      lazy-rules
+                      @update:model-value="changeFormData()"
+                    />
+                  </div>
                 </div>
 
-                <div class="col-xs-12 col-sm-3">
-                  <q-input
-                    :class="inputEdit(isReadonly)"
-                    :readonly="isReadonly"
-                    dense
-                    for="#refLaw"
-                    hide-bottom-space
-                    outlined
-                    ref="disciplinaryRefLawRef"
-                    v-model="formData.disciplinaryRefLaw"
-                    label="อ้างอิงมาตราตามกฎหมาย"
-                    :rules="[
-                      (val) => !!val || `${'กรุณากรอกอ้างอิงมาตราตามกฎหมาย'}`,
-                    ]"
-                    lazy-rules
-                    @update:model-value="changeFormData()"
-                  />
-                </div>
-                <div class="col-12" v-if="formData.disciplinaryFaultLevel === 'อื่นๆ'">
-                  <q-input
-                    :class="inputEdit(isReadonly)"
-                    outlined
-                    dense
-                    label="ระดับโทษความผิดอื่นๆ"
-                    v-model="formData.disciplinaryFaultLevelOther"
-                  />
-                </div>
                 <div class="col-xs-12 col-sm-6">
                   <q-input
                     :readonly="isReadonly"
diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
index e32265796..8601c7ea6 100644
--- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
@@ -72,7 +72,7 @@ const saveOrder = () => {
 async function Ordersave(){
   const persons = selected.value.map((r) => r.id);
 
-  if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
+  // if (props.title == "ส่งไปออกคำสั่งลงโทษทางวินัย") {
     const body = {
       persons,
     };
@@ -90,25 +90,25 @@ async function Ordersave(){
         props.getData?.();
         hideLoader();
       });
-  } else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
-    const body = {
-      persons,
-    };
-    showLoader();
-    await http
-      .put(config.API.discardResult(idPath.value, type.value as string), body)
-      .then((res: any) => {
-        success($q, `${props.title}สำเร็จ`);
-        props.closeModal?.();
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(async () => {
-        props.getData?.();
-        hideLoader();
-      });
-  }
+  // } else if (props.title == "ส่งไปออกคำสั่งงดโทษ/เพิ่มโทษ") {
+  //   const body = {
+  //     persons,
+  //   };
+  //   showLoader();
+  //   await http
+  //     .put(config.API.discardResult(idPath.value, type.value as string), body)
+  //     .then((res: any) => {
+  //       success($q, `${props.title}สำเร็จ`);
+  //       props.closeModal?.();
+  //     })
+  //     .catch((e) => {
+  //       messageError($q, e);
+  //     })
+  //     .finally(async () => {
+  //       props.getData?.();
+  //       hideLoader();
+  //     });
+  // }
 };
 
 const emit = defineEmits([
@@ -193,6 +193,7 @@ watch(
         <div class="row justify-between">
           <div class="col-5">
             <q-toolbar style="padding: 0">
+
               <q-select
                 outlined
                 dense