-
- รายละเอียดงานที่ได้รับมอบหมายของ {{ 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 01c06f54c..7f72cdc63 100644
--- a/src/modules/06_retirement/components/ListRetirement/AddList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue
@@ -4,24 +4,35 @@ import http from "@/plugins/http";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useQuasar } from "quasar";
+import { useRoute } from "vue-router";
const $q = useQuasar(); //ใช้ noti quasar
const mixin = useCounterMixin();
-const { messageError, success } = mixin;
+const { messageError, success, showLoader, hideLoader } = mixin;
+const route = useRoute();
+const type_params = route.params.type;
+const id = route.params.id;
const props = defineProps({
retireld: String,
+ listId: String,
+ UpdateListId: {
+ type: Function,
+ default: () => console.log("UpdateListId"),
+ },
});
const modal = ref(false);
const retireld = ref();
+const type = ref();
+const listId = ref(props.listId);
const columns = ref([
{
- name: "order",
+ name: "index",
required: true,
label: "ลำดับ",
- field: "order",
+ field: "index",
align: "left",
},
{
@@ -106,29 +117,80 @@ const rows = ref([
]);
const filter = ref("");
watch(modal, () => {
+ // console.log(props);
+
if (modal.value === true) {
retireld.value = props.retireld;
- fecthlistRetire(retireld.value);
+ if (type_params === "officer") {
+ type.value = type_params;
+ } else type.value = "all";
+
+ fecthlistRetire();
}
});
-const fecthlistRetire = async (retireld: any) => {
- // await http
- // .get(config.API.listRetire(retireld))
- // .then((res) => {
- // console.log(res);
- // rows.value = res.data.result.map((e: any) => ({
- // order: e.order,
- // fullname: e.fullName,
- // position: e.position,
- // level: e.positionEmployeeLevel,
- // organizationOrganization: e.organizationOrganization,
- // }));
- // })
- // .catch((e) => {
- // messageError($q, e);
- // });
+const updateListData = (retireld: string, pId: string) => {
+ props.UpdateListId(retireld, pId);
};
-const clickAdd = () => {
+const fecthlistRetire = async () => {
+ showLoader();
+ await http
+ .get(config.API.profileOrganizRoot)
+ .then((res) => {
+ const id = res.data.result[0].id;
+ // console.log(id);
+ if (id !== "") {
+ findlist(id);
+ }
+ })
+ .catch((e) => {
+ messageError($q, e);
+ });
+};
+
+const findlist = async (id: string) => {
+ let data = [{}];
+ if (type.value === "officer") {
+ data = [{ criteriaType: "is_retire", criteriaValue: "false" }];
+ } else if (type.value === "all") {
+ // console.log("all");
+ data = [
+ { criteriaType: "is_retire", criteriaValue: "false" },
+ { criteriaType: "employee_class", criteriaValue: "perm" },
+ ];
+ }
+ // console.log(data);
+
+ await http
+ .post(config.API.profileSearchNewOcIdType(id, type.value), {
+ criterias: data,
+ })
+ .then((res) => {
+ // console.log(res.data.result);
+ rows.value = res.data.result.map((e: any) => ({
+ id: e.id,
+ fullname: e.fullname,
+ position: e.position,
+ level: e.positionEmployeeLevel,
+ organizationOrganization: e.oc,
+ }));
+ })
+ .catch((e) => {
+ console.log(e);
+ })
+ .finally(() => {
+ hideLoader();
+ });
+};
+const clickAdd = (props: any) => {
+ // 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: "ต้องการเพิ่มข้อมูลนี้ใช่หรือไม่?",
@@ -139,17 +201,19 @@ const clickAdd = () => {
persistent: true,
})
.onOk(async () => {
- console.log("เพิ่มข้อมูล");
+ // console.log("เพิ่มข้อมูล");
await http
- .put(config.API.profileRetire("123"))
- .then(() => {
+ .put(config.API.profileRetire(retireld.value), { profileId: data })
+ .then((res) => {
success($q, "เพิ่มข้อมูลสำเร็จ");
+ updateListData(retireld.value, data);
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
- fecthlistRetire();
+ // fecthlistRetire();
+ modal.value = false;
});
})
.onCancel(() => {})
@@ -236,10 +300,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
-
-
+ {{ props.rowIndex + 1 }}
+
{{ props.row.fullname }}
@@ -254,9 +318,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue
index 441aa85bf..249ff5489 100644
--- a/src/modules/06_retirement/components/ListRetirement/TableList.vue
+++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue
@@ -1,5 +1,5 @@
@@ -374,7 +399,11 @@ const visibleNote = computed(() => {
-
+
@@ -443,10 +472,11 @@ const visibleNote = computed(() => {
:columns="columns"
row-key="name"
class="custom-header-table"
- hide-bottom
:filter="filter"
:visible-columns="visibleColumns"
no-data-label="ไม่มีข้อมูล"
+ :pagination-label="paginationLabel"
+ v-model:pagination="pagination"
>
@@ -461,8 +491,12 @@ const visibleNote = computed(() => {
-
- {{ props.row.order }}
+
+ {{ props.row.order }}
{{ props.row.fixname }}
{{ props.row.name }}
{{
@@ -516,6 +550,17 @@ const visibleNote = computed(() => {
+
+
+
diff --git a/src/modules/06_retirement/components/resign/Deceased.vue b/src/modules/06_retirement/components/resign/Deceased.vue
index 457e09713..798dc2ad0 100644
--- a/src/modules/06_retirement/components/resign/Deceased.vue
+++ b/src/modules/06_retirement/components/resign/Deceased.vue
@@ -2,7 +2,7 @@
import { ref } from "vue";
import type { QTableProps } from "quasar";
import { useRouter } from "vue-router";
-const router = useRouter();
+// const router = useRouter();
const pagination = ref({
sortBy: "desc",
descending: false,
@@ -187,7 +187,7 @@ const columns = ref([
-
+
diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts
index 5008215f7..bb5a3c6bf 100644
--- a/src/modules/06_retirement/router.ts
+++ b/src/modules/06_retirement/router.ts
@@ -32,8 +32,8 @@ export default [
},
},
{
- path: "/retirement/list/:id",
- name: "retirement/list/id",
+ path: "/retirement/listretire/:id/:type",
+ name: "retirement/list/id/type",
component: Listretirement,
meta: {
Auth: true,
diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue
index 1872a756f..6574a1f67 100644
--- a/src/modules/06_retirement/views/Main.vue
+++ b/src/modules/06_retirement/views/Main.vue
@@ -141,7 +141,7 @@
{{ props.row.Date }}
- {{ props.row.retireNumber }}
+ {{ props.row.total }}