From a48f2afad7e122a4b9710852f7cade2e6555bcf4 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Fri, 10 Jan 2025 11:34:15 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20?= =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/DialogOrgSelect.vue | 5 +++++ src/components/Dialogs/DialogOrgSelectEmployee.vue | 5 +++++ .../components/DialogFormPosition.vue | 3 ++- .../02_organization/components/TableMain.vue | 8 ++++++++ .../interface/response/organizational.ts | 2 ++ .../components/PersonalList/CardPosition.vue | 7 +++++++ .../05_placement/interface/index/SelectOrg.ts | 2 ++ .../components/DialogSelectPos.vue | 7 +++++++ src/modules/19_condition/interface/response/Main.ts | 1 + src/modules/19_condition/view/Main.vue | 13 ++++++++++++- 10 files changed, 51 insertions(+), 2 deletions(-) diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index 90925d8ca..338b585f1 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -721,6 +721,11 @@ onMounted(async () => { ? col.value + " " + "(ทับที่)" : col.value }} +
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue index ca0d96a82..a58baf3b9 100644 --- a/src/components/Dialogs/DialogOrgSelectEmployee.vue +++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue @@ -696,6 +696,11 @@ onMounted(() => { ? col.value + " " + "(ทับที่)" : col.value }} +
diff --git a/src/modules/02_organization/components/DialogFormPosition.vue b/src/modules/02_organization/components/DialogFormPosition.vue index 58ee748fc..2fa84dfb5 100644 --- a/src/modules/02_organization/components/DialogFormPosition.vue +++ b/src/modules/02_organization/components/DialogFormPosition.vue @@ -491,8 +491,9 @@ watch( () => formData.isDirector, (newData, oldData) => { if (newData === true) { + formData.positionSign = !formData.positionSign - ? "ผู้อำนวยการ" + props.dataTree?.orgRootName + ? '' : formData.positionSign; } else { formData.positionSign = ""; diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue index 688e6f045..c930ad715 100644 --- a/src/modules/02_organization/components/TableMain.vue +++ b/src/modules/02_organization/components/TableMain.vue @@ -801,6 +801,14 @@ watch( ? col.value + " " + "(นั่งทับตำแหน่ง)" : col.value }} + + + ผู้อำนวยการ/หัวหน้า +
{{ diff --git a/src/modules/02_organization/interface/response/organizational.ts b/src/modules/02_organization/interface/response/organizational.ts index afdfee0c2..a8fbe6d01 100644 --- a/src/modules/02_organization/interface/response/organizational.ts +++ b/src/modules/02_organization/interface/response/organizational.ts @@ -118,6 +118,7 @@ interface PosMaster { profilePoslevel: string; conditionReason: string; isCondition: boolean; + isDirector: boolean; } interface Position2 { id: string; // id ตำแหน่ง @@ -157,6 +158,7 @@ interface PosMaster2 { profilePosition: string; profilePoslevel: string; profilePostype: string; + isDirector?: boolean; } interface HistoryPos { diff --git a/src/modules/05_placement/components/PersonalList/CardPosition.vue b/src/modules/05_placement/components/PersonalList/CardPosition.vue index cab34e781..70d9da79e 100644 --- a/src/modules/05_placement/components/PersonalList/CardPosition.vue +++ b/src/modules/05_placement/components/PersonalList/CardPosition.vue @@ -432,6 +432,13 @@ onMounted(async () => { ? col.value + " " + "(นั่งทับตำแหน่ง)" : col.value }} + + ผู้อำนวยการ/หัวหน้า +
diff --git a/src/modules/05_placement/interface/index/SelectOrg.ts b/src/modules/05_placement/interface/index/SelectOrg.ts index 74040c0c0..719452468 100644 --- a/src/modules/05_placement/interface/index/SelectOrg.ts +++ b/src/modules/05_placement/interface/index/SelectOrg.ts @@ -9,6 +9,7 @@ interface DataPositionNo { isSit: boolean; positions: Positions[]; isCondition: boolean; + isDirector?: boolean; } interface Positions { @@ -24,6 +25,7 @@ interface Positions { positionField: string; positionIsSelected: boolean; positionName: string; + isDirector?: boolean; } export type { DataPositionNo }; diff --git a/src/modules/08_registryEmployee/components/DialogSelectPos.vue b/src/modules/08_registryEmployee/components/DialogSelectPos.vue index 263863f49..e02ba121d 100644 --- a/src/modules/08_registryEmployee/components/DialogSelectPos.vue +++ b/src/modules/08_registryEmployee/components/DialogSelectPos.vue @@ -692,6 +692,13 @@ onBeforeMount(async () => { ? col.value + " " + "(นั่งทับตำแหน่ง)" : col.value }} + + ผู้อำนวยการ/หัวหน้า +
diff --git a/src/modules/19_condition/interface/response/Main.ts b/src/modules/19_condition/interface/response/Main.ts index 0e55be759..b496830c0 100644 --- a/src/modules/19_condition/interface/response/Main.ts +++ b/src/modules/19_condition/interface/response/Main.ts @@ -29,6 +29,7 @@ interface DataPositionCondition { profilePoslevel: string; profilePostype: string; positions: Positions[]; + isDirector?: boolean; } interface Positions { diff --git a/src/modules/19_condition/view/Main.vue b/src/modules/19_condition/view/Main.vue index a1bd77916..2e78af69c 100644 --- a/src/modules/19_condition/view/Main.vue +++ b/src/modules/19_condition/view/Main.vue @@ -365,7 +365,7 @@ onMounted(async () => {
@@ -458,6 +458,17 @@ onMounted(async () => { /> -
+
+ {{ col.value }} + + ผู้อำนวยการ/หัวหน้า + +
+
{{ col.value ? col.value : "-" }}