ประกาศเกษียณ

src/modules/06_retirement/components/01_retirement/RetirementDetail.vue

@@ -168,11 +168,11 @@ async function fetchlistprofile(id: string) {
           prefix: e.prefix,
           firstName: e.firstName,
           lastName: e.lastName,
-          name: e.prefix + e.firstName + " " + e.lastName,
+          name: `${e.prefix}${e.firstName} ${e.lastName}`,
           organization: e.root,
           position: e.position,
           positionNumber: e.posNo,
-          positionType: e.posTypeName,
+          positionType: `${e.posTypeName} (${e.posLevelName})`,
           positionLevel: e.posLevelName,
           reason: e.reason,
           remove: e.remove,
@@ -663,7 +663,13 @@ onMounted(async () => {
                   ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
                 >
               </q-td>
-              <q-td key="order" :props="props">{{ props.row.order }} </q-td>
+
+              <q-td v-for="col in props.cols" :key="col.id">
+                <div class="table_ellipsis">
+                  {{ col.value ? col.value : "-" }}
+                </div>
+              </q-td>
+              <!-- <q-td key="order" :props="props">{{ props.row.order }} </q-td>
               <q-td key="name" :props="props"
                 >{{ props.row.prefix ? props.row.prefix : ""
                 }}{{ props.row.firstName ? props.row.firstName : "" }}
@@ -688,20 +694,9 @@ onMounted(async () => {
 
               <q-td class="table_ellipsis" key="organization" :props="props">{{
                 props.row.organization ? props.row.organization : "-"
-              }}</q-td>
+              }}</q-td> -->
             </q-tr>
           </template>
-          <!-- <template v-slot:pagination="scope">
-            <q-pagination
-              v-model="pagination.page"
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
-          </template> -->
         </d-table>
       </div>
     </q-card>

src/modules/06_retirement/components/02_resign/Table.vue

@@ -377,7 +377,7 @@ onMounted(async () => {
                       : ''
                   "
                 >
-                  {{ col.value ? col.value : "" }}
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
             </q-tr>

src/modules/06_retirement/components/03_resignEmp/Table.vue

@@ -381,7 +381,7 @@ onMounted(async () => {
                       : ''
                   "
                 >
-                  {{ col.value ? col.value : "" }}
+                  {{ col.value ? col.value : "-" }}
                 </div>
               </q-td>
             </q-tr>