From 041bdab0f75940b2f0d7f8500199f2d4bbe8d2ce Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 15 Dec 2023 13:47:26 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B4?= =?UTF-8?q?=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/8_AppealComplain/AddPage.vue | 3 ++ .../components/8_AppealComplain/EditPage.vue | 7 ++++ .../components/8_AppealComplain/Form.vue | 42 +++++++++++++++---- .../dialog/DialogEditStatus.vue | 27 ++++++++---- .../interface/response/appealComplain.ts | 5 +++ 5 files changed, 67 insertions(+), 17 deletions(-) diff --git a/src/modules/11_discipline/components/8_AppealComplain/AddPage.vue b/src/modules/11_discipline/components/8_AppealComplain/AddPage.vue index c622f236e..c029c1065 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/AddPage.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/AddPage.vue @@ -24,6 +24,8 @@ async function onSubmit(data: any) { formData.append("type", data.type); formData.append("year", data.year); formData.append("caseType", data.caseType); + formData.append("oc", data.oc); + formData.append("position", data.position); formData.append("caseNumber", data.caseNumber); formData.append("file", data.file); showLoader(); @@ -31,6 +33,7 @@ async function onSubmit(data: any) { .post(config.API.appealAdd(), formData) .then((res) => { success($q, "บันทึกข้อมูลสำเร็จ"); + router.push(`/discipline-appealcomplain/${res.data.result}`) }) .catch((e) => { messageError($q, e); diff --git a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue index b4703f92b..885ab0135 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/EditPage.vue @@ -22,6 +22,7 @@ const id = ref(route.params.id as string); const historyStatusOb = reactive({ status: "", + createdFullName: "", createdAt: new Date, }); @@ -43,6 +44,8 @@ const data = reactive({ fullname: "", citizenId: "", profileId: "", + oc: "", + position: "", lastUpdatedAt: "", historyStatus: [historyStatusOb], disciplineComplaint_Appeal_Docs: [fileOb], @@ -57,6 +60,8 @@ async function onSubmit(data: any) { year: data.year, caseType: data.caseType, caseNumber: data.caseNumber, + oc: data.oc, + position: data.position, status: data.status, }; showLoader(); @@ -93,6 +98,8 @@ function getData() { data.fullname = dataList.fullname; data.citizenId = dataList.citizenId; data.profileId = dataList.profileId; + data.oc = dataList.oc; + data.position = dataList.position; data.lastUpdatedAt = dataList.lastUpdatedAt; data.disciplineComplaint_Appeal_Docs = dataList.disciplineComplaint_Appeal_Docs data.historyStatus = dataList.historyStatus diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue index 36b347d60..d68de93e2 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue @@ -53,6 +53,7 @@ const modalEdit = ref(false); const historyStatusOb = reactive([{ status: "", + createdFullName: "", createdAt: new Date(), }]); @@ -85,7 +86,7 @@ const objectAppeal: MyObjectAppealRef = { }; /** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */ -const visibleColumns = ref(["no", "citizenId", "fullname"]); +const visibleColumns = ref(["no", "citizenId", "fullname","oc",'position']); /** หัวตารางผู้ถูกร้องเรียน */ const columns = ref([ @@ -116,6 +117,24 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "oc", + align: "left", + label: "สังกัด", + sortable: true, + field: "oc", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, + { + name: "position", + align: "left", + label: "ตำแหน่ง", + sortable: true, + field: "position", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, ]); /*** ฟังก์ชั่นสำหรับ validate ฟอร์ม */ @@ -161,14 +180,17 @@ function handleSave(returnData: any) { profileId: item.personId, fullname: item.name, citizenId: item.idcard, + oc: item.organization, + position: item.position, })); } function inputEdit(val: boolean) { return { - "full-width cursor-pointer ": val, + "full-width cursor-pointer inputgreen ": val, "full-width cursor-pointer inputgreen": !val, }; + } function uploadFile() { @@ -245,6 +267,8 @@ watch(props.data, async () => { profileId: props.data.profileId, fullname: props.data.fullname, citizenId: props.data.citizenId, + oc: props.data.oc, + position: props.data.position, }, ]); } @@ -274,6 +298,8 @@ function onSubmit() { caseType: formData.caseType, caseNumber: formData.caseNumber, file: formData.file, + oc: dataRow[0].oc, + position: dataRow[0].position, status: formData.status, }; props.onSubmit(data); @@ -299,7 +325,6 @@ onMounted(() => { { { > ผู้ยื่นอุทธณ์/ร้องทุกข์ { {{ props.rowIndex + 1 }}
- {{ props.row.organization }} + {{ props.row.oc }}
{{ col.value }} @@ -426,7 +452,7 @@ onMounted(() => {
-
+
{ class="col-2" :locale="'th'" autoApply - :readonly="isReadonly" year-picker :enableTimePicker="false" > @@ -478,7 +503,6 @@ onMounted(() => { ([]); /** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */ -const visibleColumns = ref(["no", "status", "createdAt"]); +const visibleColumns = ref(["no", "status","createdFullName", "createdAt"]); /** หัวตารางผู้ถูกร้องเรียน */ const columns = ref([ { @@ -32,16 +32,25 @@ const columns = ref([ name: "status", align: "left", label: "สถานะ", - sortable: true, + sortable: false, field: "status", headerStyle: "font-size: 14px", style: "font-size: 14px", }, + { + name: "createdFullName", + align: "left", + label: "ผู้ดำเนินการ", + sortable: false, + field: "createdFullName", + headerStyle: "font-size: 14px", + style: "font-size: 14px", + }, { name: "createdAt", align: "left", - label: "แก้ไขเมื่อวันที่", - sortable: true, + label: "วันที่แก้ไข", + sortable: false, field: "createdAt", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -70,9 +79,11 @@ watch( () => props.data, () => { rows.value = props.data.map((item: HistoryStatusType) => ({ - status: dataStore.statusTothai(item.status), - createdAt: date2Thai(item.createdAt), - })); + createdFullName:item.createdFullName, + status: dataStore.statusTothai(item.status), + createdAt: date2Thai(item.createdAt,false,true), + + })) } ); diff --git a/src/modules/11_discipline/interface/response/appealComplain.ts b/src/modules/11_discipline/interface/response/appealComplain.ts index d2ee6a212..02b62b2ff 100644 --- a/src/modules/11_discipline/interface/response/appealComplain.ts +++ b/src/modules/11_discipline/interface/response/appealComplain.ts @@ -31,6 +31,8 @@ interface RowAddList { profileId:string fullname:string citizenId:string + oc:string + position:string } interface EditDataList { @@ -45,6 +47,8 @@ interface EditDataList { fullname: string citizenId: string profileId: string + oc: string + position: string lastUpdatedAt: string historyStatus: object | null disciplineComplaint_Appeal_Docs: object | null @@ -52,6 +56,7 @@ interface EditDataList { interface HistoryStatusType { status: string + createdFullName: string createdAt: Date } interface FileObType {