From 8e7a74fe8574c1955c2df94a5ee0e2c2994af588 Mon Sep 17 00:00:00 2001 From: AnandaTon <125332905+anandaAiemvong@users.noreply.github.com> Date: Mon, 17 Jul 2023 09:35:49 +0700 Subject: [PATCH 1/2] =?UTF-8?q?Ui=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=80=E0=B8=AA=E0=B8=99=E0=B8=AD=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=9E=E0=B8=A3=E0=B8=B0=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97?= =?UTF-8?q?=E0=B8=B2=E0=B8=99=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88?= =?UTF-8?q?=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=AD=E0=B8=B4?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B8=B4=E0=B8=A2=E0=B8=B2=E0=B8=A0=E0=B8=A3?= =?UTF-8?q?=E0=B8=93=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/1_Proposals/addProposals.vue | 0 .../views/1_Proposals/listProposals.vue | 364 ++++++++++++++++++ 2 files changed, 364 insertions(+) create mode 100644 src/modules/07_insignia/views/1_Proposals/addProposals.vue create mode 100644 src/modules/07_insignia/views/1_Proposals/listProposals.vue diff --git a/src/modules/07_insignia/views/1_Proposals/addProposals.vue b/src/modules/07_insignia/views/1_Proposals/addProposals.vue new file mode 100644 index 000000000..e69de29bb diff --git a/src/modules/07_insignia/views/1_Proposals/listProposals.vue b/src/modules/07_insignia/views/1_Proposals/listProposals.vue new file mode 100644 index 000000000..da8a7ef99 --- /dev/null +++ b/src/modules/07_insignia/views/1_Proposals/listProposals.vue @@ -0,0 +1,364 @@ + + + รายการรอบการเสนอขอพระราชทานเครื่องราชอิสริยาภรณ์ + + + + + + + เพิ่มรายการรอบการเสนอขอ + + + + + + + + + + + + + + + + + + + {{ col.label }} + + + + + + + + + {{ props.row.round }} + + + {{ props.row.year }} + + + {{ props.row.startDate }} + + + {{ props.row.endDate }} + + + + + + + + ดาวน์โหลดเอกสารประกอบ + + + + + ลบข้อมูล + + + + + + + + + + + + + + + + From 85b31c2bd67c6c41192408c3c41c15073f0412c6 Mon Sep 17 00:00:00 2001 From: Thanit Konmek Date: Mon, 17 Jul 2023 14:18:31 +0700 Subject: [PATCH 2/2] =?UTF-8?q?ui=20=E0=B8=AB=E0=B8=99=E0=B9=89=E0=B8=B2?= =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=A3=E0=B8=B2=E0=B8=8A=20,=20=20ui=20=E0=B9=80=E0=B8=AB?= =?UTF-8?q?=E0=B8=A3=E0=B8=B5=E0=B8=A2=E0=B8=8D=E0=B8=88=E0=B8=B1=E0=B8=81?= =?UTF-8?q?=E0=B8=A3=E0=B8=9E=E0=B8=A3=E0=B8=A3=E0=B8=94=E0=B8=B4=E0=B8=A1?= =?UTF-8?q?=E0=B8=B2=E0=B8=A5=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table.vue | 88 +++ src/main.ts | 5 + .../components/OrderPlacement/step/step02.vue | 111 +--- .../components/OrderPlacement/step/step03.vue | 76 +-- src/modules/07_insignia/components/Coin.vue | 516 ++++++++++++++++++ .../07_insignia/components/ResultInsignia.vue | 502 +++++++++++++++++ src/modules/07_insignia/router.ts | 23 + 7 files changed, 1145 insertions(+), 176 deletions(-) create mode 100644 src/components/Table.vue create mode 100644 src/modules/07_insignia/components/Coin.vue create mode 100644 src/modules/07_insignia/components/ResultInsignia.vue diff --git a/src/components/Table.vue b/src/components/Table.vue new file mode 100644 index 000000000..cc4dc9d08 --- /dev/null +++ b/src/components/Table.vue @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + diff --git a/src/main.ts b/src/main.ts index a969335bd..2926f9112 100644 --- a/src/main.ts +++ b/src/main.ts @@ -70,6 +70,11 @@ app.component( defineAsyncComponent(() => import("@/components/Selector.vue")) ); +app.component( + "d-table", + defineAsyncComponent(() => import("@/components/Table.vue")) +); + app.config.globalProperties.$http = http; app.mount("#app"); diff --git a/src/modules/05_placement/components/OrderPlacement/step/step02.vue b/src/modules/05_placement/components/OrderPlacement/step/step02.vue index c3199cf47..b25dd46c4 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step02.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step02.vue @@ -46,9 +46,7 @@ /> - - {{ props.rowIndex + 1 }} - + {{ props.value }} - - - - + @@ -230,7 +167,7 @@ const columns = ref([ }, ]); -const rows = [ +const rows = ref([ { no: "0ac56905-1a74-4606-a120-233340adde95", name: "นางนัทธ์ เหล่าสกุล", @@ -297,7 +234,7 @@ const rows = [ idcard: "6598455632145", educate: "ปริญญาตรี", }, -]; +]); const selected = ref([]); const pagination = ref({ sortBy: "desc", @@ -332,13 +269,6 @@ const selectData = (row: any) => {}; const refresh = () => {}; -const paginationLabel = (start: number, end: number, total: number) => { - // if (props.paging == true) - // return " " + start + " ใน " + end + " จากจำนวน " + total + " รายการ"; - // else - return start + "-" + end + " ใน " + total; -}; - const resetFilter = () => { // reset ค่าที่ค้นหาเมื่อกดปุ่ม X ในกล่องค้นหา filter.value = ""; @@ -352,33 +282,4 @@ const getClass = (val: boolean) => { }; }; - + diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index 3e4e299a4..8d58d929e 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -46,18 +46,12 @@ /> - @@ -127,19 +121,7 @@ - - - - + @@ -246,10 +228,7 @@ /> - - - - - + @@ -717,34 +681,4 @@ const onSelected = async (id: string) => { const deleteData = async (id: string) => {}; - + diff --git a/src/modules/07_insignia/components/Coin.vue b/src/modules/07_insignia/components/Coin.vue new file mode 100644 index 000000000..ca851d7bd --- /dev/null +++ b/src/modules/07_insignia/components/Coin.vue @@ -0,0 +1,516 @@ + + + + ประวัติการยื่นขอพระราชทานเหรียญจักรพรรดิมาลา + + + + + + + + + + + + filterSelector(inputValue, doneFn,'capYearsOption' + ) " + /> + + + + + + + + + + + + + + + + + + {{ props.rowIndex + 1 }} + + + + {{ props.value }} + + + + + + + + + + + diff --git a/src/modules/07_insignia/components/ResultInsignia.vue b/src/modules/07_insignia/components/ResultInsignia.vue new file mode 100644 index 000000000..5cae3b3c6 --- /dev/null +++ b/src/modules/07_insignia/components/ResultInsignia.vue @@ -0,0 +1,502 @@ + + + + บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์ + + + + + + + + + + รอบ + + + + + + + + + {{ year + 543 }} + + + {{ parseInt(value + 543) }} + + + + + + + + + + + + + + + {{ year + 543 }} + + + {{ parseInt(value + 543) }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + filterSelector(inputValue, doneFn,'selectTypeOption' + ) " + /> + filterSelector(inputValue, doneFn,'selectStatusOption' + ) " + /> + + + + + + + + + + + + + + + + + + {{ props.rowIndex + 1 }} + + + + {{ props.value }} + + + + + + + + + + + diff --git a/src/modules/07_insignia/router.ts b/src/modules/07_insignia/router.ts index 20a41a5c3..51f4b44db 100644 --- a/src/modules/07_insignia/router.ts +++ b/src/modules/07_insignia/router.ts @@ -3,6 +3,9 @@ */ const Main = () => import("@/modules/07_insignia/views/Main.vue"); +const ResultInsignia = () => + import("@/modules/07_insignia/components/ResultInsignia.vue"); +const Coin = () => import("@/modules/07_insignia/components/Coin.vue"); export default [ { @@ -15,4 +18,24 @@ export default [ Role: "insignia", }, }, + { + path: "/insignia/result-insignia", + name: "result-insignia", + component: ResultInsignia, + meta: { + Auth: true, + Key: [7], + Role: "insignia", + }, + }, + { + path: "/insignia/coin", + name: "coin", + component: Coin, + meta: { + Auth: true, + Key: [7], + Role: "insignia", + }, + }, ];