From 430f6a1074448092a9d442f9ac974c7a1ee55c06 Mon Sep 17 00:00:00 2001 From: Tanyalak Date: Tue, 17 Oct 2023 10:22:35 +0700 Subject: [PATCH 1/3] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20ui?= =?UTF-8?q?=20=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A=20>=20=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B9=80=E0=B8=AA=E0=B8=99=E0=B8=AD=E0=B8=82?= =?UTF-8?q?=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/3_result/fileUpload.vue | 16 +- .../07_insignia/components/5_Borrow/Main.vue | 1 - src/modules/07_insignia/views/ResultPage.vue | 353 +++++++++--------- 3 files changed, 180 insertions(+), 190 deletions(-) diff --git a/src/modules/07_insignia/components/3_result/fileUpload.vue b/src/modules/07_insignia/components/3_result/fileUpload.vue index 14cfb4e48..eb7307d4f 100644 --- a/src/modules/07_insignia/components/3_result/fileUpload.vue +++ b/src/modules/07_insignia/components/3_result/fileUpload.vue @@ -152,7 +152,7 @@ const pagination = ref({
- +
@@ -167,20 +167,12 @@ const pagination = ref({
-
- + +
- -
- -
-
- - -
-
diff --git a/src/modules/07_insignia/components/5_Borrow/Main.vue b/src/modules/07_insignia/components/5_Borrow/Main.vue index f0930fed2..e3ce435a5 100644 --- a/src/modules/07_insignia/components/5_Borrow/Main.vue +++ b/src/modules/07_insignia/components/5_Borrow/Main.vue @@ -537,7 +537,6 @@ const clearInsigniaFilters = (name: string) => { -
เพิ่ม diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue index 79d622382..4f1f561f3 100644 --- a/src/modules/07_insignia/views/ResultPage.vue +++ b/src/modules/07_insignia/views/ResultPage.vue @@ -544,71 +544,72 @@ const clearInsigniaFilters = (name: string) => { class="q-pa-none" >
-
-
- - - อัพโหลดไฟล์บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์ +
+
+ - -
-
- - อัพโหลดไฟล์บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์ + + + อัพโหลดไฟล์บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์ + +
+ + อัพโหลดไฟล์บันทึกผลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์ + +
+
+
+ - + + อัพโหลดไฟล์บันทึกผลการจ่ายใบกำกับ + +
+ + อัพโหลดไฟล์บันทึกผลการจ่ายใบกำกับ + +
+
-
- - - อัพโหลดไฟล์บันทึกผลการจ่ายใบกำกับ - -
-
- - อัพโหลดไฟล์บันทึกผลการจ่ายใบกำกับ - -
-
-
+ +
{ option-value="id" :readonly="false" :borderless="false" - style="min-width: 150px" + style="width: 280px" @update:model-value="selectorInsignia" @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'insigniaTypeFilter' @@ -645,122 +646,8 @@ const clearInsigniaFilters = (name: string) => { - - - - - -
- - - - -
- -
- - เพิ่ม - -
- + -
{ class="gt-xs q-ml-sm" />
+ +
+
+ + + + + + + + +
+ + เพิ่ม + +
Date: Tue, 17 Oct 2023 11:34:59 +0700 Subject: [PATCH 2/3] =?UTF-8?q?UI=20=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=AA?= =?UTF-8?q?=E0=B8=A7=E0=B8=99=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=9C?= =?UTF-8?q?=E0=B8=B4=E0=B8=94=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=A7=E0=B8=B4?= =?UTF-8?q?=E0=B8=99=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3_InvestigateDisciplinary/Dialogbody.vue | 268 +++++++ .../3_InvestigateDisciplinary/MainPage.vue | 258 ++++++- .../3_InvestigateDisciplinary/Table.vue | 196 +++++ .../addInvestigate.vue | 694 ++++++++++++++++++ .../3_InvestigateDisciplinary/director.vue | 166 +++++ src/modules/11_discipline/router.ts | 215 +++--- .../stroes/InvestigateDisStore.ts | 69 ++ 7 files changed, 1769 insertions(+), 97 deletions(-) create mode 100644 src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue create mode 100644 src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue create mode 100644 src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue create mode 100644 src/modules/11_discipline/components/3_InvestigateDisciplinary/director.vue create mode 100644 src/modules/11_discipline/stroes/InvestigateDisStore.ts diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue new file mode 100644 index 000000000..20b02789c --- /dev/null +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue @@ -0,0 +1,268 @@ + + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue index 86b199249..dbf4d12c3 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue @@ -1,9 +1,259 @@ - + - \ No newline at end of file + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue new file mode 100644 index 000000000..aad0bff30 --- /dev/null +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue @@ -0,0 +1,196 @@ + + + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue new file mode 100644 index 000000000..a3e7845cd --- /dev/null +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue @@ -0,0 +1,694 @@ + + diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/director.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/director.vue new file mode 100644 index 000000000..f12a5d8fb --- /dev/null +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/director.vue @@ -0,0 +1,166 @@ + + + diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts index 419f59ccb..9cf3c64c3 100644 --- a/src/modules/11_discipline/router.ts +++ b/src/modules/11_discipline/router.ts @@ -1,104 +1,133 @@ +const complaintMain = () => + import("@/modules/11_discipline/components/1_Complaint/MainPage.vue"); +const factsMain = () => + import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue"); +const investigatefactsAdd = () => + import( + "@/modules/11_discipline/components/2_InvestigateFacts/investigatefactsAdd.vue" + ); +const disciplinaryMain = () => + import( + "@/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue" + ); +const oredrMain = () => + import("@/modules/11_discipline/components/4_Order/MainPage.vue"); +const report = () => + import("@/modules/11_discipline/components/5_Report/MainPage.vue"); +const directorMain = () => + import( + "@/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue" + ); +const channelMain = () => + import( + "@/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue" + ); +const complaintAdd = () => + import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue"); -const complaintMain = () => import("@/modules/11_discipline/components/1_Complaint/MainPage.vue") -const factsMain = () => import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue") -const investigatefactsAdd = () => import("@/modules/11_discipline/components/2_InvestigateFacts/investigatefactsAdd.vue") -const disciplinaryMain = () => import("@/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue") -const oredrMain = () => import("@/modules/11_discipline/components/4_Order/MainPage.vue") -const report = () => import("@/modules/11_discipline/components/5_Report/MainPage.vue") -const directorMain = () => import("@/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue") -const channelMain = () => import("@/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue") -const complaintAdd = () => import("@/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue") - - +const InvestigateDisciplinaryAdd = () => + import( + "@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue" + ); export default [ - { - path: "/discipline/complaints", - name: "/discipline-complaints", - component: complaintMain, - meta: { - Auth: true, - Key: [11.1], - Role: "coin", - }, + { + path: "/discipline/complaints", + name: "/discipline-complaints", + component: complaintMain, + meta: { + Auth: true, + Key: [11.1], + Role: "coin", }, - { - path: "/discipline/complaints/add", - name: "/discipline-complaints-add", - component: complaintAdd, - meta: { - Auth: true, - Key: [11.1], - Role: "coin", - }, + }, + { + path: "/discipline/complaints/add", + name: "/discipline-complaints-add", + component: complaintAdd, + meta: { + Auth: true, + Key: [11.1], + Role: "coin", }, - { - path: "/discipline/investigatefacts", - name: "/discipline-investigatefacts", - component: factsMain, - meta: { - Auth: true, - Key: [11.2], - Role: "coin", - }, + }, + { + path: "/discipline/investigatefacts", + name: "/discipline-investigatefacts", + component: factsMain, + meta: { + Auth: true, + Key: [11.2], + Role: "coin", }, - { - path: "/discipline/disciplinary", - name: "/discipline-disciplinary", - component: disciplinaryMain, - meta: { - Auth: true, - Key: [11.3], - Role: "coin", - }, + }, + { + path: "/discipline/disciplinary", + name: "/discipline-disciplinary", + component: disciplinaryMain, + meta: { + Auth: true, + Key: [11.3], + Role: "coin", }, - { - path: "/discipline/order", - name: "/discipline-order", - component: oredrMain, - meta: { - Auth: true, - Key: [11.4], - Role: "coin", - }, + }, + { + path: "/discipline/order", + name: "/discipline-order", + component: oredrMain, + meta: { + Auth: true, + Key: [11.4], + Role: "coin", }, - { - path: "/discipline/report", - name: "/discipline-report", - component: report, - meta: { - Auth: true, - Key: [11.5], - Role: "coin", - }, + }, + { + path: "/discipline/report", + name: "/discipline-report", + component: report, + meta: { + Auth: true, + Key: [11.5], + Role: "coin", }, - { - path: "/discipline/director", - name: "/discipline-director", - component: directorMain, - meta: { - Auth: true, - Key: [11.6], - Role: "coin", - }, + }, + { + path: "/discipline/director", + name: "/discipline-director", + component: directorMain, + meta: { + Auth: true, + Key: [11.6], + Role: "coin", }, - { - path: "/discipline/channel", - name: "/discipline-channel", - component: channelMain, - meta: { - Auth: true, - Key: [11.6], - Role: "coin", - }, + }, + { + path: "/discipline/channel", + name: "/discipline-channel", + component: channelMain, + meta: { + Auth: true, + Key: [11.6], + Role: "coin", }, - { - path: "/discipline/investigatefacts/add", - name: "/discipline-investigatefactsAdd", - component: investigatefactsAdd, - meta: { - Auth: true, - Key: [11.2], - Role: "coin", - }, + }, + { + path: "/discipline/investigatefacts/add", + name: "/discipline-investigatefactsAdd", + component: investigatefactsAdd, + meta: { + Auth: true, + Key: [11.2], + Role: "coin", }, -] \ No newline at end of file + }, + { + path: "/discipline/InvestigateDisciplinary/add", + name: "/discipline-InvestigateDisciplinaryAdd", + component: InvestigateDisciplinaryAdd, + meta: { + Auth: true, + Key: [11.3], + Role: "coin", + }, + }, +]; diff --git a/src/modules/11_discipline/stroes/InvestigateDisStore.ts b/src/modules/11_discipline/stroes/InvestigateDisStore.ts new file mode 100644 index 000000000..f9396f80c --- /dev/null +++ b/src/modules/11_discipline/stroes/InvestigateDisStore.ts @@ -0,0 +1,69 @@ +import { defineStore } from "pinia"; +import { ref } from "vue"; + +export const useInvestigateDisStore = defineStore("InvestigateDis", () => { + const rows = ref([]); + + async function fecthList(data: any) { + let datalist = data.map((e: any) => ({ + subject: e.subject, + interrogated: e.interrogated, + fault: convertFault(e.fault), + penaltyLevel: convertPenaltyLevel(e.penaltyLevel), + caseFault: e.caseFault, + dateInvestigate: e.dateInvestigate, + status: convertSatatus(e.status), + active: activeStatus(e.active), + })); + rows.value = datalist; + console.log(rows.value); + } + function convertFault(val: string) { + switch (val) { + case "0": + return "ความผิดวินัยยังไม่ระบุ"; + case "1": + return "ความผิดวินัยไม่ร้ายแรง"; + case "2": + return "ความผิดวินัยร้ายแรง"; + } + } + function convertSatatus(val: string) { + switch (val) { + case "0": + return "เสร็จสิ้นแล้ว"; + case "1": + return "ยุติเรื่อง"; + } + } + function activeStatus(val: string) { + switch (val) { + case "0": + return "ยังไม่ได้ยืนยันผล"; + case "1": + return "ยืนยันผลเเล้ว"; + } + } + function convertPenaltyLevel(val: string) { + switch (val) { + case "0": + return "ไม่ร้ายแรง"; + case "1": + return "ภาคทัณฑ์"; + case "3": + return "ตัดเงินเดือน"; + case "4": + return "ลดขั้นเงินเดือน"; + case "5": + return "ร้ายแรง"; + case "6": + return "ปลดออก"; + case "7": + return "ไล่ออก"; + } + } + return { + fecthList, + rows, + }; +}); From 4f79748e14625f5526eb2ad0c2a74cd4751f8d0e Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Tue, 17 Oct 2023 11:39:18 +0700 Subject: [PATCH 3/3] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88?= =?UTF-8?q?=E0=B8=A1=20pagination=20=E0=B9=83=E0=B8=99=20table=20UI=20?= =?UTF-8?q?=E0=B8=AA=E0=B8=AD=E0=B8=9A=E0=B8=AA=E0=B8=A7=E0=B8=99=E0=B8=84?= =?UTF-8?q?=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=9C=E0=B8=B4=E0=B8=94=E0=B8=97?= =?UTF-8?q?=E0=B8=B2=E0=B8=87=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../3_InvestigateDisciplinary/Table.vue | 30 +++++++++++++++---- 1 file changed, 24 insertions(+), 6 deletions(-) diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue index aad0bff30..ec5dfc0de 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue @@ -67,8 +67,7 @@ :virtual-scroll-sticky-size-start="48" dense :pagination-label="paginationLabel" - :pagination="initialPagination" - :rows-per-page-options="[0]" + v-model:pagination="pagination" >