From 947e1f48826769ab34500904a298aa9d6f20691a Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Wed, 6 Nov 2024 11:10:25 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=80=E0=B9=80?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=94=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../10_registry/01_Information/02_ChangeName.vue | 14 +-------------
 .../10_registry/01_Information/05_Educations.vue | 16 +++-------------
 .../10_registry/01_Information/06_Ability.vue    | 16 +++-------------
 .../10_registry/02_Government/02_Discipline.vue  | 15 ++-------------
 .../10_registry/02_Government/03_Leave.vue       | 15 ++-------------
 .../10_registry/02_Government/04_Duty.vue        | 15 ++-------------
 src/modules/10_registry/03_Salary/01_Salary.vue  | 15 ++-------------
 src/modules/10_registry/03_Salary/02_Nopaid.vue  | 15 ++-------------
 .../04_Achievement/01_Certificate.vue            | 14 +-------------
 .../10_registry/04_Achievement/02_Training.vue   | 14 +-------------
 .../10_registry/04_Achievement/03_Insignia.vue   | 14 +-------------
 .../10_registry/04_Achievement/04_Honor.vue      | 15 ++-------------
 .../04_Achievement/05_Assessments.vue            | 14 +-------------
 .../04_Achievement/06_DevelopmentPlan.vue        | 15 ++-------------
 src/modules/10_registry/views/main.vue           |  2 +-
 15 files changed, 26 insertions(+), 183 deletions(-)

diff --git a/src/modules/10_registry/01_Information/02_ChangeName.vue b/src/modules/10_registry/01_Information/02_ChangeName.vue
index 073a4e3..3458faf 100644
--- a/src/modules/10_registry/01_Information/02_ChangeName.vue
+++ b/src/modules/10_registry/01_Information/02_ChangeName.vue
@@ -247,13 +247,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -329,17 +328,6 @@ onMounted(() => {
         </template>
       </d-table>
     </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
-  </div>
   <DialogHistory
     v-model:modal="modalHistory"
     :title="'ประวัติแก้ไขการเปลี่ยนชื่อ-นามสกุล'"
diff --git a/src/modules/10_registry/01_Information/05_Educations.vue b/src/modules/10_registry/01_Information/05_Educations.vue
index 8f07114..33d5bd4 100644
--- a/src/modules/10_registry/01_Information/05_Educations.vue
+++ b/src/modules/10_registry/01_Information/05_Educations.vue
@@ -527,13 +527,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -611,17 +610,8 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+ 
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/01_Information/06_Ability.vue b/src/modules/10_registry/01_Information/06_Ability.vue
index ee7cc10..cf1ef6d 100644
--- a/src/modules/10_registry/01_Information/06_Ability.vue
+++ b/src/modules/10_registry/01_Information/06_Ability.vue
@@ -248,13 +248,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -333,17 +332,8 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/02_Government/02_Discipline.vue b/src/modules/10_registry/02_Government/02_Discipline.vue
index 8200a3d..fac44a0 100644
--- a/src/modules/10_registry/02_Government/02_Discipline.vue
+++ b/src/modules/10_registry/02_Government/02_Discipline.vue
@@ -219,13 +219,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -303,17 +302,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/02_Government/03_Leave.vue b/src/modules/10_registry/02_Government/03_Leave.vue
index 2b0f514..75339db 100644
--- a/src/modules/10_registry/02_Government/03_Leave.vue
+++ b/src/modules/10_registry/02_Government/03_Leave.vue
@@ -341,13 +341,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -452,17 +451,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/02_Government/04_Duty.vue b/src/modules/10_registry/02_Government/04_Duty.vue
index d491916..582c9f7 100644
--- a/src/modules/10_registry/02_Government/04_Duty.vue
+++ b/src/modules/10_registry/02_Government/04_Duty.vue
@@ -299,13 +299,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -383,17 +382,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/03_Salary/01_Salary.vue b/src/modules/10_registry/03_Salary/01_Salary.vue
index c3e92ed..6c3cf5c 100644
--- a/src/modules/10_registry/03_Salary/01_Salary.vue
+++ b/src/modules/10_registry/03_Salary/01_Salary.vue
@@ -410,13 +410,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -494,17 +493,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/03_Salary/02_Nopaid.vue b/src/modules/10_registry/03_Salary/02_Nopaid.vue
index 593f8cf..7006bd1 100644
--- a/src/modules/10_registry/03_Salary/02_Nopaid.vue
+++ b/src/modules/10_registry/03_Salary/02_Nopaid.vue
@@ -276,13 +276,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -364,17 +363,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/01_Certificate.vue b/src/modules/10_registry/04_Achievement/01_Certificate.vue
index 7c388bc..74cc2d5 100644
--- a/src/modules/10_registry/04_Achievement/01_Certificate.vue
+++ b/src/modules/10_registry/04_Achievement/01_Certificate.vue
@@ -276,13 +276,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -360,17 +359,6 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/02_Training.vue b/src/modules/10_registry/04_Achievement/02_Training.vue
index ef3eee3..90fc46c 100644
--- a/src/modules/10_registry/04_Achievement/02_Training.vue
+++ b/src/modules/10_registry/04_Achievement/02_Training.vue
@@ -403,13 +403,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -479,17 +478,6 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/03_Insignia.vue b/src/modules/10_registry/04_Achievement/03_Insignia.vue
index 0d7cb60..fa6df4d 100644
--- a/src/modules/10_registry/04_Achievement/03_Insignia.vue
+++ b/src/modules/10_registry/04_Achievement/03_Insignia.vue
@@ -480,13 +480,12 @@ onMounted(async () => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -579,17 +578,6 @@ onMounted(async () => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/04_Honor.vue b/src/modules/10_registry/04_Achievement/04_Honor.vue
index 5909700..0b12acf 100644
--- a/src/modules/10_registry/04_Achievement/04_Honor.vue
+++ b/src/modules/10_registry/04_Achievement/04_Honor.vue
@@ -281,13 +281,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -365,17 +364,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/05_Assessments.vue b/src/modules/10_registry/04_Achievement/05_Assessments.vue
index 78a64d6..97063d9 100644
--- a/src/modules/10_registry/04_Achievement/05_Assessments.vue
+++ b/src/modules/10_registry/04_Achievement/05_Assessments.vue
@@ -358,13 +358,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -444,17 +443,6 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
   </div>
   <DialogHistory
     v-model:modal="modalHistory"
diff --git a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
index 65e2878..618a855 100644
--- a/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
+++ b/src/modules/10_registry/04_Achievement/06_DevelopmentPlan.vue
@@ -208,13 +208,12 @@ onMounted(() => {
         :display-value="$q.lang.table.columns"
       />
     </q-toolbar>
-    <div v-if="rows.length != 0">
       <d-table
         flat
         dense
         bordered
         virtual-scroll
-        :rows="rows"
+        :rows="rows.length !== 0 ? rows:[]"
         :columns="columns"
         :grid="!mode"
         :filter="filter"
@@ -338,17 +337,7 @@ onMounted(() => {
           </div>
         </template>
       </d-table>
-    </div>
-    <div v-else>
-      <div class="col-12">
-        <q-card
-          class="full-width row flex-center q-pa-sm rounded-borders text-weight-medium"
-          bordered
-        >
-          ไม่พบข้อมูล
-        </q-card>
-      </div>
-    </div>
+
   </div>
 
   <DialogDevelop v-model:modal="modalDevelop" v-model:id="kpiDevelopmentId" />
diff --git a/src/modules/10_registry/views/main.vue b/src/modules/10_registry/views/main.vue
index 05c4eb2..5bb25be 100644
--- a/src/modules/10_registry/views/main.vue
+++ b/src/modules/10_registry/views/main.vue
@@ -61,7 +61,7 @@ function getMain() {
       formData.posTypeName = data.posTypeName;
       formData.posExecutiveName = data.posExecutiveName;
       formData.posLevelName = data.posLevelName;
-      formData.posNo = `${data.rootShortName}${data.posMaster}`;
+      formData.posNo = data.rootShortName ? `${data.rootShortName}${data.posMaster}`:'';
       store.profileId = data.profileId;
       if (data.avatarName) {
         await getImg(data.profileId, data.avatarName);