diff --git a/src/modules/02_organization/components/DialogStructureDetail.vue b/src/modules/02_organization/components/DialogStructureDetail.vue index ddb743660..1746f28e2 100644 --- a/src/modules/02_organization/components/DialogStructureDetail.vue +++ b/src/modules/02_organization/components/DialogStructureDetail.vue @@ -18,7 +18,7 @@ const modal = defineModel("structureDetail", { required: true }); const treeId = defineModel("treeId", { required: true }); const orgLevel = defineModel("orgLevel", { required: true }); -const formData = reactive({ +const formData = reactive({ orgName: "", agencyName: "", //*ส่วนราชการ orgType: "", //*ประเภท @@ -27,7 +27,15 @@ const formData = reactive({ orgPhoneEx: "", //หมายเลขโทรศัพท์ที่ติดต่อจากภายนอก orgPhoneIn: "", //หมายเลขโทรศัพท์ที่ติดต่อจากภายใน orgFax: "", //หมายเลขโทรสาร - orgShortName: "", + orgShortName: "", //อักษรย่อ + misId: "", //MsiId + departMentCode: "", //DEPARTMENT CODE + divisionCode: "", //DIVISION CODE + sectionCode: "", //SECTION CODE + jobCode: "", //JOB CODE + responsibility: "", //หน้าที่ความรับผิดชอบ + isCommission: "", //สำนักปลัด + isDeputy: "", //สำนักงาน กก. }); /** @@ -54,8 +62,20 @@ async function fetchDetailTree(id: string, type: string) { : "ยุบเลิก"; formData.orgPhoneEx = data[`org${type}PhoneEx`]; formData.orgPhoneIn = data[`org${type}PhoneIn`]; - formData.orgFax = data[`org${type}Fax`]; - formData.orgShortName = data[`org${type}ShortName`]; + formData.orgFax = data[`org${type}Fax`] ? data[`org${type}Fax`] : "-"; + formData.orgShortName = data[`org${type}ShortName`] + ? data[`org${type}ShortName`] + : "-"; + formData.misId = data.misId ? data.misId : "-"; + formData.departMentCode = data.DEPARTMENT_CODE + ? data.DEPARTMENT_CODE + : "-"; + formData.divisionCode = data.DIVISION_CODE ? data.DIVISION_CODE : "-"; + formData.sectionCode = data.SECTION_CODE ? data.SECTION_CODE : "-"; + formData.jobCode = data.JOB_CODE ? data.JOB_CODE : "-"; + formData.responsibility = data.responsibility ? data.responsibility : "-"; + formData.isDeputy = data.isDeputy ? "ใช่" : "-"; + formData.isCommission = data.isCommission ? "ใช่" : "-"; }) .catch((err) => { messageError($q, err); @@ -108,6 +128,12 @@ watch(

{{ formData.agencyName }}

+
+
อักษรย่อ
+
+

{{ formData.orgShortName }}

+
+
ประเภท
@@ -149,8 +175,63 @@ watch(
Fax
-

{{ formData.orgFax }}

-

-

+

{{ formData.orgFax }}

+
+
+ +
+
MsiId
+
+

{{ formData.misId }}

+
+
+ +
+
DEPARTMENT CODE
+
+

{{ formData.departMentCode }}

+
+
+ +
+
DIVISION CODE
+
+

{{ formData.divisionCode }}

+
+
+ +
+
SECTION CODE
+
+

{{ formData.sectionCode }}

+
+
+ +
+
JOB CODE
+
+

{{ formData.jobCode }}

+
+
+ +
+
หน้าที่ความรับผิดชอบ
+
+

{{ formData.responsibility }}

+
+
+ +
+
สำนักปลัด
+
+

{{ formData.isDeputy }}

+
+
+ +
+
สำนักงาน กก.
+
+

{{ formData.isCommission }}

diff --git a/src/modules/02_organization/store/organizational.ts b/src/modules/02_organization/store/organizational.ts index 120bbcc53..4e44e352c 100644 --- a/src/modules/02_organization/store/organizational.ts +++ b/src/modules/02_organization/store/organizational.ts @@ -148,6 +148,24 @@ export const useOrganizational = defineStore("organizationalStore", () => { } } + /** + * ฟังก์ชันแปลงค่าสถานะรายละเอียดโครงสร้าง + * @param type สถานะ + * @returns ชือสถานะ + */ + function convertStatus(type: string) { + switch (type) { + case "current": + return "ปกติ"; + case "draft": + return "แบบร่าง"; + case "old": + return "ยุบเลิก"; + default: + return "-"; + } + } + return { typeOrganizational, statusView, @@ -171,5 +189,6 @@ export const useOrganizational = defineStore("organizationalStore", () => { rootId, isLosck, remark, + convertStatus, }; });