From 7c0284a87add234103fa96f0add41502e917e552 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Wed, 18 Oct 2023 10:09:11 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=8A?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=20defineStore=20=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=9A=E0=B8=9A=20=E0=B8=A7=E0=B8=B4=E0=B8=99=E0=B8=B1?= =?UTF-8?q?=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1_Complaint/AddComplaintPage.vue | 24 +++++++++++++++++-- .../components/4_Order/Step01.vue | 19 +++++++++++---- .../11_discipline/stroes/ComplaintsStore.ts | 2 +- .../stroes/InvestigateDisStore.ts | 2 +- .../stroes/InvestigateFactStore.ts | 2 +- .../11_discipline/stroes/OrderStore.ts | 2 +- .../11_discipline/stroes/ReportStore.ts | 4 ++-- 7 files changed, 42 insertions(+), 13 deletions(-) diff --git a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue index bff1077ad..4dd3cf3dd 100644 --- a/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue +++ b/src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue @@ -118,6 +118,25 @@ const fileUploadDoc = async (files: any) => { }); }; +function selectLevel(val: string) { + let dayNum = 0; + if (val == "0") { + dayNum = 45; + } else if (val == "1") { + dayNum = 30; + } else { + dayNum = 15; + } + + if (dateconsideration.value) { + const currentDate = new Date(dateconsideration.value); + const newDate = new Date( + currentDate.getTime() + dayNum * 24 * 60 * 60 * 1000 + ); + datewarn.value = newDate; + } +} + function onSubmit() { dialogConfirm( $q, @@ -341,6 +360,7 @@ function onSubmit() { map-options :rules="[(val) => !!val || `${'กรุณาเลือกระดับการพิจารณา'}`]" lazy-rules + @update:model-value="selectLevel(considerationLevel)" />
@@ -366,10 +386,10 @@ function onSubmit() { dense class="full-width datepicker" :model-value="datewarn != null ? date2Thai(datewarn) : null" - label="วันที่แจ้งเตือนล่ววงหน้า" + label="วันที่แจ้งเตือนล่วงหน้า" :rules="[ (val) => - !!val || `${'กรุณาเลือกวันที่แจ้งเตือนล่ววงหน้า'}`, + !!val || `${'กรุณาเลือกวันที่แจ้งเตือนล่วงหน้า'}`, ]" lazy-rules > diff --git a/src/modules/11_discipline/components/4_Order/Step01.vue b/src/modules/11_discipline/components/4_Order/Step01.vue index e9be1de39..1a58c31ab 100644 --- a/src/modules/11_discipline/components/4_Order/Step01.vue +++ b/src/modules/11_discipline/components/4_Order/Step01.vue @@ -1,10 +1,12 @@ @@ -207,12 +216,12 @@ function onSubmit() { diff --git a/src/modules/11_discipline/stroes/ComplaintsStore.ts b/src/modules/11_discipline/stroes/ComplaintsStore.ts index 5f772a96d..26963a4a7 100644 --- a/src/modules/11_discipline/stroes/ComplaintsStore.ts +++ b/src/modules/11_discipline/stroes/ComplaintsStore.ts @@ -3,7 +3,7 @@ import { ref } from "vue"; import type { DataOption } from "../interface/index/Main"; -export const useComplainstDataStore = defineStore("complainst", () => { +export const useComplainstDataStore = defineStore("DisciplineComplainst", () => { const rows = ref([]) const optionListName = ref([{}]) diff --git a/src/modules/11_discipline/stroes/InvestigateDisStore.ts b/src/modules/11_discipline/stroes/InvestigateDisStore.ts index f9396f80c..10483bbf2 100644 --- a/src/modules/11_discipline/stroes/InvestigateDisStore.ts +++ b/src/modules/11_discipline/stroes/InvestigateDisStore.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -export const useInvestigateDisStore = defineStore("InvestigateDis", () => { +export const useInvestigateDisStore = defineStore("DisciplineInvestigateDis", () => { const rows = ref([]); async function fecthList(data: any) { diff --git a/src/modules/11_discipline/stroes/InvestigateFactStore.ts b/src/modules/11_discipline/stroes/InvestigateFactStore.ts index 072fe5ee4..06ef20a77 100644 --- a/src/modules/11_discipline/stroes/InvestigateFactStore.ts +++ b/src/modules/11_discipline/stroes/InvestigateFactStore.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -export const useInvestigateFactStore = defineStore("InvestigateFact", () => { +export const useInvestigateFactStore = defineStore("DisciplineInvestigateFact", () => { const rows = ref([]) async function fecthList(data: any) { diff --git a/src/modules/11_discipline/stroes/OrderStore.ts b/src/modules/11_discipline/stroes/OrderStore.ts index e08314fd9..e7c5b77e7 100644 --- a/src/modules/11_discipline/stroes/OrderStore.ts +++ b/src/modules/11_discipline/stroes/OrderStore.ts @@ -1,7 +1,7 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -export const useOrderStore = defineStore("order", () => { +export const useOrderStore = defineStore("DisciplineOrder", () => { const rows = ref([]) async function fecthOrder(data: any) { let datalist = data.map((e: any) => ({ diff --git a/src/modules/11_discipline/stroes/ReportStore.ts b/src/modules/11_discipline/stroes/ReportStore.ts index 0ec6fcd20..3d003a224 100644 --- a/src/modules/11_discipline/stroes/ReportStore.ts +++ b/src/modules/11_discipline/stroes/ReportStore.ts @@ -1,13 +1,13 @@ import { defineStore } from "pinia"; import { ref } from "vue"; -export const useReportDataStore = defineStore("report11", () => { +export const useReportDataStore = defineStore("DisciplineReport11", () => { interface OptionReport { id: string; title: string; } const optionReport = ref([ - { id: "1", title: "รายงานเรื่องร้องเรียนแยกรายวัน รายเดือน รายปี"}, + { id: "1", title: "รายงานเรื่องร้องเรียนแยกรายวัน รายเดือน รายปี" }, { id: "2", title: "รายงานเรื่องร้องเรียนข้าราชการสามัญฯ ในสังกัดกรุงเทพมหานคร แยกตามหน่วยงาน" }, { id: "3", title: "รายงานจำนวนข้าราชการสามัญฯ ที่กระทำความผิดทางวินัย แยกตามลักษณะความผิด" }, { id: "4", title: "รายงานรายชื่อข้าราชการสามัญฯ ที่กระทำความผิดทางวินัยแยกตามลักษณะความผิด" },