From c4a341531660300e8270184742aee092b33169b4 Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Wed, 6 Dec 2023 10:46:52 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B9=80=E0=B8=81=E0=B9=89=20?=
 =?UTF-8?q?=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/1_Complaint/Form.vue              |  6 +++---
 .../components/2_InvestigateFacts/EditPage.vue   | 11 +++++------
 .../components/2_InvestigateFacts/Form.vue       |  4 ++--
 .../3_InvestigateDisciplinary/EditPage.vue       |  6 ++++--
 .../3_InvestigateDisciplinary/Form.vue           | 16 ++++++++--------
 .../11_discipline/components/PopupSendToNext.vue |  7 +++++--
 6 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue
index 26e9f4df4..0004ca486 100644
--- a/src/modules/11_discipline/components/1_Complaint/Form.vue
+++ b/src/modules/11_discipline/components/1_Complaint/Form.vue
@@ -624,7 +624,7 @@ onMounted(() => {
                         ref="dateReceivedRef"
                         outlined
                         dense
-                        :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                        :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                         :readonly="isReadonly"
                         hide-bottom-space
                         class="full-width datepicker"
@@ -701,7 +701,7 @@ onMounted(() => {
                         for="inputDateconsideration"
                         ref="dateConsiderationRef"
                         outlined
-                        :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                        :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                         dense
                         class="full-width datepicker"
                         :model-value="
@@ -774,7 +774,7 @@ onMounted(() => {
                         for="inputDatewarn"
                         ref="dateNotificationRef"
                         outlined
-                        :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                        :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                         dense
                         :readonly="isReadonly"
                         hide-bottom-space
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
index 7384801a5..964d3274d 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
@@ -139,7 +139,7 @@ function getData() {
     .get(config.API.investigateById(id.value))
     .then((res) => {
       const dataList = res.data.result;
-      console.log(dataList)
+      console.log(dataList);
       data.id = dataList.id;
       data.idComplaint = dataList.idComplaint;
       data.respondentType = dataList.respondentType;
@@ -160,7 +160,7 @@ function getData() {
       data.investigationStatusResult = dataList.investigationStatusResult;
       data.investigationExtendStatus = dataList.investigationExtendStatus;
       data.investigationDaysExtend = dataList.investigationDaysExtend;
-      console.log(dataList)
+      console.log(dataList);
     })
     .catch((e) => {
       messageError($q, e);
@@ -222,7 +222,7 @@ function sentConfirmNoPerson() {
     .finally(() => {
       hideLoader();
       getData();
-      router.push(`/discipline/investigatefacts`)
+      router.push(`/discipline/investigatefacts`);
     });
 }
 
@@ -261,13 +261,12 @@ function confirmEndInvestigate() {
   http
     .get(config.API.investigateReject(id.value))
     .then((res) => {
-
+      success($q, "ยุติเรื่องสำเร็จ");
     })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(async () => {
-      success($q, "ยุติเรื่องสำเร็จ");
       await getData();
     });
 }
@@ -407,4 +406,4 @@ watch(
   padding: 0;
   background-color: #f0f3f3;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
index 6ac48141d..3c8b525f3 100644
--- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
+++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
@@ -765,7 +765,7 @@ onMounted(async () => {
                               for="#date"
                               class="full-width cursor-pointer"
                               ref="dateRef"
-                              :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                              :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                               :readonly="isReadonly"
                               outlined
                               dense
@@ -852,7 +852,7 @@ onMounted(async () => {
                           <template #trigger>
                             <q-input
                               for="#dateEnd"
-                              :input-style="isReadonly ? { color: 'teal' }:{color:'black'}"
+                              :input-style="isReadonly ? { color: 'black' }:{color:'teal'}"
                               ref="dateEndRef"
                               class="full-width cursor-pointer"
                               :readonly="isReadonly"
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index c143a0bb9..5712f444f 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -228,12 +228,14 @@ function confirmEndInvestigate() {
   showLoader();
   http
     .get(config.API.disciplinaryReject(id.value))
-    .then((res) => {})
+    .then((res) => {
+      success($q, "ยุติเรื่องสำเร็จ");
+    })
     .catch((e) => {
       messageError($q, e);
     })
     .finally(() => {
-      success($q, "ยุติเรื่องสำเร็จ");
+      
       fetchDetailDisciplinary();
     });
 }
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index ee22ac3cc..c4b2cbebd 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -690,7 +690,7 @@ onMounted(async () => {
                         outlined
                         dense
                         :input-style="
-                          isReadonly ? { color: 'teal' } : { color: 'black' }
+                          isReadonly ? { color: 'black' } : { color: 'teal' }
                         "
                         class="col-xs-12 col-sm-4"
                         hide-bottom-space
@@ -742,7 +742,7 @@ onMounted(async () => {
                         ref="disciplinaryDateAllegationRef"
                         outlined
                         :input-style="
-                          isReadonly ? { color: 'teal' } : { color: 'black' }
+                          isReadonly ? { color: 'black' } : { color: 'teal' }
                         "
                         dense
                         class="col-xs-12 col-sm-4"
@@ -830,8 +830,8 @@ onMounted(async () => {
                                 outlined
                                 :input-style="
                                   isReadonly
-                                    ? { color: 'teal' }
-                                    : { color: 'black' }
+                                    ? { color: 'black' }
+                                    : { color: 'teal' }
                                 "
                                 dense
                                 lazy-rules
@@ -924,8 +924,8 @@ onMounted(async () => {
                                 lazy-rules
                                 :input-style="
                                   isReadonly
-                                    ? { color: 'teal' }
-                                    : { color: 'black' }
+                                    ? { color: 'black' }
+                                    : { color: 'teal' }
                                 "
                                 hide-bottom-space
                                 borderless
@@ -986,7 +986,7 @@ onMounted(async () => {
                       class="full-width"
                       hide-bottom-space
                       :input-style="
-                        isReadonly ? { color: 'teal' } : { color: 'black' }
+                        isReadonly ? { color: 'black' } : { color: 'teal' }
                       "
                       :model-value="
                         formData.disciplinaryDateEvident != null
@@ -1038,7 +1038,7 @@ onMounted(async () => {
                       ref="disciplinaryDateResultRef"
                       outlined
                       :input-style="
-                        isReadonly ? { color: 'teal' } : { color: 'black' }
+                        isReadonly ? { color: 'black' } : { color: 'teal' }
                       "
                       dense
                       class="full-width"
diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue
index 0383e0f6b..05a5e133f 100644
--- a/src/modules/11_discipline/components/PopupSendToNext.vue
+++ b/src/modules/11_discipline/components/PopupSendToNext.vue
@@ -9,7 +9,7 @@ import { useComplainstDataStore } from "@/modules/11_discipline/store/Complaints
 const mixin = useCounterMixin();
 const $q = useQuasar();
 
-const { dialogConfirm } = mixin;
+const { dialogConfirm,dialogMessageNotify } = mixin;
 
 const props = defineProps({
   title: {
@@ -60,6 +60,9 @@ const initialPagination = ref<any>({
 });
 
 function onclickSend() {
+  if(selected.value.length === 0){
+    dialogMessageNotify($q,'กรุณาเลือกอย่างน้อย 1 บุคคล')
+  }else{
   dialogConfirm(
     $q,
     async () => {
@@ -70,7 +73,7 @@ function onclickSend() {
     `ยืนยันการ${props.title}`,
     `ต้องการยืนยันการ${props.title}หรือไม่`
   );
-}
+}}
 
 function onClickClose() {
   props.close?.();