Merge branch 'nice_dev' into develop

src/modules/05_placement/components/Other/Detail.vue

@@ -80,7 +80,7 @@ const fecthOther = async () => {
       Otherdata.value = res.data.result;
       console.log(data);
 
-      title.value.fullname = `${data.firstName ?? "-"} ${data.lastName ?? "-"}`;
+      title.value.fullname = `${data.firstname ?? "-"} ${data.lastname ?? "-"}`;
       title.value.organizationPositionOld = data.organizationPositionOld ?? "-";
       title.value.positionLevelOld = data.positionLevelOld ?? "-";
       title.value.positionTypeOld = data.positionTypeOld ?? "-";
@@ -99,7 +99,7 @@ const fecthOther = async () => {
       responseData.value.salary = data.salary !== null ? data.salary : 0;
       responseData.value.status = data.status ?? "";
       responseData.value.avataPath = data.avataPath ?? "";
-      responseData.value.fullname = `${data.firstName ?? "-"} ${
+      responseData.value.fullname = `${data.firstname ?? "-"} ${
         data.lastName ?? "-"
       }`;
 

src/modules/05_placement/components/Other/Main.vue

@@ -54,7 +54,7 @@ const visibleColumns = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+
   "statustext",
 ]);
 
@@ -64,7 +64,7 @@ const visibleColumns2 = ref<string[]>([
   "position",
   "positionLevel",
   "organizationPositionOld",
-  "organization",
+
   "statustext",
 ]); //ค้นหา คอลัมน์ คอลัมน์ที่แสดง
 const filterKeyword = ref<string>("");
@@ -94,10 +94,10 @@ const fecthlistOthet = async () => {
       rows.value = response.map((r: any) => ({
         createdAt: new Date(),
         date: new Date(),
-        firstName: r.firstName ?? "",
+        firstName: r.firstname ?? "",
         personalId: r.id ?? "",
         isActive: r.isActive ? r.isActive : false,
-        lastName: r.lastName ?? "",
+        lastName: r.lastname ?? "",
         organization: r.organization ?? "",
         organizationPositionOld: r.organizationPositionOld ?? "",
         posNo: r.posNo ?? "",
@@ -111,7 +111,7 @@ const fecthlistOthet = async () => {
         salary: r.salary ? r.salary : 0,
         status: r.status ?? "",
         statustext: status(r.status ?? ""),
-        fullname: `${r.prefix ?? ""} ${r.firstName ?? ""} ${r.lastName ?? ""}`,
+        fullname: `${r.prefix ?? ""} ${r.firstname ?? ""} ${r.lastname ?? ""}`,
       }));
       console.log(rows.value);
       rows2.value = rows.value.filter((e: any) => e.orgName !== null);
@@ -214,15 +214,6 @@ const columns = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "organization",
-    align: "left",
-    label: "หน่วยงานที่ขอโอนไป",
-    sortable: true,
-    field: "organization",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "statustext",
     align: "left",
@@ -279,15 +270,6 @@ const columns2 = ref<QTableProps["columns"]>([
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
-  {
-    name: "organization",
-    align: "left",
-    label: "หน่วยงานที่ขอโอนไป",
-    sortable: true,
-    field: "organization",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
   {
     name: "statustext",
     align: "left",

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

@@ -91,7 +91,7 @@ const columns = ref<QTableProps["columns"]>([
     sortable: true,
     field: "fullName",
     headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
+    style: "font-size: 14px,",
   },
   {
     name: "examNumber",
@@ -604,7 +604,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
               v-else-if="col.name === 'fullName'"
               class="table_ellipsis"
             >
-              <div class="row col-12 text-no-wrap items-center">
+              <div
+                class="row col-12 text-no-wrap items-center"
+                style="width: 270px"
+              >
                 <img
                   v-if="props.row.avatar == null"
                   src="@/assets/avatar_user.jpg"
@@ -706,7 +709,8 @@ const paginationLabel = (start: number, end: number, total: number) => {
                   <q-item
                     v-if="
                       (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
-                      props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
+                      (props.row.draft === 'รอส่งตัว' &&
+                        props.row.statusId !== 'DISCLAIM')
                     "
                     clickable
                     v-close-popup