From c467d12d2ee157516ec54f8fb9aefe403fb964f8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 28 Aug 2023 15:49:55 +0700 Subject: [PATCH] no message --- .../07_insignia/components/3_result/DialogForm.vue | 6 ++++-- .../07_insignia/components/4_Allocate/DialogEdit.vue | 3 +++ .../07_insignia/components/4_Allocate/Main.vue | 12 +++++++----- src/modules/07_insignia/storeAllocate.ts | 1 - 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/modules/07_insignia/components/3_result/DialogForm.vue b/src/modules/07_insignia/components/3_result/DialogForm.vue index c58e12f63..50c382813 100644 --- a/src/modules/07_insignia/components/3_result/DialogForm.vue +++ b/src/modules/07_insignia/components/3_result/DialogForm.vue @@ -217,11 +217,11 @@ const findlist = async (id: string) => { }; const fectDataByid = async (id: string) => { showLoader(); + employeeClass.value = ""; await http .get(config.API.noteByid(id)) .then((res) => { let data = res.data.result; - employeeClass.value = ""; cardid.value = data.citizenId; fullName.value = data.fullName; position.value = data.position; @@ -348,7 +348,9 @@ const searchcardid = () => {
{ props.close(); }; const clickSave = () => { + console.log(props.insigniadata); + dialogConfirm($q, () => { if (props.actionType === "insignia") { props.save( + props.insigniadata.id, props.insigniadata.insigniaId, amount.value, props.insigniadata.year diff --git a/src/modules/07_insignia/components/4_Allocate/Main.vue b/src/modules/07_insignia/components/4_Allocate/Main.vue index fd950075e..ad2a6704d 100644 --- a/src/modules/07_insignia/components/4_Allocate/Main.vue +++ b/src/modules/07_insignia/components/4_Allocate/Main.vue @@ -166,9 +166,6 @@ watch(tab, () => { fecthlistInsignia(); }); -// const selectorInsignia = () => { -// fecthlistInsignia(); -// }; const selectorRound = (round: string) => { selectRound.value = round; const yearFilter = selectRoundOption.value.find((x: any) => x.id == round); @@ -234,7 +231,12 @@ const save = async (insigniaId: string, total: string) => { close(); }); }; -const saveEdit = async (insigniaId: string, total: Number, year: Number) => { +const saveEdit = async ( + id: string, + insigniaId: string, + total: Number, + year: Number +) => { showLoader(); let body = { insignia: insigniaId, @@ -242,7 +244,7 @@ const saveEdit = async (insigniaId: string, total: Number, year: Number) => { total: Number(total), }; await http - .put(config.API.insigniaManageById(insigniaId), body) + .put(config.API.insigniaManageById(id), body) .then(async () => { success($q, "แก้ไขข้อมูลสำเร็จ"); await fecthlistInsignia(); diff --git a/src/modules/07_insignia/storeAllocate.ts b/src/modules/07_insignia/storeAllocate.ts index 0267489c0..ace861f76 100644 --- a/src/modules/07_insignia/storeAllocate.ts +++ b/src/modules/07_insignia/storeAllocate.ts @@ -38,7 +38,6 @@ export const useAllocateDataStore = defineStore("insigniaallocate", () => { })) rows.value = list listInsignia.value = list - } const selectInsignia = () => { console.log(insignia.value);