diff --git a/src/modules/05_placement/interface/request/DataNum.ts b/src/modules/05_placement/interface/request/DataNum.ts
index cf7abe6ff..1bddb6b01 100644
--- a/src/modules/05_placement/interface/request/DataNum.ts
+++ b/src/modules/05_placement/interface/request/DataNum.ts
@@ -1,10 +1,7 @@
interface DataNumObject {
- id: number;
- count: number;
- name: string;
- color: string;
- }
- export type {
- DataNumObject,
-
- };
\ No newline at end of file
+ id: number;
+ count: number;
+ name: string;
+ color: string;
+}
+export type { DataNumObject };
diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts
index 5cf91836b..cc7c87b77 100644
--- a/src/modules/05_placement/interface/request/Main.ts
+++ b/src/modules/05_placement/interface/request/Main.ts
@@ -5,7 +5,7 @@ interface FormPlacementMainData {
examOrder: number;
fiscalYear: number;
numberOfCandidates: number;
- examTypeValue:string;
+ examTypeValue: string;
examTypeName: string;
accountStartDate: string;
accountExpirationDate: string;
@@ -24,17 +24,17 @@ interface FormOrderPlacementMainData {
}
interface FormMainProbation {
- personal_id: number,
- ordering: number,
- name: string,
- position_line: string,
- position_line_id: string,
- position_level: string,
- position_level_id: string,
- organization: string,
- probation_no: number,
- order_number: string,
- probation_status: string
+ personal_id: number;
+ ordering: number;
+ name: string;
+ position_line: string;
+ position_line_id: string;
+ position_level: string;
+ position_level_id: string;
+ organization: string;
+ probation_no: number;
+ order_number: string;
+ probation_status: string;
}
interface FormMainProbation2 {
no: string;
@@ -44,45 +44,45 @@ interface FormMainProbation2 {
institution: string;
}
interface FormProbationDetail {
- no: string,
- id: string,
- round_no: number,
- date_start: string,
- date_finish: string,
- mentors: string,
- commander: string,
- chairman: null
+ no: string;
+ id: string;
+ round_no: number;
+ date_start: string;
+ date_finish: string;
+ mentors: string;
+ commander: string;
+ chairman: null;
}
interface FormProbationPersonal {
- personal_id: string,
- name: string,
- position_line: string,
- position_line_id: string,
- position_level: string,
- position_level_id: string,
- organization: string,
- probation_no: number,
- order_number: string,
- probation_status: string
+ personal_id: string;
+ name: string;
+ position_line: string;
+ position_line_id: string;
+ position_level: string;
+ position_level_id: string;
+ organization: string;
+ probation_no: number;
+ order_number: string;
+ probation_status: string;
}
interface mapData {
-id:string
-fullname:string
-position:string
-positionEmployeeLevel:string
-oc:string
-probation:string
+ id: string;
+ fullname: string;
+ position: string;
+ positionEmployeeLevel: string;
+ oc: string;
+ probation: string;
}
interface OpfillterType {
- id:number
- value:string
+ id: number;
+ value: string;
}
interface CriteriaType {
criteriaType: string;
criteriaValue: string;
}
-export type {
- FormPlacementMainData,
+export type {
+ FormPlacementMainData,
FormOrderPlacementMainData,
FormMainProbation,
FormMainProbation2,
@@ -90,5 +90,5 @@ export type {
FormProbationPersonal,
mapData,
OpfillterType,
- CriteriaType
+ CriteriaType,
};
diff --git a/src/modules/05_placement/interface/request/placement.ts b/src/modules/05_placement/interface/request/placement.ts
index 5306b8a78..8dad065c9 100644
--- a/src/modules/05_placement/interface/request/placement.ts
+++ b/src/modules/05_placement/interface/request/placement.ts
@@ -7,8 +7,8 @@ interface TableName {
ExamOrder: number;
unitId: string;
UnitGroup: string;
- positionNumber:string;
- positionPath:string;
+ positionNumber: string;
+ positionPath: string;
Unit: string;
reportingDate: string; //วันที่รายงานตัว
bmaOfficer: string;
@@ -18,9 +18,9 @@ interface TableName {
university: string;
degree: string;
disclaim: string;
- profilePhoto:string;
- organizationName:string;
- organizationShortName:string;
+ profilePhoto: string;
+ organizationName: string;
+ organizationShortName: string;
major: string;
remark: string;
number: number;
@@ -36,7 +36,7 @@ interface TableName {
scoreSum: number;
examResult: string;
};
-}
+}
interface PartialTableName {
personalId: string;
fullName: string;
@@ -53,4 +53,4 @@ interface PartialTableName {
statusId: string;
deferment: string;
}
-export type { TableName ,PartialTableName};
\ No newline at end of file
+export type { TableName, PartialTableName };
diff --git a/src/modules/05_placement/interface/response/Main.ts b/src/modules/05_placement/interface/response/Main.ts
index 092ed294e..fe8436797 100644
--- a/src/modules/05_placement/interface/response/Main.ts
+++ b/src/modules/05_placement/interface/response/Main.ts
@@ -1,7 +1,5 @@
interface OpType {
- commandCode: string
- id: string
+ commandCode: string;
+ id: string;
}
-export type {
- OpType
-};
+export type { OpType };
diff --git a/src/modules/05_placement/interface/response/OhterMain.ts b/src/modules/05_placement/interface/response/OhterMain.ts
index 41e9567e8..6279fffd6 100644
--- a/src/modules/05_placement/interface/response/OhterMain.ts
+++ b/src/modules/05_placement/interface/response/OhterMain.ts
@@ -22,7 +22,7 @@ interface listMain {
createdAt: Date;
amountOld: number;
positionDate: Date;
- leaveDate: Date
+ leaveDate: Date;
}
//ข้อมูลจาก api
interface listMainAPI {
@@ -48,8 +48,8 @@ interface listMainAPI {
statustext: string;
createdAt: Date;
amountOld: number;
- positionDate: Date
- leaveDate: Date
+ positionDate: Date;
+ leaveDate: Date;
}
interface OtherdataInterface {
@@ -98,8 +98,8 @@ interface resApiData {
positionDate: Date;
avatar: string;
commandType: string;
- militaryDate: Date
- leaveDate: Date
+ militaryDate: Date;
+ leaveDate: Date;
};
};
}
diff --git a/src/modules/05_placement/interface/response/Order.ts b/src/modules/05_placement/interface/response/Order.ts
index 6894b4fcd..e29277da5 100644
--- a/src/modules/05_placement/interface/response/Order.ts
+++ b/src/modules/05_placement/interface/response/Order.ts
@@ -5,10 +5,10 @@ interface ResponseData {
personalId: string;
selectStatus: boolean;
sequence: number;
- refRecordId: string
- salaryAmount:number|null
- positionSalaryAmount:number|null
- monthSalaryAmount:number|null
+ refRecordId: string;
+ salaryAmount: number | null;
+ positionSalaryAmount: number | null;
+ monthSalaryAmount: number | null;
}
interface ResponseOrganiz {
diff --git a/src/modules/05_placement/interface/response/Relocation.ts b/src/modules/05_placement/interface/response/Relocation.ts
index 4972a366f..f415d28cd 100644
--- a/src/modules/05_placement/interface/response/Relocation.ts
+++ b/src/modules/05_placement/interface/response/Relocation.ts
@@ -1,38 +1,38 @@
interface relocationType {
- no:number,
- id: string,
- citizenId: "0000000000005",
- prefix: string,
- firstname: string,
- lastname: string,
- dateOfBirth: Date,
- gender: string,
- status: string,
- recruitDate: Date,
- positionNumber: number,
- positionPath: string,
- positionPathSide: string,
- positionType: string,
- positionLine: string,
- positionLevel: string,
- posNoId: string,
- positionId: string,
- positionPathSideId: string,
- positionTypeId: string,
- positionLineId: string,
- positionLevelId: string,
- organizationPositionId: string,
- organizationName: string,
- organizationShortName: string,
- isActive: boolean,
- reason: string,
- educationOld: string,
- salary: number,
- positionTypeOld: string,
- positionLevelOld: string,
- positionNumberOld: string,
- organizationPositionOld: string,
- createdAt: Date
+ no: number;
+ id: string;
+ citizenId: "0000000000005";
+ prefix: string;
+ firstname: string;
+ lastname: string;
+ dateOfBirth: Date;
+ gender: string;
+ status: string;
+ recruitDate: Date;
+ positionNumber: number;
+ positionPath: string;
+ positionPathSide: string;
+ positionType: string;
+ positionLine: string;
+ positionLevel: string;
+ posNoId: string;
+ positionId: string;
+ positionPathSideId: string;
+ positionTypeId: string;
+ positionLineId: string;
+ positionLevelId: string;
+ organizationPositionId: string;
+ organizationName: string;
+ organizationShortName: string;
+ isActive: boolean;
+ reason: string;
+ educationOld: string;
+ salary: number;
+ positionTypeOld: string;
+ positionLevelOld: string;
+ positionNumberOld: string;
+ organizationPositionOld: string;
+ createdAt: Date;
}
-export type { relocationType};
\ No newline at end of file
+export type { relocationType };
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index fafbe5b73..163c1171e 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -331,6 +331,7 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
}
};
return {
- statusText, statusProbationMain
+ statusText,
+ statusProbationMain,
};
});
diff --git a/src/modules/05_placement/storePersona.ts b/src/modules/05_placement/storePersona.ts
index 8980b3624..b818ad03a 100644
--- a/src/modules/05_placement/storePersona.ts
+++ b/src/modules/05_placement/storePersona.ts
@@ -4,21 +4,20 @@ import { ref } from "vue";
import type { Information } from "@/modules/05_placement/components/PersonalDetail/profileType";
export const usePersonalDataStore = defineStore("personal-detail", () => {
- const dataMain = ref
([])
- const loading = ref(false)
- function fecthDataInformation(data: Information) {
- dataMain.value = data
- if (dataMain.value) {
- loading.value = true
- } else {
- loading.value = false
- }
+ const dataMain = ref([]);
+ const loading = ref(false);
+ function fecthDataInformation(data: Information) {
+ dataMain.value = data;
+ if (dataMain.value) {
+ loading.value = true;
+ } else {
+ loading.value = false;
}
+ }
- return {
- fecthDataInformation,
- dataMain,
- loading,
-
- };
-})
\ No newline at end of file
+ return {
+ fecthDataInformation,
+ dataMain,
+ loading,
+ };
+});
diff --git a/src/modules/05_placement/storeProbation.ts b/src/modules/05_placement/storeProbation.ts
index 59344abb7..ad3ef75b3 100644
--- a/src/modules/05_placement/storeProbation.ts
+++ b/src/modules/05_placement/storeProbation.ts
@@ -2,25 +2,25 @@ import { defineStore } from "pinia";
import { reactive, ref } from "vue";
export const useProbationDataStore = defineStore("probationStore", () => {
- const assign = ref([])
- const evaluate = ref([])
+ const assign = ref([]);
+ const evaluate = ref([]);
const tabs = ref([]);
- const mainTab = ref('')
+ const mainTab = ref("");
- const assignOutput = ref([])
- const director = ref([])
- const person = ref([])
+ const assignOutput = ref([]);
+ const director = ref([]);
+ const person = ref([]);
const fecthdataAssign = async (data: any) => {
- assign.value = await data.assign
- evaluate.value = await data.evaluate
- tabs.value = await data.evaluate
- }
+ assign.value = await data.assign;
+ evaluate.value = await data.evaluate;
+ tabs.value = await data.evaluate;
+ };
const fecthAssignoutput = (data: any) => {
- assignOutput.value = data.assign_output
- director.value = data.director
- person.value = data.person
- }
+ assignOutput.value = data.assign_output;
+ director.value = data.director;
+ person.value = data.person;
+ };
const ratingColors = ref([
"light-blue-3",
@@ -54,7 +54,10 @@ export const useProbationDataStore = defineStore("probationStore", () => {
id: "1",
label: "อุทิศตนและเสียสละเวลาในการปฏิบัติบัติงานอย่างเต็มกำลังความสามารถ",
},
- { id: "2", label: "มีจิตสำนึกที่ดี ปฏิบัติบัติงานด้วยความซื่อสัตย์ สุจริต" },
+ {
+ id: "2",
+ label: "มีจิตสำนึกที่ดี ปฏิบัติบัติงานด้วยความซื่อสัตย์ สุจริต",
+ },
{
id: "3",
label:
@@ -69,7 +72,8 @@ export const useProbationDataStore = defineStore("probationStore", () => {
},
{
id: "3",
- label: "ไม่กระทำการใด ๆ อันอาจก่อให้เกิดความเสียหายแก่ชื่อเสียงของหน่วยงาน",
+ label:
+ "ไม่กระทำการใด ๆ อันอาจก่อให้เกิดความเสียหายแก่ชื่อเสียงของหน่วยงาน",
},
{
id: "4",
@@ -99,6 +103,6 @@ export const useProbationDataStore = defineStore("probationStore", () => {
setStepOrder,
behavior_no1,
behavior_no2,
- behavior_no3
+ behavior_no3,
};
});
diff --git a/src/modules/05_placement/views/Main.vue b/src/modules/05_placement/views/Main.vue
index 299da05c1..70ffd3c1b 100644
--- a/src/modules/05_placement/views/Main.vue
+++ b/src/modules/05_placement/views/Main.vue
@@ -1,7 +1,6 @@
-
+
รายการสอบแข่งขัน / คัดเลือก
-
\ No newline at end of file
+
diff --git a/src/modules/06_retirement/interface/index/ExitInterviewQuestion.ts b/src/modules/06_retirement/interface/index/ExitInterviewQuestion.ts
index ec72b0e61..5053689a9 100644
--- a/src/modules/06_retirement/interface/index/ExitInterviewQuestion.ts
+++ b/src/modules/06_retirement/interface/index/ExitInterviewQuestion.ts
@@ -10,4 +10,4 @@ interface Answers {
desc: string;
}
-export type {Questions};
+export type { Questions };
diff --git a/src/modules/06_retirement/interface/index/Main.ts b/src/modules/06_retirement/interface/index/Main.ts
index 9958bdde7..1164a1f4b 100644
--- a/src/modules/06_retirement/interface/index/Main.ts
+++ b/src/modules/06_retirement/interface/index/Main.ts
@@ -1,4 +1,4 @@
interface Pagination {
- rowsPerPage: number;
- }
-export type {Pagination};
+ rowsPerPage: number;
+}
+export type { Pagination };
diff --git a/src/modules/06_retirement/interface/request/Main.ts b/src/modules/06_retirement/interface/request/Main.ts
index 010a13d45..39687933d 100644
--- a/src/modules/06_retirement/interface/request/Main.ts
+++ b/src/modules/06_retirement/interface/request/Main.ts
@@ -1,14 +1,10 @@
interface OptionQuestions {
- label: string;
- value: number;
+ label: string;
+ value: number;
}
interface OptionQuestions2 {
- label: string;
- value: boolean;
+ label: string;
+ value: boolean;
}
-
-export type {
- OptionQuestions,
- OptionQuestions2
-};
+export type { OptionQuestions, OptionQuestions2 };
diff --git a/src/modules/06_retirement/interface/response/Deceased.ts b/src/modules/06_retirement/interface/response/Deceased.ts
index 1c7ce3fb2..191dd67e9 100644
--- a/src/modules/06_retirement/interface/response/Deceased.ts
+++ b/src/modules/06_retirement/interface/response/Deceased.ts
@@ -115,5 +115,5 @@ export type {
ResDetailDeceased,
FormActive,
OrgTree,
- TreeMain
+ TreeMain,
};
diff --git a/src/modules/06_retirement/storeExitInterviewQuestion.ts b/src/modules/06_retirement/storeExitInterviewQuestion.ts
index a59dfa195..f3554f03e 100644
--- a/src/modules/06_retirement/storeExitInterviewQuestion.ts
+++ b/src/modules/06_retirement/storeExitInterviewQuestion.ts
@@ -2,16 +2,19 @@ import { defineStore } from "pinia";
import { reactive } from "vue";
import type { Questions } from "@/modules/06_retirement/interface/index/ExitInterviewQuestion";
-export const useExitInterviewQuestionDataStore = defineStore("exitInterviewQuestion", () => {
- const question = reactive([
- {
- no: 1,
- desc: 'เหตุใดท่านจึงตัดสินใจร่วมงานกับกรุงเทพมหานคร (เลือกได้มากกว่า 1 ข้อ)',
- score: 5,
- }
- ])
+export const useExitInterviewQuestionDataStore = defineStore(
+ "exitInterviewQuestion",
+ () => {
+ const question = reactive([
+ {
+ no: 1,
+ desc: "เหตุใดท่านจึงตัดสินใจร่วมงานกับกรุงเทพมหานคร (เลือกได้มากกว่า 1 ข้อ)",
+ score: 5,
+ },
+ ]);
- return {
- question,
- };
-});
+ return {
+ question,
+ };
+ }
+);
diff --git a/src/modules/06_retirement/storeRetirement.ts b/src/modules/06_retirement/storeRetirement.ts
index 6172ec94c..3dedb9fa2 100644
--- a/src/modules/06_retirement/storeRetirement.ts
+++ b/src/modules/06_retirement/storeRetirement.ts
@@ -1,17 +1,19 @@
import { defineStore } from "pinia";
-import { ref } from 'vue'
+import { ref } from "vue";
export const useDataStoreRetirement = defineStore("retirementDatastore", () => {
- const taboption = ref([{ name: "officer", id: "officer", label: 'ขรก.กทม.สามัญ' },
- { name: "employee", id: "employee", label: "ลูกจ้างประจำ" }])
+ const taboption = ref([
+ { name: "officer", id: "officer", label: "ขรก.กทม.สามัญ" },
+ { name: "employee", id: "employee", label: "ลูกจ้างประจำ" },
+ ]);
const tab = ref("officer");
const type = ref("officer");
const clickTab = (role: string) => {
- type.value = role
- }
+ type.value = role;
+ };
return {
tab,
type,
clickTab,
- taboption
+ taboption,
};
});
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 3f68addf0..771ff190c 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -377,7 +377,8 @@ const typeReportChangeName = (val: string) => {
{
{
- await props?.fetchData?.();
- await success($q, "บันทึกสำเร็จ");
+ .then(async () => {
+ await props?.fetchData?.();
+ await success($q, "บันทึกสำเร็จ");
closeDialog();
})
.catch((err) => {
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Document.vue b/src/modules/08_registryEmployee/components/EditEmployee/Document.vue
index e9201259d..8a018a3c9 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Document.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Document.vue
@@ -297,4 +297,4 @@ const changeBtn = async () => {
-
\ No newline at end of file
+
diff --git a/src/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue b/src/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue
index 105941b50..e0e9dfe94 100644
--- a/src/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue
+++ b/src/modules/08_registryEmployee/components/EditEmployee/Information/Address.vue
@@ -634,7 +634,7 @@ const getClass = (val: boolean) => {
:addEmployee="statusAdd()"
/>