From b3bfe6a4b9cdd94f5cfcbab02cc8231eeb77daa8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 7 Aug 2023 11:06:04 +0700 Subject: [PATCH 01/17] api retirement --- src/api/06_retirement/api.retirement.ts | 10 +- .../components/ListRetirement/TableList.vue | 313 ++++++++++++------ src/modules/06_retirement/router.ts | 4 +- src/modules/06_retirement/views/Main.vue | 240 +++++++++++--- 4 files changed, 409 insertions(+), 158 deletions(-) diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 7cf8a8057..6f9b42c5a 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -4,9 +4,11 @@ const retirement = `${env.API_URI}/retirement` export default { profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`, - profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`, + // profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`, listRetire: (retireId: string) => `${retirement}/${retireId}`, - createnote: () => `${retirement}/reason`, - reasonId: (retireId:string) => `${retirement}/reason/${retireId}`, - retirement:(type:string,year:string) => `${retirement}/${type}/${year}` + createnote: () => `${retirement}/edit`, + removeProfile: () => `${retirement}/remove`, + reasonId: (retireId: string) => `${retirement}/reason/${retireId}`, + retirement: (type: string, year: string) => `${retirement}/${type}/${year}`, + createProfile: () => `${retirement}/profile`, }; diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 33ef58904..740e7ad9e 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -4,18 +4,18 @@ import AddList from "../ListRetirement/AddList.vue"; import { useCounterMixin } from "@/stores/mixin"; import { useQuasar } from "quasar"; import { useRoute } from "vue-router"; +import { useRouter } from "vue-router"; import http from "@/plugins/http"; import config from "@/app.config"; -import { useRouter } from "vue-router"; -const router = useRouter(); const route = useRoute(); +const router = useRouter(); const $q = useQuasar(); const mixin = useCounterMixin(); const { showLoader, hideLoader, messageError, success } = mixin; -const type_params = route.params.type; -const year_params = route.params.year; -const retireld_params = route.params.id; +// const type_params = route.params.type; +// const year_params = route.params.year; +const retireld_params = route.params.retirementId; const modalNote = ref(false); const note = ref(""); @@ -159,22 +159,25 @@ const visibleColumns = ref([ "bureau", ]); +const action = ref(""); + onMounted(() => { - // console.log(route.params); - if (retireld_params === undefined) { - fecthlistprofile(type_params, year_params); - } else { - fecthlist(retireld_params); - } + retireld.value = retireld_params.toString(); + console.log(retireld_params); + + fecthlistprofile(retireld.value); }); +const round = ref(); +const typeReport = ref(""); // fecthlist -const fecthlistprofile = async (type: any, year: any) => { +const fecthlistprofile = async (id: string) => { showLoader(); await http - .get(config.API.profile(type, year)) - .then((res: any) => { - // console.log(res); - retireld.value = res.data.result.id; + .get(config.API.listRetire(id)) + .then((res) => { + console.log(res); + round.value = res.data.result.round; + typeReport.value = res.data.result.typeReport; rows.value = res.data.result.profile.map((e: any) => ({ id: e.id, profileId: e.profileId, @@ -187,37 +190,11 @@ const fecthlistprofile = async (type: any, year: any) => { positionNumber: e.posNoEmployee, positionLavel: e.positionEmployeeLevel, bureau: e.oc, + reason: e.reason, + remove: e.remove, })); }) - .catch((e: any) => { - messageError($q, e); - }) - .finally(() => { - hideLoader(); - }); -}; -const fecthlist = async (retireld: any) => { - showLoader(); - await http - .get(config.API.listRetire(retireld)) - .then((res: any) => { - // retireld.value = res.data.result.id; - rows.value = res.data.result.map((e: any) => ({ - id: e.id, - profileId: e.profileId, - order: e.order, - fixname: e.prefix, - name: e.fullName, - organizationOrganization: e.organizationOrganization, - positionType: e.positionType, - position: e.position, - positionNumber: e.posNoEmployee, - positionLavel: e.positionEmployeeLevel, - bureau: e.oc, - })); - // console.log(rows.value); - }) - .catch((e: any) => { + .catch((e) => { messageError($q, e); }) .finally(() => { @@ -225,10 +202,7 @@ const fecthlist = async (retireld: any) => { }); }; // DelProfile -const clickDelete = (prop: any) => { - console.log(prop); - - let retireProfileId = prop.profileId; +const clickDelete = () => { $q.dialog({ title: "ยืนยันการลบข้อมูล", message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?", @@ -240,7 +214,10 @@ const clickDelete = (prop: any) => { }) .onOk(async () => { await http - .delete(config.API.profileRetire(retireProfileId)) + .post(config.API.removeProfile(), { + retireProfileId: retireProfileId.value, + reason: note.value, + }) .then(() => { success($q, "ลบข้อมูลสำเร็จ"); }) @@ -248,29 +225,30 @@ const clickDelete = (prop: any) => { messageError($q, e); }) .finally(async () => { - if (retireld_params === undefined) { - await fecthlistprofile(type_params, year_params); - } else await fecthlist(retireld_params); + retireld.value = retireld_params.toString(); + await fecthlistprofile(retireld.value); + modalNote.value = false; }); }) - .onCancel(() => { }) - .onDismiss(() => { }); + .onCancel(() => {}) + .onDismiss(() => {}); }; // note -const fetchReason = async (prop: string) => { - await http - .get(config.API.reasonId(prop)) - .then((res: any) => { - console.log(res.data.result); - note.value = res.data.result.reason; - retireProfileId.value = res.data.result.id; - }) - .catch((e: any) => { - messageError($q, e); - }); -}; - +// const fetchReason = async (prop: string) => { +// await http +// .get(config.API.reasonId(prop)) +// .then((res: any) => { +// console.log(res.data.result); +// note.value = res.data.result.reason; +// retireProfileId.value = res.data.result.id; +// }) +// .catch((e: any) => { +// messageError($q, e); +// }); +// }; const saveNote = () => { + console.log(retireProfileId.value, note.value); + $q.dialog({ title: "ยืนยันการบันทึกข้อมูลข้อมูล", message: "ต้องการบันทึกข้อมูลนี้ใช่หรือไม่?", @@ -281,7 +259,6 @@ const saveNote = () => { persistent: true, }) .onOk(async () => { - // console.log("บันทึกข้อมูล"); await http .post(config.API.createnote(), { retireProfileId: retireProfileId.value, @@ -294,17 +271,18 @@ const saveNote = () => { messageError($q, e); }) .finally(async () => { - await fecthlist(retireld_params); + retireld.value = retireld_params.toString(); + fecthlistprofile(retireld.value); modalNote.value = false; }); }) - .onCancel(() => { }) - .onDismiss(() => { }); + .onCancel(() => {}) + .onDismiss(() => {}); }; const UpdateListId = (retireld: string, pId: string) => { profileId.value = pId; - fecthlist(retireld); + fecthlistprofile(retireld); console.log("profileId", profileId.value); }; const backHistory = () => { @@ -362,13 +340,29 @@ const paginationLabel = (start: number, end: number, total: number) => { @@ -502,19 +578,46 @@ const paginationLabel = (start: number, end: number, total: number) => { - กรอกเหตุผล + กรอกเหตุผล - + - + - + + diff --git a/src/modules/06_retirement/router.ts b/src/modules/06_retirement/router.ts index bb5a3c6bf..6b92458fa 100644 --- a/src/modules/06_retirement/router.ts +++ b/src/modules/06_retirement/router.ts @@ -22,8 +22,8 @@ export default [ }, }, { - path: "/retirement/list/:type/:year", - name: "retirement/list/", + path: "/retirement/:retirementId", + name: "retirementid", component: Listretirement, meta: { Auth: true, diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index 335f4f591..5f5a24245 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -175,6 +175,93 @@ + + + + +
เพิ่มประกาศ
+ + + + เลือกประกาศที่ต้องการเพิ่มข้อมูล + + +
+ + + + + + + ประกาศเพิ่มผู้เกษียณ + + + + + + + + + ประกาศแก้ไขข้อมูลผู้เกษียน + + + + + + + + + + + + ประกาศยกเลิกผู้เกษียณ + + + + + +
+ + + + + + + + @@ -447,6 +590,9 @@ watch(type, () => { .filter-card { background-color: #f1f1f1b0; } +.q-item-custom { + padding: 0; +} .toggle-expired-account { font-size: 12px; From c21a95f486604eeaea467ac433a68f8b7832e4a3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 7 Aug 2023 13:17:59 +0700 Subject: [PATCH 02/17] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20retirement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/06_retirement/api.retirement.ts | 2 +- .../components/ListRetirement/TableList.vue | 9 +++++---- src/modules/06_retirement/views/Main.vue | 10 +++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/api/06_retirement/api.retirement.ts b/src/api/06_retirement/api.retirement.ts index 6f9b42c5a..698f2cb82 100644 --- a/src/api/06_retirement/api.retirement.ts +++ b/src/api/06_retirement/api.retirement.ts @@ -4,7 +4,7 @@ const retirement = `${env.API_URI}/retirement` export default { profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`, - // profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`, + profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`, listRetire: (retireId: string) => `${retirement}/${retireId}`, createnote: () => `${retirement}/edit`, removeProfile: () => `${retirement}/remove`, diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 740e7ad9e..f8c7f6949 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -463,6 +463,7 @@ const paginationLabel = (start: number, end: number, total: number) => { :props="props" class="cursor-pointer" :style="props.row.profileId === profileId && 'color: #26a69a;'" + @click.stop="router.push(`/registry/${props.row.profileId}`)" > {{ props.row.order }} @@ -511,7 +512,7 @@ const paginationLabel = (start: number, end: number, total: number) => { > โน้ต --> - { @click.stop="router.push(`/registry/${props.row.profileId}`)" > ดูข้อมูลทะเบียนประวัติ - + --> { (modalNote = true), (note = props.row.reason), (action = 'edit'), - (retireProfileId = props.row.profileId) + (retireProfileId = props.row.id) " > กรอกเหตุผล @@ -550,7 +551,7 @@ const paginationLabel = (start: number, end: number, total: number) => { (modalNote = true), (action = 'delete'), (note = props.row.remove), - (retireProfileId = props.row.profileId) + (retireProfileId = props.row.id) " >ลบข้อมูล diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index 5f5a24245..304a9bb3a 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -125,7 +125,7 @@ {{ col.label }} - + diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue index 4f9f42fcb..fab7859b7 100644 --- a/src/modules/05_placement/components/Receive/receiveModal.vue +++ b/src/modules/05_placement/components/Receive/receiveModal.vue @@ -153,20 +153,23 @@ const validateData = async () => { } }); }; - +const id = ref(""); const saveAppoint = async () => { console.log("save", dataForm); myFormPosition.value.validate().then(async (result: boolean) => { + if (props.personalId !== undefined) { + id.value = props.personalId.toString(); + } if (result) { const dataAppoint = await { - personalId: props.personalId, - containDate: dataForm.containDate, + // personalId: props.personalId, + recruitDate: dataForm.containDate, posNoId: dataForm.posNoId, positionId: dataForm.positionId, positionLevelId: dataForm.positionLevelId, positionLineId: dataForm.positionLineId, - positionPathSideId: dataForm.positionPathSideId, + positionPathSideId: null, positionTypeId: dataForm.positionTypeId, // salaryAmount: dataForm.salaryAmount, // mouthSalaryAmount: dataForm.mouthSalaryAmount, @@ -175,7 +178,7 @@ const saveAppoint = async () => { console.log("save appoint===>", dataAppoint); showLoader(); await http - .post(config.API.placementPass(), dataAppoint) + .put(config.API.receivePosition(id.value), dataAppoint) .then((res) => { console.log("respone=>", res); success($q, "บันทึกสำเร็จ"); diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 5f6061fee..3250e6e11 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -362,7 +362,7 @@ const paginationLabel = (start: number, end: number, total: number) => { :profile-id="profileId" :UpdateListId="UpdateListId" v-if=" - statusReport !== true || typeReport == 'ADD' || typeReport == '' + statusReport !== true && typeReport == 'ADD' || typeReport == '' " /> @@ -459,11 +459,11 @@ const paginationLabel = (start: number, end: number, total: number) => { @@ -535,7 +535,7 @@ const paginationLabel = (start: number, end: number, total: number) => { { Date: Mon, 7 Aug 2023 16:53:51 +0700 Subject: [PATCH 05/17] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5=E0=B8=95=E0=B8=B3=E0=B9=81?= =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=AA=E0=B8=A1=E0=B8=B1=E0=B8=84=E0=B8=A3=E0=B9=83=E0=B8=99?= =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=9F=E0=B8=AD=E0=B8=A3?= =?UTF-8?q?=E0=B9=8C=E0=B8=A1=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/OrderPlacement/step/step01.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/05_placement/components/OrderPlacement/step/step01.vue b/src/modules/05_placement/components/OrderPlacement/step/step01.vue index eeddc482b..1377ba208 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step01.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step01.vue @@ -101,10 +101,10 @@ ) " -->
- + :options="positionOption" option-value="id" use-input input-debounce="0" /> -->
@@ -366,7 +366,7 @@ const fetchdetailOrder = async () => { nameCommand.value = data.signatoryBy; positionCommand.value = data.signatoryPosition; examRound.value = data.examRound; - position.value = data.registerPosition; + // position.value = data.registerPosition; register.value = data.conclusionRegisterNo; dateRegister.value = data.conclusionRegisterDate; announce.value = data.conclusionResultNo; From 07ae0d4a5e750a4e505976c37639bce5913f9aef Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 7 Aug 2023 17:11:33 +0700 Subject: [PATCH 06/17] =?UTF-8?q?api=20=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B9=82=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/Receive/receiveMain.vue | 7 ++++++- .../05_placement/components/Receive/receiveModal.vue | 10 ++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 7adf079fe..d01dbf801 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -64,17 +64,22 @@ const resetFilter = () => { onMounted(() => { fecthlistRecevice(); }); +const listRecevice = ref([]); const fecthlistRecevice = async () => { showLoader(); await http .get(config.API.receiveData()) .then((res) => { let response = res.data.result; + listRecevice.value = response; console.log(response); rows.value = response.map((e: any) => ({ personalId: e.id, citizenId: e.citizenId, fullname: e.firstname + " " + e.lastname, + organizationName: "sssss", + orgName: "xxaxa", + organizationShortName: "ssss", positionNumber: e.positionNumber, positionPath: e.positionPath, birthday: date2Thai(e.dateOfBirth), @@ -207,7 +212,7 @@ const openModalTree = (id: string) => { personalId.value = id; console.log(personalId.value); - personal.value = []; + personal.value = listRecevice.value.filter((e) => e.id === id); modalTree.value = true; }; diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue index fab7859b7..89208163a 100644 --- a/src/modules/05_placement/components/Receive/receiveModal.vue +++ b/src/modules/05_placement/components/Receive/receiveModal.vue @@ -169,7 +169,7 @@ const saveAppoint = async () => { positionId: dataForm.positionId, positionLevelId: dataForm.positionLevelId, positionLineId: dataForm.positionLineId, - positionPathSideId: null, + positionPathSideId: dataForm.positionPathSideId, positionTypeId: dataForm.positionTypeId, // salaryAmount: dataForm.salaryAmount, // mouthSalaryAmount: dataForm.mouthSalaryAmount, @@ -377,6 +377,8 @@ const expanded = ref([]); watch(props, () => { expanded.value = []; const dataPersonal = props.personal; + console.log(props.personal); + if (dataPersonal) { dataPersonal.map((data: any) => { personal.value = data; @@ -385,15 +387,15 @@ watch(props, () => { } // console.log("draft===>", personal.value.draft); - if (personal.value && personal.value.draft === false) { + if (personal.value) { // const findData = dataRespone.value.find(findByPerson); let findData: any = null; dataRespone.value.map((x: any) => { findData = findByPerson(x); - console.log(findData); + // console.log(findData); if (findData != null) { - console.log("findData===>", findData); + // console.log("findData===>", findData); selectedPosition(findData); for (let i = 3; i <= findData.keyId.length; i += 2) { expanded.value.push(findData.keyId.slice(0, i)); From e731d12fd92aacf152af71a39da05389e2329a4f Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 7 Aug 2023 17:18:18 +0700 Subject: [PATCH 07/17] no message --- src/modules/05_placement/components/Receive/receiveMain.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index d01dbf801..8156fb8af 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -245,7 +245,7 @@ const openDelete = (id: string) => { }; const closeModalTree = async () => { - // await getTable(); + await fecthlistRecevice(); modalTree.value = false; }; From d5ee366ea25c7bbe0dd56333a9557296203a5604 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Mon, 7 Aug 2023 17:40:57 +0700 Subject: [PATCH 08/17] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20condition?= =?UTF-8?q?=20=E0=B9=81=E0=B8=AA=E0=B8=94=E0=B8=87=20action=20=E0=B8=95?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=E0=B8=87=E0=B9=86=20=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B9=80=E0=B8=81=E0=B8=A9=E0=B8=B5=E0=B8=A2=E0=B8=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ListRetirement/TableList.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 3250e6e11..0c32115ec 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -362,7 +362,7 @@ const paginationLabel = (start: number, end: number, total: number) => { :profile-id="profileId" :UpdateListId="UpdateListId" v-if=" - statusReport !== true && typeReport == 'ADD' || typeReport == '' + statusReport === false && (typeReport == 'ADD' || typeReport == '' || typeReport == null) " /> @@ -459,11 +459,11 @@ const paginationLabel = (start: number, end: number, total: number) => { @@ -535,7 +535,7 @@ const paginationLabel = (start: number, end: number, total: number) => { { Date: Mon, 7 Aug 2023 18:12:26 +0700 Subject: [PATCH 09/17] no message --- src/api/05_placement/api.placement.ts | 6 ++-- .../components/OrderPlacement/step/step04.vue | 23 ++++++++++++- .../components/ListRetirement/AddList.vue | 8 ++--- .../components/ListRetirement/TableList.vue | 34 ++++++++++++++++--- 4 files changed, 59 insertions(+), 12 deletions(-) diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 2b02d64f9..79a08679e 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -57,10 +57,12 @@ export default { yearOptionsOrder: () => `${order}/order/fiscal-year`, createOrder: () => `${order}/order/detail`, listOrder: () => `${order}/order`, - detailOrder:(orderId:string) => `${order}/order/detail/${orderId}`, - deleteOrder:(orderId:string) => `${order}/order/${orderId}`, + detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, + deleteOrder: (orderId: string) => `${order}/order/${orderId}`, typeOrder: () => `${order}/order/order-type`, examroundOrder: () => `${order}/order/detail/exam-round`, + attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`, + receiveData: () => `${receive}`, receiveDataId: (id: string) => `${receive}/${id}`, diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue index d7521a80d..e35338733 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue @@ -422,10 +422,15 @@ import { VuePDF, usePDF } from "@tato30/vue-pdf"; import type { PDFDocumentLoadingTask } from "pdfjs-dist/types/src/display/api"; import type { QForm } from "quasar"; import { useCounterMixin } from "@/stores/mixin"; +import { useRoute } from "vue-router"; +import http from "@/plugins/http"; +import config from "@/app.config"; const mixin = useCounterMixin(); const { date2Thai } = mixin; +const route = useRoute(); +const orderId_params = route.params.orderid; const dialog = ref(false); // onUnmounted(() => { @@ -433,8 +438,15 @@ const dialog = ref(false); // myEventHandler(e); // }); // }); - +const orderId = ref(""); onMounted(async () => { + console.log(orderId_params); + if (orderId_params !== undefined) { + orderId.value == orderId_params.toString(); + } + + fetchAttachment(orderId.value); + // window.addEventListener("resize", (e: any) => { // myEventHandler(e); // }); @@ -447,6 +459,15 @@ onMounted(async () => { }, 1000); }); +const fetchAttachment = async (orderId: string) => { + console.log(123); + await http + .get(config.API.attachmentOrder("08db94be-f7c6-43e2-83eb-3c5cef3a91c7")) + .then((res) => { + console.log(res); + }); +}; + // const myEventHandler = (e: any) => { // console.log("e", e.target.innerWidth); // if (vuePDFRef !== null) { diff --git a/src/modules/06_retirement/components/ListRetirement/AddList.vue b/src/modules/06_retirement/components/ListRetirement/AddList.vue index 98126b058..3091cb41e 100644 --- a/src/modules/06_retirement/components/ListRetirement/AddList.vue +++ b/src/modules/06_retirement/components/ListRetirement/AddList.vue @@ -16,6 +16,7 @@ const retireld_params = route.params.id; const props = defineProps({ retireld: String, profileId: String, + dataProfile: Object, UpdateListId: { type: Function, default: () => console.log("UpdateListId"), @@ -112,8 +113,8 @@ const rows = ref([ watch(modal, () => { if (modal.value === true) { retireld.value = props.retireld; - if (type_params === "officer") { - type.value = type_params; + if (props.dataProfile.type === "OFFICER") { + type.value = "officer"; } else type.value = "all"; fecthlistRetire(); @@ -125,8 +126,7 @@ const fecthlistRetire = async () => { await http .get(config.API.profileOrganizRoot) .then((res) => { - // console.log(res); - + console.log(res); const id = res.data.result[0].id; if (id !== "") { findlist(id); diff --git a/src/modules/06_retirement/components/ListRetirement/TableList.vue b/src/modules/06_retirement/components/ListRetirement/TableList.vue index 0c32115ec..122d388ce 100644 --- a/src/modules/06_retirement/components/ListRetirement/TableList.vue +++ b/src/modules/06_retirement/components/ListRetirement/TableList.vue @@ -169,6 +169,7 @@ onMounted(() => { const round = ref(); const typeReport = ref(""); const statusReport = ref(); +const dataProfile = ref([]); // fecthlist const fecthlistprofile = async (id: string) => { showLoader(); @@ -176,6 +177,7 @@ const fecthlistprofile = async (id: string) => { .get(config.API.listRetire(id)) .then((res) => { console.log(res); + dataProfile.value = res.data.result; round.value = res.data.result.round; statusReport.value = res.data.result.json; typeReport.value = res.data.result.typeReport; @@ -358,11 +360,13 @@ const paginationLabel = (start: number, end: number, total: number) => {
@@ -459,11 +463,21 @@ const paginationLabel = (start: number, end: number, total: number) => { @@ -535,7 +549,12 @@ const paginationLabel = (start: number, end: number, total: number) => { { Date: Mon, 7 Aug 2023 20:34:59 +0700 Subject: [PATCH 10/17] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B8=AB?= =?UTF-8?q?=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../05_placement/components/Receive/receiveMain.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 8156fb8af..816fd8e71 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -77,9 +77,16 @@ const fecthlistRecevice = async () => { personalId: e.id, citizenId: e.citizenId, fullname: e.firstname + " " + e.lastname, - organizationName: "sssss", - orgName: "xxaxa", - organizationShortName: "ssss", + organizationName: + e.organizationName + + " " + + e.organizationShortName + + " " + + e.positionNumber + + " " + + e.positionPath, + orgName: e.organizationName, + organizationShortName: e.organizationShortName, positionNumber: e.positionNumber, positionPath: e.positionPath, birthday: date2Thai(e.dateOfBirth), From 5400518678955550d0f16e857526ebe21fd768c2 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Mon, 7 Aug 2023 22:56:05 +0700 Subject: [PATCH 11/17] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=AA=E0=B8=96=E0=B8=B2=E0=B8=99=E0=B8=B0=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A5=E0=B8=B2=E0=B8=AD=E0=B8=AD=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../06_retirement/components/resign/ResignByid.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue index 34b196a57..8c191671d 100644 --- a/src/modules/06_retirement/components/resign/ResignByid.vue +++ b/src/modules/06_retirement/components/resign/ResignByid.vue @@ -45,10 +45,10 @@
-
สถานะการทดลองงาน
+
สถานะ
- - + + {{ status }}
@@ -175,7 +175,7 @@ const name = ref('นายสมคิด ยอดใจ') const position = ref('นักจัดการงานทั่วไป') const level = ref('ชำนาญการพิเศษ') const institution = ref('ฝ่ายบริหารงานทั่วไป') -const status = ref('อยู่ระหว่างการทดลองงาน') +const status = ref('อยู่ระหว่างการพิจารณา') const edit = ref(true) const location = ref('ที่ทำงาน') const filingDate = ref('21 ก.ค. 2566') From e650e992aa1da23067a6605b79ab292491772057 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Tue, 8 Aug 2023 00:22:26 +0700 Subject: [PATCH 12/17] =?UTF-8?q?step2=20=E0=B8=A2=E0=B8=B1=E0=B8=87?= =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B9=87?= =?UTF-8?q?=E0=B8=88=20,step=203=20=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B9=87?= =?UTF-8?q?=E0=B8=88=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7=20=E0=B8=AD?= =?UTF-8?q?=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.placement.ts | 46 +- .../OrderPlacement/detailOrderPlacement.vue | 11 +- .../components/OrderPlacement/step/step01.vue | 333 +++++-- .../components/OrderPlacement/step/step02.vue | 419 +++++--- .../components/OrderPlacement/step/step03.vue | 896 +++++++++--------- .../05_placement/interface/request/Order.ts | 7 + .../05_placement/interface/response/Order.ts | 43 + src/modules/05_placement/store.ts | 18 +- 8 files changed, 1127 insertions(+), 646 deletions(-) create mode 100644 src/modules/05_placement/interface/request/Order.ts create mode 100644 src/modules/05_placement/interface/response/Order.ts diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 94259b628..8231235bd 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -45,19 +45,55 @@ export default { //education placementEducationId: (id: string) => `${placement}/education/${id}`, - // position + // position placementPosition: () => `${placement}/position/use`, // putPositiom putPosition: (id: any) => `${placement}/position/${id}`, // clear Position - clearPosition: (personalId: string) => `${placement}/position/clear/${personalId}`, + clearPosition: (personalId: string) => + `${placement}/position/clear/${personalId}`, // order yearOptionsOrder: () => `${order}/order/fiscal-year`, - createOrder: () => `${order}/order/detail`, listOrder: () => `${order}/order`, - detailOrder:(orderId:string) => `${order}/order/detail/${orderId}`, - deleteOrder:(orderId:string) => `${order}/order/${orderId}`, + deleteOrder: (orderId: string) => `${order}/order/${orderId}`, typeOrder: () => `${order}/order/order-type`, + + createOrder: () => `${order}/order/detail`, + detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, examroundOrder: () => `${order}/order/detail/exam-round`, + + //ข้อมูลเลือกรายชื่อออกคำสั่ง, ลบรายชื่อ + personsOrder: (orderId: string) => `${order}/order/persons/${orderId}`, + + //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป + nextOrder: (orderId: string) => `${order}/order/next/${orderId}`, + //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป + preventOrder: (orderId: string) => `${order}/order/prev/${orderId}`, + + //สลับลำดับข้อมูลในบัญชีแนบท้ายขึ้น + swapUpOrder: (personalId: string) => `${order}/order/swap/up/${personalId}`, + //สลับลำดับข้อมูลในบัญชีแนบท้ายลง + swapDownOrder: (personalId: string) => + `${order}/order/swap/down/${personalId}`, + + //บันทึกข้อมูลเงินเดือนสำหรับผู้บรรจุ + salaryOrder: (id: string) => `${order}/order/salary/${id}`, + + // popup แสดงรายชื่อตามหน่วยงานที่เลือก , popup เลือกรายชื่อส่งสำเนา + copyOrderPersonsId: (id: string) => `${order}/order/copy-order/persons/${id}`, + + copyOrder: `${order}/order/copy-order`, + + copyOrderId: (id: string) => `${order}/order/copy-order/${id}`, + + attachmentId: (id: string) => `${order}/order/attachment/${id}`, + + attachmentOrderId: (orderId: string) => + `${order}/order/attachment/order-file/${orderId}`, + + attachmentFileId: (orderId: string) => + `${order}/order/attachment/file/${orderId}`, + + orderReady: (id: string) => `${order}/order/ready/${id}`, }; diff --git a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue index 6c17f39fd..8b68a05df 100644 --- a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue @@ -48,6 +48,7 @@ :name="4" title="รายละเอียดคำสั่งและแนบท้าย" prefix="4" + :done="step > 4" :header-nav="step > 4" /> diff --git a/src/modules/05_placement/interface/request/Order.ts b/src/modules/05_placement/interface/request/Order.ts new file mode 100644 index 000000000..d7e306c25 --- /dev/null +++ b/src/modules/05_placement/interface/request/Order.ts @@ -0,0 +1,7 @@ +interface RequestCopyOrder { + personalId: string; + emailChannel: boolean; + inboxChannel: boolean; +} + +export type { RequestCopyOrder }; diff --git a/src/modules/05_placement/interface/response/Order.ts b/src/modules/05_placement/interface/response/Order.ts new file mode 100644 index 000000000..6dc958ff1 --- /dev/null +++ b/src/modules/05_placement/interface/response/Order.ts @@ -0,0 +1,43 @@ +interface ResponseData { + education: string; + idCard: string; + name: string; + personId: string; + selectStatus: boolean; + sequence: number; +} + +interface ResponseOrganiz { + firstName: string; + idCard: string; + lastName: string; + name: string; + position: string; + prefixId: string; + profileId: string; + unit: string; +} + +interface ResponseCopyOrder { + emailChannel: boolean; + idCard: string; + inboxChannel: boolean; + name: string; + personalId: string; + position: string; + selectStatus: boolean; + sequence: number; + unit: string; +} + +interface DataCopyOrder { + personalId: string; + name: string; + idCard: string; + position: string; + unit: string; + send: string; + mutiselect: number[]; +} + +export type { ResponseData, ResponseOrganiz, ResponseCopyOrder, DataCopyOrder }; diff --git a/src/modules/05_placement/store.ts b/src/modules/05_placement/store.ts index 0fca902c5..0ebbda72f 100644 --- a/src/modules/05_placement/store.ts +++ b/src/modules/05_placement/store.ts @@ -229,8 +229,6 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { ) => { DataMainUpdateOrder.value = []; - - if (filter_1 === "" && filter_2 === "" && filterYear === 0) { DataMainUpdateOrder.value = DataMainOrigOrder.value; } else if (filter_1 !== "" && filter_2 === "" && filterYear === 0) { @@ -269,7 +267,11 @@ export const useOrderPlacementDataStore = defineStore("placementOrder", () => { item.OrderStatus === filter_2 && item.fiscalYear === filterYear ); - } else if (filter_1 == "ทั้งหมด" && filter_2 == "ทั้งหมด" && filterYear !== null) { + } else if ( + filter_1 == "ทั้งหมด" && + filter_2 == "ทั้งหมด" && + filterYear !== null + ) { DataMainUpdateOrder.value = DataMainOrigOrder.value; } }; @@ -294,8 +296,18 @@ export const useProbationDataStore = defineStore("probationDataStore", () => { "blue-9", "blue-10", ]); + const orderId = ref(""); + + const stepOrder = ref(2); + + const setOrderId = (val: string) => (orderId.value = val); + const setStepOrder = (val: number) => (stepOrder.value = val); return { ratingColors, + orderId, + stepOrder, + setOrderId, + setStepOrder, }; }); From eaec5470c46d3632ef37044b17249b032235d696 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 8 Aug 2023 09:09:44 +0700 Subject: [PATCH 13/17] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20disabled=20button=20=E0=B8=95=E0=B8=81=E0=B8=A5?= =?UTF-8?q?=E0=B8=87=20=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=81=E0=B8=B2=E0=B8=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/06_retirement/views/Main.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/modules/06_retirement/views/Main.vue b/src/modules/06_retirement/views/Main.vue index 359536720..1edcb1b45 100644 --- a/src/modules/06_retirement/views/Main.vue +++ b/src/modules/06_retirement/views/Main.vue @@ -263,7 +263,12 @@ - + From 85632ec16cdcef1f883415ea507855b65740c413 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 8 Aug 2023 09:28:24 +0700 Subject: [PATCH 14/17] =?UTF-8?q?filter=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Receive/receiveMain.vue | 37 +++++++++++++------ 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue index 816fd8e71..98c75f741 100644 --- a/src/modules/05_placement/components/Receive/receiveMain.vue +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -72,25 +72,27 @@ const fecthlistRecevice = async () => { .then((res) => { let response = res.data.result; listRecevice.value = response; - console.log(response); + // console.log(response); rows.value = response.map((e: any) => ({ personalId: e.id, citizenId: e.citizenId, fullname: e.firstname + " " + e.lastname, organizationName: - e.organizationName + - " " + - e.organizationShortName + - " " + - e.positionNumber + - " " + - e.positionPath, - orgName: e.organizationName, - organizationShortName: e.organizationShortName, + e.organizationName + + " " + + e.organizationShortName + + " " + + e.positionNumber + + " " + + e.positionPath, + orgName: e.organizationName, + organizationShortName: e.organizationShortName, positionNumber: e.positionNumber, positionPath: e.positionPath, birthday: date2Thai(e.dateOfBirth), })); + // console.log(rows.value); + rows2.value = rows.value.filter((e: any) => e.orgName !== null); }) .catch((e) => { console.log(typeof e); @@ -116,6 +118,19 @@ const rows = ref([ // birthday: dateText(new Date("1989-09-03")), // }, ]); +const rows2 = ref([ + { + personalId: "08db721d-add6-47b0-8a13-5f45d106e8d1", + citizenId: "1234444332222", + fullname: "นางสาวอย พชช", + organizationName: "นักจัดการงานทั่วไป", + orgName: "กลุ่มงานช่วยนักบริหาร", + organizationShortName: "สกจ.", + positionNumber: "กก. 1", + positionPath: "นักจัดการงานทั่วไป", + birthday: dateText(new Date("1989-09-03")), + }, +]); const columns = ref([ { name: "no", @@ -219,7 +234,7 @@ const openModalTree = (id: string) => { personalId.value = id; console.log(personalId.value); - personal.value = listRecevice.value.filter((e) => e.id === id); + personal.value = listRecevice.value.filter((e: any) => e.id === id); modalTree.value = true; }; From ddfb5a05d507c5429172a034d89c345b0865e7b2 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 8 Aug 2023 11:15:34 +0700 Subject: [PATCH 15/17] fix finally --- tsconfig.app.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tsconfig.app.json b/tsconfig.app.json index cdbea1d76..a4299392b 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -7,6 +7,7 @@ "baseUrl": ".", "paths": { "@/*": ["./src/*"] - } + }, + "lib": ["dom", "es2015", "es2018", "es2018.promise"] } } From dc2457d9ed458bd43c7da884df828acab63634e7 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 8 Aug 2023 11:25:44 +0700 Subject: [PATCH 16/17] api put/pver --- src/api/05_placement/api.placement.ts | 3 +- .../OrderPlacement/detailOrderPlacement.vue | 36 ++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 8a3f5e8ed..fd13782a1 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -60,6 +60,8 @@ export default { detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`, deleteOrder: (orderId: string) => `${order}/order/${orderId}`, typeOrder: () => `${order}/order/order-type`, + nextStep: (orderId: string) => `${order}/order/next/${orderId}`, + prevStep: (orderId: string) => `${order}/order/prev/${orderId}`, createOrder: () => `${order}/order/detail`, @@ -93,7 +95,6 @@ export default { attachmentOrderId: (orderId: string) => `${order}/order/attachment/order-file/${orderId}`, - attachmentFileId: (orderId: string) => `${order}/order/attachment/file/${orderId}`, diff --git a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue index 8b68a05df..6188a047a 100644 --- a/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/detailOrderPlacement.vue @@ -65,7 +65,12 @@ import { useRouter } from "vue-router"; import { ref, defineAsyncComponent, onMounted, onUnmounted } from "vue"; import type { QStepper } from "quasar"; import { useProbationDataStore } from "@/modules/05_placement/store"; +import { useRoute } from "vue-router"; +import http from "@/plugins/http"; +import config from "@/app.config"; +const route = useRoute(); +const orderId_params = route.params.orderid; const probationData = useProbationDataStore(); const { stepOrder, setStepOrder } = probationData; @@ -89,19 +94,38 @@ const step04 = defineAsyncComponent( const router = useRouter(); const step = ref(1); const stepper = ref(); +const orderId = ref(""); onUnmounted(() => { destroyLocalStorage(); }); - -const nextStep = () => { +const nextStep = async () => { stepper.value!.next(); localStorage.setItem("currentStep", step.value.toString()); + if (orderId.value) { + await http + .put(config.API.nextStep(orderId.value)) + .then((res) => { + console.log(res); + }) + .catch((e) => { + console.log(e); + }); + } }; - -const previousStep = () => { +const previousStep = async () => { stepper.value!.previous(); localStorage.setItem("currentStep", step.value.toString()); + if (orderId.value) { + await http + .put(config.API.prevStep(orderId.value)) + .then((res) => { + console.log(res); + }) + .catch((e) => { + console.log(e); + }); + } }; const destroyLocalStorage = () => { localStorage.clear(); @@ -111,6 +135,10 @@ onMounted(() => { if (currentStep) { step.value = Number(currentStep); } + if (orderId_params !== undefined) { + orderId.value = orderId_params.toString(); + console.log(orderId.value); + } });