From 9f398379402595a702a3ab65778db2a23d68be99 Mon Sep 17 00:00:00 2001
From: "STW_TTTY\\stwtt" <trx.setthawut@gmail.com>
Date: Tue, 25 Jun 2024 16:41:48 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?=
 =?UTF-8?q?=20=E0=B8=82=E0=B8=B5=E0=B8=94=20/=E0=B8=A5=E0=B8=B3=E0=B8=94?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B8=AD=E0=B8=A2=E0=B8=B9=E0=B9=88=E0=B8=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B2=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/PopupPersonalNew.vue   | 30 +++++++++----------
 .../3_InvestigateDisciplinary/Form.vue        |  2 +-
 .../store/InvestigateDisStore.ts              |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue
index 09a6572da..4df83404b 100644
--- a/src/components/Dialogs/PopupPersonalNew.vue
+++ b/src/components/Dialogs/PopupPersonalNew.vue
@@ -270,7 +270,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.citizenId"
+                        :model-value="imformation.citizenId ? imformation.citizenId:'-'"
                         label="เลขประจำตัวประชาชน"
                       ></q-input>
                     </div>
@@ -278,7 +278,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.prefix"
+                        :model-value="imformation.prefix ? imformation.prefix:'-'"
                         label="คำนำหน้าชื่อ"
                       />
                     </div>
@@ -286,7 +286,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.firstName"
+                        :model-value="imformation.firstName ? imformation.firstName:'-'"
                         label="ชื่่อ"
                       />
                     </div>
@@ -294,7 +294,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.lastName"
+                        :model-value="imformation.lastName ? imformation.lastName:'-'"
                         label="นามสกุล"
                       />
                     </div>
@@ -302,7 +302,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.birthDate"
+                        :model-value="imformation.birthDate ? imformation.birthDate:'-'"
                         label="วัน/เดือน/ปีเกิด"
                       />
                     </div>
@@ -310,7 +310,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.gender"
+                        :model-value="imformation.gender ? imformation.gender:'-'"
                         label="เพศ"
                       />
                     </div>
@@ -318,7 +318,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="imformation.age"
+                        :model-value="imformation.age ? imformation.age:'-'"
                         label="อายุ"
                       />
                     </div>
@@ -346,7 +346,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.posNo"
+                        :model-value="goverment.posNo ? goverment.posNo:'-'"
                         label="ตำแหน่งเลขที่"
                       />
                     </div>
@@ -354,7 +354,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.position"
+                        :model-value="goverment.position ? goverment.position:'-'"
                         label="ตำแหน่ง"
                       />
                     </div>
@@ -362,7 +362,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionPathSide"
+                        :model-value="goverment.positionPathSide ? goverment.positionPathSide:'-'"
                         label="ด้าน/สาขา"
                       />
                     </div>
@@ -370,7 +370,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionLine"
+                        :model-value="goverment.positionLine ? goverment.positionLine:'-'"
                         label="สายงาน"
                       />
                     </div>
@@ -378,7 +378,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionType"
+                        :model-value="goverment.positionType ? goverment.positionType:'-'"
                         label="ประเภทตำแหน่ง"
                       />
                     </div>
@@ -386,7 +386,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionLevel"
+                        :model-value="goverment.positionLevel ? goverment.positionLevel:'-'"
                         label="ระดับตำแหน่ง"
                       />
                     </div>
@@ -397,7 +397,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionExecutive"
+                        :model-value="goverment.positionExecutive ? goverment.positionExecutive:'-'"
                         label="ตำแหน่งทางการบริหาร"
                       />
                     </div>
@@ -408,7 +408,7 @@ async function fetchProfile(id: string, avatarName: string) {
                       <q-input
                         borderless
                         readonly
-                        :model-value="goverment.positionExecutiveSide"
+                        :model-value="goverment.positionExecutiveSide ? goverment.positionExecutiveSide:'-'"
                         label="ด้านตำแหน่งทางการบริหาร"
                       />
                     </div>
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
index ca488991f..339684b8e 100644
--- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
+++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
@@ -1468,7 +1468,7 @@ onMounted(async () => {
                               {{ props.rowIndex + 1 }}
                             </div>
                             <div v-else class="table_ellipsis2">
-                              {{ col.value }}
+                              {{ col.value?col.value:'-' }}
                             </div>
                           </q-td>
                           <q-td class="text-right">
diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts
index 60e98a22d..e52792d3b 100644
--- a/src/modules/11_discipline/store/InvestigateDisStore.ts
+++ b/src/modules/11_discipline/store/InvestigateDisStore.ts
@@ -190,7 +190,7 @@ export const useInvestigateDisStore = defineStore(
     const columnsDirector = ref<QTableProps["columns"]>([
       {
         name: "no",
-        align: "left",
+        align: "center",
         label: "ลำดับ",
         sortable: false,
         field: "no",