Merge branch 'develop' of https://github.com/Frappet/bma-ehr-frontend into develop

src/modules/11_discipline/components/6_BasicInformation/Director/DialogInvestigateTotal.vue

@@ -108,13 +108,13 @@ function clickList(id: string, type: string) {
 
 <template>
   <q-dialog v-model="props.modal" persistent>
-    <q-card style="min-width: 40vw">
+    <q-card style="min-width: 50vw">
       <q-form ref="myForm">
         <DialogHeader :title="props.title" :close="props.close" />
         <q-separator />
         <q-card-section>
           <div class="row q-col-gutter-sm">
-            <div class="col-5">
+            <div class="col-6">
               <q-card
                 bordered
                 class="row col-12"
@@ -128,7 +128,7 @@ function clickList(id: string, type: string) {
 
                 <div class="col-12"><q-separator /></div>
                 <q-scroll-area
-                  style="height: 300px; max-width: 300px"
+                  style="height: 300px;"
                   class="bg-white rounded-borders q-px-sm row col-12"
                 >
                   <q-list
@@ -150,7 +150,7 @@ function clickList(id: string, type: string) {
                 </q-scroll-area>
               </q-card>
             </div>
-            <div class="col-7">
+            <div class="col-6">
               <q-card
                 bordered
                 class="row col-12"

src/modules/11_discipline/components/6_BasicInformation/Director/MainPage.vue

@@ -227,14 +227,28 @@ onMounted(() => {
                 {{ props.rowIndex + 1 }}
               </div>
               <div
-                v-else-if="col.name == 'totalInvestigate'"
-                @click="openDetail('รายการการสืบสวน')"
+                v-else-if="
+                  col.name == 'totalInvestigate' &&
+                  props.row.totalInvestigate > 0
+                "
+                class="text-blue"
+                @click="
+                  openDetail(`รายการสืบสวนข้อเท็จจริงของ ${props.row.fullName}`)
+                "
               >
                 {{ props.row.totalInvestigate }}
               </div>
               <div
-                v-else-if="col.name == 'totalDisciplinary'"
-                @click="openDetail('รายการการสอบสวน')"
+                v-else-if="
+                  col.name == 'totalDisciplinary' &&
+                  props.row.totalDisciplinary > 0
+                "
+                class="text-blue"
+                @click="
+                  openDetail(
+                    `รายการสอบสวนความผิดทางวินัยของ ${props.row.fullName}`
+                  )
+                "
               >
                 {{ props.row.totalDisciplinary }}
               </div>

src/modules/11_discipline/store/DirectorStore.ts

@@ -96,8 +96,8 @@ export const useDisciplineDirectorDataStore = defineStore(
           id: item.id,
           fullName: `${item.prefix}${item.firstName} ${item.lastName}`,
           position: item.position,
-          email: item.email,
-          phone: item.phone,
+          email: item.email ? item.email : '-',
+          phone: item.phone ? item.phone : '-',
           totalInvestigate: item.totalInvestigate,
           totalDisciplinary: item.totalDisciplinary,
         })