hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

ปรับโค้ดวินัย

Browse source
This commit is contained in:
setthawutttty 2024-01-12 15:05:45 +07:00
parent 1483bbcac7
commit c81b5db558
17 changed files with 93 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/modules/11_discipline/components/3_InvestigateDisciplinary/Calendar.vue
View file

@ -157,29 +157,12 @@ async function fetchCalendar() {
*/
onMounted(async () => {
fetchCalendar();
// if (fullCalendar !== undefined) {
// const calen = fullCalendar.value.getApi();
// const date = new Date(dateMonth.value.year, dateMonth.value.month);
// calen.gotoDate(date);
// }
});
function changCalendar() {
fetchCalendar();
// const calen = fullCalendar.value.getApi();
// const date = new Date(dateMonth.value.year, dateMonth.value.month);
// calen.gotoDate(date);
}
/**
* ค่า props(วันเดือนปีที่เลือก) ตอนอัพเดท ค่าฏิทินให้อัพเดทใหม่
*/
// watch(props, async (count, prevCount) => {
// const calen = fullCalendar.value.getApi();
// const date = new Date(props.dateYear, props.dateMonth);
// calen.gotoDate(date);
// });
/**
* ฟังก์ชั่นยกเลิก model
* @param text

91
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -217,7 +217,7 @@ function validateForm() {
}
}
if (hasError.every((result) => result === true)) {
countNum.value = 1
countNum.value = 1;
onSubmit();
}
}
@ -230,7 +230,7 @@ async function calEndDate(val: string) {
changeFormData();
const date = await new Date(props.data.disciplinaryDateEnd);
formData.disciplinaryDateEnd = await new Date(
date.setDate(date.getDate() + (Number(val)))
date.setDate(date.getDate() + Number(val))
);
}
@ -374,7 +374,7 @@ async function fetchDatadetail() {
function returnCount(num: number) {
countNum.value = num;
console.log(countNum.value)
console.log(countNum.value);
}
async function addPerson(data: any) {
@ -557,14 +557,13 @@ function emitPerson(data: PersonsArray[]) {
Id: dataMapId,
})
.then((res) => {
// router.push(`/discipline/investigatefacts`);
fetchOrganization();
})
.catch((e) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
fetchOrganization();
});
}
@ -596,7 +595,6 @@ async function saveDuty(id: string, duty: string, resolution: string) {
messageError($q, e);
})
.finally(async () => {
hideLoader();
});
}
@ -772,15 +770,15 @@ onMounted(async () => {
<q-tr :props="props" class="cursor-pointer">
<td>
<q-btn
dense
flat
round
color="info"
icon="info"
@click="onclickViewinfo(props.row.personId)"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
dense
flat
round
color="info"
icon="info"
@click="onclickViewinfo(props.row.personId)"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
</td>
<q-td
v-for="col in props.cols"
@ -977,7 +975,6 @@ onMounted(async () => {
for="#daysExtend"
outlined
dense
ref="daysExtendRef"
v-model="formData.daysExtend"
:options="investigateDis.daysExtendOps"
@ -1089,7 +1086,6 @@ onMounted(async () => {
"
outlined
dense
hide-bottom-space
borderless
:model-value="
@ -1225,7 +1221,6 @@ onMounted(async () => {
: null
"
:label="`${'วันที่รายงานผลการสอบสวน'}`"
>
<template v-slot:prepend>
<q-icon
@ -1361,7 +1356,6 @@ onMounted(async () => {
ref="disciplinaryInvestigateAtRef"
v-model="formData.disciplinaryInvestigateAt"
label="สอบสวนที่"
@update:model-value="changeFormData()"
/>
</div>
@ -1382,7 +1376,6 @@ onMounted(async () => {
hide-bottom-space
:options="investigateDis.optionsfaultLevel"
label="ระดับโทษความผิด"
group-label="group"
group-values="options"
@update:model-value="changeFormData()"
@ -1496,37 +1489,35 @@ onMounted(async () => {
<div class="col-12"><q-separator /></div>
<div class="q-pa-sm row q-col-gutter-sm">
<div class="col-3">
<q-select
:class="inputEdit(isReadonly)"
for="#fault"
outlined
dense
:readonly="isReadonly"
ref="disciplinaryStatusResultRef"
v-model="formData.disciplinaryStatusResult"
:options="mainStore.statusResultOptions"
label="ผลการสอบสวน"
emit-value
hide-bottom-space
map-options
option-label="name"
option-value="id"
use-input
@filter="(inputValue: any,
<div class="col-3">
<q-select
:class="inputEdit(isReadonly)"
for="#fault"
outlined
dense
:readonly="isReadonly"
ref="disciplinaryStatusResultRef"
v-model="formData.disciplinaryStatusResult"
:options="mainStore.statusResultOptions"
label="ผลการสอบสวน"
emit-value
hide-bottom-space
map-options
option-label="name"
option-value="id"
use-input
@filter="(inputValue: any,
doneFn: Function) => investigateDis.filterFnOptionsType(inputValue, doneFn, 'offenseDetailsOps'
)"
@update:model-value="changeFormData()"
><template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
ไม่มีข้อมูล
</q-item-section>
</q-item>
</template>
</q-select>
@update:model-value="changeFormData()"
><template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
ไม่มีข้อมูล
</q-item-section>
</q-item>
</template>
</q-select>
<div
v-if="
@ -1561,7 +1552,7 @@ onMounted(async () => {
</div>
</div>
<div class=" col-12">
<div class="col-12">
<q-input
:class="inputEdit(isReadonly)"
:readonly="isReadonly"