From 9599310b8419a7acb20c2c3a2e024c69bb2319d6 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Mon, 24 Jun 2024 15:04:19 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A=E0=B8=B7?=
 =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=9C=E0=B8=B9=E0=B9=89=E0=B8=96=E0=B8=B9?=
 =?UTF-8?q?=E0=B8=81=E0=B8=9E=E0=B8=B1=E0=B8=81=E0=B8=A3=E0=B8=B2=E0=B8=8A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=20=E0=B8=8A=E0=B8=B7=E0=B9=88?=
 =?UTF-8?q?=E0=B8=AD=20null?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/3_InvestigateDisciplinary/EditPage.vue      | 4 +++-
 .../components/3_InvestigateDisciplinary/Form.vue          | 7 +++++--
 .../11_discipline/components/7_ListSuspend/ListsPage.vue   | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
index b439fb913..c2a8bb262 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
@@ -30,7 +30,7 @@ import { useInvestigateDisStore } from "@/modules/11_discipline/store/Investigat
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 const mainStore = useDisciplineMainStore();
-
+const isSaveInfo = ref<boolean>(false)
 const $q = useQuasar();
 const mixin = useCounterMixin();
 const store = useInvestigateDisStore();
@@ -404,6 +404,7 @@ onMounted(async () => {
           label="ส่งไปสรุปผลการพิจารณา"
           color="public"
           @click="sentIssueGate"
+          :disable="isSaveInfo"
         />
         <q-btn
           v-if="status === 'NEW'"
@@ -462,6 +463,7 @@ onMounted(async () => {
             :data="data"
             @submit:disciplinary="onSubmitDisciplinary"
             :fetchData="fetchDetailDisciplinary"
+            v-model:isSaveInfo="isSaveInfo"
           />
         </q-tab-panel>
       </q-tab-panels>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index 60c7a072b..ca488991f 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -40,7 +40,7 @@ import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
-
+const isSaveInfo = defineModel<boolean>('isSaveInfo')
 const calendarModal = ref<boolean>(false);
 const calendarModalclose = () => (calendarModal.value = !calendarModal.value);
 const modalPopup = ref<boolean>(false);
@@ -211,6 +211,7 @@ function onSubmit() {
 
     emit("submit:disciplinary", formData);
     isSave.value = false;
+    isSaveInfo.value = false
     extendStatus.value = false;
   });
 }
@@ -232,7 +233,7 @@ async function fetchDatadetail() {
     if (countNum.value === 1) {
       isReadonly.value = props.data.status != "NEW" ?? true;
       isSave.value = false;
-
+      isSaveInfo.value = false
       formData.respondentType = props.data.respondentType;
       formData.organizationId = props.data.organizationId;
       formData.organization = props.data.organization;
@@ -524,6 +525,7 @@ async function selectComplainant(val: string) {
 /** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
 function changeFormData() {
   isSave.value = true;
+  isSaveInfo.value = true
   if (formData.disciplinaryFaultLevel !== "อื่นๆ") {
     formData.disciplinaryFaultLevelOther = "";
   }
@@ -537,6 +539,7 @@ function changeFormData() {
 /** เช็ควันที่สิ้นสุดต้องมากกว่า หรือเท่ากับวันเริ่ม */
 function changeFormDataDate() {
   isSave.value = true;
+  isSaveInfo.value = true
   const startDate = new Date(formData.disciplinaryDateStart as Date);
   const endDate = new Date(formData.disciplinaryDateEnd as Date);
 
diff --git a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
index bb110ade5..618b85608 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/ListsPage.vue
@@ -345,6 +345,9 @@ onMounted(() => {
                       1
                     }}
                   </div>
+                  <div v-else-if="col.name === 'name'" class="table_ellipsis">
+                    {{ props.row.prefix ? props.row.prefix : "" }}{{ props.row.firstName ? props.row.firstName : "" }} {{ props.row.lastName ? props.row.lastName : "" }}
+                  </div>
                   <div v-else-if="col.name === 'title'" class="table_ellipsis">
                     {{ props.row.title ? props.row.title : "-" }}
                   </div>