From 3e76c45de0bd75c8846d132bb327efe31d04adac Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Tue, 25 Jul 2023 18:13:17 +0700 Subject: [PATCH 1/8] =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88=E0=B8=A7?= =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7//pop=20up=20=20=E0=B9=80?= =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=A5=E0=B8=B9=E0=B8=81?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1=E0=B9=88?= =?UTF-8?q?=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7=E0=B9=84=E0=B8=9B?= =?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 --- .../08_registryEmployee/views/Detail.vue | 4 +- .../08_registryEmployee/views/Main.vue | 498 +++++++++++++++++- src/modules/08_registryEmployee/views/top.vue | 136 +++++ 3 files changed, 630 insertions(+), 8 deletions(-) create mode 100644 src/modules/08_registryEmployee/views/top.vue diff --git a/src/modules/08_registryEmployee/views/Detail.vue b/src/modules/08_registryEmployee/views/Detail.vue index 4819f4d54..ab1cc1b79 100644 --- a/src/modules/08_registryEmployee/views/Detail.vue +++ b/src/modules/08_registryEmployee/views/Detail.vue @@ -429,8 +429,8 @@ + > + บันทึก diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index 8235acbe0..1faa17ad9 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -7,6 +7,13 @@ เพิ่มข้อมูล +
@@ -57,7 +64,7 @@ :columns="columns" :visible-columns="visibleColumnsEmployeeTemp" :filter="filter" - row-key="name" + row-key="id" class="custom-header-table" :pagination-label="paginationLabel" v-model:pagination="pagination" @@ -71,7 +78,11 @@ + From fde551b674038a02e623ff61e05008100d866aa9 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Thu, 27 Jul 2023 09:24:08 +0700 Subject: [PATCH 2/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=9B=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../08_registryEmployee/views/information.vue | 98 +++++++++++-------- 1 file changed, 56 insertions(+), 42 deletions(-) diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue index 6c0367fb4..ab210617d 100644 --- a/src/modules/08_registryEmployee/views/information.vue +++ b/src/modules/08_registryEmployee/views/information.vue @@ -11,6 +11,7 @@ :historyClick="clickHistory" :addEmployee="statusAdd()" /> +
@@ -342,33 +343,46 @@
+ + + + +
+ + +
+ - - - + diff --git a/src/modules/08_registryEmployee/views/Discipline.vue b/src/modules/08_registryEmployee/views/Discipline.vue new file mode 100644 index 000000000..ae43a8383 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Discipline.vue @@ -0,0 +1,943 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Document.vue b/src/modules/08_registryEmployee/views/Document.vue new file mode 100644 index 000000000..4b6bfe21b --- /dev/null +++ b/src/modules/08_registryEmployee/views/Document.vue @@ -0,0 +1,272 @@ + + diff --git a/src/modules/08_registryEmployee/views/EditDetail.vue b/src/modules/08_registryEmployee/views/EditDetail.vue new file mode 100644 index 000000000..401ae0b9f --- /dev/null +++ b/src/modules/08_registryEmployee/views/EditDetail.vue @@ -0,0 +1,997 @@ + + + diff --git a/src/modules/08_registryEmployee/views/Education.vue b/src/modules/08_registryEmployee/views/Education.vue new file mode 100644 index 000000000..e3c38afce --- /dev/null +++ b/src/modules/08_registryEmployee/views/Education.vue @@ -0,0 +1,1567 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Information/Address.vue b/src/modules/08_registryEmployee/views/Information/Address.vue new file mode 100644 index 000000000..8b8ffbf67 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/Address.vue @@ -0,0 +1,877 @@ + + diff --git a/src/modules/08_registryEmployee/views/Information/Certicate.vue b/src/modules/08_registryEmployee/views/Information/Certicate.vue new file mode 100644 index 000000000..d08e8c3b2 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/Certicate.vue @@ -0,0 +1,830 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Information/Family.vue b/src/modules/08_registryEmployee/views/Information/Family.vue new file mode 100644 index 000000000..8b9eaf90c --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/Family.vue @@ -0,0 +1,1514 @@ + + diff --git a/src/modules/08_registryEmployee/views/Information/Government.vue b/src/modules/08_registryEmployee/views/Information/Government.vue new file mode 100644 index 000000000..35d6fca2a --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/Government.vue @@ -0,0 +1,763 @@ + + diff --git a/src/modules/08_registryEmployee/views/Information/Information.vue b/src/modules/08_registryEmployee/views/Information/Information.vue new file mode 100644 index 000000000..ec7a1440b --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/Information.vue @@ -0,0 +1,1132 @@ + + diff --git a/src/modules/08_registryEmployee/views/Information/OldName.vue b/src/modules/08_registryEmployee/views/Information/OldName.vue new file mode 100644 index 000000000..6c6cefadc --- /dev/null +++ b/src/modules/08_registryEmployee/views/Information/OldName.vue @@ -0,0 +1,973 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Leave.vue b/src/modules/08_registryEmployee/views/Leave.vue new file mode 100644 index 000000000..1c3ecf5fe --- /dev/null +++ b/src/modules/08_registryEmployee/views/Leave.vue @@ -0,0 +1,1270 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Other.vue b/src/modules/08_registryEmployee/views/Other.vue new file mode 100644 index 000000000..715ce6256 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Other.vue @@ -0,0 +1,620 @@ + + + diff --git a/src/modules/08_registryEmployee/views/Record.vue b/src/modules/08_registryEmployee/views/Record.vue new file mode 100644 index 000000000..37ad44982 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Record.vue @@ -0,0 +1,825 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Salary.vue b/src/modules/08_registryEmployee/views/Salary.vue new file mode 100644 index 000000000..1f2a9c562 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Salary.vue @@ -0,0 +1,2070 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/SalaryEmployee.vue b/src/modules/08_registryEmployee/views/SalaryEmployee.vue new file mode 100644 index 000000000..b38af4d3d --- /dev/null +++ b/src/modules/08_registryEmployee/views/SalaryEmployee.vue @@ -0,0 +1,2009 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Talent.vue b/src/modules/08_registryEmployee/views/Talent.vue new file mode 100644 index 000000000..c964bd194 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Talent.vue @@ -0,0 +1,684 @@ + + + diff --git a/src/modules/08_registryEmployee/views/Train.vue b/src/modules/08_registryEmployee/views/Train.vue new file mode 100644 index 000000000..284272588 --- /dev/null +++ b/src/modules/08_registryEmployee/views/Train.vue @@ -0,0 +1,1130 @@ + + + + diff --git a/src/modules/08_registryEmployee/views/Work.vue b/src/modules/08_registryEmployee/views/Work.vue new file mode 100644 index 000000000..14f78c39b --- /dev/null +++ b/src/modules/08_registryEmployee/views/Work.vue @@ -0,0 +1,908 @@ + + + + From 132aa6db0d3e43a30b441beb58e0d7ac7167087f Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Thu, 27 Jul 2023 16:38:52 +0700 Subject: [PATCH 6/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=E0=B8=9B=E0=B8=B8=E0=B9=88=E0=B8=A1=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=20=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=A5=E0=B8=B9?= =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/08_registryEmployee/views/information.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/modules/08_registryEmployee/views/information.vue b/src/modules/08_registryEmployee/views/information.vue index 2dd575d24..ade1f0cfd 100644 --- a/src/modules/08_registryEmployee/views/information.vue +++ b/src/modules/08_registryEmployee/views/information.vue @@ -380,7 +380,7 @@ class="q-px-md items-center" color="light-blue-10" label="บันทึก" - @click="saveData, router.go(-1)" + @click="saveData" />
@@ -406,7 +406,7 @@ import HeaderTop from "@/modules/08_registryEmployee/views/top.vue"; import HistoryTable from "@/components/TableHistory.vue"; import http from "@/plugins/http"; import config from "@/app.config"; -import { useRoute } from "vue-router"; +import { useRoute, useRouter } from "vue-router"; import { useProfileDataStore } from "@/modules/08_registryEmployee/store"; import type { QTableColumn, QForm } from "quasar"; @@ -426,6 +426,7 @@ const props = defineProps({ }); const emit = defineEmits(["update:statusEdit"]); +const router = useRouter(); const route = useRoute(); const $q = useQuasar(); const mixin = useCounterMixin(); @@ -1093,11 +1094,16 @@ const saveData = async () => { await myform.value.validate().then(async (saveDataTest: Boolean) => { if (saveDataTest) { await addData(); + await clickBack(); } }); } }; +const clickBack = () => { + router.push({ name: "registryEmployee" }); +}; + const getClass = (val: boolean) => { return { "full-width inputgreen cursor-pointer": val, From aa786793ac53b5b99b9c0b73c247d35c2a6dd9ff Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Thu, 27 Jul 2023 18:26:28 +0700 Subject: [PATCH 7/8] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20route=20registryEmployeeEdit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/08_registryEmployee/router.ts | 2 +- src/modules/08_registryEmployee/views/Main.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/08_registryEmployee/router.ts b/src/modules/08_registryEmployee/router.ts index ce8e0d3c2..67a4cc826 100644 --- a/src/modules/08_registryEmployee/router.ts +++ b/src/modules/08_registryEmployee/router.ts @@ -47,7 +47,7 @@ export default [ }, }, { - path: "/registryEmployee/Edit/:Id", + path: "/registryEmployee/edit/:Id", name: "registryEmployeeEdit", component: EditDetail, meta: { diff --git a/src/modules/08_registryEmployee/views/Main.vue b/src/modules/08_registryEmployee/views/Main.vue index c89d46bee..edd6bba6f 100644 --- a/src/modules/08_registryEmployee/views/Main.vue +++ b/src/modules/08_registryEmployee/views/Main.vue @@ -1355,7 +1355,7 @@ const clickAdd = () => { // ดูรายการแก้ไขรายชื่อ const redirectToPage = (profileId?: string) => { - router.push(`/registryEmployee/Edit/${profileId}`); + router.push(`/registryEmployee/edit/${profileId}`); }; const editDetail = async (row: any) => { await getPosition(row.id); From e64b68c017c6a9e20c30110b3fe69523f1edf855 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Fri, 28 Jul 2023 08:34:52 +0700 Subject: [PATCH 8/8] =?UTF-8?q?Mock=20up=20=E0=B8=A3=E0=B8=B2=E0=B8=A2?= =?UTF-8?q?=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Receive/DialogFooter.vue | 69 ++ .../components/Receive/DialogHeader.vue | 29 + .../components/Receive/receiveMain.vue | 563 +++++++++++++ .../components/Receive/receiveModal.vue | 794 ++++++++++++++++++ src/modules/05_placement/router.ts | 14 + 5 files changed, 1469 insertions(+) create mode 100644 src/modules/05_placement/components/Receive/DialogFooter.vue create mode 100644 src/modules/05_placement/components/Receive/DialogHeader.vue create mode 100644 src/modules/05_placement/components/Receive/receiveMain.vue create mode 100644 src/modules/05_placement/components/Receive/receiveModal.vue diff --git a/src/modules/05_placement/components/Receive/DialogFooter.vue b/src/modules/05_placement/components/Receive/DialogFooter.vue new file mode 100644 index 000000000..d2358bb75 --- /dev/null +++ b/src/modules/05_placement/components/Receive/DialogFooter.vue @@ -0,0 +1,69 @@ + + diff --git a/src/modules/05_placement/components/Receive/DialogHeader.vue b/src/modules/05_placement/components/Receive/DialogHeader.vue new file mode 100644 index 000000000..a20e917b0 --- /dev/null +++ b/src/modules/05_placement/components/Receive/DialogHeader.vue @@ -0,0 +1,29 @@ + + + + diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue new file mode 100644 index 000000000..9dd3924d4 --- /dev/null +++ b/src/modules/05_placement/components/Receive/receiveMain.vue @@ -0,0 +1,563 @@ + + + diff --git a/src/modules/05_placement/components/Receive/receiveModal.vue b/src/modules/05_placement/components/Receive/receiveModal.vue new file mode 100644 index 000000000..4f9f42fcb --- /dev/null +++ b/src/modules/05_placement/components/Receive/receiveModal.vue @@ -0,0 +1,794 @@ + + + + + diff --git a/src/modules/05_placement/router.ts b/src/modules/05_placement/router.ts index 90d23090b..93d3af33f 100644 --- a/src/modules/05_placement/router.ts +++ b/src/modules/05_placement/router.ts @@ -46,6 +46,10 @@ const RepatriationOrder = () => const RepatriationOrderAdd = () => import("@/modules/05_placement/components/RepatriationOrder/AddOrder.vue"); +//รับโอน +const receiveMain = () => + import("@/modules/05_placement/components/Receive/receiveMain.vue"); + export default [ { path: "/placement", @@ -207,4 +211,14 @@ export default [ Role: "placement", }, }, + { + path: "/receive", + name: "receive", + component: receiveMain, + meta: { + Auth: true, + Key: [6.3], + Role: "placement", + }, + }, ];