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

วินัยรองรับลูกจ้างประจำ กทม.

Browse source
This commit is contained in:
setthawutttty 2024-12-18 16:39:42 +07:00
parent 77a3e7b57f
commit 9bb81be90d
20 changed files with 370 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/modules/11_discipline/store/Main.ts
View file

@ -44,6 +44,15 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "profileType",
align: "left",
label: "สถานภาพ",
sortable: true,
field: "profileType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "idcard",
align: "left",
@ -115,6 +124,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
/** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */
const visibleColumnsRespondent = ref<string[]>([
"no",
"profileType",
"idcard",
"name",
"posNo",
@ -125,16 +135,17 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
]);
/** หัวตารางกรรมการ */
// {
// name: "info",
// align: "left",
// label: "",
// sortable: false,
// field: "info",
// headerStyle: "font-size: 14px",
// style: "font-size: 14px",
// },
const columnsDirector = ref<QTableProps["columns"]>([
{
name: "info",
align: "left",
label: "",
sortable: false,
field: "info",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "no",
align: "left",
@ -144,6 +155,15 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "profileType",
align: "left",
label: "สถานภาพ",
sortable: true,
field: "profileType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "idcard",
align: "left",
@ -220,9 +240,10 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
]);
/** หัวข้อที่เเสดงในตารางกรรมการ */
// "info",
const visibleColumnsDirector = ref<string[]>([
"info",
"no",
"profileType",
"idcard",
"name",
"posNo",
@ -407,8 +428,13 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
* จัดเก็บข้อมูลไว้ เพื่อใช้ใน POPUP
* @param data ข้อมูลรายการบุคคล
*/
async function fetchData(data: ArrayPersonAdd[]) {
async function fetchData(data: ArrayPersonAdd[], type?: string) {
const dataList: any = data.map((item: any) => ({
profileType: item.profileType
? item.profileType
: type == "officer"
? "OFFICER"
: "EMPLOYEE",
id: item.id,
idcard: item.idcard,
name: item.name,
@ -442,7 +468,13 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
posLevelId: item.posLevelId,
posLevelName: item.posLevelName,
}));
rowsAdd.value = dataList;
const newItems = dataList.filter(
(newItem: any) => !rowsAdd.value.some((existingItem: any) => existingItem.personId === newItem.personId)
);
// เพิ่มข้อมูลใหม่เข้า rowsAdd
rowsAdd.value = [...rowsAdd.value, ...newItems];
}
/**
@ -454,6 +486,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
id: item.id,
idcard: item.idcard,
name: item.name,
profileType: item.profileType,
prefix: item.prefix,
firstName: item.firstName,
lastName: item.lastName,
@ -488,6 +521,14 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
rowsSend.value = dataList;
}
function convertType(val: string) {
switch (val) {
case "OFFICER":
return "ข้าราชการ กทม. สามัญ";
case "EMPLOYEE":
return "ลูกจ้างประจำ กทม.";
}
}
return {
complainantoptionsMain,
convertFault,
@ -513,5 +554,6 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
pathDiscip,
pathComplaintsChannal,
pathDirector,
convertType,
};
});

3
src/modules/11_discipline/store/SuspendStore.ts
View file

@ -7,7 +7,7 @@ import type {
listData,
dataType,
DataOption,
} from "@/modules/11_discipline/interface/response/Suspend";
} from "@/modules/11_discipline/interface/response/suspend";
import type { QTableProps } from "quasar";
export const useDisciplineSuspendStore = defineStore(
@ -38,6 +38,7 @@ export const useDisciplineSuspendStore = defineStore(
name: `${item.prefix}${item.firstName} ${item.lastName}`,
prefix: item.prefix,
firstName: item.firstName,
profileType: item.profileType,
lastName: item.lastName,
organization: item.organization,
position: item.position,