ปรับ Table ส่งไปออกคำสั่ง ส่วน รายการแต่งตั้งลูกจ้างประจำ

src/modules/05_placement/components/AppointEmployee/Dialogbody.vue

@@ -86,9 +86,9 @@ const columns2 = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
 ]);
-const pageNext = (item: object) => {
-  props.nextPage?.(item);
-};
+// const pageNext = (item: object) => {
+//   props.nextPage?.(item);
+// };
 const emit = defineEmits([
   "update:filterKeyword2",
   "update:type",
@@ -240,18 +240,20 @@ watchEffect(() => {
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
               </q-td>
-              <q-td key="citizenId" :props="props" @click="pageNext(props.row)">
+              <q-td key="citizenId" :props="props">
                 {{ props.row.citizenId }}
               </q-td>
-              <q-td key="fullname" :props="props" @click="pageNext(props.row)">
+              <q-td key="fullname" :props="props">
                 {{ props.row.fullname }}
               </q-td>
-              <q-td
-                key="organizationName"
-                :props="props"
-                @click="pageNext(props.row)"
-              >
-                <div
+              <q-td key="organizationName" :props="props">
+                {{ props.row.orgName !== null ? props.row.orgName : "-" }}
+                {{
+                  props.row.organizationShortName !== null
+                    ? `(${props.row.organizationShortName})`
+                    : ""
+                }}
+                <!-- <div
                   v-if="
                     props.row.orgName !== null ||
                     props.row.positionPath !== null
@@ -284,9 +286,9 @@ watchEffect(() => {
                   <div class="col-4">
                     <div class="text-weight-medium">-</div>
                   </div>
-                </div>
+                </div> -->
               </q-td>
-              <q-td key="birthday" :props="props" @click="pageNext(props.row)">
+              <q-td key="birthday" :props="props">
                 {{ props.row.birthday }}
               </q-td>
             </q-tr>