ปรับเเก้

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

@@ -9,8 +9,13 @@ import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHe
 
 import http from "@/plugins/http";
 import config from "@/app.config";
+
+import { useTransferDataStore } from "@/modules/05_placement/store";
+const storeFn = useTransferDataStore();
+const { statusText } = storeFn;
+
 const mixin = useCounterMixin();
-const { showLoader, success, messageError, dialogConfirm, hideLoader } = mixin;
+const { showLoader, success, messageError, dialogConfirm, hideLoader ,date2Thai} = mixin;
 
 const $q = useQuasar();
 const selected = ref<[]>([]);
@@ -35,7 +40,7 @@ const visibleColumns2 = ref<string[]>([
   "citizenId",
   "fullname",
   "organizationName",
-  "birthday",
+  "dateOfBirth",
 ]);
 const columns2 = ref<QTableProps["columns"]>([
   {
@@ -68,7 +73,7 @@ const columns2 = ref<QTableProps["columns"]>([
   {
     name: "organizationName",
     align: "left",
-    label: "หน่วยงานที่รับการปรับระดับชั้นงาน",
+    label: "หน่วยงานที่รับการแต่งตั้ง-เลื่อน-ย้าย",
     sortable: true,
     field: "organizationName",
     headerStyle: "font-size: 14px",
@@ -77,11 +82,11 @@ const columns2 = ref<QTableProps["columns"]>([
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
   {
-    name: "birthday",
+    name: "dateOfBirth",
     align: "left",
     label: "วัน/เดือน/ปี เกิด",
     sortable: true,
-    field: "birthday",
+    field: "dateOfBirth",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -115,7 +120,7 @@ const createdAppoint = async () => {
   let pId: string[] = [];
   let Type = props.type as string;
   selected.value.forEach((e: UserData) => {
-    pId.push(e.personalId);
+    pId.push(e.id);
   });
   let data = {
     id: pId,
@@ -228,7 +233,7 @@ watchEffect(() => {
           </template>
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
-              <q-td>
+              <q-td auto-width>
                 <q-checkbox
                   keep-color
                   color="primary"
@@ -236,59 +241,64 @@ watchEffect(() => {
                   v-model="props.selected"
                 />
               </q-td>
-              <q-td key="no" :props="props">
-                {{ props.rowIndex + 1 }}
-              </q-td>
-              <q-td key="citizenId" :props="props">
-                {{ props.row.citizenId }}
-              </q-td>
-              <q-td key="fullname" :props="props">
-                {{ props.row.fullname }}
-              </q-td>
-              <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
-                  "
-                >
+              <q-td
+                v-for="col in props.cols"
+                :key="col.name"
+                :props="props"
+              >
+                <div v-if="col.name == 'no'">
+                  {{ props.rowIndex + 1 }}
+                </div>
+                <div v-else-if="col.name == 'fullname'">
+                  {{
+                    props.row.firstName
+                      ? `${props.row.prefix ?? ""}${
+                          props.row.firstName ?? ""
+                        } ${props.row.lastName ?? ""}`
+                      : "-"
+                  }}
+                </div>
+
+                <!-- <div v-else-if="col.name == 'status'">
+                  {{ props.row.status ? statusText(props.row.status) : "-" }}
+                </div> -->
+                <div v-else-if="col.name == 'dateOfBirth'">
+                  {{
+                    props.row.dateOfBirth
+                      ? date2Thai(props.row.dateOfBirth)
+                      : "-"
+                  }}
+                </div>
+                <div v-else-if="col.name == 'organizationName'">
                   <div class="col-4">
                     <div class="text-weight-medium">
-                      {{ props.row.orgName !== null ? props.row.orgName : "-" }}
+                      {{ props.row.root !== null ? props.row.root : "-" }}
                       {{
-                        props.row.organizationShortName !== null
-                          ? `(${props.row.organizationShortName})`
+                        props.row.rootShortName !== null
+                          ? `(${props.row.rootShortName})`
                           : ""
                       }}
                     </div>
                     <div class="text-weight-light">
                       {{
-                        props.row.positionPath !== null
-                          ? props.row.positionPath
-                          : "-"
+                        props.row.nodeName !== null ? props.row.nodeName : ""
                       }}
                       {{
-                        props.row.positionNumber !== null
-                          ? `(${props.row.positionNumber})`
+                        props.row.nodeShortName !== null
+                          ? `(${props.row.nodeShortName}${props.row.posMasterNo})`
                           : ""
                       }}
                     </div>
                   </div>
                 </div>
+                <div v-else-if="col.name == 'createdAt'">
+                  {{
+                    props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
+                  }}
+                </div>
                 <div v-else>
-                  <div class="col-4">
-                    <div class="text-weight-medium">-</div>
-                  </div>
-                </div> -->
-              </q-td>
-              <q-td key="birthday" :props="props">
-                {{ props.row.birthday }}
+                  {{ col.value ? col.value : "-" }}
+                </div>
               </q-td>
             </q-tr>
           </template>