From 721847fd41445bd7582c5e56fd6cf2b6845d0c03 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Oct 2023 09:31:58 +0700 Subject: [PATCH 1/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20filter=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B6=E0=B8=81=E0=B8=9C=E0=B8=A5=E0=B8=81=E0=B8=B2=E0=B8=A3?= =?UTF-8?q?=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9E?= =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=A3=E0=B8=B2=E0=B8=8A=E0=B8=97=E0=B8=B2?= =?UTF-8?q?=E0=B8=99=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=E0=B8=AD=E0=B8=B4=E0=B8=AA?= =?UTF-8?q?=E0=B8=A3=E0=B8=B4=E0=B8=A2=E0=B8=B2=E0=B8=A0=E0=B8=A3=E0=B8=93?= =?UTF-8?q?=E0=B9=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/07_insignia/views/ResultPage.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue index 46900cc12..517f79d7d 100644 --- a/src/modules/07_insignia/views/ResultPage.vue +++ b/src/modules/07_insignia/views/ResultPage.vue @@ -272,6 +272,7 @@ const columns = ref([ ]); watch(tab, () => { if (tab.value !== "doc") { + DataStore.insignia = '' fecthlistInsignia(); insigniaTypeOption.value = DataStore.insigniaOp.filter( (e: any) => e.insigniaType == tab.value || e.name == "ทั้งหมด" From 6119fbcb59fdcda1ddb588b8cd35e1ab6dac4855 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Oct 2023 11:03:39 +0700 Subject: [PATCH 2/5] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84?= =?UTF-8?q?=E0=B8=82=20filter=20=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../07_insignia/components/2_Manage/Tab1.vue | 636 ++++++++++++++---- .../07_insignia/components/2_Manage/Tab2.vue | 73 +- .../07_insignia/components/2_Manage/Tab3.vue | 74 +- .../components/2_Manage/listManage.vue | 1 + 4 files changed, 554 insertions(+), 230 deletions(-) diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue index 86f5b97f9..1a92fb66f 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab1.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue @@ -261,10 +261,14 @@ const props = defineProps({ }); onMounted(async () => { - organization.value = await (DataStore.agency != null - ? DataStore.agency - : DataStore.typeOc); + // organization.value = await (DataStore.agency != null + // ? DataStore.agency + // : DataStore.typeOc); + organizationOptions.value = await DataStore.optionsTypeOc; + organization.value = await DataStore.typeOc; + console.log(organization.value); + if (organization.value !== "" || organization.value !== undefined) { if (props.fecthInsigniaByOc) { props.fecthInsigniaByOc( @@ -347,17 +351,17 @@ const fecthlistperson = async (id: string) => { const clickAdd = async () => { dataPerson.id ? await myForm.value!.validate().then((result: boolean) => { - if (result) { - dialogConfirm( - $q, - async () => { - await addlistperson(dataPerson.id); - }, - "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ", - "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?" - ); - } - }) + if (result) { + dialogConfirm( + $q, + async () => { + await addlistperson(dataPerson.id); + }, + "ยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ", + "ต้องการยืนยันการเพิ่มรายชื่อคนที่ยื่นขอพระราชทานเครื่องราชฯ นี้หรือไม่?" + ); + } + }) : dialogMessageNotify($q, "กรุณาเลือกราชชื่อที่ต้องการเพิ่ม"); }; //เพิ่มราชชื่อข้าราชการ @@ -415,11 +419,15 @@ const downloadFileexcel = async () => { showLoader(); await http - .put(config.API.insigniaDowanload(DataStore.requestId), { - profileType: - DataStore.employeeClass == "all" ? null : DataStore.employeeClass, - InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id, - }, { responseType: "blob" }) + .put( + config.API.insigniaDowanload(DataStore.requestId), + { + profileType: + DataStore.employeeClass == "all" ? null : DataStore.employeeClass, + InsigniaId: DataStore.typeinsignia == "all" ? null : findInsigniaId.id, + }, + { responseType: "blob" } + ) .then(async (res) => { await downloadFile( res, @@ -695,114 +703,231 @@ const clearInsigniaFilters = (name: string) => {
- - + + )" + > + + ไม่มีข้อมูล + +
- + )" + > + + ไม่มีข้อมูล + +
- + ดาวน์โหลด - + เพิ่ม
- + - +
- +
@@ -912,8 +1113,14 @@ const clearInsigniaFilters = (name: string) => { เพิ่มรายชื่อ - + @@ -922,24 +1129,49 @@ const clearInsigniaFilters = (name: string) => { - + - + @@ -962,28 +1201,71 @@ const clearInsigniaFilters = (name: string) => {
- +
- +
- +
- + ]" + />
- +
@@ -1005,18 +1287,42 @@ const clearInsigniaFilters = (name: string) => { - +
- +
- + บันทึก @@ -1026,27 +1332,59 @@ const clearInsigniaFilters = (name: string) => { - + - + - + แจ้งเตือน - +
- + - + diff --git a/src/modules/07_insignia/components/2_Manage/Tab2.vue b/src/modules/07_insignia/components/2_Manage/Tab2.vue index c30cbf972..72d312dd2 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab2.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab2.vue @@ -148,10 +148,11 @@ const columns = ref([ // ข้อมูลตาราง (จำลอง) onMounted(async () => { - organizationOptions.value = DataStore.optionsTypeOc; - organization.value = await (DataStore.agency != null - ? DataStore.agency - : DataStore.typeOc); + organizationOptions.value = await DataStore.optionsTypeOc; + organization.value = await DataStore.typeOc; + // organization.value = await (DataStore.agency != null + // ? DataStore.agency + // : DataStore.typeOc); if (organization.value !== "" || organization.value !== undefined) { if (props.fecthInsigniaByOc) { await props.fecthInsigniaByOc( @@ -163,7 +164,7 @@ onMounted(async () => { DataStore.mainTab = props.tab; } } - filterOrganizationOP.value = organizationOptions.value + filterOrganizationOP.value = organizationOptions.value; }); // เลือกหน่วยงาน const changtypeOc = () => { @@ -214,32 +215,28 @@ const closeReson = () => { const filterSelector = (val: any, update: Function, name: any) => { update(() => { const needle = val.toLowerCase(); - if (name === 'typeinsigniaOptions') { - DataStore.typeinsignia = '' - typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if(name === 'employeeClassOps'){ - DataStore.employeeClass = '' - employeeClassOps.value = DataStore.employeeClassOps.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if(name === 'filterOrganizationOP'){ + if (name === "typeinsigniaOptions") { + DataStore.typeinsignia = ""; + typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter( + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "employeeClassOps") { + DataStore.employeeClass = ""; + employeeClassOps.value = DataStore.employeeClassOps.filter( + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "filterOrganizationOP") { filterOrganizationOP.value = organizationOptions.value.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); } - - } - ) -} + }); +}; const clearInsigniaFilters = (name: string) => { if (name === "typeinsigniaOptions") { DataStore.typeinsignia = "all"; typeinsigniaOptions.value = DataStore.typeinsigniaOptions; - } else if (name === 'employeeClassOps') { + } else if (name === "employeeClassOps") { DataStore.employeeClass = "all"; employeeClassOps.value = DataStore.employeeClassOps; } @@ -250,7 +247,7 @@ const clearInsigniaFilters = (name: string) => {
{ ) " /> { /> + + ไม่มีข้อมูล + +
{ /> + + ไม่มีข้อมูล + +
diff --git a/src/modules/07_insignia/components/2_Manage/Tab3.vue b/src/modules/07_insignia/components/2_Manage/Tab3.vue index e16e9e537..3bbb06cce 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab3.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab3.vue @@ -28,7 +28,7 @@ const props = defineProps({ }); const typeinsigniaOptions = ref(DataStore.typeinsigniaOptions); const employeeClassOps = ref(DataStore.employeeClassOps); - const filterOrganizationOP = ref([]); +const filterOrganizationOP = ref([]); const organization = ref("1"); const organizationOptions = ref([{ id: "1", name: "ทั้งหมด" }]); const visibleColumns = ref([ @@ -147,10 +147,10 @@ const columns = ref([ ]); onMounted(async () => { organizationOptions.value = DataStore.optionsTypeOc; - organization.value = await (DataStore.agency != null - ? DataStore.agency - : DataStore.typeOc); - + // organization.value = await (DataStore.agency != null + // ? DataStore.agency + // : DataStore.typeOc); + organization.value = await DataStore.typeOc; if (organization.value !== "" || organization.value !== undefined) { if (props.fecthInsigniaByOc) { await props.fecthInsigniaByOc( @@ -162,7 +162,7 @@ onMounted(async () => { DataStore.mainTab = props.tab; } } - filterOrganizationOP.value = organizationOptions.value + filterOrganizationOP.value = organizationOptions.value; }); const changtypeOc = async () => { if (props.fecthInsigniaByOc) { @@ -211,32 +211,28 @@ const closeReson = () => { const filterSelector = (val: any, update: Function, name: any) => { update(() => { const needle = val.toLowerCase(); - if (name === 'typeinsigniaOptions') { - DataStore.typeinsignia = '' - typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if(name === 'employeeClassOps'){ - DataStore.employeeClass = '' - employeeClassOps.value = DataStore.employeeClassOps.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); - } - else if(name === 'filterOrganizationOP'){ + if (name === "typeinsigniaOptions") { + DataStore.typeinsignia = ""; + typeinsigniaOptions.value = DataStore.typeinsigniaOptions.filter( + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "employeeClassOps") { + DataStore.employeeClass = ""; + employeeClassOps.value = DataStore.employeeClassOps.filter( + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); + } else if (name === "filterOrganizationOP") { filterOrganizationOP.value = organizationOptions.value.filter( - (v: any) => v.name.toLowerCase().indexOf(needle) > -1 - ); + (v: any) => v.name.toLowerCase().indexOf(needle) > -1 + ); } - - } - ) -} + }); +}; const clearInsigniaFilters = (name: string) => { if (name === "typeinsigniaOptions") { DataStore.typeinsignia = "all"; typeinsigniaOptions.value = DataStore.typeinsigniaOptions; - } else if (name === 'employeeClassOps') { + } else if (name === "employeeClassOps") { DataStore.employeeClass = "all"; employeeClassOps.value = DataStore.employeeClassOps; } @@ -247,7 +243,7 @@ const clearInsigniaFilters = (name: string) => {
{ ) " /> { /> + + ไม่มีข้อมูล + +
{ /> + + ไม่มีข้อมูล + +
diff --git a/src/modules/07_insignia/components/2_Manage/listManage.vue b/src/modules/07_insignia/components/2_Manage/listManage.vue index 74ae0eb88..53f5223a0 100644 --- a/src/modules/07_insignia/components/2_Manage/listManage.vue +++ b/src/modules/07_insignia/components/2_Manage/listManage.vue @@ -97,6 +97,7 @@ const fecthAgency = async () => { .then(async (res) => { loadview.value = true; DataStore.agency = res.data.result; + DataStore.typeOc = DataStore.agency if (roleDataStore.adminRole) { await fecthType(); // ถ้าไม่มีหนวยงานจะเรียกหน่วยงานทั้งหมด } else { From 58a99e1e494df09eccfef7849bef94ba737deb9f Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Oct 2023 13:28:48 +0700 Subject: [PATCH 3/5] =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B8=A3=E0=B8=87?= =?UTF-8?q?=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87=20folder=20?= =?UTF-8?q?=E0=B8=8A=E0=B8=B7=E0=B9=88=E0=B8=AD=2011=5Fdiscipline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/interface/request/main/main.ts | 58 +++++++++++++++++++ .../components/1_Complaint/MainPage.vue | 9 +++ .../2_InvestigateFacts/MainPage.vue | 9 +++ .../3_InvestigateDisciplinary/MainPage.vue | 9 +++ .../components/4_Order/MainPage.vue | 9 +++ .../components/5_Report/MainPage.vue | 9 +++ .../ุ6_Information/Channel/MainPage.vue | 9 +++ .../ุ6_Information/Director/MainPage.vue | 9 +++ .../11_discipline/interface/index/Main.ts | 4 ++ src/modules/11_discipline/router.ts | 38 ++++++++++++ src/router/index.ts | 6 +- src/views/MainLayout.vue | 21 +++++-- 12 files changed, 182 insertions(+), 8 deletions(-) create mode 100644 src/modules/11_discipline/components/1_Complaint/MainPage.vue create mode 100644 src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue create mode 100644 src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue create mode 100644 src/modules/11_discipline/components/4_Order/MainPage.vue create mode 100644 src/modules/11_discipline/components/5_Report/MainPage.vue create mode 100644 src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue create mode 100644 src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue create mode 100644 src/modules/11_discipline/interface/index/Main.ts create mode 100644 src/modules/11_discipline/router.ts diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index 7bd5d227d..c2717c0e1 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -402,6 +402,64 @@ const menuList = readonly([ // }, // ], // }, + { + key: 11, + icon: "mdi-scale-balance", + activeIcon: "mdi-calendar", + label: "วินัย", + path: "/discipline", + role: "coin", + children: [ + { + key: 11.1, + label: "เรื่องร้องเรียน", + path: "/discipline-complaints", + role: "coin", + }, + { + key: 11.2, + label: "สืบสวนข้อเท็จจริง", + path: "/discipline-investigatefacts", + role: "coin", + }, + { + key: 11.3, + label: "สอบสวนความผิดวินัย", + path: "/discipline-disciplinary", + role: "coin", + }, + { + key: 11.4, + label: "ออกคำสั่ง", + path: "", + role: "coin", + }, + { + key: 11.5, + label: "รายงาน", + path: "", + role: "coin", + }, + { + label: "ข้อมูลพื้นฐาน", + path: "", + key: 11.6, + role: "coin", + children: [ + { + label: "กรรมการ", + path: "", + role: "coin", + }, + { + label: "ช่องทางการร้องเรียน", + path: "", + role: "coin", + }, + ], + }, + ], + }, ]); const tabList = readonly([ diff --git a/src/modules/11_discipline/components/1_Complaint/MainPage.vue b/src/modules/11_discipline/components/1_Complaint/MainPage.vue new file mode 100644 index 000000000..d04385ff3 --- /dev/null +++ b/src/modules/11_discipline/components/1_Complaint/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue new file mode 100644 index 000000000..9908a051e --- /dev/null +++ b/src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue new file mode 100644 index 000000000..86b199249 --- /dev/null +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/4_Order/MainPage.vue b/src/modules/11_discipline/components/4_Order/MainPage.vue new file mode 100644 index 000000000..d04385ff3 --- /dev/null +++ b/src/modules/11_discipline/components/4_Order/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/5_Report/MainPage.vue b/src/modules/11_discipline/components/5_Report/MainPage.vue new file mode 100644 index 000000000..d04385ff3 --- /dev/null +++ b/src/modules/11_discipline/components/5_Report/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue new file mode 100644 index 000000000..d04385ff3 --- /dev/null +++ b/src/modules/11_discipline/components/ุ6_Information/Channel/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue b/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue new file mode 100644 index 000000000..d04385ff3 --- /dev/null +++ b/src/modules/11_discipline/components/ุ6_Information/Director/MainPage.vue @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/src/modules/11_discipline/interface/index/Main.ts b/src/modules/11_discipline/interface/index/Main.ts new file mode 100644 index 000000000..9870350dd --- /dev/null +++ b/src/modules/11_discipline/interface/index/Main.ts @@ -0,0 +1,4 @@ + +export type { + +}; diff --git a/src/modules/11_discipline/router.ts b/src/modules/11_discipline/router.ts new file mode 100644 index 000000000..0f41d90f9 --- /dev/null +++ b/src/modules/11_discipline/router.ts @@ -0,0 +1,38 @@ + +const complaintMain = () => import("@/modules/11_discipline/components/1_Complaint/MainPage.vue") +const factsMain = () => import("@/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue") +const disciplinaryMain = () => import("@/modules/11_discipline/components/3_InvestigateDisciplinary/MainPage.vue") + + +export default [ + { + path: "/discipline/complaints", + name: "/discipline-complaints", + component: complaintMain, + 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/disciplinary", + name: "/discipline-disciplinary", + component: disciplinaryMain, + meta: { + Auth: true, + Key: [9], + Role: "coin", + }, + }, +] \ No newline at end of file diff --git a/src/router/index.ts b/src/router/index.ts index 8676b6de3..effe76e05 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -13,7 +13,8 @@ import ModuleRetirement from "@/modules/06_retirement/router"; import ModuleInsignia from "@/modules/07_insignia/router"; import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router"; import ModuleOrder from "@/modules/10_order/router"; -import ModuleLeave from "@/modules/09_leave/router" +import ModuleLeave from "@/modules/09_leave/router"; +import ModuleDiscipline from "@/modules/11_discipline/router" // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -45,7 +46,8 @@ const router = createRouter({ ...ModuleInsignia, ...ModuleRegistryEmployee, ...ModuleOrder, - ...ModuleLeave + ...ModuleLeave, + ...ModuleDiscipline ], }, /** diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue index 8b9c8c849..c5770894d 100644 --- a/src/views/MainLayout.vue +++ b/src/views/MainLayout.vue @@ -562,7 +562,7 @@ const clickDelete = (id: string) => { @click="doLogout" />
-
+
@@ -646,7 +646,8 @@ const clickDelete = (id: string) => { menuItem.key == 6 || menuItem.key == 7 || menuItem.key == 8 || - menuItem.key == 9 + menuItem.key == 9 || + menuItem.key == 11 " >
@@ -808,7 +809,8 @@ const clickDelete = (id: string) => { menuItem.key == 6 || menuItem.key == 7 || menuItem.key == 8 || - menuItem.key == 9 + menuItem.key == 9 || + menuItem.key == 11 " > -
+
@@ -858,7 +867,7 @@ const clickDelete = (id: string) => { :to="{ name: `${subMenu.path}` }" > - {{ subMenu.label }} + {{ subMenu.label }}
From 6c84ac69d9333c27207454c4436623085847561e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Mon, 16 Oct 2023 13:34:04 +0700 Subject: [PATCH 4/5] store discipline --- src/modules/11_discipline/stroes/ComplaintsStore.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/modules/11_discipline/stroes/ComplaintsStore.ts diff --git a/src/modules/11_discipline/stroes/ComplaintsStore.ts b/src/modules/11_discipline/stroes/ComplaintsStore.ts new file mode 100644 index 000000000..e69de29bb From fea81fc718f8c67011454d225e80c70e6829c701 Mon Sep 17 00:00:00 2001 From: Tanyalak Date: Mon, 16 Oct 2023 15:55:28 +0700 Subject: [PATCH 5/5] =?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=E0=B9=80=E0=B8=A1?= =?UTF-8?q?=E0=B8=99=E0=B8=B9=20=E0=B8=88=E0=B8=B1=E0=B8=94=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=82=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../07_insignia/components/2_Manage/Tab1.vue | 251 +++++++++--------- .../07_insignia/components/2_Manage/Tab2.vue | 165 ++++++------ .../07_insignia/components/2_Manage/Tab3.vue | 193 +++++++------- src/modules/07_insignia/views/ResultPage.vue | 6 +- 4 files changed, 307 insertions(+), 308 deletions(-) diff --git a/src/modules/07_insignia/components/2_Manage/Tab1.vue b/src/modules/07_insignia/components/2_Manage/Tab1.vue index 1a92fb66f..f8579443e 100644 --- a/src/modules/07_insignia/components/2_Manage/Tab1.vue +++ b/src/modules/07_insignia/components/2_Manage/Tab1.vue @@ -704,7 +704,6 @@ const clearInsigniaFilters = (name: string) => {
{ :borderless="false" :outlined="true" :hide-dropdown-icon="false" - style="min-width: 150px" + style="width: 400px" @update:model-value="changtypeOc" @filter="(inputValue: any, doneFn: Function) => filterSelector(inputValue, doneFn, 'filterOrganizationOP' )" /> - - - - -
- - - - -
-
- - ดาวน์โหลด - - - เพิ่ม - -
{ class="col-xs-12 col-sm-3 col-md-2" />
+ +
+ + + + + + + + + +
+ + ดาวน์โหลด + + + เพิ่ม + +
+
+
{
{ :borderless="false" :outlined="true" :hide-dropdown-icon="false" - style="min-width: 150px" + style="width: 400px" @update:model-value="changtypeOc" @filter="(inputValue:any, doneFn:Function) => filterSelector(inputValue, doneFn,'filterOrganizationOP' ) " /> + + + + + + + +
+ +
{ -
- - - - -
- - - -