From a321b873212c86e4715728d7f28dbd2391ee2b06 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 18 Aug 2023 14:50:24 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?= =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87=20step=202=20=E0=B9=80?= =?UTF-8?q?=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9B=E0=B8=B8=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20(=E0=B8=84=E0=B9=89=E0=B8=B2=E0=B8=87=20comma)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/interface/response/Order.ts | 3 +++ .../07_insignia/components/4_Allocate/allocateAdd.vue | 11 +++++++++-- src/modules/07_insignia/components/RecordInsignia.vue | 11 +++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/modules/05_placement/interface/response/Order.ts b/src/modules/05_placement/interface/response/Order.ts index 375361a97..6894b4fcd 100644 --- a/src/modules/05_placement/interface/response/Order.ts +++ b/src/modules/05_placement/interface/response/Order.ts @@ -6,6 +6,9 @@ interface ResponseData { selectStatus: boolean; sequence: number; refRecordId: string + salaryAmount:number|null + positionSalaryAmount:number|null + monthSalaryAmount:number|null } interface ResponseOrganiz { diff --git a/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue b/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue index 9b3597e6a..a95f9e1d6 100644 --- a/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue +++ b/src/modules/07_insignia/components/4_Allocate/allocateAdd.vue @@ -47,7 +47,7 @@ class="q-px-md items-center" color="light-blue-10" label="บันทึก" - @click="router.go(-1)" + @click="saveData" /> @@ -62,7 +62,7 @@ import { useRouter } from "vue-router"; import { useCounterMixin } from "@/stores/mixin"; const mixin = useCounterMixin(); -const { date2Thai } = mixin; +const { date2Thai ,dialogConfirm} = mixin; const router = useRouter(); const $q = useQuasar(); const dateStart = ref(new Date()); @@ -74,4 +74,11 @@ const year = ref(""); const datelast = ref(""); const routeName = router.currentRoute.value.name; + +const saveData = () => { + dialogConfirm($q,() => DataSave()) +} +const DataSave = () => { +router.go(-1) +} diff --git a/src/modules/07_insignia/components/RecordInsignia.vue b/src/modules/07_insignia/components/RecordInsignia.vue index bc22ac120..8be5cf2fb 100644 --- a/src/modules/07_insignia/components/RecordInsignia.vue +++ b/src/modules/07_insignia/components/RecordInsignia.vue @@ -362,11 +362,12 @@ import { useCounterMixin } from "@/stores/mixin"; import type { DataOption } from "@/modules/05_placement/interface/index/Main"; import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; import type { QTableProps, QInput } from "quasar"; +import { useQuasar } from "quasar"; // const router = useRouter(); const mixin = useCounterMixin(); -const { date2Thai } = mixin; - +const { date2Thai,dialogConfirm } = mixin; +const $q = useQuasar(); const tab = ref("hight"); const arrow = ref(false); @@ -492,6 +493,12 @@ onMounted(() => { selectStatusOptionFilter.value = op2; }); +const save = () => { + dialogConfirm($q,() => SaveData()) +} +const SaveData = () => { + console.log("save") +} const clickRound = () => { arrow.value = !arrow.value; };