From 5d625bc4aed4940221a703d28cbb626bc0dcd421 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 28 Nov 2023 11:21:20 +0700 Subject: [PATCH] no message --- .../2_InvestigateFacts/EditPage.vue | 7 +- .../components/2_InvestigateFacts/Form.vue | 179 ++++++++++++------ .../11_discipline/interface/index/Main.ts | 14 +- .../interface/request/investigateFact.ts | 2 +- .../store/InvestigateDisStore.ts | 32 ++-- 5 files changed, 145 insertions(+), 89 deletions(-) diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue index 62738cb55..8ac1109b1 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue @@ -235,7 +235,6 @@ function getData() { http .get(config.API.investigateById(id.value)) .then((res) => { - console.log(res.data.result); const dataList = res.data.result; data.id = dataList.id; data.idComplaint = dataList.idComplaint; @@ -251,8 +250,7 @@ function getData() { data.result = dataList.result; data.directors = dataList.director; data.disciplineInvestigateDocs = dataList.disciplineInvestigateDocs; - data.disciplineInvestigateRelevantDocs = - dataList.disciplineInvestigateRelevantDocs; + data.disciplineInvestigateRelevantDocs = dataList.disciplineInvestigateRelevantDocs; data.investigationStatusResult = dataList.investigationStatusResult; }) .catch((e) => { @@ -282,6 +280,7 @@ async function onSubmit(data: any) { }) .finally(async () => { hideLoader(); + getData(); }); // router.push(`/discipline/investigatefacts`); } @@ -361,6 +360,7 @@ function confirmCancelInvestigate() { function emitPerson(data: FormData[]) { const dataMapId = data.map((item: FormData) => item.id); + console.log(dataMapId); showLoader(); http .put(config.API.investigateApprove(id.value), { @@ -374,6 +374,7 @@ function emitPerson(data: FormData[]) { }) .finally(() => { hideLoader(); + getData(); }); } diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue index 022bf99ad..f766947cf 100644 --- a/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue +++ b/src/modules/11_discipline/components/2_InvestigateFacts/Form.vue @@ -310,10 +310,23 @@ watch(props.data, async () => { formData.investigationCauseText = props.data.investigationCauseText; formData.result = props.data.result; formData.disciplineInvestigateDocs = props.data.disciplineInvestigateDocs; - formData.evidenceFiles = props.data.evidenceFiles; + formData.disciplineInvestigateRelevantDocs = + props.data.disciplineInvestigateRelevantDocs; + formData.status = props.data.status; investigateFactStore.rowsAdd = props.data.persons; - rows.value = props.data.directors; + + const dataMap = props.data.directors.map((item: any) => ({ + id: item.id, + name: `${item.prefix}${item.firstName} ${item.lastName}`, + prefix: item.prefix, + firstName: item.firstName, + lastName: item.lastName, + position: item.position, + email: item.email, + phone: item.phone, + })); + rows.value = dataMap; } }); @@ -482,11 +495,30 @@ async function getList() { function returnDirector(data: any) { clickClose(); const dataList = data.map((item: any) => item.id); - console.log(dataList); + console.log(data); formData.directors = dataList; rows.value = data; } +function deletePerson(id: string) { + dialogRemove($q, () => remove(id)); +} + +function remove(id: string) { + const dataRow = investigateFactStore.rowsAdd; + const updatedRows = dataRow.filter((item: any) => item.id !== id); + investigateFactStore.rowsAdd = updatedRows; +} + +function deleteDirector(id: string) { + dialogRemove($q, () => removePerson(id)); +} + +function removePerson(id: string) { + const dataRow = rows.value; + const updatedRows = dataRow.filter((item: any) => item.id !== id); + rows.value = updatedRows; +} onMounted(async () => { console.log(route.name); getOc(); @@ -558,35 +590,36 @@ onMounted(async () => { -->
- - + > + +
-
{ ref="organizationIdRef" dense hide-bottom-space - :readonly="formData.status !== 'NEW' && formData.status !== ''" + :readonly="formData.status !== 'NEW'" outlined option-label="name" option-value="id" @@ -611,35 +644,6 @@ onMounted(async () => { lazy-rules />
-
- - -
{ > ผู้ถูกร้องเรียน { > {{ col.label }} +
+
+ + +
-
{ flat round color="red" - icon="mdi-delete" + icon="mdi-delete-outline" + @click="deleteDirector(props.row.id)" > ลบข้อมูล @@ -1137,7 +1187,10 @@ onMounted(async () => { >อัปโหลดเอกสาร
-
+
ไม่มีรายการเอกสาร
@@ -1205,6 +1258,7 @@ onMounted(async () => {
{
({ - // id: e.id, - // name: `${e.prefix}${e.firstName} ${e.lastName}`, - // prefix: e.prefix, - // firstName: e.firstName, - // lastName: e.lastName, - // position: e.position, - // email: e.email, - // phone: e.phone, - // })); - // rows2.value = datalistDirector; - // selected.value = rows2.value; - // // console.log(rows2.value); - // } + async function fecthDirector(data: directorType[]) { + let datalistDirector: responseType[] = data.map((e: directorType) => ({ + id: e.id, + name: `${e.prefix}${e.firstName} ${e.lastName}`, + prefix: e.prefix, + firstName: e.firstName, + lastName: e.lastName, + position: e.position, + email: e.email, + phone: e.phone, + })); + rows2.value = datalistDirector; + selected.value = rows2.value; + // console.log(rows2.value); + } function convertRespondentType(val: string) { switch (val) { @@ -305,7 +305,7 @@ export const useInvestigateDisStore = defineStore( rows2, optionsTypefault, optionsfaultLevel, - // fecthDirector, + fecthDirector, visibleColumns, columns, visibleColumnsDirector,