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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2025-06-23 09:59:24 +07:00
commit 7c6aaeb520
13 changed files with 227 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,13 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
const $q = useQuasar();
const storeCommand = useCommandMainStore();
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
const {
dialogConfirm,
date2Thai,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const { statusText } = useTransferDataStore();
const props = defineProps({
@ -166,7 +172,14 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""} ${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -429,44 +442,21 @@ watch(
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<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>
{{
props.row.nodeName !== null
? props.row.nodeName
: "-"
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{
props.row.position !== null ? props.row.position : ""
}}
{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>

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

@ -19,7 +19,13 @@ const $q = useQuasar();
const storeFn = useTransferDataStore();
const storeCommand = useCommandMainStore();
const { statusText } = storeFn;
const { dialogConfirm, onSearchDataTable, date2Thai } = useCounterMixin();
const {
dialogConfirm,
onSearchDataTable,
date2Thai,
findOrgNameHtml,
findOrgName,
} = useCounterMixin();
/**
* props
@ -163,7 +169,22 @@ const columns2 = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${
row.positionExecutive !== null
? `${row.positionExecutive}${
row.positionExecutiveField
? ` (${row.positionExecutiveField})`
: ""
}`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -436,44 +457,38 @@ watch(
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<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>
{{
props.row.nodeName !== null
? props.row.nodeName
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{
props.row.position !== null ? props.row.position : ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
<!-- {{
(props.row.posTypeName !== null &&
props.row.posTypeName === "บริหาร") ||
props.row.posTypeName === "อำนวยการ"
? `${props.row.posTypeName}`
: ""
}} -->
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div>
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>
<div v-else-if="col.name == 'createdAt'">

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

@ -32,7 +32,13 @@ const dataMapToSend = computed(() => {
}));
});
const mixin = useCounterMixin();
const { dialogConfirm, date2Thai, onSearchDataTable } = mixin;
const {
dialogConfirm,
date2Thai,
onSearchDataTable,
findOrgName,
findOrgNameHtml,
} = mixin;
const rows = defineModel<any[]>("rows", { required: true });
const rowsData = defineModel<any[]>("rowsData", { required: true });
@ -136,7 +142,14 @@ const columns2 = ref<QTableProps["columns"]>([
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} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{
@ -324,29 +337,33 @@ watchEffect(() => {
</div>
<div v-else-if="col.name == 'organizationName'">
<div class="col-4">
<div class="text-weight-medium">
{{ props.row.root !== null ? props.row.root : "-" }}
{{
props.row.rootShortName !== null
? `(${props.row.rootShortName})`
: ""
}}
</div>
<div class="text-weight-light">
{{
props.row.nodeName !== null
? props.row.nodeName
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
</div>
{{ props.row.position !== null ? props.row.position : ""
}}{{
props.row.posLevelName !== null
? `${props.row.posLevelName}`
: ""
}}
{{
props.row.nodeShortName !== null
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
: ""
}}
<!-- <div>
{{
props.row.positionExecutive !== null
? `${props.row.positionExecutive}${
props.row.positionExecutiveField
? ` (${props.row.positionExecutiveField})`
: ""
}`
: ""
}}
</div> -->
<div class="text-html">
{{ findOrgNameHtml(props.row) }}
</div>
</div>
<div v-else>
{{ col.value ? col.value : "-" }}
</div>

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

@ -38,6 +38,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -163,7 +164,14 @@ const columns = ref<QTableProps["columns"]>([
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} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

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

@ -37,6 +37,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = useCounterMixin();
const status = ref<string>("");
@ -147,9 +148,24 @@ const columns = ref<QTableProps["columns"]>([
field: "organizationName",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
// format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// },
format: (val, row) => {
// return `${row.root.position}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${
row.positionExecutive !== null
? `${row.positionExecutive}${
row.positionExecutiveField
? ` (${row.positionExecutiveField})`
: ""
}`
: ""
} ${findOrgName(row)}`;
},
},
{
name: "dateOfBirth",

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

@ -36,6 +36,7 @@ const {
dialogRemove,
onSearchDataTable,
findOrgNameHtml,
findOrgName,
} = mixin;
const status = ref<string>("");
@ -166,7 +167,14 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val, row) => {
return `${row.root.position}${row.root.posTypeName}${row.root.posLevelName}${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""} ${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
},
{

12
src/modules/05_placement/views/08_otherMain.vue
View file

@ -35,6 +35,7 @@ const {
dialogRemove,
onSearchDataTable,
findChildNameHtml,
findOrgName,
} = useCounterMixin();
const modal = ref<boolean>(false);
@ -134,8 +135,15 @@ const columns = ref<QTableProps["columns"]>([
label: "ตำแหน่ง/หน่วยงานที่บรรจุกลับ",
sortable: true,
field: "organizationPositionReturn",
format(val, row) {
return row.organizationPositionReturn.replace(/\n/g, " ");
format: (val, row) => {
// return `${row.root} (${row.rootShortName}) ${row.nodeName} (${row.nodeShortName}${row.posMasterNo})`;
return `${row.position !== null ? row.position : ""}${
row.posLevelName !== null ? `${row.posLevelName}` : ""
} ${
row.nodeShortName !== null
? `(${row.nodeShortName}${row.posMasterNo})`
: ""
} ${findOrgName(row)}`;
},
headerStyle: "font-size: 14px",
style: "font-size: 14px",

2
src/modules/06_retirement/components/06_dismissOrder/DetailEMP.vue
View file

@ -19,7 +19,7 @@ import CardProfile from "@/components/CardProfile.vue";
const $q = useQuasar();
const route = useRoute();
const router = useRouter();
const checkRoutePermisson = ref<boolean>(route.name == "outDetailOnly");
const checkRoutePermisson = ref<boolean>(route.name == "outDetailOnlyEmp");
const mixin = useCounterMixin();
const dataId = route.params.id.toString();
const {

45
src/plugins/auth.ts
View file

@ -1,7 +1,9 @@
const ACCESS_TOKEN = "BMAHRISMGT_KEYCLOAK_IDENTITY";
const key_C_Config = {
url_Logout: import.meta.env.VITE_URL_SSO,
landing_PageUrl: import.meta.env.VITE_URL_LANDING,
};
interface AuthResponse {
access_token: string;
expires_in: number;
@ -10,22 +12,32 @@ interface AuthResponse {
const authenticated = async () => ((await getToken()) ? true : false);
async function setAuthen(r: AuthResponse, val: string) {
await setCookie(ACCESS_TOKEN, r.access_token, r.expires_in);
setCookie("SSO", val, r.expires_in);
window.location.href = "/";
async function setAuthen(r: AuthResponse, val: string, url?: string) {
if (r && r.access_token) {
await setCookie(ACCESS_TOKEN, r.access_token, r.expires_in);
setCookie("SSO", val, r.expires_in);
window.location.href = url ? encodeURI(url) : "/";
}
}
async function logout() {
await deleteCookie(ACCESS_TOKEN);
window.location.href = key_C_Config.url_Logout;
async function logout(force: boolean = false) {
if (!force) {
await deleteCookie(ACCESS_TOKEN);
window.location.href = key_C_Config.url_Logout;
} else {
const currentUrl = window.location.href;
const loginUrl = `${
key_C_Config.landing_PageUrl
}?system=mgt&redirectUrl=${encodeURIComponent(currentUrl)}`;
window.location.href = loginUrl;
}
}
async function getToken() {
return getCookie(ACCESS_TOKEN);
}
// 2024-08-29T02:55:13.000Z
function setCookie(name: string, value: any, time: number) {
async function setCookie(name: string, value: any, time: number) {
let expires = "";
if (time) {
const date = new Date();
@ -47,7 +59,7 @@ function getCookie(name: string) {
return null;
}
function deleteCookie(name: string) {
async function deleteCookie(name: string) {
document.cookie = `${name}=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;`;
}
@ -71,4 +83,17 @@ async function tokenParsed() {
return JSON.parse(jsonPayload);
}
export { getToken, authenticated, logout, setAuthen, tokenParsed, getCookie };
async function redirectToLandingPage() {
await deleteCookie(ACCESS_TOKEN);
window.location.href = key_C_Config.landing_PageUrl;
}
export {
getToken,
authenticated,
logout,
setAuthen,
tokenParsed,
getCookie,
redirectToLandingPage,
};

2
src/plugins/http.ts
View file

@ -29,6 +29,8 @@ http.interceptors.response.use(
if (typeof error !== undefined) {
// eslint-disable-next-line no-prototype-builtins
if (error.hasOwnProperty("response")) {
console.log("error.response", error.response);
if (error.response.status === 403) {
window.location.href = "/error";
// Store.commit("SET_ERROR_MESSAGE", error.response.data.message);

4
src/router/index.ts
View file

@ -123,10 +123,8 @@ const router = createRouter({
router.beforeEach(async (to, from, next) => {
if (to.meta.Auth) {
const checkAuthen = await authenticated();
console.log("checkAuthen", checkAuthen);
if (!checkAuthen && to.meta.Auth) {
logout();
logout(true);
}
}
next();

13
src/views/MainLayout.vue
View file

@ -6,7 +6,12 @@ import { storeToRefs } from "pinia";
import { scroll, useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import { useMenuDataStore } from "@/stores/menuList";
import { tokenParsed, logout, getCookie } from "@/plugins/auth";
import {
tokenParsed,
logout,
getCookie,
redirectToLandingPage,
} from "@/plugins/auth";
import avatar from "@/assets/avatar_user.jpg";
import http from "@/plugins/http";
@ -758,7 +763,11 @@ function onViewDetailNoti(url: string) {
เลือกโหมด
</div> -->
<q-list dense>
<q-item clickable :href="landingPageUrl" v-if="isSsoToken">
<q-item
clickable
@click="redirectToLandingPage"
v-if="isSsoToken"
>
<q-item-section avatar>
<q-avatar
color="blue"

6
src/views/auth.vue
View file

@ -12,7 +12,11 @@ onMounted(async () => {
expires_in: route.query.expires ? route.query.expires : 36000,
refresh_token: route.query.accessToken,
};
setAuthen(params, "y");
setAuthen(
params,
"y",
route.query.redirectUrl ? (route.query.redirectUrl as string) : ""
);
}
});
</script>