From f07044b41af940a872561b2b1055f23be41c6015 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Wed, 31 Jan 2024 10:27:41 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogFormAgency.vue | 22 ++--- .../components/DialogFormPosition.vue | 17 ++-- .../components/StructureDetail.vue | 91 +++++++------------ .../interface/index/Main.ts | 6 +- 4 files changed, 53 insertions(+), 83 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue index 878452235..5392d33fc 100644 --- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue +++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue @@ -60,9 +60,9 @@ const orgLevelOption = ref([]); const orgNameRef = ref(null); const orgShortNameRef = ref(null); const orgCodeRef = ref(null); -const orgPhoneExRef = ref(null); -const orgPhoneInRef = ref(null); -const orgFaxRef = ref(null); +// const orgPhoneExRef = ref(null); +// const orgPhoneInRef = ref(null); +// const orgFaxRef = ref(null); const orgLevelRef = ref(null); const formData = reactive({ @@ -80,9 +80,9 @@ const objectComplaintsRef: FormAgencyRef = { orgName: orgNameRef, orgShortName: orgShortNameRef, orgCode: orgCodeRef, - orgPhoneEx: orgPhoneExRef, - orgPhoneIn: orgPhoneInRef, - orgFax: orgFaxRef, + // orgPhoneEx: orgPhoneExRef, + // orgPhoneIn: orgPhoneInRef, + // orgFax: orgFaxRef, orgLevel: orgLevelRef, }; @@ -334,11 +334,6 @@ const tittleName = computed(() => { for="#telOut" label="หมายเลขโทรศัพท์ที่ติดต่อจากภายนอก" hide-bottom-space - :rules="[ - (val) => - !!val || - `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อจากภายนอก'}`, - ]" />
@@ -350,10 +345,6 @@ const tittleName = computed(() => { for="#telIn" label="หมายเลขโทรศัพท์ที่ติดต่อจากภายใน" hide-bottom-space - :rules="[ - (val) => - !!val || `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อจากภายใน'}`, - ]" />
@@ -365,7 +356,6 @@ const tittleName = computed(() => { for="#tel" label="หมายเลขโทรสาร" hide-bottom-space - :rules="[(val) => !!val || `${'กรุณากรอกหมายเลขโทรสาร'}`]" />
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index 865220529..c4c58b053 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -308,16 +308,17 @@ watch( ); function addPosition(data: RowDetailPositions) { - const isIdExist = rows.value.some(item => item.positionId === data.positionId); + const isIdExist = rows.value.some( + (item) => item.positionId === data.positionId + ); if (!isIdExist) { rows.value = [data, ...rows.value]; } } - -function deleteData(id:string){ - const dataRow = rows.value +function deleteData(id: string) { + const dataRow = rows.value; const updatedRows = dataRow.filter((item: any) => item.positionId !== id); rows.value = updatedRows; } @@ -326,7 +327,7 @@ function deleteData(id:string){ diff --git a/src/modules/02_organizationalNew/components/StructureDetail.vue b/src/modules/02_organizationalNew/components/StructureDetail.vue index 7e2f334fc..3973c2e47 100644 --- a/src/modules/02_organizationalNew/components/StructureDetail.vue +++ b/src/modules/02_organizationalNew/components/StructureDetail.vue @@ -38,10 +38,17 @@ async function fetchDetailTree(id: string, type: string) { .get(config.API.orgLevelByid(type.toLocaleLowerCase(), id)) .then((res) => { const data = res.data.result; - formData.orgName = data[`org${type}Name`]; - formData.agencyName = data[`org${type}Name`]; - formData.orgType = data[`org${type}Name`]; - formData.orgLevel = store.convertType(data[`org${type}Rank`]); + const range = data[`org${type}Rank`]; + formData.orgName = + range == "DEPARTMENT" + ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})` + : "-"; + formData.agencyName = + range != "DEPARTMENT" + ? data[`org${type}Name`] + ` (${data[`org${type}ShortName`]})` + : "-"; + formData.orgType = range != "DEPARTMENT" ? "ส่วนราชการ" : "หน่วยงาน"; + formData.orgLevel = store.convertType(range); formData.status = store.typeOrganizational === "current" ? "ปัจจุบัน" : "แบบร่าง"; formData.orgPhoneEx = data[`org${type}PhoneEx`]; @@ -80,88 +87,60 @@ watch(
-
-
-

หน่วยงาน

-
-
+
หน่วยงาน
-

{{ formData.orgName }} ({{ formData.orgShortName }})

+

{{ formData.orgName }}

-
-
-

ส่วนราชการ

-
-
+
ส่วนราชการ

{{ formData.agencyName }}

-
-
-

ประเภท

-
-
+
ประเภท

{{ formData.orgType }}

-
-
-

ระดับ

-
-
+
ระดับ

{{ formData.orgLevel }}

-
-
-

สถานะ

-
-
+
สถานะ

{{ formData.status }}

-
-
-
-

เบอร์โทร

-
-
-
-

- {{ - formData.orgPhoneEx ? `ภายนอก ${formData.orgPhoneEx}` : "" - }} -

-
-
-
-
-

- {{ - formData.orgPhoneIn ? `ภายใน ${formData.orgPhoneIn}` : "" - }} +

+
เบอร์โทร
+
+

+ {{ `ภายนอก ${formData.orgPhoneEx}` }} +

+

+ {{ `ภายใน ${formData.orgPhoneIn}` }} +

+

+ -

-
-
-

Fax

-
-
+
Fax
-

{{ formData.orgFax }}

+

{{ formData.orgFax }}

+

-

diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organizationalNew/interface/index/Main.ts index f4b6d1b58..a62afe7ac 100644 --- a/src/modules/02_organizationalNew/interface/index/Main.ts +++ b/src/modules/02_organizationalNew/interface/index/Main.ts @@ -42,9 +42,9 @@ interface FormAgencyRef { orgName: object | null; orgShortName: object | null; orgCode: object | null; - orgPhoneEx: object | null; - orgPhoneIn: object | null; - orgFax: object | null; + // orgPhoneEx: object | null; + // orgPhoneIn: object | null; + // orgFax: object | null; orgLevel: object | null; [key: string]: any; }