Merge branch 'nice' into develop

src/components/Dialogs/PopupPersonalNew.vue

@@ -45,6 +45,7 @@ const emit = defineEmits(["update:modal"]);
 
 /** ตัวแปร*/
 const modal = ref<boolean>(false);
+const employeeClass = ref<string>("");
 const avatar = reactive<Avatar>({
   avatar: "",
   fullname: "",
@@ -124,6 +125,7 @@ async function fetchInformation(id: string) {
       imformation.birthDate = data.birthDate ? date2Thai(data.birthDate) : "-";
       imformation.age = data.birthDate ? calculateAge(data.birthDate) : "-";
       imformation.gender = data.gender ?? "-";
+      employeeClass.value = data.employeeClass ?? "officer";
 
       avatar.fullname = `${data.prefix}${data.firstName} ${data.lastName}`;
 
@@ -191,7 +193,11 @@ async function fetchProfileGov(id: string) {
 function redirecToRegistry() {
   router.push(
     `/registry-${
-      props.type.toLocaleLowerCase() == "employee" ? "employee" : "officer"
+      employeeClass.value.toLocaleLowerCase() === "perm"
+        ? "employee"
+        : employeeClass.value.toLocaleLowerCase() === "temp"
+        ? "temp"
+        : "officer"
     }/${props.id}`
   );
   modal.value = false;

src/modules/08_registryEmployee/views/Main.vue

@@ -30,6 +30,7 @@ const {
   hideLoader,
   date2Thai,
   dialogRemove,
+  findOrgNameHtml,
 } = useCounterMixin();
 const { statusText } = useRegistryEmp();
 
@@ -93,7 +94,7 @@ const columns = ref<QTableProps["columns"]>([
   {
     name: "draftOrganizationOrganization",
     align: "left",
-    label: "ตำแหน่ง/หน่วยงานที่รับการบรรจุ",
+    label: "ตำแหน่ง/สังกัดที่รับการบรรจุ",
     sortable: false,
     field: "draftOrganizationOrganization",
     headerStyle: "font-size: 14px",
@@ -303,6 +304,7 @@ onMounted(async () => {
   <div class="toptitle text-dark col-12 row items-center">
     รายชื่อลูกจ้างชั่วคราว
   </div>
+
   <q-card flat bordered class="q-pa-md">
     <div class="col-12 row items-center">
       <q-btn
@@ -458,37 +460,36 @@ onMounted(async () => {
             </q-td>
             <q-td v-for="col in props.cols" :key="col.name" :props="props">
               <template v-if="col.name === 'draftOrganizationOrganization'">
-                <div
-                  v-if="
-                    props.row.orgName !== null ||
-                    props.row.positionPath !== null
-                  "
-                >
+                <div v-if="props.row.draftPositionEmployee !== null">
                   <div class="col-4">
                     <div>
                       {{
-                        props.row.position !== null ? props.row.position : "-"
+                        props.row.draftPositionEmployee !== null
+                          ? props.row.draftPositionEmployee
+                          : "-"
                       }}
                       {{
-                        props.row.posTypeShortName !== null
+                        props.row.posTypeShortName !== null &&
+                        props.row.draftPositionEmployee !== null
                           ? `(${props.row.posTypeShortName}`
                           : ""
                       }}
                       {{
-                        props.row.posLevel !== null
+                        props.row.posLevel !== null &&
+                        props.row.draftPositionEmployee !== null
                           ? `${props.row.posLevel})`
                           : ""
                       }}
-                    </div>
-                    <div class="text-weight-medium">
-                      {{ props.row.root !== null ? props.row.root : "" }}
                       {{
-                        props.row.rootShortName !== null
-                          ? `(${props.row.rootShortName})`
+                        props.row.nodeShortName !== null
+                          ? `${props.row.nodeShortName}${props.row.posNo}`
                           : ""
                       }}
                     </div>
-                    <div class="text-weight-light">
+                    <div class="text-html">
+                      {{ findOrgNameHtml(props.row) }}
+                    </div>
+                    <!-- <div class="text-weight-light">
                       {{
                         props.row.nodeName !== null ? props.row.nodeName : ""
                       }}
@@ -497,7 +498,7 @@ onMounted(async () => {
                           ? `(${props.row.nodeShortName}${props.row.posNo})`
                           : ""
                       }}
-                    </div>
+                    </div> -->
                   </div>
                 </div>