From 2f0594ee08715466adfb9d7bdaa1be54559281b8 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 26 Jan 2024 09:57:07 +0700 Subject: [PATCH] =?UTF-8?q?IsAncestorDNA=20/=20=E0=B9=81=E0=B8=81=E0=B9=89?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=9F=E0=B8=B4=E0=B8=A5?= =?UTF-8?q?=20popup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogFormAgency.vue | 4 ++-- .../components/2_InvestigateFacts/EditPage.vue | 2 ++ .../components/2_InvestigateFacts/Form.vue | 10 ++++++---- .../3_InvestigateDisciplinary/EditPage.vue | 1 + .../components/3_InvestigateDisciplinary/Form.vue | 15 +++++++++++---- .../interface/request/investigateFact.ts | 1 + src/modules/11_discipline/store/main.ts | 2 +- 7 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/modules/02_organizationalNew/components/DialogFormAgency.vue b/src/modules/02_organizationalNew/components/DialogFormAgency.vue index 95563f0ed..0d569ccf0 100644 --- a/src/modules/02_organizationalNew/components/DialogFormAgency.vue +++ b/src/modules/02_organizationalNew/components/DialogFormAgency.vue @@ -109,9 +109,9 @@ watch( dense outlined for="#ocName" - label="สรุปผลการพิจารณา" + label="ชื่อหน่วยงาน" hide-bottom-space - :rules="[(val) => !!val || `${'กรุณากรอกสรุปผลการพิจารณา'}`]" + :rules="[(val) => !!val || `${'กรุณากรอกชื่อหน่วยงาน'}`]" />
diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue index 9320e171a..a0a9636ce 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue @@ -60,6 +60,7 @@ const data = reactive({ persons: [], investigationExtendHistory: [], isDisciplinary: false, + isAncestorDNA: false, }); /** ข้อมูล v-model ของฟอร์มเรื่องร้องเรียน */ @@ -164,6 +165,7 @@ function getData() { data.investigationExtendStatus = dataList.investigationExtendStatus; data.investigationDaysExtend = dataList.investigationDaysExtend; data.isDisciplinary = dataList.isDisciplinary; + data.isAncestorDNA = dataList.isAncestorDNA; data.investigationExtendHistory = dataList.investigationExtendHistory ?? []; }) diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index b9959df10..c10ac1e69 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -134,6 +134,7 @@ const formData = reactive({ persons: [], investigationExtendHistory: [], isDisciplinary: false, + isAncestorDNA: false, }); const rows = ref([]); @@ -272,6 +273,7 @@ watch(props.data, async () => { organization: person.organization, isSend: person.isSend, isDisciplinary: person.isDisciplinary, + isAncestorDNA: person.isAncestorDNA, })); mainStore.rowsCheck = mainStore.rowsAdd.filter( (item: any) => item.isDisciplinary === false && item.isSend === "NEW" @@ -783,7 +785,7 @@ onMounted(async () => { col.label }} - + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue index baf3f7155..6ddd4ec56 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue @@ -118,6 +118,7 @@ const dataInvestigatefacts = reactive({ persons: [], investigationExtendHistory: [], isDisciplinary: false, + isAncestorDNA:false }); /** function fetchData สอบสวนความผิดทางวินัย*/ diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 36ec4a343..be04adf4c 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -365,6 +365,7 @@ async function fetchDatadetail() { isSuspend: person.isSuspend, status: person.status, statusDiscard: person.statusDiscard, + isAncestorDNA: person.isAncestorDNA, })); mainStore.rowsCheck = mainStore.rowsAdd.filter( (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW" @@ -668,6 +669,12 @@ watch( } ); +function deletePerson(id: string) { + changeFormData(); + const dataRow = mainStore.rowsAdd; + const updatedRows = dataRow.filter((item: any) => item.personId !== id); + mainStore.rowsAdd = updatedRows; +} /** Hook */ onMounted(async () => { @@ -824,7 +831,7 @@ onMounted(async () => { col.label }} - + diff --git a/src/modules/11_discipline/interface/request/investigateFact.ts b/src/modules/11_discipline/interface/request/investigateFact.ts index f3c6a3cd8..7403a7838 100644 --- a/src/modules/11_discipline/interface/request/investigateFact.ts +++ b/src/modules/11_discipline/interface/request/investigateFact.ts @@ -27,6 +27,7 @@ interface FormData { persons: object | null; investigationExtendHistory: ExtendHistoryObject[]; isDisciplinary:boolean + isAncestorDNA:boolean } interface ExtendHistoryObject { diff --git a/src/modules/11_discipline/store/main.ts b/src/modules/11_discipline/store/main.ts index ab3344e6d..e38425dbd 100644 --- a/src/modules/11_discipline/store/main.ts +++ b/src/modules/11_discipline/store/main.ts @@ -306,7 +306,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { salary: item.salary === null ? '-':item.salary, personId: item.personId, posNo: item.posNo === null ? '-':item.posNo, - organization: item.organization + organization: item.organization, } )) rowsAdd.value = dataList;