แก้ไขเรื่องร้องเรียน, สืบสวน, สอบสวน
This commit is contained in:
parent
76594a2359
commit
f247167e9a
20 changed files with 1356 additions and 1714 deletions
|
|
@ -23,7 +23,7 @@ import type { DataOptionRes } from "@/modules/11_discipline/interface/response/M
|
|||
|
||||
/** import components*/
|
||||
import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
|
||||
import Dialogbody from "@/modules/11_discipline/components/3_InvestigateDisciplinary/Dialogbody.vue";
|
||||
import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
|
||||
import Table from "@/modules/11_discipline/components/3_InvestigateDisciplinary/DirectorTable.vue";
|
||||
import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
|
||||
|
||||
|
|
@ -31,9 +31,12 @@ import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
|
||||
import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
|
||||
import { useDisciplineMainStore } from "@/modules/11_discipline/store";
|
||||
import { co } from "@fullcalendar/core/internal-common";
|
||||
|
||||
const complainstStore = useComplainstDataStore();
|
||||
const investigateDis = useInvestigateDisStore();
|
||||
const mainStore = useDisciplineMainStore();
|
||||
const { filterSelector } = complainstStore; // function จาก store complainstStore
|
||||
const mixin = useCounterMixin();
|
||||
const { date2Thai, showLoader, hideLoader, dialogConfirm, messageError } =
|
||||
|
|
@ -52,95 +55,13 @@ const modalPerson = ref<boolean>(false);
|
|||
/** search data table*/
|
||||
const filter = ref<string>("");
|
||||
|
||||
const isSave = ref<boolean>(false); // มีการแก้ไขรอบันทึก
|
||||
const isReadonly = ref<boolean>(false); // อ่านได้อย่างเดียว
|
||||
|
||||
function toggleModal() {
|
||||
modalPerson.value = !modalPerson.value;
|
||||
}
|
||||
|
||||
/** หัวตารางของรายการผู้ถูกสอบสวน กรณีบุคคล */
|
||||
const columnsPerson = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "info",
|
||||
align: "center",
|
||||
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",
|
||||
},
|
||||
]);
|
||||
|
||||
/** formData*/
|
||||
const formData = reactive<FormData>({
|
||||
respondentType: "",
|
||||
|
|
@ -158,7 +79,7 @@ const formData = reactive<FormData>({
|
|||
result: "", // ผลการสอบสวน
|
||||
directors: [],
|
||||
persons: [],
|
||||
clickTime: false,
|
||||
extendStatus: false,
|
||||
disciplinaryDateStart: null, // วันที่เริ่มการสอบสวน
|
||||
disciplinaryDateEnd: null, // วันที่สิ้นสุดการสอบสวน
|
||||
daysExtend: 0,
|
||||
|
|
@ -167,21 +88,6 @@ const formData = reactive<FormData>({
|
|||
disciplinaryStatusResult: "",
|
||||
disciplinaryCauseText: "",
|
||||
disciplinaryResult: "",
|
||||
|
||||
// detailComplaint: "",
|
||||
// whereInvestigate: "",
|
||||
// trueDetail: "",
|
||||
// evidence: "",
|
||||
// recordAccuser: "",
|
||||
// witnesses: "",
|
||||
// InvestResults: "",
|
||||
// complaintStatus: "",
|
||||
// filesEvidence: null,
|
||||
// filesRecordAccuser: null,
|
||||
// filesWitnesses: null,
|
||||
// filesEtc: null,
|
||||
// organizationId: "",
|
||||
// consideredAgency: "",
|
||||
});
|
||||
const disciplineDisciplinary_DocRelevants = ref<FileLists[]>([]); // ยังไม่มีรอ api
|
||||
const disciplineDisciplinary_DocSummaryEvidences = ref<FileLists[]>([]);
|
||||
|
|
@ -280,8 +186,7 @@ function validateForm() {
|
|||
}
|
||||
if (hasError.every((result) => result === true)) {
|
||||
onSubmit();
|
||||
} else {
|
||||
console.log("ไม่ผ่าน ");
|
||||
isSave.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -306,8 +211,6 @@ function onSubmit() {
|
|||
dialogConfirm(
|
||||
$q,
|
||||
async () => {
|
||||
const dataList = formData.directors.map((item: any) => item.id);
|
||||
formData.directors = dataList;
|
||||
emit("submit:disciplinary", formData);
|
||||
},
|
||||
"ยืนยันการบันทึกข้อมูล",
|
||||
|
|
@ -315,14 +218,23 @@ function onSubmit() {
|
|||
);
|
||||
}
|
||||
|
||||
/** ฟังชั่น delect */
|
||||
async function deleteData(id: string) {
|
||||
console.log("delete");
|
||||
/** ฟังชั่นลบข้อมูลกรรมการ */
|
||||
async function deleteDirector(id: string) {
|
||||
changeFormData();
|
||||
const dataRow = rows.value;
|
||||
const updatedRows = dataRow.filter((item: any) => item.id !== id);
|
||||
rows.value = updatedRows;
|
||||
|
||||
const dataList = updatedRows.map((item: any) => item.id);
|
||||
formData.directors = dataList;
|
||||
}
|
||||
|
||||
/** เรียกข้อมูลรายละเอียด*/
|
||||
async function fetchDatadetail() {
|
||||
if (props.data) {
|
||||
isReadonly.value = props.data.status != "NEW" ?? true;
|
||||
isSave.value = false;
|
||||
|
||||
formData.respondentType = props.data.respondentType;
|
||||
formData.organizationId = props.data.organizationId;
|
||||
formData.consideredAgency = props.data.consideredAgency;
|
||||
|
|
@ -337,7 +249,6 @@ async function fetchDatadetail() {
|
|||
formData.disciplinaryRecordAccuser = props.data.disciplinaryRecordAccuser;
|
||||
formData.disciplinaryWitnesses = props.data.disciplinaryWitnesses;
|
||||
formData.result = props.data.result;
|
||||
formData.directors = props.data.director ?? [];
|
||||
formData.persons = props.data.persons ?? [];
|
||||
formData.disciplinaryDateStart = props.data.disciplinaryDateStart ?? null;
|
||||
formData.disciplinaryDateEnd = props.data.disciplinaryDateEnd ?? null;
|
||||
|
|
@ -359,23 +270,25 @@ async function fetchDatadetail() {
|
|||
|
||||
investigateDis.rowSent = formData.persons;
|
||||
|
||||
formData.disciplinaryStatusResult = props.data.disciplinaryStatusResult;
|
||||
formData.disciplinaryCauseText = props.data.disciplinaryCauseText;
|
||||
formData.disciplinaryResult = props.data.disciplinaryResult;
|
||||
|
||||
/** MAP รายชื่อกรรมการ หน้าหลัก */
|
||||
let datalistDirector: responseType[] = formData.directors.map(
|
||||
(e: directorType) => ({
|
||||
id: e.id,
|
||||
directorId: e.directorId,
|
||||
name: `${e.prefix}${e.firstName} ${e.lastName}`,
|
||||
prefix: e.prefix,
|
||||
firstName: e.firstName,
|
||||
lastName: e.lastName,
|
||||
position: e.position ? e.position : "-",
|
||||
email: e.email ? e.email : "-",
|
||||
phone: e.phone ? e.phone : "-",
|
||||
total: Number(e.total) ?? "-",
|
||||
duty: e.duty ? e.duty : "-",
|
||||
})
|
||||
);
|
||||
rows.value = datalistDirector;
|
||||
const dataMap = props.data.director.map((item: any) => ({
|
||||
id: item.directorId,
|
||||
name: `${item.prefix}${item.firstName} ${item.lastName}`,
|
||||
prefix: item.prefix,
|
||||
firstName: item.firstName,
|
||||
lastName: item.lastName,
|
||||
position: item.position,
|
||||
email: item.email,
|
||||
phone: item.phone,
|
||||
}));
|
||||
|
||||
rows.value = dataMap;
|
||||
const dataList = dataMap.map((item: any) => item.id);
|
||||
formData.directors = dataList;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -518,6 +431,11 @@ async function selectComplainant(val: string) {
|
|||
// }
|
||||
}
|
||||
|
||||
/** ฟังก์ชั่นเช็คการแก้ไขฟอร์มแล้วไม่ได้กดบันทึก */
|
||||
function changeFormData() {
|
||||
isSave.value = true;
|
||||
}
|
||||
|
||||
/** Hook */
|
||||
onMounted(async () => {
|
||||
await fetchOrganization();
|
||||
|
|
@ -652,7 +570,7 @@ onMounted(async () => {
|
|||
<div class="col-xs-12 q-pa-sm">
|
||||
<d-table
|
||||
ref="table"
|
||||
:columns="columnsPerson"
|
||||
:columns="mainStore.columnsRespondent"
|
||||
:rows="formData.persons"
|
||||
row-key="personId"
|
||||
flat
|
||||
|
|
@ -730,16 +648,16 @@ onMounted(async () => {
|
|||
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-sm q-px-md"
|
||||
>
|
||||
วันที่สอบสวน
|
||||
<!-- v-if="
|
||||
props.data.disciplinaryDateStart &&
|
||||
props.data.disciplinaryDateStart != null &&
|
||||
props.data.disciplinaryDateEnd != null
|
||||
" -->
|
||||
|
||||
<q-checkbox
|
||||
for="#clickTime"
|
||||
v-if="
|
||||
formData.disciplinaryDateStart != null &&
|
||||
formData.disciplinaryDateEnd != null &&
|
||||
((isReadonly && formData.extendStatus) || !isReadonly)
|
||||
"
|
||||
for="#extendStatus"
|
||||
size="md"
|
||||
v-model="formData.clickTime"
|
||||
v-model="formData.extendStatus"
|
||||
label="ขยายเวลา"
|
||||
color="primary"
|
||||
dense
|
||||
|
|
@ -750,7 +668,7 @@ onMounted(async () => {
|
|||
<div class="col-12"><q-separator /></div>
|
||||
<div class="q-pa-sm">
|
||||
<div class="q-col-gutter-sm row">
|
||||
<div class="col-3" v-if="!formData.clickTime">
|
||||
<div class="col-3" v-if="!formData.extendStatus">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
:readonly="isUpdate"
|
||||
|
|
@ -802,7 +720,7 @@ onMounted(async () => {
|
|||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-3" v-if="formData.clickTime">
|
||||
<div class="col-3" v-if="formData.extendStatus">
|
||||
<q-selectinvestigateDis
|
||||
for="#daysExtend"
|
||||
outlined
|
||||
|
|
@ -817,7 +735,7 @@ onMounted(async () => {
|
|||
map-options
|
||||
:rules="[
|
||||
(val: any) =>
|
||||
formData.clickTime
|
||||
formData.extendStatus
|
||||
? !!val || 'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
|
||||
: true,
|
||||
]"
|
||||
|
|
@ -1147,8 +1065,8 @@ onMounted(async () => {
|
|||
flat
|
||||
round
|
||||
color="red"
|
||||
@click="deleteData(props.row.id)"
|
||||
icon="mdi-delete"
|
||||
@click="deleteDirector(props.row.id)"
|
||||
icon="mdi-delete-outline"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
|
|
@ -1305,7 +1223,7 @@ onMounted(async () => {
|
|||
:rules="[
|
||||
(val) => !!val || `${'กรุณาเลือกผลการสอบสวน'}`,
|
||||
]"
|
||||
:options="investigateDis.offenseDetailsOps"
|
||||
:options="mainStore.statusResultOptions"
|
||||
label="ผลการสอบสวน"
|
||||
emit-value
|
||||
map-options
|
||||
|
|
@ -1454,7 +1372,7 @@ onMounted(async () => {
|
|||
@returnData="handleSave"
|
||||
/>
|
||||
|
||||
<Dialogbody
|
||||
<DialogDirector
|
||||
v-model:Modal="modal"
|
||||
:clickClose="clickClose"
|
||||
:rows2="listDirector"
|
||||
|
|
@ -1464,6 +1382,7 @@ onMounted(async () => {
|
|||
:rowsPerPage="rowsPerPage"
|
||||
:page="page"
|
||||
:maxPage="maxPage"
|
||||
:selected-row="rows"
|
||||
@update:pagination="updatePaging"
|
||||
@returnDirector="returnDirector"
|
||||
/>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue