From 332a35569e0cec389c6ce246d8f294d25e2846f1 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Fri, 24 May 2024 17:50:43 +0700 Subject: [PATCH] updated retirement field --- .../04_registry/components/Profile.vue | 10 +- .../04_registryNew/views/detailView.vue | 56 ++++++++++- .../components/AppointEmployee/Detail.vue | 2 +- .../components/AppointMent/Detail.vue | 2 +- .../05_placement/components/Other/Detail.vue | 2 +- .../components/Other/Dialogbody.vue | 2 +- .../05_placement/components/Other/Main.vue | 2 +- .../components/Receive/receiveDetail2.vue | 2 +- .../components/Relocation/RelocationbyId.vue | 4 +- .../components/Repatriate/Dialogbody.vue | 2 +- .../components/Repatriate/RepatriateMain.vue | 2 +- .../components/Repatriate/RepatriatebyId.vue | 2 +- .../components/Transfer/Dialogbody.vue | 2 +- .../components/Transfer/transferMain.vue | 2 +- .../components/Transfer/transferRegistry.vue | 2 +- .../helpgovernment/governmentDetail.vue | 4 +- .../Discharged/dischargedRegistry.vue | 2 +- .../components/DismissOrder/outRegistry.vue | 2 +- .../Expulsion/expulsionRegistry.vue | 2 +- .../components/resign/DialogSendToCommand.vue | 76 +++++++-------- .../components/resign/Resign.vue | 88 +++++++---------- .../components/resign/ResignByid.vue | 96 ++++--------------- 22 files changed, 172 insertions(+), 192 deletions(-) diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 930e04a59..9b84e9244 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -155,7 +155,9 @@
ยืนยันการตรวจสอบข้อมูล (false); +const leaveReason = ref(""); +const reasonOptions = ref([ + { + id: "RETIRE", + name: "เกษียณอายุราชการ", + }, + { + id: "RESIGN", + name: "ลาออก", + }, + { + id: "TRANSFER", + name: "ให้โอน", + }, + { + id: "DEATH", + name: "ถึงแก่กรรม", + }, + { + id: "LAYOFF", + name: "ให้ออก", + }, + { + id: "DISCHARGE", + name: "ปลดออก", + }, + { + id: "DISMISS", + name: "ไล่ออก", + }, + { + id: "OTHER", + name: "อื่นๆ", + }, +]); + async function fetchDataPersonal() { showLoader(); await http .get(config.API.registryNewByProfileId(profileId.value, empType.value)) .then((res) => { formDetail.value = res.data.result; + + if (res.data.result.leaveReason) { + // เหตุผลพ้นจากราชการต่อท้ายชื่อ + const reason = reasonOptions.value.filter( + (r: DataOption) => r.id == res.data.result.leaveReason + ); + if (reason.length > 0) { + leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${reason[0].name})`; + } else if ( + res.data.result.leaveReason !== null && + res.data.result.leaveReason !== "" + ) { + leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${res.data.result.leaveReason})`; + } + reasonStatus.value = reason.length > 0 ? true : false; + } + fileName.value = res.data.result.avatarName; if (formDetail.value?.avatarName) { fetchProfile(profileId.value); @@ -593,7 +647,7 @@ onMounted(async () => { v-if="formDetail && formDetail.firstName && formDetail.lastName" > {{ - `${formDetail?.prefix}${formDetail?.firstName} ${formDetail?.lastName}` + `${formDetail?.prefix}${formDetail?.firstName} ${formDetail?.lastName} ${leaveReason}` }}
diff --git a/src/modules/05_placement/components/AppointEmployee/Detail.vue b/src/modules/05_placement/components/AppointEmployee/Detail.vue index c55db3cb5..d46e389a6 100644 --- a/src/modules/05_placement/components/AppointEmployee/Detail.vue +++ b/src/modules/05_placement/components/AppointEmployee/Detail.vue @@ -251,7 +251,7 @@ onMounted(async () => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue index 477b3e080..f126e6012 100644 --- a/src/modules/05_placement/components/AppointMent/Detail.vue +++ b/src/modules/05_placement/components/AppointMent/Detail.vue @@ -233,7 +233,7 @@ onMounted(async () => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue index 87500223a..8ddfcc6d5 100644 --- a/src/modules/05_placement/components/Other/Detail.vue +++ b/src/modules/05_placement/components/Other/Detail.vue @@ -230,7 +230,7 @@ onMounted(async () => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue index 2a0f44acb..1b5d81286 100644 --- a/src/modules/05_placement/components/Other/Main.vue +++ b/src/modules/05_placement/components/Other/Main.vue @@ -97,7 +97,7 @@ const columns = ref([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Receive/receiveDetail2.vue b/src/modules/05_placement/components/Receive/receiveDetail2.vue index ae421682b..f636bd112 100644 --- a/src/modules/05_placement/components/Receive/receiveDetail2.vue +++ b/src/modules/05_placement/components/Receive/receiveDetail2.vue @@ -847,7 +847,7 @@ onMounted(async () => { />
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
{
-
- ตำแหน่งและหน่วยงานเดิม -
+
ตำแหน่ง/สังกัดเดิม
([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue index 6776f0b5c..800b9335d 100644 --- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue +++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue @@ -91,7 +91,7 @@ const columns = ref([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue index 422337586..7472d9473 100644 --- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue +++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue @@ -203,7 +203,7 @@ onMounted(() => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Transfer/transferMain.vue b/src/modules/05_placement/components/Transfer/transferMain.vue index 4b6a33823..81b979ba4 100644 --- a/src/modules/05_placement/components/Transfer/transferMain.vue +++ b/src/modules/05_placement/components/Transfer/transferMain.vue @@ -84,7 +84,7 @@ const columns = ref([ { name: "organizationPositionOld", align: "left", - label: "ตำแหน่งและหน่วยงานเดิม", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", diff --git a/src/modules/05_placement/components/Transfer/transferRegistry.vue b/src/modules/05_placement/components/Transfer/transferRegistry.vue index 7ed570b08..7d54910cd 100644 --- a/src/modules/05_placement/components/Transfer/transferRegistry.vue +++ b/src/modules/05_placement/components/Transfer/transferRegistry.vue @@ -555,7 +555,7 @@ onMounted(async () => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
(); const fullname = ref(""); /** form แก้ไขข้อมูลเพื่อลงบัญชีแนบท้าย*/ -const organizationPositionOld = ref(""); //ตำแหน่งและหน่วยงานเดิม +const organizationPositionOld = ref(""); //ตำแหน่ง/สังกัดเดิม const organization = ref(""); //หน่วยงานเดิม const dateStart = ref(null); //ตั้งแต่วันที่ const dateEnd = ref(null); // ถึงวันที่ @@ -196,7 +196,7 @@ onMounted(() => {
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
{
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
-
ตำแหน่งและหน่วยงานเดิม
+
ตำแหน่ง/สังกัดเดิม
([ sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, - { - name: "positionTypeOld", + name: "location", align: "left", - label: "ตำแหน่งในสายงาน", + label: "สถานที่ยื่นขอลาออกจากราชการ", sortable: true, - field: "positionTypeOld", + field: "location", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "positionLevelOld", + name: "positionLevel", align: "left", - label: "ระดับ", + label: "ประเภทตำแหน่ง", sortable: true, - field: "positionLevelOld", + field: "positionLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + format(val, row) { + let name = ""; + if (row.positionTypeOld && row.positionLevelOld) { + name = `${row.positionTypeOld} (${row.positionLevelOld})`; + } else if (row.positionTypeOld) { + name = `${row.positionTypeOld}`; + } else if (row.positionLevelOld) { + name = `(${row.positionLevelOld})`; + } else name = "-"; + return name; + }, }, { name: "positionNumberOld", @@ -77,7 +85,7 @@ const columns2 = ref([ { name: "organizationPositionOld", align: "left", - label: "สังกัด", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", @@ -113,9 +121,10 @@ const columns2 = ref([ /** คอลัมน์ที่แสดง */ const visibleColumns2 = ref([ "no", + "prefix", "fullname", - "positionTypeOld", - "positionLevelOld", + "location", + "positionLevel", "positionNumberOld", "organizationPositionOld", "datetext", @@ -268,35 +277,22 @@ watchEffect(() => { v-model="props.selected" /> - - {{ props.rowIndex + 1 }} - - - {{ props.row.prefix }} - - - {{ props.row.fullname }} - - - {{ props.row.positionTypeOld }} - - - {{ props.row.positionLevelOld }} - - - {{ props.row.positionNumberOld }} - - - -
- {{ props.row.organizationPositionOld }} + +
+ {{ props.rowIndex + 1 }} +
+ +
+ {{ col.value ? col.value : "-" }}
- - - {{ props.row.datetext }} - - - {{ props.row.statustext }} diff --git a/src/modules/06_retirement/components/resign/Resign.vue b/src/modules/06_retirement/components/resign/Resign.vue index 42c9c0ae8..eca3f34f5 100644 --- a/src/modules/06_retirement/components/resign/Resign.vue +++ b/src/modules/06_retirement/components/resign/Resign.vue @@ -55,26 +55,24 @@ const columns = ref([ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "positionTypeOld", + name: "positionLevel", align: "left", - label: "ตำแหน่งในสายงาน", + label: "ประเภทตำแหน่ง", sortable: true, - field: "positionTypeOld", + field: "positionLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), - }, - { - name: "positionLevelOld", - align: "left", - label: "ระดับ", - sortable: true, - field: "positionLevelOld", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - sort: (a: string, b: string) => - a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), + format(val, row) { + let name = ""; + if (row.positionTypeOld && row.positionLevelOld) { + name = `${row.positionTypeOld} (${row.positionLevelOld})`; + } else if (row.positionTypeOld) { + name = `${row.positionTypeOld}`; + } else if (row.positionLevelOld) { + name = `(${row.positionLevelOld})`; + } else name = "-"; + return name; + }, }, { name: "positionNumberOld", @@ -90,7 +88,7 @@ const columns = ref([ { name: "organizationPositionOld", align: "left", - label: "สังกัด", + label: "ตำแหน่ง/สังกัดเดิม", sortable: true, field: "organizationPositionOld", headerStyle: "font-size: 14px", @@ -129,8 +127,7 @@ const visibleColumns = ref([ "prefix", "fullname", "location", - "positionTypeOld", - "positionLevelOld", + "positionLevel", "positionNumberOld", "organizationPositionOld", "datetext", @@ -310,40 +307,27 @@ const pagination = ref({ diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue index 09228ec13..e1ed611fe 100644 --- a/src/modules/06_retirement/components/resign/ResignByid.vue +++ b/src/modules/06_retirement/components/resign/ResignByid.vue @@ -6,7 +6,6 @@ import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogF import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue"; import { useCounterMixin } from "@/stores/mixin"; import { useRetirementDataStore } from "@/modules/06_retirement/store"; -import CurrencyInput from "@/components/CurruncyInput.vue"; import http from "@/plugins/http"; import config from "@/app.config"; import axios from "axios"; @@ -306,7 +305,7 @@ const onSubmitConditions = () => { showLoader(); http .put(config.API.resignConditions(id.value), { - IsNoDebt: checkboxGroup.value[0] ? true : false, + isNoDebt: checkboxGroup.value[0] ? true : false, }) .then(() => { fetchData(id.value); @@ -549,65 +548,6 @@ function removeFile(fileName: string) { - -
ข้อมูลการลาออก
@@ -615,14 +555,14 @@ function removeFile(fileName: string) {
@@ -1139,9 +1079,9 @@ function removeFile(fileName: string) { :readonly="!edit" :borderless="!edit" v-model="positionTypeOld" - :rules="[(val) => !!val || `${'กรุณากรอกประเภทตำแหน่ง'}`]" + :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งประเภท'}`]" hide-bottom-space - :label="`${'ประเภทตำแหน่ง'}`" + :label="`${'ตำแหน่งประเภท'}`" />
@@ -1155,9 +1095,9 @@ function removeFile(fileName: string) { :readonly="!edit" :borderless="!edit" v-model="positionLevelOld" - :rules="[(val) => !!val || `${'กรุณากรอกระดับ'}`]" + :rules="[(val) => !!val || `${'กรุณากรอกระดับตำแหน่ง'}`]" hide-bottom-space - :label="`${'ระดับ'}`" + :label="`${'ระดับตำแหน่ง'}`" />
@@ -1179,13 +1119,19 @@ function removeFile(fileName: string) {
-