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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2023-12-01 17:32:43 +07:00
commit 62c3435db6
3 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/09_leave/components/3_Report/DetailReport.vue
View file

@ -45,8 +45,8 @@ function monthYearThai(val: DataDateMonthObject) {
}
const employeeClassMain = ref<DataOption[]>([
{ id: "employee", name: "ข้าราชการ" },
{ id: "perm", name: "ลูกจ้างประจำ" },
{ id: "temp", name: "ลูกจ้างชั่วคราว" },
]);
const employeeClassOption = ref<DataOption[]>(employeeClassMain.value);

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

@ -193,7 +193,7 @@ function validateForm() {
* @param val จำนวนวันที่ต้องการขยาย
*/
function calEndDate(val: string) {
const date = new Date(props.data.investigationDateEnd);
const date = new Date(props.data.disciplinaryDateEnd);
const dateNew = new Date();
formData.disciplinaryDateEnd = new Date(
dateNew.setDate(date.getDate() + Number(val))
@ -459,6 +459,7 @@ onMounted(async () => {
<div class="col-12 row q-col-gutter-md">
<div class="col-xs-12 col-sm-3">
<q-select
:readonly="isReadonly"
for="SelectrespondentType"
v-model="formData.respondentType"
ref="respondentTypeRef"
@ -497,6 +498,7 @@ onMounted(async () => {
id="organizationId"
>
<q-select
:readonly="isReadonly"
for="inputOffice"
name="organizationId"
ref="organizationIdRef"
@ -564,6 +566,7 @@ onMounted(async () => {
>
ผู้ถูกร้องเรียน
<q-btn
v-if="!isReadonly"
size="12px"
flat
round
@ -680,6 +683,7 @@ onMounted(async () => {
formData.disciplinaryDateEnd != null &&
((isReadonly && formData.extendStatus) || !isReadonly)
"
:disable="isReadonly"
for="#extendStatus"
size="md"
v-model="formData.extendStatus"
@ -697,7 +701,7 @@ onMounted(async () => {
<div class="col-3" v-if="!formData.extendStatus">
<datepicker
menu-class-name="modalfix"
:readonly="isUpdate"
:readonly="isReadonly"
v-model="formData.disciplinaryDateStart"
:locale="'th'"
autoApply
@ -716,7 +720,7 @@ onMounted(async () => {
for="#date"
class="full-width cursor-pointer"
ref="dateRef"
:readonly="isUpdate"
:readonly="isReadonly"
outlined
dense
lazy-rules
@ -748,7 +752,8 @@ onMounted(async () => {
</div>
<div class="col-3" v-if="formData.extendStatus">
<q-selectinvestigateDis
<q-select
:readonly="isReadonly"
for="#daysExtend"
outlined
dense
@ -761,11 +766,11 @@ onMounted(async () => {
hide-bottom-space
map-options
:rules="[
(val: any) =>
formData.extendStatus
? !!val || 'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
: true,
]"
(val) =>
formData.extendStatus
? !!val || 'กรุณาเลือกจำนวนวันที่ต้องการขยาย'
: true,
]"
option-label="name"
option-value="id"
use-input
@ -777,14 +782,14 @@ onMounted(async () => {
</q-item-section>
</q-item>
</template>
</q-selectinvestigateDis>
</q-select>
</div>
<div class="col-3">
<datepicker
menu-class-name="modalfix"
v-model="formData.disciplinaryDateEnd"
:readonly="isUpdate"
:readonly="isReadonly"
:locale="'th'"
autoApply
:enableTimePicker="false"
@ -802,7 +807,7 @@ onMounted(async () => {
for="#dateEnd"
ref="dateEndRef"
class="full-width cursor-pointer"
:readonly="isUpdate"
:readonly="isReadonly"
outlined
dense
lazy-rules
@ -838,6 +843,7 @@ onMounted(async () => {
</div>
<datepicker
:readonly="isReadonly"
menu-class-name="modalfix"
for="#dateAllegation"
v-model="formData.disciplinaryDateAllegation"
@ -857,6 +863,7 @@ onMounted(async () => {
</template>
<template #trigger>
<q-input
:readonly="isReadonly"
ref="disciplinaryDateAllegationRef"
outlined
dense
@ -887,6 +894,7 @@ onMounted(async () => {
</datepicker>
<datepicker
:readonly="isReadonly"
menu-class-name="modalfix"
for="#dateAllegation"
v-model="formData.disciplinaryDateInvestigation"
@ -906,6 +914,7 @@ onMounted(async () => {
</template>
<template #trigger>
<q-input
:readonly="isReadonly"
outlined
dense
class="col-xs-12 col-sm-4"
@ -935,6 +944,7 @@ onMounted(async () => {
</datepicker>
<datepicker
:readonly="isReadonly"
menu-class-name="modalfix"
for="#dateEvident"
v-model="formData.disciplinaryDateEvident"
@ -954,6 +964,7 @@ onMounted(async () => {
</template>
<template #trigger>
<q-input
:readonly="isReadonly"
ref="disciplinaryDateEvidentRef"
outlined
dense
@ -984,6 +995,7 @@ onMounted(async () => {
</datepicker>
<datepicker
:readonly="isReadonly"
menu-class-name="modalfix"
for="#dateEvident"
v-model="formData.disciplinaryDateResult"
@ -1003,6 +1015,7 @@ onMounted(async () => {
</template>
<template #trigger>
<q-input
:readonly="isReadonly"
ref="disciplinaryDateResultRef"
outlined
dense
@ -1043,6 +1056,7 @@ onMounted(async () => {
>
รายชื่อกรรมการเพื่อพิจารณาความผิดทางวินัย
<q-btn
v-if="!isReadonly"
size="12px"
flat
round
@ -1092,6 +1106,7 @@ onMounted(async () => {
</q-td>
<q-td>
<q-btn
v-if="!isReadonly"
dense
size="12px"
flat
@ -1110,6 +1125,7 @@ onMounted(async () => {
</q-card>
</div>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-3"
dense
outlined
@ -1124,6 +1140,7 @@ onMounted(async () => {
/>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-3"
dense
hide-bottom-space
@ -1138,6 +1155,7 @@ onMounted(async () => {
/>
<q-select
:readonly="isReadonly"
dense
class="col-xs-12 col-sm-3"
outlined
@ -1160,6 +1178,7 @@ onMounted(async () => {
</q-select>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-3"
dense
for="#refLaw"
@ -1176,6 +1195,7 @@ onMounted(async () => {
/>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-6"
dense
outlined
@ -1191,6 +1211,7 @@ onMounted(async () => {
/>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-6"
dense
outlined
@ -1206,6 +1227,7 @@ onMounted(async () => {
/>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-6"
dense
outlined
@ -1221,6 +1243,7 @@ onMounted(async () => {
/>
<q-input
:readonly="isReadonly"
class="col-xs-12 col-sm-6"
dense
outlined
@ -1256,7 +1279,7 @@ onMounted(async () => {
for="#fault"
outlined
dense
:readonly="isUpdate"
:readonly="isReadonly"
lazy-rules
ref="disciplinaryStatusResultRef"
v-model="formData.disciplinaryStatusResult"
@ -1291,6 +1314,7 @@ onMounted(async () => {
class="col-3"
>
<q-select
:readonly="isReadonly"
for="#fault"
outlined
dense
@ -1321,6 +1345,7 @@ onMounted(async () => {
<div class="row col-12">
<q-input
:readonly="isReadonly"
class="full-width cursor-pointer"
outlined
ref="disciplinaryResultRef"
@ -1341,7 +1366,7 @@ onMounted(async () => {
</div>
</div>
<q-separator />
<div class="row col-12 q-pa-sm">
<div v-if="!isReadonly" class="row col-12 q-pa-sm">
<q-space />
<q-btn
for="ButtonOnSubmit"
@ -1367,6 +1392,7 @@ onMounted(async () => {
:id="id"
type="relevant"
:fetchData="props.fetchData"
:is-readonly="isReadonly"
/>
<UploadFile
@ -1376,6 +1402,7 @@ onMounted(async () => {
:id="id"
type="summaryEvidence"
:fetchData="props.fetchData"
:is-readonly="isReadonly"
/>
<UploadFile
title="อัปโหลดบันทึกถ้อยคำของผู้กล่าวหา"
@ -1384,7 +1411,9 @@ onMounted(async () => {
:id="id"
type="recordAccuser"
:fetchData="props.fetchData"
:is-readonly="isReadonly"
/>
<UploadFile
title="อัปโหลดพยานและการบันทึกถ้อยคำ"
label="เลือกไฟล์"
@ -1392,7 +1421,9 @@ onMounted(async () => {
:id="id"
type="witnesses"
:fetchData="props.fetchData"
:is-readonly="isReadonly"
/>
<UploadFile
title="อัปโหลดไฟล์เอกสารหลักฐานอื่น ๆ"
label="เลือกไฟล์"
@ -1400,6 +1431,7 @@ onMounted(async () => {
:id="id"
type="other"
:fetchData="props.fetchData"
:is-readonly="isReadonly"
/>
</div>
</div>
@ -1429,6 +1461,4 @@ onMounted(async () => {
@update:pagination="updatePaging"
@returnDirector="returnDirector"
/>
<!-- :fecthlistappointment="fecthlistappointment" -->
</template>
@/modules/11_discipline/store/store
</template>

12
src/modules/11_discipline/components/UploadFile.vue
View file

@ -11,7 +11,7 @@ import { useCounterMixin } from "@/stores/mixin";
const $q = useQuasar();
const mixin = useCounterMixin();
const { showLoader, hideLoader, success, messageError,dialogRemove } = mixin;
const { showLoader, hideLoader, success, messageError, dialogRemove } = mixin;
const fileRef = ref<Object | null>(null);
const file = ref<any>();
@ -47,6 +47,9 @@ const props = defineProps({
type: Function,
default: () => "",
},
isReadonly: {
type: Boolean,
},
});
/**
@ -73,8 +76,8 @@ async function uploadFile() {
});
}
function popupRemove(id:string){
dialogRemove($q,()=> removeFile(id))
function popupRemove(id: string) {
dialogRemove($q, () => removeFile(id));
}
async function removeFile(id: string) {
@ -109,7 +112,7 @@ function downloadFile(link: string) {
{{ title }}
</div>
<div class="col-12"><q-separator /></div>
<div class="row">
<div v-if="!isReadonly" class="row">
<div class="col-11 q-pa-sm">
<q-file
outlined
@ -169,6 +172,7 @@ function downloadFile(link: string) {
</div>
<div>
<q-btn
v-if="!isReadonly"
dense
flat
round