From 5abf3c5945716579e6c5056a2a9010d816beb8e4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 28 Mar 2025 14:28:41 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=20field=20posNumCodeSit=20,=20posNumCodeSitAbb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detail/DialogHistory.vue | 15 +++++- .../GovernmentInformation/07_Position.vue | 53 ++++++++++++++++++- .../detail/Salary/01_PositionSalary.vue | 52 +++++++++++++++++- .../interface/index/government.ts | 2 + .../interface/request/Salary.ts | 2 + .../interface/response/Position.ts | 2 + 6 files changed, 121 insertions(+), 5 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/DialogHistory.vue b/src/modules/04_registryPerson/components/detail/DialogHistory.vue index 09d81b8c7..bb0bfaf77 100644 --- a/src/modules/04_registryPerson/components/detail/DialogHistory.vue +++ b/src/modules/04_registryPerson/components/detail/DialogHistory.vue @@ -7,7 +7,7 @@ import type { DataHistory } from "@/modules/04_registryPerson/interface/index/Ma import DialogHeader from "@/components/DialogHeader.vue"; -const { onSearchDataTable } = useCounterMixin(); +const { onSearchDataTable, findOrgNameHtml } = useCounterMixin(); const modal = defineModel("modal", { required: true }); const title = defineModel("title", { required: true }); @@ -117,6 +117,19 @@ watch(
{{ props.rowIndex + 1 }}
+
+ {{ + props.row + ? findOrgNameHtml({ + root: props.row.orgRoot, + child1: props.row.orgChild1, + child2: props.row.orgChild2, + child3: props.row.orgChild3, + child4: props.row.orgChild4, + }) + : "-" + }} +
{{ col.value ? col.value : "-" }}
diff --git a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue index 579415349..7bf4f903e 100644 --- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue +++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue @@ -86,6 +86,22 @@ const baseColumns = ref([ .toString() .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, + { + name: "posNumCodeSit", + align: "left", + label: "หน่วยงานที่ออกคำสั่ง", + sortable: false, + field: "posNumCodeSit", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.posNumCodeSitAbb && row.posNumCodeSit + ? `${row.posNumCodeSit} (${row.posNumCodeSitAbb})` + : row.posNumCodeSit + ? row.posNumCodeSit + : "-"; + }, + }, { name: "posNo", align: "left", @@ -276,6 +292,7 @@ const baseColumns = ref([ ]); const baseVisibleColumns = ref([ "commandDateAffect", + "posNumCodeSit", "posNo", "positionName", "positionType", @@ -349,6 +366,8 @@ const formData = reactive({ orgChild3: "", //ส่วนราชการระดับ 3 orgChild4: "", //ส่วนราชการระดับ 4 remark: "", //หมายเหตุ + posNumCodeSit: "", + posNumCodeSitAbb: "", }); const columnsHistory = computed(() => { @@ -658,6 +677,9 @@ async function onClickOpenDialog( formData.orgChild3 = statusEdit ? data.orgChild3 : ""; formData.orgChild4 = statusEdit ? data.orgChild4 : ""; formData.remark = statusEdit ? data.remark : ""; + formData.posNumCodeSit = statusEdit ? data.posNumCodeSit : ""; + formData.posNumCodeSitAbb = statusEdit ? data.posNumCodeSitAbb : ""; + hideLoader(); } @@ -995,7 +1017,7 @@ onMounted(async () => {
-
+
{
-
+
{
+
+ +
+ +
+ +
+
diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 75651b024..9578a82fc 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -91,6 +91,22 @@ const baseColumns = ref([ .toString() .localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, + { + name: "posNumCodeSit", + align: "left", + label: "หน่วยงานที่ออกคำสั่ง", + sortable: false, + field: "posNumCodeSit", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + format(val, row) { + return row.posNumCodeSitAbb && row.posNumCodeSit + ? `${row.posNumCodeSit} (${row.posNumCodeSitAbb})` + : row.posNumCodeSit + ? row.posNumCodeSit + : "-"; + }, + }, { name: "posNo", align: "left", @@ -309,6 +325,7 @@ const baseColumns = ref([ ]); const baseVisibleColumns = ref([ "commandDateAffect", + "posNumCodeSit", "posNo", "positionName", "positionType", @@ -389,6 +406,8 @@ const formData = reactive({ orgChild3: "", //ส่วนราชการระดับ 3 orgChild4: "", //ส่วนราชการระดับ 4 remark: "", //หมายเหตุ + posNumCodeSit: "", + posNumCodeSitAbb: "", }); const modalDialogSalary = ref(false); //แสดง popup ตำแหน่งเงินเดือน @@ -626,6 +645,8 @@ async function onClickOpenDialog( formData.orgChild3 = statusEdit ? data.orgChild3 : ""; formData.orgChild4 = statusEdit ? data.orgChild4 : ""; formData.remark = statusEdit ? data.remark : ""; + formData.posNumCodeSit = statusEdit ? data.posNumCodeSit : ""; + formData.posNumCodeSitAbb = statusEdit ? data.posNumCodeSitAbb : ""; hideLoader(); } @@ -940,7 +961,7 @@ onMounted(async () => {
-
+
{
-
+
{
+
+ +
+ +
+ +
+
diff --git a/src/modules/04_registryPerson/interface/index/government.ts b/src/modules/04_registryPerson/interface/index/government.ts index 950837dc0..07dde7313 100644 --- a/src/modules/04_registryPerson/interface/index/government.ts +++ b/src/modules/04_registryPerson/interface/index/government.ts @@ -81,5 +81,7 @@ interface FormPostition { orgChild3: string; //ส่วนราชการระดับ 3 orgChild4: string; //ส่วนราชการระดับ 4 remark: string; //หมายเหตุstring + posNumCodeSit: string; + posNumCodeSitAbb: string; } export type { RequestItemsHistoryObject, FormMain, DataCardPos, FormPostition }; diff --git a/src/modules/04_registryPerson/interface/request/Salary.ts b/src/modules/04_registryPerson/interface/request/Salary.ts index bd2327839..61b78b3ba 100644 --- a/src/modules/04_registryPerson/interface/request/Salary.ts +++ b/src/modules/04_registryPerson/interface/request/Salary.ts @@ -23,6 +23,8 @@ interface FormSalary { orgChild3: string; //ส่วนราชการระดับ 3 orgChild4: string; //ส่วนราชการระดับ 4 remark: string; //หมายเหตุstring + posNumCodeSit: string; + posNumCodeSitAbb: string; } interface RequestNoPaidObject { diff --git a/src/modules/04_registryPerson/interface/response/Position.ts b/src/modules/04_registryPerson/interface/response/Position.ts index 6f9092b8a..ce36b9402 100644 --- a/src/modules/04_registryPerson/interface/response/Position.ts +++ b/src/modules/04_registryPerson/interface/response/Position.ts @@ -39,6 +39,8 @@ interface DataPositions { profileId: string; refId: string; remark: string; + posNumCodeSit: string; + posNumCodeSitAbb: string; } interface DataCommandCode {