hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'nice' into develop

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-01 17:21:05 +07:00
commit d55cbd552d
12 changed files with 552 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

136
src/modules/05_placement/components/AppointEmployee/DialogOrders.vue
View file

@ -4,6 +4,7 @@ import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import { useCommandMainStore } from "@/modules/18_command/store/Main";
import { useTransferDataStore } from "@/modules/05_placement/store";
import type { QTableProps } from "quasar";
import type { ListCommand } from "@/modules/18_command/interface/index/Main";
@ -16,6 +17,7 @@ const $q = useQuasar();
const storeCommand = useCommandMainStore();
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
const { statusText } = useTransferDataStore();
const props = defineProps({
Modal: Boolean,
@ -57,9 +59,14 @@ const visibleColumns2 = ref<string[]>([
"no",
"citizenId",
"fullname",
"positionLevel",
"positionNumberOld",
"organizationNameOld",
"organizationName",
"typeCommand",
"dateOfBirth",
"typeCommand",
"createdAt",
"status",
]);
const commandType = ref<string>(""); //ประเภทคำสั่ง
@ -98,10 +105,56 @@ const columns2 = ref<QTableProps["columns"]>([
field: "fullname",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${
row.firstName
? `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`
: "-"
}`;
},
},
{
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.firstName
? `${row.prefix}${row.firstName} ${row.lastName}`
: "-";
return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
},
},
{
@ -112,10 +165,20 @@ const columns2 = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
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})`;
},
},
{
name: "dateOfBirth",
align: "left",
label: "วัน/เดือน/ปี เกิด",
sortable: true,
field: "dateOfBirth",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return date2Thai(row.dateOfBirth);
},
},
{
@ -135,15 +198,27 @@ const columns2 = ref<QTableProps["columns"]>([
},
},
{
name: "dateOfBirth",
name: "createdAt",
align: "left",
label: "วัน/เดือน/ปี เกิด",
label: "วันที่ดำเนินการ",
sortable: true,
field: "dateOfBirth",
field: "createdAt",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return date2Thai(row.dateOfBirth);
return date2Thai(row.createdAt);
},
},
{
name: "status",
align: "left",
label: "สถานะ",
sortable: true,
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return statusText(row.status);
},
},
]);
@ -231,7 +306,7 @@ watch(
<template>
<q-dialog v-model="props.Modal" persistent>
<q-card style="width: 1200px; max-width: 80vw">
<q-card style="min-width: 80%">
<q-form greedy @submit.prevent @validation-success="clickAddlist">
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
<q-separator />
@ -342,21 +417,49 @@ watch(
: "-"
}}
</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">
{{ props.row.root !== null ? props.row.root : "-" }}
<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
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div class="text-weight-light">
<div>
{{
props.row.nodeName !== null
? props.row.nodeName
: ""
: "-"
}}
{{
props.row.nodeShortName !== null
@ -366,6 +469,7 @@ watch(
</div>
</div>
</div>
<div v-else-if="col.name == 'createdAt'">
{{
props.row.createdAt

129
src/modules/05_placement/components/AppointMent/DialogOrders.vue
View file

@ -66,9 +66,14 @@ const visibleColumns2 = ref<string[]>([
"no",
"citizenId",
"fullname",
"positionNumberOld",
"positionLevel",
"organizationNameOld",
"organizationName",
"dateOfBirth",
"typeCommand",
"dateOfBirth",
"createdAt",
"status",
]);
const columns2 = ref<QTableProps["columns"]>([
{
@ -97,10 +102,56 @@ const columns2 = ref<QTableProps["columns"]>([
field: "fullname",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${
row.firstName
? `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`
: "-"
}`;
},
},
{
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.firstName
? `${row.prefix}${row.firstName} ${row.lastName}`
: "-";
return `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")}`;
},
},
{
@ -111,10 +162,20 @@ const columns2 = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
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})`;
},
},
{
name: "dateOfBirth",
align: "left",
label: "วัน/เดือน/ปี เกิด",
sortable: true,
field: "dateOfBirth",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return date2Thai(row.dateOfBirth);
},
},
{
@ -136,15 +197,27 @@ const columns2 = ref<QTableProps["columns"]>([
},
},
{
name: "dateOfBirth",
name: "createdAt",
align: "left",
label: "วัน/เดือน/ปี เกิด",
label: "วันที่ดำเนินการ",
sortable: true,
field: "dateOfBirth",
field: "createdAt",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return date2Thai(row.dateOfBirth);
return date2Thai(row.createdAt);
},
},
{
name: "status",
align: "left",
label: "สถานะ",
sortable: true,
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return statusText(row.status);
},
},
]);
@ -244,7 +317,7 @@ watch(
<template>
<q-dialog v-model="props.Modal" persistent>
<q-card style="width: 1200px; max-width: 80vw">
<q-card style="min-width: 80%">
<q-form greedy @submit.prevent @validation-success="sendToCommand">
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
<q-separator />
@ -351,9 +424,37 @@ watch(
}}
</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
@ -361,7 +462,7 @@ watch(
: ""
}}
</div>
<div class="text-weight-light">
<div>
{{
props.row.nodeName !== null
? props.row.nodeName

32
src/modules/05_placement/components/Help-Government/DialogOrders.vue
View file

@ -16,14 +16,8 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
/** use*/
const $q = useQuasar();
const { statusText } = useTransferDataStore();
const {
dialogConfirm,
findOrgNameOld,
findPosMasterNoOld,
date2Thai,
onSearchDataTable,
findOrgNameOldHtml,
} = useCounterMixin();
const { dialogConfirm, findPosMasterNoOld, date2Thai, onSearchDataTable } =
useCounterMixin();
/** props*/
const props = defineProps({
@ -66,7 +60,7 @@ const columns2 = ref<QTableProps["columns"]>([
{
name: "posMasterNoOld",
align: "left",
label: "ตำแหน่งเลขที่",
label: "เลขที่ตำแหน่งเดิม",
sortable: true,
field: "posMasterNoOld",
headerStyle: "font-size: 14px",
@ -75,19 +69,10 @@ const columns2 = 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",
@ -112,7 +97,11 @@ const columns2 = ref<QTableProps["columns"]>([
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => findOrgNameOld(row),
format: (val, row) => {
return row.organizationPositionOld
? `${row.organizationPositionOld.replace(/(.*)\s(.*)$/, "$1\n$2")} `
: "-";
},
},
{
name: "organization",
@ -168,7 +157,6 @@ const visibleColumns2 = ref<string[]>([
"no",
"name",
"posMasterNoOld",
"positionOld",
"positionLevel",
"organizationPositionOld",
"organization",
@ -310,7 +298,7 @@ function onSearch() {
v-else-if="col.name === 'organizationPositionOld'"
class="text-html"
>
{{ findOrgNameOldHtml(props.row) }}
{{ col.value }}
</div>
<div v-else>

42
src/modules/05_placement/components/Receive/DialogOrders.vue
View file

@ -86,6 +86,45 @@ const columns2 = 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",
@ -149,6 +188,9 @@ const visibleColumns2 = ref<string[]>([
"no",
"citizenId",
"fullname",
"posTypeOld",
"positionNumberOld",
"organizationNameOld",
"organizationName",
"dateOfBirth",
"createdAt",

12
src/modules/05_placement/components/Repatriate/DialogOrders.vue
View file

@ -71,21 +71,21 @@ const columns2 = 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",
@ -147,7 +147,7 @@ const columns2 = ref<QTableProps["columns"]>([
const visibleColumns2 = ref<string[]>([
"no",
"name",
"posMasterNoOld",
"positionNumberOld",
"positionLevel",
"organizationPositionOld",
"organization",

17
src/modules/05_placement/components/Transfer/DialogOrders.vue
View file

@ -48,6 +48,7 @@ const visibleColumns2 = ref<string[]>([
"no",
"fullname",
"posType",
"positionNumberOld",
"organizationPositionOld",
"organization",
"status",
@ -75,10 +76,19 @@ const columns2 = 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",
@ -87,6 +97,7 @@ const columns2 = ref<QTableProps["columns"]>([
return row.positionTypeOld + " (" + row.positionLevelOld + ")";
},
},
{
name: "organizationPositionOld",
align: "left",
@ -94,7 +105,9 @@ const columns2 = ref<QTableProps["columns"]>([
sortable: true,
field: "organizationPositionOld",
format(val, row) {
return row.organizationPositionOld.replace(/\n/g, " ");
return row.organizationPositionOld
? `${row.organizationPositionOld.replace(/\n/g, " ")}`
: "-";
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",

17
src/modules/05_placement/views/02_transferMain.vue
View file

@ -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",

63
src/modules/05_placement/views/03_receiveMain.vue
View file

@ -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 : ""
}}

25
src/modules/05_placement/views/04_helpGovernmentMain.vue
View file

@ -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>

12
src/modules/05_placement/views/05_repatriateMain.vue
View file

@ -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",

80
src/modules/05_placement/views/06_appointPromoteMain.vue
View file

@ -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 : ""
}}

81
src/modules/05_placement/views/07_appointEmployeeMain.vue
View file

@ -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 : ""
}}