Merge branch 'nice_dev' into develop

src/modules/05_placement/components/PersonalList/Table.vue

@@ -1005,7 +1005,7 @@ onMounted(async () => {
                 borderless
                 outlined
                 dense
-                debounce="300"
+                debounce="200"
                 v-model="filterlistAdd"
                 placeholder="ค้นหา"
                 style="width: 850px; max-width: auto"
@@ -1033,7 +1033,7 @@ onMounted(async () => {
           </div>
         </div>
 
-        <q-table
+        <d-table
           flat
           bordered
           dense
@@ -1139,20 +1139,18 @@ onMounted(async () => {
                           props.row.orgName !== null ? props.row.orgName : "-"
                         }}
                         {{
-                          props.row.organizationShortName !== null
-                            ? `(${props.row.organizationShortName})`
+                          props.row.orgTreeShortName !== null
+                            ? `(${props.row.orgTreeShortName})`
                             : ""
                         }}
                       </div>
                       <div class="text-weight-light">
                         {{
-                          props.row.positionPath !== null
-                            ? props.row.positionPath
-                            : "-"
+                          props.row.posPath !== null ? props.row.posPath : "-"
                         }}
                         {{
-                          props.row.positionNumber !== null
-                            ? `(${props.row.positionNumber})`
+                          props.row.posNumber !== null
+                            ? `(${props.row.orgTreeShortName}${props.row.posNumber})`
                             : ""
                         }}
                       </div>
@@ -1202,7 +1200,7 @@ onMounted(async () => {
               </q-td>
             </q-tr>
           </template>
-          <template v-slot:pagination="scope">
+          <!-- <template v-slot:pagination="scope">
             <q-pagination
               v-model="pagination.page"
               color="primary"
@@ -1212,8 +1210,8 @@ onMounted(async () => {
               boundary-links
               direction-links
             ></q-pagination>
-          </template>
-        </q-table>
+          </template> -->
+        </d-table>
       </q-card-section>
 
       <q-card-actions align="right" class="bg-white text-teal">