From bc8a03139d26c1d8815612dfaf61f3dfba73586e Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 5 Jan 2024 11:05:49 +0700 Subject: [PATCH] history --- src/api/11_discipline/api.discipline.ts | 7 +-- .../components/4_Result/DialogHistory.vue | 50 ++++++++++++------- .../components/4_Result/Form.vue | 33 ++++++------ src/modules/11_discipline/store/main.ts | 9 ---- 4 files changed, 51 insertions(+), 48 deletions(-) diff --git a/src/api/11_discipline/api.discipline.ts b/src/api/11_discipline/api.discipline.ts index 6ebaa8b95..df57b2893 100644 --- a/src/api/11_discipline/api.discipline.ts +++ b/src/api/11_discipline/api.discipline.ts @@ -24,7 +24,7 @@ export default { complaintbyId: (id: string) => `${disciplineMain}/complaint/${id}`, complaintReject: (id: string) => `${disciplineMain}/complaint/reject/${id}`, complaintResume: (id: string) => `${disciplineMain}/complaint/resume/${id}`, - complaintList: (page: number, pageSize: number, keyword: string,status:string) => + complaintList: (page: number, pageSize: number, keyword: string, status: string) => `${disciplineMain}/complaint?page=${page}&pageSize=${pageSize}&keyword=${keyword}&status=${status}`, complaintFileUpload: (id: string) => `${disciplineMain}/complaint/file/${id}`, complaintFileDelete: (id: string, docId: string) => @@ -32,7 +32,7 @@ export default { complaintApprove: (id: string) => `${disciplineMain}/complaint/approve/${id}`, /** API สืบสวนข้อเท็จจริง*/ - investigateMain: (page: number, pageSize: number, keyword: string,status:string) => + investigateMain: (page: number, pageSize: number, keyword: string, status: string) => `${investigate}?page=${page}&pageSize=${pageSize}&keyword=${keyword}&status=${status}`, investigateById: (id: string) => `${investigate}/${id}`, @@ -105,5 +105,6 @@ export default { appealDeleteFile: (id: string, docId: string) => `${appeal}/file/${id}/${docId}`, - historyDirectorbyId:(id:string,type:string) => `${disciplineMain}/director/${type}/${id}` + historyDirectorbyId: (id: string, type: string) => `${disciplineMain}/director/${type}/${id}`, + historyOrderById:(id:string)=>`${env.API_URI}/order/history/discipline/${id}` }; diff --git a/src/modules/11_discipline/components/4_Result/DialogHistory.vue b/src/modules/11_discipline/components/4_Result/DialogHistory.vue index 23462ab85..a293ed740 100644 --- a/src/modules/11_discipline/components/4_Result/DialogHistory.vue +++ b/src/modules/11_discipline/components/4_Result/DialogHistory.vue @@ -11,11 +11,14 @@ import { QForm, useQuasar } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; import type { QTableProps } from "quasar"; import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue"; +import http from "@/plugins/http"; +import config from "@/app.config"; const $q = useQuasar(); const mixin = useCounterMixin(); const { showLoader, success, messageError, dialogConfirm, hideLoader,date2Thai } = mixin; const listCheck = ref(""); +const id = ref('') const props = defineProps({ modal: Boolean, personId: { @@ -37,41 +40,50 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "directions", + name: "commandSubject", align: "left", label: "คำสั่ง", sortable: true, - field: "directions", + field: "commandSubject", headerStyle: "font-size: 14px", style: "font-size: 14px", }, { - name: "dateDirections", + name: "lastUpdatedAt", align: "left", label: "วันที่ส่งไปออกคำสั่ง", sortable: true, - field: "dateDirections", + field: "lastUpdatedAt", headerStyle: "font-size: 14px", style: "font-size: 14px", }, ]); -onMounted(() => { - const data = [ - { - id: "1", - directions: "จำลอง1", - dateDirections: date2Thai(new Date(),false,true), - }, - { - id: "2", - directions: "จำลอง2", - dateDirections: date2Thai(new Date(),false,true), - }, - ]; +function getHistory(id:string){ + showLoader() + http + .get(config.API.historyOrderById(id)) + .then((res)=>{ + console.log(res) + const data = res.data.result; + rows.value = data.map((item:any)=>({ + commandSubject:item.commandSubject ? item.commandSubject : '-', + createdAt:item.createdAt ? date2Thai(item.createdAt,false,true) : '-', + lastUpdatedAt:item.lastUpdatedAt ? date2Thai(item.lastUpdatedAt,false,true) : '-', + })) + }).catch((e)=>{ + messageError($q,e) + }).finally(()=>{ + hideLoader() + }) +} + +watch(()=>props.personId,()=>{ + if(props.personId){ + getHistory(props.personId) + } +}) - rows.value = data; -});