From b9584e006bf9ba1761ce26d9874421b697a4ec0e Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Tue, 17 Oct 2023 16:51:49 +0700 Subject: [PATCH] =?UTF-8?q?ui=20=20=E0=B8=8A=E0=B9=88=E0=B8=AD=E0=B8=87?= =?UTF-8?q?=E0=B8=97=E0=B8=B2=E0=B8=87=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=A3?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=87=E0=B9=80=E0=B8=A3=E0=B8=B5=E0=B8=A2?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../addInvestigate.vue | 43 +-- .../ุ6_Information/Channel/MainPage.vue | 284 +++++++++++++++++- .../ุ6_Information/Channel/addChannel.vue | 214 +++++++++++++ src/modules/11_discipline/router.ts | 88 ++++-- 4 files changed, 579 insertions(+), 50 deletions(-) create mode 100644 src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue index a3e7845cd..8a3fa7802 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue @@ -106,8 +106,9 @@ const $q = useQuasar(); const id = ref(route.params.id as string); const myForm = ref(null); //form data input const edit = ref(false); -const dateStart = ref(new Date()); -const dateEnd = ref(new Date()); +const dateInvestigate = ref(new Date()); +const dateAllegation = ref(new Date()); +const dateEvident = ref(new Date()); const filterKeyword2 = ref(""); const typefault = ref(""); const faultLevel = ref(""); @@ -171,8 +172,8 @@ const fetchData = async () => { // : null; // yearly.value = data.period_year; // datelast.value = data.period_amount; - // dateStart.value = new Date(data.period_start); - // dateEnd.value = new Date(data.period_end); + // dateInvestigate.value = new Date(data.period_start); + // dateAllegation.value = new Date(data.period_end); // files.value = data.period_doc; // }) // .catch((e) => { @@ -239,11 +240,11 @@ const addData = async () => { // formData.append("year", yearly.value.toString()); // formData.append("amount", datelast.value.toString()); // formData.append("round", roundInsig.value.value); - // if (dateStart.value !== null) { - // formData.append("startDate", dateToISO(dateStart.value)); + // if (dateInvestigate.value !== null) { + // formData.append("startDate", dateToISO(dateInvestigate.value)); // } - // if (dateEnd.value !== null) { - // formData.append("endDate", dateToISO(dateEnd.value)); + // if (dateAllegation.value !== null) { + // formData.append("endDate", dateToISO(dateAllegation.value)); // } // formData.append("file", files.value); // showLoader(); @@ -269,11 +270,11 @@ const editData = async (id: string) => { // formData.append("year", yearly.value.toString()); // formData.append("amount", datelast.value.toString()); // formData.append("round", roundInsig.value.value); - // if (dateStart.value !== null) { - // formData.append("startDate", dateToISO(dateStart.value)); + // if (dateInvestigate.value !== null) { + // formData.append("startDate", dateToISO(dateInvestigate.value)); // } - // if (dateEnd.value !== null) { - // formData.append("endDate", dateToISO(dateEnd.value)); + // if (dateAllegation.value !== null) { + // formData.append("endDate", dateToISO(dateAllegation.value)); // } // formData.append("file", files.value); // showLoader(); @@ -328,7 +329,7 @@ const clickBack = () => { /> { dense class="full-width datepicker" :model-value=" - dateStart != null ? date2Thai(dateStart) : null + dateInvestigate != null + ? date2Thai(dateInvestigate) + : null " :label="`${'วันที่สอบสวน'}`" :rules="[(val) => !!val || `${'กรุณาเลือกวันที่สอบสวน'}`]" @@ -366,7 +369,7 @@ const clickBack = () => { { outlined dense class="col-xs-12 col-sm-4" - :model-value="dateEnd != null ? date2Thai(dateEnd) : null" + :model-value=" + dateAllegation != null + ? date2Thai(dateAllegation) + : null + " :label="`${'วันที่รับทราบข้อกล่าวหา'}`" :rules="[ (val) => @@ -405,7 +412,7 @@ const clickBack = () => { { dense class="full-width datepicker" :model-value=" - dateStart != null ? date2Thai(dateStart) : null + dateEvident != null ? date2Thai(dateEvident) : null " :label="`${'วันที่สรุปพยานหลักฐาน'}`" :rules="[ diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue index 87ddd73fb..22e83bc1f 100644 --- a/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue +++ b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue @@ -1,9 +1,285 @@ - + - + diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue b/src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue new file mode 100644 index 000000000..0a6c0eccb --- /dev/null +++ b/src/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue @@ -0,0 +1,214 @@ + + diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts index bd70fb399..5dfe5d742 100644 --- a/src/modules/11_discipline/router.ts +++ b/src/modules/11_discipline/router.ts @@ -1,18 +1,40 @@ -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 reportType = () => import('@/modules/11_discipline/components/5_Report/reportDetail.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 reportType = () => + import("@/modules/11_discipline/components/5_Report/reportDetail.vue"); const InvestigateDisciplinaryAdd = () => import( "@/modules/11_discipline/components/3_InvestigateDisciplinary/addInvestigate.vue" ); +const channelAdd = () => + import( + "@/modules/11_discipline/components/ุ6_Information/Channel/addChannel.vue" + ); export default [ { path: "/discipline/complaints", @@ -74,25 +96,25 @@ export default [ Role: "coin", }, }, - { - path: "/discipline/report/:type", - name: "/discipline-reportType", - component: reportType, - meta: { - Auth: true, - Key: [11.5], - Role: "coin", - }, + { + path: "/discipline/report/:type", + name: "/discipline-reportType", + component: reportType, + 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/director", @@ -134,4 +156,14 @@ export default [ Role: "coin", }, }, + { + path: "/discipline/channel/add", + name: "/discipline-channelAdd", + component: channelAdd, + meta: { + Auth: true, + Key: [11.2], + Role: "coin", + }, + }, ];