diff --git a/src/api/07_insignia/api.insignia.ts b/src/api/07_insignia/api.insignia.ts index 7d61bbef0..4d996f36f 100644 --- a/src/api/07_insignia/api.insignia.ts +++ b/src/api/07_insignia/api.insignia.ts @@ -26,7 +26,7 @@ export default { insigniaDashboard: (insigniaPeriodId: string) => `${insignia}/request/dashboard/${insigniaPeriodId}`, // record noteround: () => `${insignia}/request/note`, - requestDocNote: (id:string) => `${insignia}/request/note/doc/${id}`, + requestDocNote: (id: string) => `${insignia}/request/note/doc/${id}`, noteSearch: () => `${insignia}/request/note/search`, noteAdd: (insigniaId: string) => `${insignia}/request/note/${insigniaId}`, noteByid: (id: string) => `${insignia}/request/note/${id}`, @@ -35,4 +35,9 @@ export default { insigniaSendToDirector: (roundId: string, ocId: string) => `${insignia}/request/officer/approve/${roundId}/${ocId}`, insigniaDirectorBackToEdit: (roundId: string, ocId: string) => `${insignia}/request/director/reject/${roundId}/${ocId}`, insigniaDirectorApproved: (roundId: string, ocId: string) => `${insignia}/request/director/approve/${roundId}/${ocId}`, + + // uploadfile + uploadfilereceice: (noteId: string) => `${insignia}/request/import/receice/${noteId}`, + uploadfileinvoice: (noteId: string) => `${insignia}/request/import/invoice/${noteId}`, + }; diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue index 60fa7e5d0..269c3d687 100644 --- a/src/modules/07_insignia/components/3_result/DialogForm.vue +++ b/src/modules/07_insignia/components/3_result/DialogForm.vue @@ -228,7 +228,7 @@ const fectDataByid = async (id: string) => { Advertise.value = data.number; brand.value = data.requestInsigniaId; receivedate.value = data.dateReceive; - issue.value = ""; + issue.value = data.issue; affiliationRequest.value = data.organizationOrganizationSend; affiliationReceived.value = data.organizationOrganizationReceive; announceDate.value = data.date; diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue index f9ebcb255..c7cf4f82c 100644 --- a/src/modules/07_insignia/views/ResultPage.vue +++ b/src/modules/07_insignia/views/ResultPage.vue @@ -16,8 +16,14 @@ import { useQuasar } from "quasar"; // const router = useRouter(); const DataStore = useResultDataStore(); const mixin = useCounterMixin(); -const { date2Thai, dialogConfirm, showLoader, hideLoader, messageError } = - mixin; +const { + date2Thai, + dialogConfirm, + showLoader, + hideLoader, + messageError, + success, +} = mixin; const $q = useQuasar(); const tab = ref(""); @@ -205,18 +211,6 @@ const rows = ref([ // typepay: null, // address: "เลขที่ 2/3 หมู่ที่ 14 ถนนบ...", // }, - // { - // no: "2", - // status: "บันทึกลง ก.พ. 7 แล้ว", - // name: "นางสาวภาพรรณ ลออ", - // type: "ทั้งหมด", - // page: "12", - // number: "11", - // vatnumber: "1122345", - // datepay: null, - // typepay: null, - // address: "เลขที่ 2/3 หมู่ที่ 14 ถนนบ...", - // }, ]); watch(tab, () => { if (tab.value !== "doc") { @@ -272,6 +266,43 @@ const fecthlistInsignia = async () => { hideLoader(); }); }; +const uploadFile = async (event: any, action: string) => { + console.log(selectRound.value); + if (selectRound.value !== undefined) { + let id = selectRound.value.toString(); + if (action === "result") { + const formdata = new FormData(); + formdata.append("file", event); + await http + .put(config.API.uploadfilereceice(id), formdata) + .then(() => { + success($q, "อัพโหลดไฟล์สำเร็จ"); + }) + .catch((err) => { + console.log(err); + }) + .finally(async () => { + await fecthlistInsignia(); + fileResult.value = null; + }); + } else if (action === "invoice") { + const formdata = new FormData(); + formdata.append("file", event); + await http + .put(config.API.uploadfileinvoice(id), formdata) + .then(() => { + success($q, "อัพโหลดไฟล์สำเร็จ"); + }) + .catch((err) => { + console.log(err); + }) + .finally(async () => { + await fecthlistInsignia(); + fileinvoice.value = null; + }); + } + } +}; const filterRef = ref(); const filter = ref(""); @@ -285,9 +316,7 @@ const addData = () => { action.value = "addData"; }; -const editData = (data) => { - console.log(data); - +const editData = (data: any) => { personId.value = data.id; profileType.value = data.profileType; action.value = "editData"; @@ -398,6 +427,7 @@ const resetFilter = () => { v-model="fileResult" label="บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์" style="min-width: auto" + accept=".xlsx" >