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

no message

Browse source
This commit is contained in:
Kittapath 2023-10-13 17:33:39 +07:00
parent 58a8f97e6c
commit 68771708b2
5 changed files with 66 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/modules/03_recruiting/components/Career.vue
View file

@ -13,6 +13,7 @@
:edit="clickEdit" :edit="clickEdit"
:addData="false" :addData="false"
:bottom="true" :bottom="true"
:boss="status == 'checkRegister' || status == 'payment'"
:editData="status == 'checkRegister' || status == 'payment'" :editData="status == 'checkRegister' || status == 'payment'"
name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)" name="ประวัติการทำงาน (ตั้งแต่เริ่มปฏิบัติงานกับกรุงเทพมหานคร - ปัจจุบัน)"
icon="mdi-briefcase" icon="mdi-briefcase"
@ -83,12 +84,14 @@
> >
<div class="col-xs-12 col-sm-6 col-md-6"> <div class="col-xs-12 col-sm-6 col-md-6">
<q-input <q-input
:class="getClass(edit)" :class="
:outlined="edit" getClass(status == 'checkRegister' || status == 'payment')
"
:outlined="status == 'checkRegister' || status == 'payment'"
dense dense
lazy-rules lazy-rules
:readonly="!edit" :readonly="!status == 'checkRegister' || status == 'payment'"
:borderless="!edit" :borderless="!status == 'checkRegister' || status == 'payment'"
v-model="position" v-model="position"
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/ลักษณะงาน'}`]" :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/ลักษณะงาน'}`]"
:label="`${'ตำแหน่ง/ลักษณะงาน'}`" :label="`${'ตำแหน่ง/ลักษณะงาน'}`"
@ -98,17 +101,19 @@
</div> </div>
<div class="col-xs-12 col-sm-6 col-md-6"> <div class="col-xs-12 col-sm-6 col-md-6">
<q-select <q-select
:class="getClass(edit)" :class="
:outlined="edit" getClass(status == 'checkRegister' || status == 'payment')
"
:outlined="status == 'checkRegister' || status == 'payment'"
dense dense
lazy-rules lazy-rules
:readonly="!edit" :readonly="!status == 'checkRegister' || status == 'payment'"
:borderless="!edit" :borderless="!status == 'checkRegister' || status == 'payment'"
v-model="type" v-model="type"
:options="opType" :options="opType"
:rules="[(val) => !!val || `${'กรุณาเลือกประเภท'}`]" :rules="[(val) => !!val || `${'กรุณาเลือกประเภท'}`]"
:label="`${'ประเภท'}`" :label="`${'ประเภท'}`"
@update:modelValue="clickEditRow" @update:modelValue="clickEditRowPosition"
hide-bottom-space hide-bottom-space
/> />
</div> </div>
@ -160,7 +165,7 @@
<div class="col-xs-12 col-sm-6 col-md-6"> <div class="col-xs-12 col-sm-6 col-md-6">
<datepicker <datepicker
menu-class-name="modalfix" menu-class-name="modalfix"
:readonly="!edit" :readonly="!status == 'checkRegister' || status == 'payment'"
v-model="startDate" v-model="startDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -176,11 +181,15 @@
</template> </template>
<template #trigger> <template #trigger>
<q-input <q-input
:class="getClass(edit)" :class="
:outlined="edit" getClass(status == 'checkRegister' || status == 'payment')
"
:outlined="status == 'checkRegister' || status == 'payment'"
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="
!status == 'checkRegister' || status == 'payment'
"
:model-value="date2Thai(startDate)" :model-value="date2Thai(startDate)"
:rules="[ :rules="[
(val) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`, (val) => !!val || `${'กรุณาเลือกวันที่เริ่ม'}`,
@ -196,7 +205,7 @@
name="event" name="event"
class="cursor-pointer" class="cursor-pointer"
:style=" :style="
edit status == 'checkRegister' || status == 'payment'
? 'color: var(--q-primary)' ? 'color: var(--q-primary)'
: 'color: var(--q-grey)' : 'color: var(--q-grey)'
" "
@ -210,7 +219,7 @@
<div class="col-xs-12 col-sm-6 col-md-6"> <div class="col-xs-12 col-sm-6 col-md-6">
<datepicker <datepicker
menu-class-name="modalfix" menu-class-name="modalfix"
:readonly="!edit" :readonly="!status == 'checkRegister' || status == 'payment'"
v-model="endDate" v-model="endDate"
:locale="'th'" :locale="'th'"
autoApply autoApply
@ -226,11 +235,15 @@
</template> </template>
<template #trigger> <template #trigger>
<q-input <q-input
:class="getClass(edit)" :class="
:outlined="edit" getClass(status == 'checkRegister' || status == 'payment')
"
:outlined="status == 'checkRegister' || status == 'payment'"
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="
!status == 'checkRegister' || status == 'payment'
"
:model-value="date2Thai(endDate)" :model-value="date2Thai(endDate)"
:rules="[ :rules="[
(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`, (val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`,
@ -246,7 +259,7 @@
name="event" name="event"
class="cursor-pointer" class="cursor-pointer"
:style=" :style="
edit status == 'checkRegister' || status == 'payment'
? 'color: var(--q-primary)' ? 'color: var(--q-primary)'
: 'color: var(--q-grey)' : 'color: var(--q-grey)'
" "
@ -506,6 +519,14 @@ const calDate = async () => {
} }
dayDiff += daysInMonth[_startDate.getMonth()]; dayDiff += daysInMonth[_startDate.getMonth()];
} }
if (dayDiff >= 30) {
monthDiff = monthDiff + 1;
dayDiff = 0;
if (monthDiff >= 12) {
yearDiff = yearDiff + 1;
monthDiff = 0;
}
}
rangeDate.value = `${yearDiff > 0 ? yearDiff + " ปี " : ""}${ rangeDate.value = `${yearDiff > 0 ? yearDiff + " ปี " : ""}${
monthDiff > 0 ? monthDiff + " เดือน " : "" monthDiff > 0 ? monthDiff + " เดือน " : ""
}${dayDiff > 0 ? dayDiff + " วัน " : ""}`; }${dayDiff > 0 ? dayDiff + " วัน " : ""}`;
@ -543,6 +564,14 @@ const calDateSplit = async (startDate: Date, endDate: Date) => {
} }
dayDiff += daysInMonth[_startDate.getMonth()]; dayDiff += daysInMonth[_startDate.getMonth()];
} }
if (dayDiff >= 30) {
monthDiff = monthDiff + 1;
dayDiff = 0;
if (monthDiff >= 12) {
yearDiff = yearDiff + 1;
monthDiff = 0;
}
}
var obj = { var obj = {
yearDiff: yearDiff, yearDiff: yearDiff,
monthDiff: monthDiff, monthDiff: monthDiff,

28
src/modules/03_recruiting/components/Education.vue
View file

@ -10,8 +10,8 @@
/> />
<q-form ref="myform"> <q-form ref="myform">
<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs"> <div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-xs">
<div class="col-12 row"> <div class="col-12 row q-col-gutter-sm">
<div class="col-3"> <div class="col-xs-12 col-sm-3">
<q-select <q-select
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')" :readonly="!(status == 'checkRegister' || status == 'payment')"
@ -30,9 +30,8 @@
@update:model-value="(value) => checkInputName()" @update:model-value="(value) => checkInputName()"
/> />
</div> </div>
<div class="col-3" v-if="showEducationName"> <div class="col-xs-12 col-sm-3" v-if="showEducationName">
<q-input <q-input
class="q-pl-sm"
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:outlined="status == 'checkRegister' || status == 'payment'" :outlined="status == 'checkRegister' || status == 'payment'"
dense dense
@ -45,9 +44,8 @@
:label="`${'ชื่อปริญญา'}`" :label="`${'ชื่อปริญญา'}`"
/> />
</div> </div>
<div class="col-3"> <div class="col-xs-12 col-sm-3">
<q-input <q-input
class="q-pl-sm"
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:outlined="status == 'checkRegister' || status == 'payment'" :outlined="status == 'checkRegister' || status == 'payment'"
dense dense
@ -60,9 +58,7 @@
:label="`${'สาขาวิชา/วิชาเอก'}`" :label="`${'สาขาวิชา/วิชาเอก'}`"
/> />
</div> </div>
</div> <div class="col-xs-12 col-sm-3">
<div class="col-12 row">
<div class="col-3">
<q-input <q-input
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:outlined="status == 'checkRegister' || status == 'payment'" :outlined="status == 'checkRegister' || status == 'payment'"
@ -76,9 +72,8 @@
:label="`${'ชื่อสถานศึกษา'}`" :label="`${'ชื่อสถานศึกษา'}`"
/> />
</div> </div>
<div class="col-3"> <div class="col-xs-12 col-sm-3">
<q-select <q-select
class="q-pl-sm"
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')" :readonly="!(status == 'checkRegister' || status == 'payment')"
:borderless="!(status == 'checkRegister' || status == 'payment')" :borderless="!(status == 'checkRegister' || status == 'payment')"
@ -95,7 +90,7 @@
:label="`${'ประเภทสถานศึกษา'}`" :label="`${'ประเภทสถานศึกษา'}`"
/> />
</div> </div>
<div class="col-3"> <div class="col-xs-12 col-sm-3">
<datepicker <datepicker
v-model="defaultEducation.educationEndDate" v-model="defaultEducation.educationEndDate"
:locale="'th'" :locale="'th'"
@ -113,7 +108,6 @@
</template> </template>
<template #trigger> <template #trigger>
<q-input <q-input
class="q-pl-sm"
:class=" :class="
getClass(status == 'checkRegister' || status == 'payment') getClass(status == 'checkRegister' || status == 'payment')
" "
@ -147,9 +141,8 @@
</template> </template>
</datepicker> </datepicker>
</div> </div>
<div class="col-3"> <div class="col-xs-12 col-sm-3">
<q-input <q-input
class="q-pl-sm"
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:outlined="status == 'checkRegister' || status == 'payment'" :outlined="status == 'checkRegister' || status == 'payment'"
dense dense
@ -162,9 +155,7 @@
:label="`${'คะแนนเฉลี่ยสะสม'}`" :label="`${'คะแนนเฉลี่ยสะสม'}`"
/> />
</div> </div>
</div> <div class="col-xs-12 col-sm-3">
<div class="col-12 row">
<div class="col-3">
<q-select <q-select
:class="getClass(status == 'checkRegister' || status == 'payment')" :class="getClass(status == 'checkRegister' || status == 'payment')"
:readonly="!(status == 'checkRegister' || status == 'payment')" :readonly="!(status == 'checkRegister' || status == 'payment')"
@ -268,6 +259,7 @@ const fetchData = async () => {
defaultEducation.value.educationEndDate = data.educationEndDate; defaultEducation.value.educationEndDate = data.educationEndDate;
defaultEducation.value.educationScores = data.educationScores; defaultEducation.value.educationScores = data.educationScores;
defaultEducation.value.educationLevelHighId = data.educationLevelHighId; defaultEducation.value.educationLevelHighId = data.educationLevelHighId;
checkInputName();
} }
}) })
.catch((e) => { .catch((e) => {

3
src/modules/03_recruiting/components/TableCan.vue
View file

@ -71,7 +71,7 @@
<q-th v-for="col in props.cols" :key="col.name" :props="props"> <q-th v-for="col in props.cols" :key="col.name" :props="props">
<span class="text-weight-medium">{{ col.label }}</span> <span class="text-weight-medium">{{ col.label }}</span>
</q-th> </q-th>
<q-th auto-width v-if="editBtn == true" /> <q-th auto-width v-if="boss == true" />
</q-tr> </q-tr>
</template> </template>
<template #body="props"> <template #body="props">
@ -103,6 +103,7 @@ const props = defineProps({
editvisible: Boolean, editvisible: Boolean,
nameHeader: Boolean, nameHeader: Boolean,
bottom: Boolean, bottom: Boolean,
boss: Boolean,
addData: { addData: {
type: Boolean, type: Boolean,
defualt: true, defualt: true,

3
src/modules/03_recruiting/components/TableCandidate.vue
View file

@ -78,7 +78,8 @@
color="primary" color="primary"
@click="candidateCheckProfileDialog" @click="candidateCheckProfileDialog"
:disabled=" :disabled="
attrs.rows.filter((r) => r.status == 'checkRegister').length == 0 attrs.rows.filter((r) => r.status == 'checkRegister').length == 0 ||
selected.length == 0
" "
> >
<q-tooltip>ตรวจสอบข้อมูล/ได้รับใบสมัครแล้ว</q-tooltip> <q-tooltip>ตรวจสอบข้อมูล/ได้รับใบสมัครแล้ว</q-tooltip>

8
src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
View file

@ -993,10 +993,10 @@
type="textarea" type="textarea"
/> />
</div> </div>
<div class="col-12"> <div class="col-12" v-if="announcementExam">
<q-separator size="5px" color="grey-2" class="q-my-lg" /> <q-separator size="5px" color="grey-2" class="q-my-lg" />
</div> </div>
<div class="col-12"> <div class="col-12" v-if="announcementExam">
<div class="text-bold text-subtitle2 q-pb-sm"> <div class="text-bold text-subtitle2 q-pb-sm">
ข้อกำหนดและเงื่อนไข ข้อกำหนดและเงื่อนไข
</div> </div>
@ -1060,10 +1060,10 @@
}" }"
/> />
</div> </div>
<div class="col-12"> <div class="col-12" v-if="announcementExam">
<q-separator size="5px" color="grey-2" class="q-my-lg" /> <q-separator size="5px" color="grey-2" class="q-my-lg" />
</div> </div>
<div class="col-12"> <div class="col-12" v-if="announcementExam">
<div class="text-bold text-subtitle2 q-pb-sm">คำรับรอง</div> <div class="text-bold text-subtitle2 q-pb-sm">คำรับรอง</div>
<q-editor <q-editor
v-model="editorConfirm" v-model="editorConfirm"