Merge branch 'develop' into devTee
This commit is contained in:
setthawutttty
commit
9c6375d832
8 changed files with 8 additions and 309 deletions
|
|
@ -65,7 +65,7 @@ export default {
|
||||||
disciplinarySuspend: (id: string) => `${discipline}/suspend/${id}`,
|
disciplinarySuspend: (id: string) => `${discipline}/suspend/${id}`,
|
||||||
disciplinaryCalendar: () => `${discipline}/calendar`,
|
disciplinaryCalendar: () => `${discipline}/calendar`,
|
||||||
|
|
||||||
/** รายการผลการพิจารณาทางวินัย*/
|
/** รายการสรุปผลการพิจารณาทางวินัย*/
|
||||||
listResult: () => `${disciplineMain}/result`,
|
listResult: () => `${disciplineMain}/result`,
|
||||||
listResultById: (id: string) => `${disciplineMain}/result/${id}`,
|
listResultById: (id: string) => `${disciplineMain}/result/${id}`,
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,301 +0,0 @@
|
||||||
import { defineStore } from "pinia";
|
|
||||||
import type { QTableProps } from "quasar";
|
|
||||||
import { ref } from "vue";
|
|
||||||
import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
|
|
||||||
import type { ArrayPerson, ArrayPersonAdd } from "@/modules/11_discipline/interface/response/investigate";
|
|
||||||
|
|
||||||
export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
|
|
||||||
/** option ผู้ถูกสอบสวน*/
|
|
||||||
const complainantoptionsMain = ref<DataOption[]>([
|
|
||||||
{ id: "PERSON", name: "บุคคล" },
|
|
||||||
{ id: "ORGANIZATION", name: "หน่วยงาน" },
|
|
||||||
{ id: "BANGKOK", name: "กรุงเทพมหานคร" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
function convertComplaintType(val: string) {
|
|
||||||
const result = complainantoptionsMain.value.find(
|
|
||||||
(x: any) => x.id == val
|
|
||||||
)?.name;
|
|
||||||
return result ? result : "-";
|
|
||||||
}
|
|
||||||
|
|
||||||
/** function ลักษณะความผิด*/
|
|
||||||
function convertFault(val: string) {
|
|
||||||
switch (val) {
|
|
||||||
case "NOT_SPECIFIED":
|
|
||||||
return "ความผิดวินัยยังไม่ระบุ";
|
|
||||||
case "NOT_DEADLY":
|
|
||||||
return "ความผิดวินัยไม่ร้ายแรง";
|
|
||||||
case "DEADLY":
|
|
||||||
return "ความผิดวินัยร้ายแรง";
|
|
||||||
default:
|
|
||||||
return "-";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** function สถานะ*/
|
|
||||||
function convertStatus(val: string) {
|
|
||||||
switch (val) {
|
|
||||||
case "NEW":
|
|
||||||
return "กำลังสอบสวน";
|
|
||||||
case "STOP":
|
|
||||||
return "ยุติเรื่อง";
|
|
||||||
case "SEND_DISCIPLINARY":
|
|
||||||
return "ส่งไปสอบสวน";
|
|
||||||
case "DONE":
|
|
||||||
return "ส่งไปสรุปผลการพิจารณาทางวินัย";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** option ลักษณะความผิด */
|
|
||||||
const offenseDetailstOptions = ref<DataOption[]>([
|
|
||||||
{ id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
|
|
||||||
{ id: "NOT_DEADLY", name: "ไม่ร้ายแรง" },
|
|
||||||
{ id: "DEADLY", name: "ร้ายแรง" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
function convertOffenseDetailst(val: string) {
|
|
||||||
return (
|
|
||||||
offenseDetailstOptions.value.find((x: any) => x.id == val)?.name ?? "-"
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const statusResultOptions = ref<DataOption[]>([
|
|
||||||
{ id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
|
|
||||||
{ id: "HAVE_CAUSE", name: "มีมูล" },
|
|
||||||
{ id: "NO_CAUSE", name: "ไม่มีมูล" },
|
|
||||||
]);
|
|
||||||
function convertStatusResult(val: string) {
|
|
||||||
const result = statusResultOptions.value.find(
|
|
||||||
(x: any) => x.id == val
|
|
||||||
)?.name;
|
|
||||||
return result ? result : "-";
|
|
||||||
}
|
|
||||||
|
|
||||||
const causeTextOptions = ref<DataOption[]>([
|
|
||||||
{ id: "ร้ายแรง", name: "ร้ายแรง" },
|
|
||||||
{ id: "ไม่ร้ายแรง", name: "ไม่ร้ายแรง" },
|
|
||||||
]);
|
|
||||||
|
|
||||||
/** หัวตารางผู้ถูกร้องเรียน */
|
|
||||||
const columnsRespondent = ref<QTableProps["columns"]>([
|
|
||||||
{
|
|
||||||
name: "info",
|
|
||||||
align: "left",
|
|
||||||
label: "",
|
|
||||||
sortable: false,
|
|
||||||
field: "info",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "no",
|
|
||||||
align: "left",
|
|
||||||
label: "ลำดับ",
|
|
||||||
sortable: false,
|
|
||||||
field: "no",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "idcard",
|
|
||||||
align: "left",
|
|
||||||
label: "เลขบัตรประชาชน",
|
|
||||||
sortable: true,
|
|
||||||
field: "idcard",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "name",
|
|
||||||
align: "left",
|
|
||||||
label: "ชื่อ - นามสกุล",
|
|
||||||
sortable: true,
|
|
||||||
field: "name",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "posNo",
|
|
||||||
align: "left",
|
|
||||||
label: "ตำแหน่งเลขที่",
|
|
||||||
sortable: true,
|
|
||||||
field: "posNo",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "position",
|
|
||||||
align: "left",
|
|
||||||
label: "ตำแหน่ง",
|
|
||||||
sortable: true,
|
|
||||||
field: "position",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "positionLevel",
|
|
||||||
align: "left",
|
|
||||||
label: "ระดับ",
|
|
||||||
sortable: true,
|
|
||||||
field: "positionLevel",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "salary",
|
|
||||||
align: "left",
|
|
||||||
label: "เงินเดือน",
|
|
||||||
sortable: true,
|
|
||||||
field: "salary",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "organization",
|
|
||||||
align: "left",
|
|
||||||
label: "หน่วยงาน",
|
|
||||||
sortable: true,
|
|
||||||
field: "organization",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
/** หัวข้อที่เเสดงในตารางผู้ถูกร้องเรียน */
|
|
||||||
const visibleColumnsRespondent = ref<string[]>([
|
|
||||||
"info",
|
|
||||||
"no",
|
|
||||||
"idcard",
|
|
||||||
"name",
|
|
||||||
"posNo",
|
|
||||||
"position",
|
|
||||||
"positionLevel",
|
|
||||||
"salary",
|
|
||||||
"organization",
|
|
||||||
]);
|
|
||||||
|
|
||||||
/** หัวตารางกรรมการ */
|
|
||||||
const columnsDirector = ref<QTableProps["columns"]>([
|
|
||||||
{
|
|
||||||
name: "info",
|
|
||||||
align: "left",
|
|
||||||
label: "",
|
|
||||||
sortable: false,
|
|
||||||
field: "info",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "no",
|
|
||||||
align: "left",
|
|
||||||
label: "ลำดับ",
|
|
||||||
sortable: false,
|
|
||||||
field: "no",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "idcard",
|
|
||||||
align: "left",
|
|
||||||
label: "เลขบัตรประชาชน",
|
|
||||||
sortable: true,
|
|
||||||
field: "idcard",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "name",
|
|
||||||
align: "left",
|
|
||||||
label: "ชื่อ - นามสกุล",
|
|
||||||
sortable: true,
|
|
||||||
field: "name",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "posNo",
|
|
||||||
align: "left",
|
|
||||||
label: "ตำแหน่งเลขที่",
|
|
||||||
sortable: true,
|
|
||||||
field: "posNo",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "position",
|
|
||||||
align: "left",
|
|
||||||
label: "ตำแหน่ง",
|
|
||||||
sortable: true,
|
|
||||||
field: "position",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "positionLevel",
|
|
||||||
align: "left",
|
|
||||||
label: "ระดับ",
|
|
||||||
sortable: true,
|
|
||||||
field: "positionLevel",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "salary",
|
|
||||||
align: "left",
|
|
||||||
label: "เงินเดือน",
|
|
||||||
sortable: true,
|
|
||||||
field: "salary",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: "organization",
|
|
||||||
align: "left",
|
|
||||||
label: "หน่วยงาน",
|
|
||||||
sortable: true,
|
|
||||||
field: "organization",
|
|
||||||
headerStyle: "font-size: 14px",
|
|
||||||
style: "font-size: 14px",
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
|
|
||||||
/** หัวข้อที่เเสดงในตารางกรรมการ */
|
|
||||||
const visibleColumnsDirector = ref<string[]>([
|
|
||||||
"info",
|
|
||||||
"no",
|
|
||||||
"idcard",
|
|
||||||
"name",
|
|
||||||
"posNo",
|
|
||||||
"position",
|
|
||||||
"positionLevel",
|
|
||||||
"salary",
|
|
||||||
"organization",
|
|
||||||
]);
|
|
||||||
|
|
||||||
const rowsAdd = ref<ArrayPerson[]>([]);
|
|
||||||
function fetchData(data: ArrayPerson[]) {
|
|
||||||
rowsAdd.value = data;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
return {
|
|
||||||
complainantoptionsMain,
|
|
||||||
convertFault,
|
|
||||||
convertStatus,
|
|
||||||
columnsRespondent,
|
|
||||||
visibleColumnsRespondent,
|
|
||||||
offenseDetailstOptions,
|
|
||||||
convertOffenseDetailst,
|
|
||||||
convertComplaintType,
|
|
||||||
|
|
||||||
columnsDirector,
|
|
||||||
visibleColumnsDirector,
|
|
||||||
rowsAdd,
|
|
||||||
fetchData,
|
|
||||||
statusResultOptions,
|
|
||||||
convertStatusResult,
|
|
||||||
|
|
||||||
causeTextOptions
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
@ -73,7 +73,7 @@ onMounted(async () => {
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="toptitle text-dark col-12 row items-center">เรื่องร้องเรียน</div>
|
<div class="toptitle text-dark col-12 row items-center">รายการเรื่องร้องเรียน</div>
|
||||||
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
|
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
|
||||||
<div class="row col-12 q-col-gutter-sm q-mb-sm">
|
<div class="row col-12 q-col-gutter-sm q-mb-sm">
|
||||||
<div>
|
<div>
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ onMounted(async () => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="toptitle text-dark col-12 row items-center">
|
<div class="toptitle text-dark col-12 row items-center">
|
||||||
รายการการสอบสวนความผิดทางวินัย
|
รายการสอบสวนความผิดทางวินัย
|
||||||
</div>
|
</div>
|
||||||
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
|
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
|
||||||
<div>
|
<div>
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ const pageSize = ref<number>(5);
|
||||||
const maxPage = ref<number>(1);
|
const maxPage = ref<number>(1);
|
||||||
const filter = ref<string>("");
|
const filter = ref<string>("");
|
||||||
|
|
||||||
/** function เรียกรายการผลการพิจารณาทางวินัย*/
|
/** function เรียกรายการสรุปผลการพิจารณาทางวินัย*/
|
||||||
async function fetchListResult() {
|
async function fetchListResult() {
|
||||||
showLoader();
|
showLoader();
|
||||||
await http
|
await http
|
||||||
|
|
@ -76,7 +76,7 @@ onMounted(async () => {
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="toptitle text-dark col-12 row items-center">
|
<div class="toptitle text-dark col-12 row items-center">
|
||||||
รายการผลการพิจารณาทางวินัย
|
รายการสรุปผลการพิจารณาทางวินัย
|
||||||
</div>
|
</div>
|
||||||
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
|
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
|
||||||
<div>
|
<div>
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ function save() {
|
||||||
v-model="channel"
|
v-model="channel"
|
||||||
for="channel"
|
for="channel"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
label="กรอกชื่อช่องทาง"
|
label="ชื่อช่องทาง"
|
||||||
:rules="[(val:string) => !!val || `${'กรุณากรอกชื่อช่องทาง'}`]"
|
:rules="[(val:string) => !!val || `${'กรุณากรอกชื่อช่องทาง'}`]"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ const InvestigateDisciplinaryAdd = () =>
|
||||||
// const oredrMain = () =>
|
// const oredrMain = () =>
|
||||||
// import("@/modules/11_discipline/components/4_Order/MainPage.vue");
|
// import("@/modules/11_discipline/components/4_Order/MainPage.vue");
|
||||||
|
|
||||||
/** หน้ารายการผลการพิจารณาทางวินัย */
|
/** หน้ารายการสรุปผลการพิจารณาทางวินัย */
|
||||||
const resultMainPage = () =>
|
const resultMainPage = () =>
|
||||||
import("@/modules/11_discipline/components/4_Result/MainPage.vue");
|
import("@/modules/11_discipline/components/4_Result/MainPage.vue");
|
||||||
const resultEditPage = () =>
|
const resultEditPage = () =>
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ export const useDisciplineChannelDataStore = defineStore(
|
||||||
{
|
{
|
||||||
name: "name",
|
name: "name",
|
||||||
align: "left",
|
align: "left",
|
||||||
label: "ชื่อประเภท",
|
label: "ชื่อช่องทาง",
|
||||||
sortable: true,
|
sortable: true,
|
||||||
field: "name",
|
field: "name",
|
||||||
headerStyle: "font-size: 14px",
|
headerStyle: "font-size: 14px",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue