บรรจุแต่งตั้ง

2025-04-01 17:20:47 +07:00 · 2025-04-01 17:20:47 +07:00 · 184e1a8815
commit 184e1a8815
parent dbb9e5719b
12 changed files with 552 additions and 94 deletions
--- a/src/modules/05_placement/views/02_transferMain.vue
+++ b/src/modules/05_placement/views/02_transferMain.vue
@ -54,10 +54,19 @@ const columns = ref<QTableProps["columns"]>([
      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
    },
  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
  {
    name: "posType",
    align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
    sortable: true,
    field: "posType",
    headerStyle: "font-size: 14px",
@ -70,6 +79,7 @@ const columns = ref<QTableProps["columns"]>([
        : "";
    },
  },
+
  {
    name: "organizationPositionOld",
    align: "left",
@ -79,7 +89,9 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    format(val, row) {
-      return row.organizationPositionOld.replace(/\n/g, " ");
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/\n/g, " ")}`
+        : "-";
    },
  },
  {
@ -118,6 +130,7 @@ const visibleColumns = ref<string[]>([
  "no",
  "fullname",
  "posType",
+  "positionNumberOld",
  "organizationPositionOld",
  "organization",
  "status",
--- a/src/modules/05_placement/views/03_receiveMain.vue
+++ b/src/modules/05_placement/views/03_receiveMain.vue
@ -64,6 +64,9 @@ const visibleColumns = ref<string[]>([
  "no",
  "citizenId",
  "fullname",
+  "posTypeOld",
+  "positionNumberOld",
+  "organizationNameOld",
  "organizationName",
  "dateOfBirth",
  "createdAt",
@ -104,6 +107,46 @@ const columns = ref<QTableProps["columns"]>([
      return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
    },
  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+  {
+    name: "posTypeOld",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "posTypeOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionTypeOld
+        ? `${row.positionTypeOld}${
+            row.positionLevelOld ? `(${row.positionLevelOld})` : ""
+          }`
+        : "";
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
+  },
+
  {
    name: "organizationName",
    align: "left",
@ -572,9 +615,25 @@ onMounted(async () => {
                      props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
                    }}
                  </div>
+
                  <div v-else-if="col.name == 'organizationName'">
                    <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                        {{ props.row.root !== null ? props.row.root : "-" }}
                        {{
                          props.row.rootShortName !== null
@ -582,7 +641,7 @@ onMounted(async () => {
                            : ""
                        }}
                      </div>
-                      <div class="text-weight-light">
+                      <div>
                        {{
                          props.row.nodeName !== null ? props.row.nodeName : ""
                        }}
--- a/src/modules/05_placement/views/04_helpGovernmentMain.vue
+++ b/src/modules/05_placement/views/04_helpGovernmentMain.vue
@ -28,10 +28,8 @@ const {
  hideLoader,
  success,
  dialogRemove,
-  findOrgNameOld,
  findPosMasterNoOld,
  onSearchDataTable,
-  findOrgNameOldHtml,
 } = mixin;

 /** Table*/
@ -69,7 +67,7 @@ const columns = ref<QTableProps["columns"]>([
  {
    name: "posMasterNoOld",
    align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
    sortable: true,
    field: "posMasterNoOld",
    headerStyle: "font-size: 14px",
@ -78,19 +76,10 @@ const columns = ref<QTableProps["columns"]>([
      return findPosMasterNoOld(row);
    },
  },
-  {
-    name: "positionOld",
-    align: "left",
-    label: "ตำแหน่งในสายงาน",
-    sortable: true,
-    field: "positionOld",
-    headerStyle: "font-size: 14px",
-    style: "font-size: 14px",
-  },
  {
    name: "positionLevel",
    align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
    sortable: true,
    field: "positionLevel",
    headerStyle: "font-size: 14px",
@ -110,12 +99,16 @@ const columns = ref<QTableProps["columns"]>([
  {
    name: "organizationPositionOld",
    align: "left",
-    label: "สังกัด",
+    label: "ตำแหน่ง/สังกัดเดิม",
    sortable: true,
    field: "organizationPositionOld",
    headerStyle: "font-size: 14px;min-width: 280px",
    style: "font-size: 14px",
-    format: (val, row) => findOrgNameOld(row),
+    format: (val, row) => {
+      return row.organizationPositionOld
+        ? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
+        : "-";
+    },
  },
  {
    name: "organization",
@ -409,7 +402,7 @@ onMounted(async () => {
                    v-else-if="col.name === 'organizationPositionOld'"
                    class="text-html"
                  >
-                    {{ findOrgNameOldHtml(props.row) }}
+                    {{ col.value }}
                  </div>

                  <div v-else>
--- a/src/modules/05_placement/views/05_repatriateMain.vue
+++ b/src/modules/05_placement/views/05_repatriateMain.vue
@ -64,21 +64,21 @@ const columns = ref<QTableProps["columns"]>([
    },
  },
  {
-    name: "posMasterNoOld",
+    name: "positionNumberOld",
    align: "left",
-    label: "ตำแหน่งเลขที่",
+    label: "เลขที่ตำแหน่งเดิม",
    sortable: true,
-    field: "posMasterNoOld",
+    field: "positionNumberOld",
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    format(val, row) {
-      return findPosMasterNoOld(row);
+      return row.positionNumberOld;
    },
  },
  {
    name: "positionLevel",
    align: "left",
-    label: "ประเภทตำแหน่ง",
+    label: "ตำแหน่งประเภทเดิม",
    sortable: true,
    field: "positionLevel",
    headerStyle: "font-size: 14px",
@ -140,7 +140,7 @@ const columns = ref<QTableProps["columns"]>([
 const visibleColumns = ref<string[]>([
  "no",
  "name",
-  "posMasterNoOld",
+  "positionNumberOld",
  "positionLevel",
  "organizationPositionOld",
  "organization",
--- a/src/modules/05_placement/views/06_appointPromoteMain.vue
+++ b/src/modules/05_placement/views/06_appointPromoteMain.vue
@ -90,6 +90,50 @@ const columns = ref<QTableProps["columns"]>([
      }`;
    },
  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "เลขที่ตำแหน่งเดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
+    },
+  },
  {
    name: "organizationName",
    align: "left",
@ -99,7 +143,7 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
    },
  },
  {
@ -161,6 +205,9 @@ const visibleColumns = ref<string[]>([
  "no",
  "citizenId",
  "fullname",
+  "positionNumberOld",
+  "positionLevel",
+  "organizationNameOld",
  "organizationName",
  "typeCommand",
  "dateOfBirth",
@ -178,7 +225,7 @@ const pagination = ref({
 async function fecthlistappointment() {
  showLoader();
  await http
-    .get(config.API.appointmentMain()+`?status=${status.value}`)
+    .get(config.API.appointmentMain() + `?status=${status.value}`)
    .then((res) => {
      let response = res.data.result;
      listRecevice.value = response;
@ -544,10 +591,35 @@ onMounted(async () => {
                  <div v-if="col.name == 'no'">
                    {{ props.rowIndex + 1 }}
                  </div>
+                  <div
+                    v-else-if="col.name == 'organizationNameOld'"
+                    class="text-html"
+                  >
+                    {{
+                      props.row.organizationPositionOld !== null
+                        ? props.row.organizationPositionOld
+                        : "-"
+                    }}
+                  </div>

                  <div v-else-if="col.name == 'organizationName'">
                    <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                        {{ props.row.root !== null ? props.row.root : "-" }}
                        {{
                          props.row.rootShortName !== null
@ -555,7 +627,7 @@ onMounted(async () => {
                            : ""
                        }}
                      </div>
-                      <div class="text-weight-light">
+                      <div>
                        {{
                          props.row.nodeName !== null ? props.row.nodeName : ""
                        }}
--- a/src/modules/05_placement/views/07_appointEmployeeMain.vue
+++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue
@ -58,6 +58,9 @@ const visibleColumns = ref<string[]>([
  "no",
  "citizenId",
  "fullname",
+  "positionLevel",
+  "positionNumberOld",
+  "organizationNameOld",
  "organizationName",
  "dateOfBirth",
  "typeCommand",
@ -105,6 +108,50 @@ const columns = ref<QTableProps["columns"]>([
      }`;
    },
  },
+  {
+    name: "positionNumberOld",
+    align: "left",
+    label: "ตำแหน่งเลขที่เดิม",
+    sortable: true,
+    field: "positionNumberOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      return row.positionNumberOld;
+    },
+  },
+  {
+    name: "positionLevel",
+    align: "left",
+    label: "ตำแหน่งประเภทเดิม",
+    sortable: true,
+    field: "positionLevel",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format(val, row) {
+      let name = "";
+      if (row.positionTypeOld && row.positionLevelOld) {
+        name = `${row.positionTypeOld} (${row.positionLevelOld})`;
+      } else if (row.positionTypeOld) {
+        name = `${row.positionTypeOld}`;
+      } else if (row.positionLevelOld) {
+        name = `(${row.positionLevelOld})`;
+      } else name = "-";
+      return name;
+    },
+  },
+  {
+    name: "organizationNameOld",
+    align: "left",
+    label: "ตำแหน่ง/สังกัดเดิม",
+    sortable: true,
+    field: "organizationNameOld",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
+    },
+  },
  {
    name: "organizationName",
    align: "left",
@ -114,7 +161,7 @@ const columns = ref<QTableProps["columns"]>([
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
    format: (val, row) => {
-      return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
+      return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
    },
  },
  {
@ -175,7 +222,7 @@ const columns = ref<QTableProps["columns"]>([
 async function fecthlistappointment() {
  showLoader();
  await http
-    .get(config.API.appointEmployee()+`?status=${status.value}`)
+    .get(config.API.appointEmployee() + `?status=${status.value}`)
    .then(async (res) => {
      let response = await res.data.result;
      listRecevice.value = response;
@ -517,9 +564,35 @@ onMounted(async () => {
                    {{ props.rowIndex + 1 }}
                  </div>

+                  <div
+                    v-else-if="col.name == 'organizationNameOld'"
+                    class="text-html"
+                  >
+                    {{
+                      props.row.organizationPositionOld !== null
+                        ? props.row.organizationPositionOld
+                        : "-"
+                    }}
+                  </div>
+
                  <div v-else-if="col.name == 'organizationName'">
                    <div class="col-4">
-                      <div class="text-weight-medium">
+                      <div>
+                        {{
+                          props.row.position !== null ? props.row.position : ""
+                        }}{{
+                          (props.row.posTypeName !== null &&
+                            props.row.posTypeName === "บริหาร") ||
+                          props.row.posTypeName === "อำนวยการ"
+                            ? `${props.row.posTypeName}`
+                            : ""
+                        }}{{
+                          props.row.posLevelName !== null
+                            ? `${props.row.posLevelName}`
+                            : ""
+                        }}
+                      </div>
+                      <div>
                        {{ props.row.root !== null ? props.row.root : "-" }}
                        {{
                          props.row.rootShortName !== null
@ -527,7 +600,7 @@ onMounted(async () => {
                            : ""
                        }}
                      </div>
-                      <div class="text-weight-light">
+                      <div>
                        {{
                          props.row.nodeName !== null ? props.row.nodeName : ""
                        }}