-
- รายละเอียดงานที่ได้รับมอบหมายของ {{ name }}
-
+
+
+ รายละเอียดงานที่ได้รับมอบหมายของ {{ name }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
ตำแหน่งในสายงาน
-
{{position}}
-
-
-
-
-
-
สังกัด
-
{{institution}}
-
-
-
-
-
สถานะการทดลองงาน
-
-
-
-
- {{ status }}
-
-
-
-
-
+
+
+
+
+
+
+
+
ตำแหน่งในสายงาน
+
{{ position }}
+
+
+
+
+
+
สังกัด
+
{{ institution }}
+
+
+
+
+
สถานะการทดลองงาน
+
+
+
+
+ {{ status }}
+
+
+
+
+
-
-
-
- เพิ่มงานที่ได้รับมอบหมาย
-
-
-
-
-
-
-
-
-
+
+
+
+
+ เพิ่มงานที่ได้รับมอบหมาย
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/form/formEva2.vue b/src/modules/05_placement/components/probation/form/formEva2.vue
new file mode 100644
index 000000000..0b4771475
--- /dev/null
+++ b/src/modules/05_placement/components/probation/form/formEva2.vue
@@ -0,0 +1,289 @@
+
+
+
+
+ 2
+ พฤติกรรมของผู้ทดลองปฏิบัติบัติหน้าที่ราชการ
+
+
+
+ 2.1 ความประพฤติ
+
+
+
+
+
+ {{ list.label }}
+
+
+
+
+ ต่ำกว่าความคาดหวังมาก
+
+
+ ต่ำกว่าความคาดหวังค่อนข้างมาก
+
+
+ เป็นไปตามความคาดหวัง
+
+
+ สูงว่าความคาดหวังค่อนข้างมาก
+
+
+ สูงกว่าความคาดหวังมาก
+
+
+
+
+
+
+
+
+
+
+
+ 2.2 ความมีคุณธรรมจริยธรรม
+
+
+
+
+
+ {{ list.label }}
+
+
+
+
+ ต่ำกว่าความคาดหวังมาก
+
+
+ ต่ำกว่าความคาดหวังค่อนข้างมาก
+
+
+ เป็นไปตามความคาดหวัง
+
+
+ สูงว่าความคาดหวังค่อนข้างมาก
+
+
+ สูงกว่าความคาดหวังมาก
+
+
+
+
+
+
+
+
+
+
+
+ 2.3 การรักษาวินัย
+
+
+
+
+
+ {{ list.label }}
+
+
+
+
+ ต่ำกว่าความคาดหวังมาก
+
+
+ ต่ำกว่าความคาดหวังค่อนข้างมาก
+
+
+ เป็นไปตามความคาดหวัง
+
+
+ สูงว่าความคาดหวังค่อนข้างมาก
+
+
+ สูงกว่าความคาดหวังมาก
+
+
+
+
+
+
+
+
+
+
+
+ 2.4 อื่นๆ
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ต่ำกว่าความคาดหวังมาก
+
+
+ ต่ำกว่าความคาดหวังค่อนข้างมาก
+
+
+ เป็นไปตามความคาดหวัง
+
+
+ สูงว่าความคาดหวังค่อนข้างมาก
+
+
+ สูงกว่าความคาดหวังมาก
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/form/formEva3.vue b/src/modules/05_placement/components/probation/form/formEva3.vue
new file mode 100644
index 000000000..e368f2dc6
--- /dev/null
+++ b/src/modules/05_placement/components/probation/form/formEva3.vue
@@ -0,0 +1,130 @@
+
+
+
+
+ 3
+ การพัฒนาผู้ทดลองปฏิบัติบัติหน้าที่ราชการ
+
+
+
+
+
+ 1. การปฐมนิเทศ
+
+
+
+
+
+
+
+
+
+
+
+ 2. การเรียนรู้ด้วยตนเอง
+
+
+
+
+
+
+
+
+
+
+
+ 3. การอบรมสัมนาร่วมกัน
+
+
+
+
+
+
+
+
+
+
+
+ 4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/form/formEvaOrder.vue b/src/modules/05_placement/components/probation/form/formEvaOrder.vue
new file mode 100644
index 000000000..2a0c7f662
--- /dev/null
+++ b/src/modules/05_placement/components/probation/form/formEvaOrder.vue
@@ -0,0 +1,83 @@
+
+
+
+
+ ผู้บังคับบัญชาผู้มอบหมายงาน
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/form/formEvacomment.vue b/src/modules/05_placement/components/probation/form/formEvacomment.vue
new file mode 100644
index 000000000..5dc58496c
--- /dev/null
+++ b/src/modules/05_placement/components/probation/form/formEvacomment.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+ จุดเด่น (ไม่เกิน 5 บรรทัด)
+
+
+
+
+
+
+ สิ่งที่ควรปรับปรุง (ไม่เกิน 5 บรรทัด)
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/tabs/tabs2.vue b/src/modules/05_placement/components/probation/tabs/tabs2.vue
new file mode 100644
index 000000000..60ed911ee
--- /dev/null
+++ b/src/modules/05_placement/components/probation/tabs/tabs2.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+
+ เพิ่มบันทึกผลการทดลอง
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/tabs/tabs3.vue b/src/modules/05_placement/components/probation/tabs/tabs3.vue
new file mode 100644
index 000000000..62cebf32c
--- /dev/null
+++ b/src/modules/05_placement/components/probation/tabs/tabs3.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+
+ เพิ่มบันทึกผลการทดลอง
+
+
+
+
+
+
diff --git a/src/modules/05_placement/components/probation/tabs/tabs4.vue b/src/modules/05_placement/components/probation/tabs/tabs4.vue
new file mode 100644
index 000000000..62cebf32c
--- /dev/null
+++ b/src/modules/05_placement/components/probation/tabs/tabs4.vue
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+ ดาวน์โหลด
+
+
+
+
+ ไฟล์ .PDF
+
+
+
+ ไฟล์ .docx
+
+
+
+
+
+
+
+
+ เพิ่มบันทึกผลการทดลอง
+
+
+
+
+
+
diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts
index 8b1d5a8d3..90d23090b 100644
--- a/src/modules/05_placement/router.ts
+++ b/src/modules/05_placement/router.ts
@@ -21,7 +21,7 @@ const detailOrderReplace = () =>
"@/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue"
);
- // ระบบทดลองงาน
+// ระบบทดลองงาน
const mainProbation = () =>
import("@/modules/05_placement/components/probation/MainProbation.vue");
@@ -33,179 +33,178 @@ const probationFormEvaluation = () =>
const probationWorkAdd = () =>
import("@/modules/05_placement/components/probation/MainDetail.vue");
- const probationFormAssign = () =>
- import("@/modules/05_placement/components/probation/FormAssign.vue");
- const transfer = () =>
- import("@/modules/05_placement/components/Transfer/transferMain.vue");
- const transferbyId = () =>
- import("@/modules/05_placement/components/Transfer/transferRegistry.vue");
+const probationFormAssign = () =>
+ import("@/modules/05_placement/components/probation/FormAssign.vue");
+const transfer = () =>
+ import("@/modules/05_placement/components/Transfer/transferMain.vue");
+const transferbyId = () =>
+ import("@/modules/05_placement/components/Transfer/transferRegistry.vue");
-
- // คำสั่งช่วยราชการ/ส่งตัวกลับ
- const RepatriationOrder = () =>
+// คำสั่งช่วยราชการ/ส่งตัวกลับ
+const RepatriationOrder = () =>
import("@/modules/05_placement/components/RepatriationOrder/List.vue");
- const RepatriationOrderAdd = () =>
+const RepatriationOrderAdd = () =>
import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue");
- export default [
- {
- path: "/placement",
- name: "placement",
- component: PlacementMain,
- meta: {
- Auth: true,
- Key: [6.1],
- Role: "placement",
- },
+export default [
+ {
+ path: "/placement",
+ name: "placement",
+ component: PlacementMain,
+ meta: {
+ Auth: true,
+ Key: [6.1],
+ Role: "placement",
},
- {
- path: "/placement/personal-list/:examId",
- name: "placementDetail",
- component: PlacementDetail,
- meta: {
- Auth: true,
- Key: [6.1],
- Role: "placement",
- },
+ },
+ {
+ path: "/placement/personal-list/:examId",
+ name: "placementDetail",
+ component: PlacementDetail,
+ meta: {
+ Auth: true,
+ Key: [6.1],
+ Role: "placement",
},
- {
- path: "/placement/personal-detail/:personalId",
- name: "PlacementPersonalDetail",
- component: PlacementPersonalDetail,
- meta: {
- Auth: true,
- Key: [6.1],
- Role: "placement",
- },
+ },
+ {
+ path: "/placement/personal-detail/:personalId",
+ name: "PlacementPersonalDetail",
+ component: PlacementPersonalDetail,
+ meta: {
+ Auth: true,
+ Key: [6.1],
+ Role: "placement",
},
- {
- path: "/placement/order",
- name: "Orderplacement",
- component: MainOrderPlacement,
- meta: {
- Auth: true,
- Key: [6.2],
- Role: "placement",
- },
+ },
+ {
+ path: "/placement/order",
+ name: "Orderplacement",
+ component: MainOrderPlacement,
+ meta: {
+ Auth: true,
+ Key: [6.2],
+ Role: "placement",
},
- {
- path: "/placement/order/detail",
- name: "OrderplacementDetail",
- component: detailOrderReplace,
- meta: {
- Auth: true,
- Key: [6.2],
- Role: "placement",
- },
+ },
+ {
+ path: "/placement/order/detail",
+ name: "OrderplacementDetail",
+ component: detailOrderReplace,
+ meta: {
+ Auth: true,
+ Key: [6.2],
+ Role: "placement",
},
- {
- path: "/placement/addOrderPlacement",
- name: "addOrderPlacement",
- component: addOrderPlacement,
- meta: {
- Auth: true,
- Key: [6.2],
- Role: "placement",
- },
+ },
+ {
+ path: "/placement/addOrderPlacement",
+ name: "addOrderPlacement",
+ component: addOrderPlacement,
+ meta: {
+ Auth: true,
+ Key: [6.2],
+ Role: "placement",
},
- {
- path: "/probation",
- name: "probation",
- component: mainProbation,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation",
+ name: "probation",
+ component: mainProbation,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/probation/detail/:id",
- name: "probationDetail",
- component: probationDetail,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation/detail/:id",
+ name: "probationDetail",
+ component: probationDetail,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/probation/form",
- name: "probationForm",
- component: probationFormEvaluation,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation/detail/:id/:form",
+ name: "probationForm",
+ component: probationFormEvaluation,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/probation/work/add",
- name: "probationWorkAdd",
- component: probationWorkAdd,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation/work/add",
+ name: "probationWorkAdd",
+ component: probationWorkAdd,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/probation/work/:id",
- name: "probationWork",
- component: probationWorkAdd,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation/work/:id",
+ name: "probationWork",
+ component: probationWorkAdd,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/probation/add",
- name: "probationWorkAdd",
- component: probationFormAssign,
- meta: {
- Auth: true,
- Key: [6.3],
- Role: "placement",
- },
+ },
+ {
+ path: "/probation/add",
+ name: "probationWorkAdd",
+ component: probationFormAssign,
+ meta: {
+ Auth: true,
+ Key: [6.3],
+ Role: "placement",
},
- {
- path: "/transfer",
- name: "transfer",
- component: transfer,
- meta: {
- Auth: true,
- Key: [6.4],
- Role: "placement",
- }
+ },
+ {
+ path: "/transfer",
+ name: "transfer",
+ component: transfer,
+ meta: {
+ Auth: true,
+ Key: [6.4],
+ Role: "placement",
},
- {
- path: "/transfer/:id",
- name: "transfer-id",
- component: transferbyId,
- meta: {
- Auth: true,
- Key: [6.4],
- Role: "placement",
- }
+ },
+ {
+ path: "/transfer/:id",
+ name: "transfer-id",
+ component: transferbyId,
+ meta: {
+ Auth: true,
+ Key: [6.4],
+ Role: "placement",
},
- {
- path: "/repatriation-order",
- name: "repatriation-order",
- component: RepatriationOrder,
- meta: {
- Auth: true,
- Key: [6.6],
- Role: "placement",
- },
+ },
+ {
+ path: "/repatriation-order",
+ name: "repatriation-order",
+ component: RepatriationOrder,
+ meta: {
+ Auth: true,
+ Key: [6.6],
+ Role: "placement",
},
- {
- path: "/repatriation-order/add",
- name: "repatriation-order-add",
- component: RepatriationOrderAdd,
- meta: {
- Auth: true,
- Key: [6.6],
- Role: "placement",
- },
+ },
+ {
+ path: "/repatriation-order/add",
+ name: "repatriation-order-add",
+ component: RepatriationOrderAdd,
+ meta: {
+ Auth: true,
+ Key: [6.6],
+ Role: "placement",
},
- ];
+ },
+];
diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts
index 3f51227be..29f73c9b7 100644
--- a/src/modules/05_placement/store.ts
+++ b/src/modules/05_placement/store.ts
@@ -281,3 +281,17 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
DataMainOrder,
};
});
+
+export const useProbationDataStore = defineStore("probationDataStore", () => {
+ const ratingColors = ref
([
+ "light-blue-3",
+ "light-blue-6",
+ "blue",
+ "blue-9",
+ "blue-10",
+ ]);
+
+ return {
+ ratingColors,
+ };
+});
diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue
index 865c20433..7f72cdc63 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -16,7 +16,10 @@ const id = route.params.id;
const props = defineProps({
retireld: String,
listId: String,
- UpdateListId: Function,
+ UpdateListId: {
+ type: Function,
+ default: () => console.log("UpdateListId"),
+ },
});
const modal = ref(false);
@@ -114,7 +117,7 @@ const rows = ref([
]);
const filter = ref("");
watch(modal, () => {
- console.log(props);
+ // console.log(props);
if (modal.value === true) {
retireld.value = props.retireld;
@@ -125,11 +128,8 @@ watch(modal, () => {
fecthlistRetire();
}
});
-const updateListId = (val: any) => {
- listId.value = val;
- if (props.UpdateListId) {
- props.UpdateListId(listId.value);
- }
+const updateListData = (retireld: string, pId: string) => {
+ props.UpdateListId(retireld, pId);
};
const fecthlistRetire = async () => {
showLoader();
@@ -137,7 +137,7 @@ const fecthlistRetire = async () => {
.get(config.API.profileOrganizRoot)
.then((res) => {
const id = res.data.result[0].id;
- console.log(id);
+ // console.log(id);
if (id !== "") {
findlist(id);
}
@@ -152,20 +152,20 @@ const findlist = async (id: string) => {
if (type.value === "officer") {
data = [{ criteriaType: "is_retire", criteriaValue: "false" }];
} else if (type.value === "all") {
- console.log("all");
+ // console.log("all");
data = [
{ criteriaType: "is_retire", criteriaValue: "false" },
{ criteriaType: "employee_class", criteriaValue: "perm" },
];
}
- console.log(data);
+ // console.log(data);
await http
.post(config.API.profileSearchNewOcIdType(id, type.value), {
criterias: data,
})
.then((res) => {
- console.log(res.data.result);
+ // console.log(res.data.result);
rows.value = res.data.result.map((e: any) => ({
id: e.id,
fullname: e.fullname,
@@ -182,13 +182,15 @@ const findlist = async (id: string) => {
});
};
const clickAdd = (props: any) => {
- console.log(retireld.value, id);
+ // console.log("props===>",props.row.id)
if (retireld.value == undefined) {
retireld.value = id;
}
let data: any = props.row.id;
+ console.log("retireld & profileId",retireld.value, data);
+
$q.dialog({
title: "ยืนยันการเพิ่มข้อมูล",
message: "ต้องการเพิ่มข้อมูลนี้ใช่หรือไม่?",
@@ -199,12 +201,12 @@ const clickAdd = (props: any) => {
persistent: true,
})
.onOk(async () => {
- console.log("เพิ่มข้อมูล");
+ // console.log("เพิ่มข้อมูล");
await http
.put(config.API.profileRetire(retireld.value), { profileId: data })
.then((res) => {
success($q, "เพิ่มข้อมูลสำเร็จ");
- updateListId(data);
+ updateListData(retireld.value, data);
})
.catch((e) => {
messageError($q, e);
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index aa9311d18..249ff5489 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -19,23 +19,23 @@ const modalNote = ref(false);
const note = ref("");
const retireProfileId = ref("");
const retireld = ref();
-const listId = ref("");
+const profileId = ref("");
onMounted(() => {
- console.log(route.params);
- if (route.params.id === undefined) {
+ // console.log(route.params);
+ if (retireld_params === undefined) {
fecthlistprofile(type_params, year_params);
- }
- if (route.params.id !== undefined) {
+ } else {
fecthlist(retireld_params);
}
});
+
const fecthlistprofile = async (type: any, year: any) => {
showLoader();
await http
.get(config.API.profile(type, year))
.then((res: any) => {
- console.log(res);
+ // console.log(res);
retireld.value = res.data.result.id;
rows.value = res.data.result.profile.map((e: any) => ({
id: e.id,
@@ -62,10 +62,10 @@ const fecthlist = async (id: any) => {
await http
.get(config.API.listRetire(id))
.then((res: any) => {
- console.log(res);
- retireld.value = res.data.result.id;
+ // retireld.value = res.data.result.id;
rows.value = res.data.result.map((e: any) => ({
id: e.id,
+ profileId: e.profileId,
order: e.order,
fixname: e.prefix,
name: e.fullName,
@@ -76,7 +76,7 @@ const fecthlist = async (id: any) => {
positionLavel: e.positionEmployeeLevel,
bureau: e.oc,
}));
- console.log(rows.value);
+ // console.log(rows.value);
})
.catch((e: any) => {
messageError($q, e);
@@ -250,7 +250,7 @@ const visibleColumns = ref([
const filter = ref("");
const clickDelete = (prop: any) => {
- console.log(prop.id);
+ // console.log(prop.id);
$q.dialog({
title: "ยืนยันการลบข้อมูล",
message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?",
@@ -270,7 +270,7 @@ const clickDelete = (prop: any) => {
messageError($q, e);
})
.finally(() => {
- if (route.params.id === undefined) {
+ if (retireld_params === undefined) {
fecthlistprofile(type_params, year_params);
} else fecthlist(retireld_params);
});
@@ -285,7 +285,7 @@ const fetchReason = async (val: string) => {
await http
.get(config.API.reasonId(val))
.then((res: any) => {
- console.log(res.data.result);
+ // console.log(res.data.result);
note.value = res.data.result.reason;
retireProfileId.value = res.data.result.id;
@@ -305,7 +305,7 @@ const saveNote = () => {
persistent: true,
})
.onOk(async () => {
- console.log("บันทึกข้อมูล");
+ // console.log("บันทึกข้อมูล");
await http
.post(config.API.createnote(), {
retireProfileId: retireProfileId.value,
@@ -330,13 +330,12 @@ const visibleNote = computed(() => {
return true;
}
});
-watch(listId, () => {
- if (route.params.id === undefined) {
- fecthlistprofile(type_params, year_params);
- } else fecthlist(retireld_params);
-});
-const UpdateListId = (newListId: string) => {
- listId.value = newListId;
+
+const UpdateListId = (retireld: string, pId: string) => {
+ profileId.value = pId
+ fecthlist(retireld)
+ console.log("profileId",profileId.value);
+
};
// const saveList = () => {
// $q.dialog({
@@ -365,16 +364,15 @@ const UpdateListId = (newListId: string) => {
// .onCancel(() => {})
// .onDismiss(() => {});
// };
-const classrow = (prop: any) => {
- console.log(prop.id);
- if (prop.id === listId.value) {
- return "color: #26a69a ";
- } else return "";
-};
+// const classrow = (prop: any) => {
+// if (profileId.value!=='' && prop.profileId === profileId.value) {
+// return "color: #26a69a;";
+// } else return "";
+// };
const paging = ref(true);
const pagination = ref({
- sortBy: "fullname",
- descending: true,
+ sortBy: "order",
+ descending: false,
page: 1,
rowsPerPage: 10,
});
@@ -403,7 +401,7 @@ const paginationLabel = (start: number, end: number, total: number) => {
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index b5a054580..6574a1f67 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -246,15 +246,15 @@ const visibleColumns2 = ref(["no", "name", "retireNumber"]);
const getYear = () => {
yearOptions.length = 0;
yearOptions.push(currentYear + 543);
- console.log(yearOptions);
+ // console.log(yearOptions);
get(type.value, currentYear);
fiscalyear.value = currentYear + 543;
};
-const get = async (type: string, year: string) => {
+const get = async (type: string, year: any) => {
await http
.get(config.API.retirement(type, year))
.then((res) => {
- console.log(res);
+ // console.log(res);
rows.value = [];
let data = res.data.result;
@@ -410,7 +410,7 @@ const paginationLabel = (start: string, end: string, total: string) => {
else return start + "-" + end + " ใน " + total;
};
const nextPage = (prop: any) => {
- console.log(prop.id);
+ // console.log(prop.id);
router.push(`/retirement/listretire/${prop.id}/${type.value}`);
};