From 5358cc3d0855006aa78942b0a3c41bba1321d41d Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Fri, 11 Aug 2023 15:11:36 +0700 Subject: [PATCH 01/15] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=8A=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.placement.ts | 3 + .../helpgovernment/governmentDetail.vue | 293 ++++++++ .../components/helpgovernment/mainHelp.vue | 688 ++++++++++++++++++ .../interface/response/officer.ts | 23 + src/modules/05_placement/router.ts | 23 +- 5 files changed, 1029 insertions(+), 1 deletion(-) create mode 100644 src/modules/05_placement/components/helpgovernment/governmentDetail.vue create mode 100644 src/modules/05_placement/components/helpgovernment/mainHelp.vue create mode 100644 src/modules/05_placement/interface/response/officer.ts diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index b29f33155..5123b7716 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -97,4 +97,7 @@ export default { transferUser: `${transfer}/user`, transferUserId: (id: string) => `${transfer}/user/${id}`, transferConfirmId: (id: string) => `${transfer}/confirm/${id}`, + officerMain: () => `${placement}/officer`, + officerDetail: (id:string) => `${placement}/officer/${id}`, + officerMainDelete: (id:string) => `${placement}/officer/${id}`, }; diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue new file mode 100644 index 000000000..08c864fc6 --- /dev/null +++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue @@ -0,0 +1,293 @@ + + + diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue new file mode 100644 index 000000000..a36b8a59d --- /dev/null +++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue @@ -0,0 +1,688 @@ + + + diff --git a/src/modules/05_placement/interface/response/officer.ts b/src/modules/05_placement/interface/response/officer.ts new file mode 100644 index 000000000..64d298641 --- /dev/null +++ b/src/modules/05_placement/interface/response/officer.ts @@ -0,0 +1,23 @@ +interface officerType { + no:number, + id: string, + prefix: string, + firstName: string, + lastName: string, + position: string, + posNo: string, + positionLevel: string, + createdAt: Date, + organization: string, + reason: string, + status: string, + date: Date, + salary: number, + positionTypeOld: string, + positionLevelOld: string, + positionNumberOld: string, + organizationPositionOld: string, + isActive: true +} + +export type { officerType}; \ No newline at end of file diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 12cbb254e..216bfdf50 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -42,7 +42,8 @@ const receiveMain = () => import("@/modules/05_placement/components/Receive/receiveDetail.vue"); const ReceiveAdd = () => import("@/modules/05_placement/components/Receive/FormAdd.vue"); - +const helpgovernment = () => import("@/modules/05_placement/components/helpgovernment/mainHelp.vue") +const helpgovernmentbyId = () => import("@/modules/05_placement/components/helpgovernment/governmentDetail.vue") export default [ { path: "/placement", @@ -204,4 +205,24 @@ export default [ Role: "placement", }, }, + { + path: "/help-government", + name: "help-government", + component: helpgovernment, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", + }, + }, + { + path: "/help-government/detail/:id", + name: "help-governmentbyId", + component: helpgovernmentbyId, + meta: { + Auth: true, + Key: [6.6], + Role: "placement", + }, + }, ]; From 0849b873f67ed6cc2a1f255e4d57944965130e24 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 11 Aug 2023 15:20:29 +0700 Subject: [PATCH 02/15] =?UTF-8?q?fix=20bug=20=E0=B8=AA=E0=B9=88=E0=B8=87?= =?UTF-8?q?=E0=B9=84=E0=B8=9B=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=9A?= =?UTF-8?q?=E0=B8=A3=E0=B8=A3=E0=B8=88=E0=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/components/PersonalList/Table.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue index 40c9ee9ec..147b024d7 100644 --- a/src/modules/05_placement/components/PersonalList/Table.vue +++ b/src/modules/05_placement/components/PersonalList/Table.vue @@ -256,7 +256,7 @@ const getTable = async () => { (e: any) => e.draft == "รอส่งตัว" && e.positionNumber !== null && - e.statusName == " เตรียมบรรจุ" + e.statusName == "เตรียมบรรจุ" ); console.log(rowsFilter.value); }) From a3ccc67bdd12c3ec5dab90f54c76cab3a0927933 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Fri, 11 Aug 2023 16:19:49 +0700 Subject: [PATCH 03/15] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20popup=20=E0=B9=81=E0=B8=A5=E0=B8=B0=20fix=20bug=20?= =?UTF-8?q?=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/10_order/components/Main.vue | 27 +- .../10_order/components/step/step01.vue | 328 ++++------------- .../10_order/components/step/step02.vue | 344 ++++++------------ .../10_order/components/step/step03.vue | 2 +- .../10_order/components/step/step04.vue | 59 ++- src/modules/10_order/router.ts | 20 +- 6 files changed, 242 insertions(+), 538 deletions(-) diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue index f5ed2ae12..c6b61430d 100644 --- a/src/modules/10_order/components/Main.vue +++ b/src/modules/10_order/components/Main.vue @@ -125,7 +125,7 @@ import config from "@/app.config"; const $q = useQuasar(); //ใช้ noti quasar const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai, dateText, success } = +const { showLoader, hideLoader, messageError, date2Thai, dateText, success, dialogMessage } = mixin; const DataStore = useOrderPlacementDataStore(); @@ -314,20 +314,17 @@ const redirectToPage = (id?: string, status?: string) => { }; const clickDelete = (id: string) => { - $q.dialog({ - title: "ยืนยันการลบข้อมูล", - message: "ต้องการลบข้อมูลนี้ใช่หรือไม่?", - cancel: { - flat: true, - color: "negative", - }, - persistent: true, - }) - .onOk(async () => { - await deleteData(id); - }) - .onCancel(() => { }) - .onDismiss(() => { }); + dialogMessage( + $q, + "ยืนยันการลบข้อมูล", + "ต้องการลบข้อมูลนี้ใช่หรือไม่?", + "mdi-delete", + "ตกลง", + "red", + () => deleteData(id), + undefined + ); + }; const deleteData = async (id: string) => { diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index 4f63bc851..9ba307395 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -3,24 +3,10 @@
- + @@ -29,73 +15,36 @@
- +
- +
- +
- +
- + @@ -103,24 +52,12 @@ {{ parseInt(value + 543) }} diff --git a/src/modules/10_order/components/Main.vue b/src/modules/10_order/components/Main.vue index c6b61430d..75f1ad406 100644 --- a/src/modules/10_order/components/Main.vue +++ b/src/modules/10_order/components/Main.vue @@ -125,7 +125,7 @@ import config from "@/app.config"; const $q = useQuasar(); //ใช้ noti quasar const mixin = useCounterMixin(); -const { showLoader, hideLoader, messageError, date2Thai, dateText, success, dialogMessage } = +const { showLoader, hideLoader, messageError, date2Thai, dateText, success, dialogRemove } = mixin; const DataStore = useOrderPlacementDataStore(); @@ -314,15 +314,9 @@ const redirectToPage = (id?: string, status?: string) => { }; const clickDelete = (id: string) => { - dialogMessage( + dialogRemove( $q, - "ยืนยันการลบข้อมูล", - "ต้องการลบข้อมูลนี้ใช่หรือไม่?", - "mdi-delete", - "ตกลง", - "red", () => deleteData(id), - undefined ); }; diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue index 1eef3cc73..0307b4fd6 100644 --- a/src/modules/10_order/components/step/step01.vue +++ b/src/modules/10_order/components/step/step01.vue @@ -3,24 +3,10 @@
- + @@ -29,73 +15,36 @@
- +
- +
- +
- +
- + @@ -103,24 +52,12 @@ {{ parseInt(value + 543) }} + diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue new file mode 100644 index 000000000..89208163a --- /dev/null +++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue @@ -0,0 +1,799 @@ + + + + + diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue new file mode 100644 index 000000000..7cf80c7e8 --- /dev/null +++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue @@ -0,0 +1,508 @@ + + + + + \ No newline at end of file diff --git a/src/modules/05_placement/interface/response/Relocation.ts b/src/modules/05_placement/interface/response/Relocation.ts new file mode 100644 index 000000000..4972a366f --- /dev/null +++ b/src/modules/05_placement/interface/response/Relocation.ts @@ -0,0 +1,38 @@ +interface relocationType { + no:number, + id: string, + citizenId: "0000000000005", + prefix: string, + firstname: string, + lastname: string, + dateOfBirth: Date, + gender: string, + status: string, + recruitDate: Date, + positionNumber: number, + positionPath: string, + positionPathSide: string, + positionType: string, + positionLine: string, + positionLevel: string, + posNoId: string, + positionId: string, + positionPathSideId: string, + positionTypeId: string, + positionLineId: string, + positionLevelId: string, + organizationPositionId: string, + organizationName: string, + organizationShortName: string, + isActive: boolean, + reason: string, + educationOld: string, + salary: number, + positionTypeOld: string, + positionLevelOld: string, + positionNumberOld: string, + organizationPositionOld: string, + createdAt: Date +} + +export type { relocationType}; \ No newline at end of file From 077f12a34df0196803ae0c3aeb6841d8e7b4b893 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 15 Aug 2023 17:21:26 +0700 Subject: [PATCH 12/15] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=8A=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=A3?= =?UTF-8?q?=E0=B8=B2=E0=B8=8A=E0=B8=81=E0=B8=B2=E0=B8=A3=20=20=E0=B8=AA?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=81=E0=B8=A5?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.placement.ts | 4 + .../components/Relocation/RelocationMain.vue | 16 +- .../components/Relocation/RelocationModal.vue | 2 +- .../components/Relocation/RelocationbyId.vue | 523 +++++++++--------- .../components/Repatriate/RepatriateMain.vue | 2 +- .../components/Repatriate/RepatriatebyId.vue | 3 +- .../helpgovernment/governmentDetail.vue | 2 +- .../components/helpgovernment/mainHelp.vue | 2 +- 8 files changed, 290 insertions(+), 264 deletions(-) diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 5e3012bdd..b655b8a73 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -115,6 +115,7 @@ export default { officerDetail: (id:string) => `${placement}/officer/${id}`, officerMainDelete: (id:string) => `${placement}/officer/${id}`, officerMainReport: () => `${placement}/officer/report`, + officerMainEdit: (id:string) => `${placemenHelpGov}/${id}`, // ส่งตัวกลับ placemenRepatriation, @@ -122,12 +123,15 @@ export default { repatriationDetail: (id:string) => `${placement}/repatriation/${id}`, repatriationMainDelete: (id:string) => `${placement}/repatriation/${id}`, repatriationMainReport: () => `${placement}/repatriation/report`, + repatriationMainEdit: (id:string) => `${placemenRepatriation}/${id}`, // ขอย้าย placemenRelocation, relocationMain: () => `${placement}/relocation`, relocationDetail: (id:string) => `${placement}/relocation/${id}`, relocationMainDelete: (id:string) => `${placement}/relocation/${id}`, relocationMainReport: () => `${placement}/relocation/report`, + relocationMainPut: (id:string) => `${placement}/relocation/position/${id}`, + relocationMainEdit: (id:string) => `${placemenRelocation}/${id}`, // อื่นๆ placemenOther, }; diff --git a/src/modules/05_placement/components/Relocation/RelocationMain.vue b/src/modules/05_placement/components/Relocation/RelocationMain.vue index 1f84c5212..86e3bf520 100644 --- a/src/modules/05_placement/components/Relocation/RelocationMain.vue +++ b/src/modules/05_placement/components/Relocation/RelocationMain.vue @@ -23,13 +23,7 @@ const checkSelected = computed(() => { return true; } }); -const getSelectedString = computed(() => { - return selected.value.length === 0 - ? '' - : `${selected.value.length} record${ - selected.value.length > 1 ? 's' : '' - } selected of ${rows.value.length}`; -}); + const $q = useQuasar(); const router = useRouter(); const mixin = useCounterMixin(); @@ -283,7 +277,6 @@ const openModalOrder = () => { const openModalTree = (id: string) => { personalId.value = id; console.log(personalId.value); - personal.value = rows.value.filter((e: any) => e.id === id); modalTree.value = true; }; @@ -645,7 +638,7 @@ onMounted(async () => { :columns="columns2" :rows="rows2" :filter="filterKeyword2" - row-key="personalId" + row-key="id" flat :visible-columns="visibleColumns2" selection="multiple" @@ -664,7 +657,6 @@ onMounted(async () => { { - + /> diff --git a/src/modules/05_placement/components/Relocation/RelocationModal.vue b/src/modules/05_placement/components/Relocation/RelocationModal.vue index 89208163a..2318223cf 100644 --- a/src/modules/05_placement/components/Relocation/RelocationModal.vue +++ b/src/modules/05_placement/components/Relocation/RelocationModal.vue @@ -178,7 +178,7 @@ const saveAppoint = async () => { console.log("save appoint===>", dataAppoint); showLoader(); await http - .put(config.API.receivePosition(id.value), dataAppoint) + .put(config.API.relocationMainPut(id.value), dataAppoint) .then((res) => { console.log("respone=>", res); success($q, "บันทึกสำเร็จ"); diff --git a/src/modules/05_placement/components/Relocation/RelocationbyId.vue b/src/modules/05_placement/components/Relocation/RelocationbyId.vue index 7cf80c7e8..4e1825af8 100644 --- a/src/modules/05_placement/components/Relocation/RelocationbyId.vue +++ b/src/modules/05_placement/components/Relocation/RelocationbyId.vue @@ -37,19 +37,31 @@ const institution = ref("ฝ่ายบริหารงานทั const fullname = ref(""); const id = ref(""); const prefix = ref(""); -const firstName = ref(""); -const lastName = ref(""); +const prefixId = ref(""); +const firstname = ref(""); +const citizenId = ref("") +const lastname = ref(""); const position = ref(""); const posNo = ref(""); const positionLevel = ref(""); +const educationOld = ref(""); const createdAt = ref(""); const organization = ref(""); const reason = ref(""); const status = ref(""); const date = ref(null); const salary = ref(""); +const salaryNew = ref(""); const positionTypeOld = ref(""); const positionLevelOld = ref(""); +const dateOfBirth = ref() +const genderId = ref("") +const nationality = ref("") +const race = ref("") +const religionId = ref("") +const bloodGroupId = ref("") +const relationshipId = ref("") +const telephoneNumber = ref("") const positionNumberOld = ref(""); const organizationPositionOld = ref(""); const isActive = ref(""); @@ -104,10 +116,13 @@ const getData = async () => { .get(config.API.relocationDetail(personId)) .then((res: any) => { const data = res.data.result; - fullname.value = `${data.firstname} ${data.lastname}` + citizenId.value = data.citizenId + fullname.value = `${data.prefix}${data.firstname} ${data.lastname}`; + prefixId.value = data.prefixId; prefix.value = data.prefix; - firstName.value = data.firstname; - lastName.value = data.lastname; + firstname.value = data.firstname; + lastname.value = data.lastname; + educationOld.value = data.educationOld; position.value = data.position; posNo.value = data.posNo; positionLevel.value = data.positionLevel; @@ -121,6 +136,14 @@ const getData = async () => { positionLevelOld.value = data.positionLevelOld; positionNumberOld.value = data.positionNumberOld; organizationPositionOld.value = data.organizationPositionOld; + dateOfBirth.value = data.dateOfBirth; + genderId.value = data.genderId; + nationality.value = data.nationality; + race.value = data.race; + religionId.value = data.religionId; + bloodGroupId.value = data.bloodGroupId; + relationshipId.value = data.relationshipId; + telephoneNumber.value = data.telephoneNumber; isActive.value = data.isActive; }) .catch((e) => { @@ -157,18 +180,29 @@ const conditionSave = async () => { }; const saveData = async () => { const body = { - organization: organization.value, + educationOld: educationOld.value, + prefixId:prefixId.value, + citizenId:citizenId.value, + firstname:firstname.value, + lastname:lastname.value, reason: reason.value, organizationPositionOld: organizationPositionOld.value, - date: date.value, positionTypeOld: positionTypeOld.value, positionLevelOld: positionLevelOld.value, - positionNumberOld: posNo.value, + positionNumberOld: positionNumberOld.value, amountOld: salary.value, + dateOfBirth:dateOfBirth.value , + genderId:genderId.value , + nationality:nationality.value , + race:race.value , + religionId:religionId.value , + bloodGroupId:bloodGroupId.value , + relationshipId:relationshipId.value , + telephoneNumber:telephoneNumber.value , }; showLoader(); await http - .put(config.API.transferId(personId.toString()), body) + .put(config.API.relocationMainEdit(personId.toString()), body) .then((res: any) => { // const data = res.data.result; // console.log(data); @@ -218,199 +252,219 @@ onMounted(async () => { }); +
+ + + - - \ No newline at end of file + diff --git a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue index 2deb571b2..c678620e9 100644 --- a/src/modules/05_placement/components/Repatriate/RepatriateMain.vue +++ b/src/modules/05_placement/components/Repatriate/RepatriateMain.vue @@ -534,7 +534,7 @@ onMounted(async () => { :columns="columns2" :rows="rows2" :filter="filterKeyword2" - row-key="personalId" + row-key="id" class="custom-header-table" :visible-columns="visibleColumns2" selection="multiple" diff --git a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue index 2f214ec16..0d7bf023a 100644 --- a/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue +++ b/src/modules/05_placement/components/Repatriate/RepatriatebyId.vue @@ -439,10 +439,11 @@ positionLevelOld: positionLevelOld.value, positionNumberOld: posNo.value, amountOld: salary.value, + }; showLoader(); await http - .put(config.API.transferId(personId.toString()), body) + .put(config.API.repatriationMainEdit(personId.toString()), body) .then((res: any) => { // const data = res.data.result; // console.log(data); diff --git a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue index 716269933..944de9a45 100644 --- a/src/modules/05_placement/components/helpgovernment/governmentDetail.vue +++ b/src/modules/05_placement/components/helpgovernment/governmentDetail.vue @@ -442,7 +442,7 @@ const saveData = async () => { }; showLoader(); await http - .put(config.API.transferId(personId.toString()), body) + .put(config.API.officerMainEdit(personId.toString()), body) .then((res: any) => { // const data = res.data.result; // console.log(data); diff --git a/src/modules/05_placement/components/helpgovernment/mainHelp.vue b/src/modules/05_placement/components/helpgovernment/mainHelp.vue index 26c1e5a24..0b66418ce 100644 --- a/src/modules/05_placement/components/helpgovernment/mainHelp.vue +++ b/src/modules/05_placement/components/helpgovernment/mainHelp.vue @@ -534,7 +534,7 @@ onMounted(async () => { :columns="columns2" :rows="rows2" :filter="filterKeyword2" - row-key="personalId" + row-key="id" class="custom-header-table" :visible-columns="visibleColumns2" selection="multiple" From a8036f2353c842cd90bc83f5a3873804b6731cb6 Mon Sep 17 00:00:00 2001 From: setthawutttty Date: Tue, 15 Aug 2023 17:39:32 +0700 Subject: [PATCH 13/15] status text --- .../05_placement/components/Relocation/RelocationMain.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/05_placement/components/Relocation/RelocationMain.vue b/src/modules/05_placement/components/Relocation/RelocationMain.vue index 86e3bf520..03122f023 100644 --- a/src/modules/05_placement/components/Relocation/RelocationMain.vue +++ b/src/modules/05_placement/components/Relocation/RelocationMain.vue @@ -297,6 +297,7 @@ const getData = async () => { dateOfBirth: item.dateOfBirth, gender: item.gender, status: item.status, + statusText:statusText(item.status), recruitDate: item.recruitDate, positionNumber: item.positionNumber, positionPath: item.positionPath, From f7e686fbec58a3e201c05186e649ef7ce8878887 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 15 Aug 2023 17:58:41 +0700 Subject: [PATCH 14/15] =?UTF-8?q?api=20=E0=B9=81=E0=B8=95=E0=B9=88?= =?UTF-8?q?=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89=E0=B8=87=20-=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=20,=E0=B8=AD?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/05_placement/api.placement.ts | 18 +- .../AppointMent/AppointmentModal.vue | 803 ++++++++++++++++++ .../components/AppointMent/Detail.vue | 446 ++++++++++ .../components/AppointMent/DialogHeader.vue | 29 + .../components/AppointMent/Main.vue | 734 ++++++++++++++++ .../05_placement/components/Other/Detail.vue | 135 +++ .../components/Other/DialogHeader.vue | 29 + .../05_placement/components/Other/Main.vue | 735 ++++++++++++++++ .../components/Other/OtherModal.vue | 799 +++++++++++++++++ src/modules/05_placement/router.ts | 46 + 10 files changed, 3770 insertions(+), 4 deletions(-) create mode 100644 src/modules/05_placement/components/AppointMent/AppointmentModal.vue create mode 100644 src/modules/05_placement/components/AppointMent/Detail.vue create mode 100644 src/modules/05_placement/components/AppointMent/DialogHeader.vue create mode 100644 src/modules/05_placement/components/AppointMent/Main.vue create mode 100644 src/modules/05_placement/components/Other/Detail.vue create mode 100644 src/modules/05_placement/components/Other/DialogHeader.vue create mode 100644 src/modules/05_placement/components/Other/Main.vue create mode 100644 src/modules/05_placement/components/Other/OtherModal.vue diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 655b9b247..36877c240 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -108,23 +108,33 @@ export default { // แต่งตั้ง-เลื่อน placemenAppointment, + appointmentMain: () => `${placement}/appointment`, + appointmentByid: (id: string) => `${placement}/appointment/${id}`, + appointmentDelete: (id: string) => `${placement}/appointment/${id}`, + appointmentPosition: (id: string) => `${placement}/appointment/position/${id}`, + apppointmentReport: (id: string) => `${placement}/appointment/report/${id}`, // ช่วยราชการ placemenHelpGov, officerMain: () => `${placement}/officer`, - officerDetail: (id:string) => `${placement}/officer/${id}`, - officerMainDelete: (id:string) => `${placement}/officer/${id}`, + officerDetail: (id: string) => `${placement}/officer/${id}`, + officerMainDelete: (id: string) => `${placement}/officer/${id}`, officerMainReport: () => `${placement}/officer/report`, // ส่งตัวกลับ placemenRepatriation, repatriationMain: () => `${placement}/repatriation`, - repatriationDetail: (id:string) => `${placement}/repatriation/${id}`, - repatriationMainDelete: (id:string) => `${placement}/repatriation/${id}`, + repatriationDetail: (id: string) => `${placement}/repatriation/${id}`, + repatriationMainDelete: (id: string) => `${placement}/repatriation/${id}`, repatriationMainReport: () => `${placement}/repatriation/report`, // ขอย้าย placemenRelocation, // อื่นๆ placemenOther, + otherMain: () => `${placemenOther}`, + otherPosition: (id: string) => `${placemenOther}/position/${id}`, + otherReport: (id: string) => `${placemenOther}/report/${id}`, + otherByid: (id: string) => `${placemenOther}/${id}`, + }; diff --git a/src/modules/05_placement/components/AppointMent/AppointmentModal.vue b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue new file mode 100644 index 000000000..8625c2b2a --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/AppointmentModal.vue @@ -0,0 +1,803 @@ + + + + + diff --git a/src/modules/05_placement/components/AppointMent/Detail.vue b/src/modules/05_placement/components/AppointMent/Detail.vue new file mode 100644 index 000000000..c06310ff1 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/Detail.vue @@ -0,0 +1,446 @@ + + + diff --git a/src/modules/05_placement/components/AppointMent/DialogHeader.vue b/src/modules/05_placement/components/AppointMent/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + diff --git a/src/modules/05_placement/components/AppointMent/Main.vue b/src/modules/05_placement/components/AppointMent/Main.vue new file mode 100644 index 000000000..2aa65f1e8 --- /dev/null +++ b/src/modules/05_placement/components/AppointMent/Main.vue @@ -0,0 +1,734 @@ + + + diff --git a/src/modules/05_placement/components/Other/Detail.vue b/src/modules/05_placement/components/Other/Detail.vue new file mode 100644 index 000000000..a03165d3c --- /dev/null +++ b/src/modules/05_placement/components/Other/Detail.vue @@ -0,0 +1,135 @@ + + + + + diff --git a/src/modules/05_placement/components/Other/DialogHeader.vue b/src/modules/05_placement/components/Other/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/Other/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + diff --git a/src/modules/05_placement/components/Other/Main.vue b/src/modules/05_placement/components/Other/Main.vue new file mode 100644 index 000000000..2e7b50c3c --- /dev/null +++ b/src/modules/05_placement/components/Other/Main.vue @@ -0,0 +1,735 @@ + + + diff --git a/src/modules/05_placement/components/Other/OtherModal.vue b/src/modules/05_placement/components/Other/OtherModal.vue new file mode 100644 index 000000000..b39a8d1a8 --- /dev/null +++ b/src/modules/05_placement/components/Other/OtherModal.vue @@ -0,0 +1,799 @@ + + + + + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 639e5a7b7..662b19093 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -57,6 +57,12 @@ const FormSaveResultAdd = () => import( "@/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue" ); +//แต่งตั้ง-เลื่อน +const AppointmentMain = () => import("@/modules/05_placement/components/AppointMent/Main.vue"); +const AppointmentDetail = () => import("@/modules/05_placement/components/AppointMent/Detail.vue"); +//อื่นๆ +const OtherMain = () => import("@/modules/05_placement/components/Other/Main.vue") +const OthertDetail = () => import("@/modules/05_placement/components/Other/Detail.vue"); export default [ { @@ -269,4 +275,44 @@ export default [ Role: "placement", }, }, + { + path: "appoint-promote", + name: "appoint-promote", + component: AppointmentMain, + meta: { + Auth: true, + Key: [6.8], + Role: "placement", + }, + }, + { + path: "appoint-promote/detail/:id", + name: "appoint-promote-detail", + component: AppointmentDetail, + meta: { + Auth: true, + Key: [6.8], + Role: "placement", + }, + }, + { + path: "other", + name: "other", + component: OtherMain, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, + { + path: "other/detail/:id", + name: "other-detail", + component: OthertDetail, + meta: { + Auth: true, + Key: [6.9], + Role: "placement", + }, + }, ]; From 0decf3206e447503b65be40bf2eeb76264e75f45 Mon Sep 17 00:00:00 2001 From: waruneeta Date: Tue, 15 Aug 2023 18:12:52 +0700 Subject: [PATCH 15/15] fix bug url api appointment --- src/api/05_placement/api.placement.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/05_placement/api.placement.ts b/src/api/05_placement/api.placement.ts index 5e3012bdd..cb1e3ff68 100644 --- a/src/api/05_placement/api.placement.ts +++ b/src/api/05_placement/api.placement.ts @@ -8,7 +8,7 @@ const placemenHelpGov = `${placement}/officer`; const placemenRepatriation = `${placement}/repatriation`; const placemenRelocation = `${placement}/relocation`; const placemenOther = `${env.API_URI}/retirement/other`; -const placemenAppointment = `${env.API_URI}/retirement/appointment`; +const placemenAppointment = `${placement}/appointment`; export default { MainDetail: (year: number) => `${placement}/exam/${year}`,