From ad17f85efd0501aade29846057499064166b0b16 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 26 Jan 2024 12:07:49 +0700 Subject: [PATCH] popup --- .../components/DialogNewStructure.vue | 132 ++++++++++++++++++ .../interface/index/Main.ts | 36 +++-- .../02_organizationalNew/views/main.vue | 11 ++ .../components/4_Result/EditPage.vue | 3 +- 4 files changed, 169 insertions(+), 13 deletions(-) create mode 100644 src/modules/02_organizationalNew/components/DialogNewStructure.vue diff --git a/src/modules/02_organizationalNew/components/DialogNewStructure.vue b/src/modules/02_organizationalNew/components/DialogNewStructure.vue new file mode 100644 index 000000000..66cf80ecf --- /dev/null +++ b/src/modules/02_organizationalNew/components/DialogNewStructure.vue @@ -0,0 +1,132 @@ + + diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organizationalNew/interface/index/Main.ts index afc90fbf9..249170468 100644 --- a/src/modules/02_organizationalNew/interface/index/Main.ts +++ b/src/modules/02_organizationalNew/interface/index/Main.ts @@ -8,19 +8,26 @@ interface DataOption { } interface FormDataAgency { -ocName:string -shortName:string -ocNo:string -ocLevel:string -telOut:string -telIn:string -tel:string + ocName: string + shortName: string + ocNo: string + ocLevel: string + telOut: string + telIn: string + tel: string } + interface FormDataPosition { -prefixNo:string -positionNo:string -suffixNo:string -confirm:boolean + prefixNo: string + positionNo: string + suffixNo: string + confirm: boolean +} + +interface FormDataNewStructure { + orgRevisionName: string + type: string + } interface FormAgencyRef { @@ -42,4 +49,9 @@ interface FormDateTimeRef { dateTime: object | null; [key: string]: any; } -export type { Pagination, DataOption,FormDataAgency,FormDataPosition,FormAgencyRef,FormPositionRef,FormDateTimeRef }; +interface FormNewStructureRef { + orgRevisionName: object | null; + type: object | null; + [key: string]: any; +} +export type { Pagination, DataOption, FormDataAgency, FormDataPosition, FormAgencyRef, FormPositionRef, FormDateTimeRef,FormDataNewStructure,FormNewStructureRef }; diff --git a/src/modules/02_organizationalNew/views/main.vue b/src/modules/02_organizationalNew/views/main.vue index e4ecbaa38..9acb001f3 100644 --- a/src/modules/02_organizationalNew/views/main.vue +++ b/src/modules/02_organizationalNew/views/main.vue @@ -4,10 +4,12 @@ import { ref } from "vue"; /** importComponents*/ import ListView from "@/modules/02_organizationalNew/components/listView.vue"; import StructureView from "@/modules/02_organizationalNew/components/structureView.vue"; +import DialogFormNewStructure from "@/modules/02_organizationalNew/components/DialogNewStructure.vue"; /** importStore*/ import { useOrganizational } from "@/modules/02_organizationalNew/store/organizational"; +const modalNewStructure = ref(false); const stroe = useOrganizational(); const isStatusData = ref(true); @@ -32,9 +34,16 @@ const itemStructure = ref([ ]); diff --git a/src/modules/11_discipline/components/4_Result/EditPage.vue b/src/modules/11_discipline/components/4_Result/EditPage.vue index 58ea31e4c..a944d8498 100644 --- a/src/modules/11_discipline/components/4_Result/EditPage.vue +++ b/src/modules/11_discipline/components/4_Result/EditPage.vue @@ -65,7 +65,8 @@ const dataInvestigatefacts = reactive({ organizationId: "", persons: [], investigationExtendHistory: [], - isDisciplinary:false + isDisciplinary:false, + isAncestorDNA:false }); const personObjComplaint = reactive({