From c51f66c808affd8756b4b3b5397c486918c46b08 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 8 Aug 2023 16:50:50 +0700 Subject: [PATCH] =?UTF-8?q?api=20=E0=B8=96=E0=B8=B6=E0=B8=87=E0=B9=81?= =?UTF-8?q?=E0=B8=81=E0=B9=88=E0=B8=81=E0=B8=A3=E0=B8=A3=E0=B8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/06_retirement/api.retirement.ts | 5 + src/api/registry/api.profile.ts | 4 + .../04_registry/components/Profile.vue | 66 +++++- .../components/resign/Deceased.vue | 193 ++++++++------- .../components/resign/DetailDeceased.vue | 221 ++++++++++++++++++ src/modules/06_retirement/router.ts | 19 +- 6 files changed, 416 insertions(+), 92 deletions(-) create mode 100644 src/modules/06_retirement/components/resign/DetailDeceased.vue diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 698f2cb82..d8e373cb4 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -11,4 +11,9 @@ export default { reasonId: (retireId: string) => `${retirement}/reason/${retireId}`, retirement: (type: string, year: string) => `${retirement}/${type}/${year}`, createProfile: () => `${retirement}/profile`, + + //RetirementDeceased ถึงแก่กรรม + listDeceased: () => `${retirement}/deceased`, + detailDeceased: (id: string) => `${retirement}/deceased/${id}` + }; diff --git a/src/api/registry/api.profile.ts b/src/api/registry/api.profile.ts index d3333d893..62574c66f 100644 --- a/src/api/registry/api.profile.ts +++ b/src/api/registry/api.profile.ts @@ -182,4 +182,8 @@ export default { profileCitizenId: (citizenId: string) => `${profile}citizenId/${citizenId}`, profileEmployeeIn: `${profile}information/employee`, + + + + }; diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue index 468079674..db03c712a 100644 --- a/src/modules/04_registry/components/Profile.vue +++ b/src/modules/04_registry/components/Profile.vue @@ -472,12 +472,28 @@ - + + บันทึก + + + @@ -704,7 +720,7 @@ const dialogPassaway = ref(false); const loader = ref(false); //รอโหลด const statusEdit = ref(false); const activeImage = ref(null); -const filePassaway = ref(null); +const filePassaway = ref(null); const images = ref([]); const checkValidate = ref(false); //validate data ผ่านหรือไม่ const myForm = ref(null); //form data input @@ -1188,6 +1204,50 @@ const Retire = async () => { }); } }; +const clickSaveDeceased = async () => { + // console.log( + // filePassaway.value, + // deathCertificateNo.value, + // placeDeathCertificate.value, + // reasonDeath.value + // ); + const formData = new FormData(); + formData.append("File", filePassaway.value); + formData.append("Number", deathCertificateNo.value); + formData.append("Date", dateToISO(dateDeath.value)); + formData.append("Location", placeDeathCertificate.value); + formData.append("Reason", reasonDeath.value); + formData.append("ProfileId", profileId.value); + + $q.dialog({ + title: "ยืนยันการบันทึกข้อมูล", + message: "ต้องการบันทึกข้อมูลนี้ใช่หรือไม่?", + cancel: { + flat: true, + color: "negative", + }, + persistent: true, + }) + .onOk(async () => { + showLoader(); + await http + .post(config.API.listDeceased(), formData) + .then(() => { + success($q, "บันทึกข้อมูลสำเร็จ"); + router.push("/deceased"); + + }) + .catch((e) => { + console.log(e); + messageError($q, e); + }) + .finally(()=>{ + hideLoader(); + }) + }) + .onCancel(() => {}) + .onDismiss(() => {}); +}; \ No newline at end of file + + .q-table tr:nth-child(even) td { + background: #f8f8f8; + } + + .q-table thead tr { + background: #ecebeb; + } + + .q-table thead tr th { + position: sticky; + z-index: 1; + } + + /* this will be the loading indicator */ + .q-table thead tr:last-child th { + /* height of all previous header rows */ + top: 48px; + } + + .q-table thead tr:first-child th { + top: 0; + } +} + diff --git a/src/modules/06_retirement/components/resign/DetailDeceased.vue b/src/modules/06_retirement/components/resign/DetailDeceased.vue new file mode 100644 index 000000000..4c78eed8f --- /dev/null +++ b/src/modules/06_retirement/components/resign/DetailDeceased.vue @@ -0,0 +1,221 @@ + + + diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts index 6b92458fa..af06080ef 100644 --- a/src/modules/06_retirement/router.ts +++ b/src/modules/06_retirement/router.ts @@ -6,10 +6,11 @@ const Main = () => import("@/modules/06_retirement/views/Main.vue"); const Listretirement = () => import("@/modules/06_retirement/components/ListRetirement/TableList.vue") const resignOrder = () => import("@/modules/06_retirement/components/resign/ResignOrder.vue"); const resign = () => import("@/modules/06_retirement/components/resign/Resign.vue"); -const resignByid = () => import("@/modules/06_retirement/components/resign/ResignByid.vue") -const deceased = () => import("@/modules/06_retirement/components/resign/Deceased.vue") -const dismissOrder = () => import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue") -const addOrder = () => import("@/modules/06_retirement/components/DismissOrder/AddOrder.vue") +const resignByid = () => import("@/modules/06_retirement/components/resign/ResignByid.vue"); +const deceased = () => import("@/modules/06_retirement/components/resign/Deceased.vue"); +const detaildeceased = () => import("@/modules/06_retirement/components/resign/DetailDeceased.vue"); +const dismissOrder = () => import("@/modules/06_retirement/components/DismissOrder/DismissOrder.vue"); +const addOrder = () => import("@/modules/06_retirement/components/DismissOrder/AddOrder.vue"); export default [ { path: "/retirement", @@ -81,6 +82,16 @@ export default [ Role: "retirement", }, }, + { + path: "/deceased/:id", + name: "deceased-detail", + component: detaildeceased, + meta: { + Auth: true, + Key: [7.8], + Role: "retirement", + }, + }, { path: "/dismiss-order", name: "dismiss-order",