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

เพิ่ม id ระบบ วินัย ส่วนเรื่องร้องเรียนและออกคำสั่งลงโทษทางวินัย

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-10-24 15:03:48 +07:00
parent 752332faab
commit c602ca401b
6 changed files with 131 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/09_leave/components/2_Leave/ToolBar.vue
View file

@ -10,6 +10,7 @@ const { searchDataFn, filterOption } = leaveStore;
<q-toolbar style="padding: 0" class="q-gutter-sm q-mb-sm">
<div class="col-2">
<q-select
for="selectYear"
emit-value
map-options
outlined
@ -23,6 +24,7 @@ const { searchDataFn, filterOption } = leaveStore;
</div>
<div class="col-3">
<q-select
for="selectType"
emit-value
map-options
outlined
@ -50,6 +52,7 @@ const { searchDataFn, filterOption } = leaveStore;
</div>
<div class="col-2">
<q-select
for="selectStatus"
v-if="leaveStore.tab == '2'"
emit-value
map-options
@ -72,10 +75,17 @@ const { searchDataFn, filterOption } = leaveStore;
</div>
<q-space />
<div class="col-2">
<q-input dense outlined v-model="leaveStore.filterTable" label="ค้นหา" />
<q-input
for="filterTable"
dense
outlined
v-model="leaveStore.filterTable"
label="ค้นหา"
/>
</div>
<div class="col-2">
<q-select
for="visibleColumns"
v-model="leaveStore.visibleColumns"
multiple
outlined

30
src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
View file

@ -214,6 +214,7 @@ function onSubmit() {
<template>
<div class="toptitle text-dark col-12 row items-center">
<q-btn
for="backMainPageButton"
icon="mdi-arrow-left"
unelevated
round
@ -234,7 +235,7 @@ function onSubmit() {
>
<div class="col-xs-12 col-sm-2" id="complainantType">
<q-select
for="complainantType"
for="SelectcomplainantType"
ref="complainantTypeRef"
dense
outlined
@ -271,7 +272,7 @@ function onSubmit() {
v-if="formData.complainantType === '0'"
>
<q-select
for="complainant"
for="selectComplainant"
ref="complainantRef"
dense
outlined
@ -303,7 +304,7 @@ function onSubmit() {
id="office"
>
<q-input
for="office"
for="inputOffice"
name="office"
ref="officeRef"
dense
@ -317,7 +318,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-2" id="agency">
<q-select
ref="agencyRef"
for="agency"
for="selectAgency"
dense
outlined
v-model="formData.agency"
@ -345,7 +346,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-12" id="topicComplaint">
<q-input
for="topicComplaint"
for="inputTopicComplaint"
ref="topicComplaintRef"
dense
outlined
@ -359,7 +360,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-12" id="detail">
<q-input
for="detail"
for="inputDetail"
ref="detailRef"
dense
outlined
@ -389,7 +390,7 @@ function onSubmit() {
</template>
<template #trigger>
<q-input
for="datereceive"
for="inputDatereceive"
ref="datereceiveRef"
outlined
dense
@ -435,7 +436,7 @@ function onSubmit() {
</template>
<template #trigger>
<q-input
for="dateconsideration"
for="inputDateconsideration"
ref="dateconsiderationRef"
outlined
dense
@ -465,7 +466,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-2" id="offenseDescription">
<q-select
for="offenseDescription"
for="selectOffenseDescription"
ref="offenseDescriptionRef"
dense
outlined
@ -482,7 +483,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-2" id="considerationLevel">
<q-select
for="considerationLevel"
for="selectConsiderationLevel"
ref="considerationLevelRef"
dense
outlined
@ -517,7 +518,7 @@ function onSubmit() {
</template>
<template #trigger>
<q-input
for="datewarn"
for="inputDatewarn"
ref="datewarnRef"
outlined
dense
@ -548,7 +549,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-2" id="receivecomplaints">
<q-select
for="receivecomplaints"
for="selectReceivecomplaints"
ref="receivecomplaintsRef"
dense
outlined
@ -566,7 +567,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6"></div>
<div class="col-xs-12 col-sm-4" id="petitioner">
<q-input
id="petitioner"
for="inputPetitioner"
ref="petitionerRef"
dense
outlined
@ -578,7 +579,7 @@ function onSubmit() {
</div>
<div class="col-xs-12 col-sm-4" id="files">
<q-file
for="files"
for="inputFiles"
ref="filesRef"
class="col-xs-12 col-sm-10"
outlined
@ -603,6 +604,7 @@ function onSubmit() {
<div class="row col-12 q-pa-sm">
<q-space />
<q-btn
for="ButtonOnSubmit"
id="onSubmit"
flat
round

93
src/modules/11_discipline/components/1_Complaint/MainPage.vue
View file

@ -63,53 +63,54 @@ function redirectToPageadd() {
<template>
<div class="toptitle text-dark col-12 row items-center">เรื่องร้องเรียน</div>
<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>
<q-btn
id="addComplaints"
size="12px"
flat
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
id="filterTable"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
id="visibleColumns"
for="visibleColumns"
v-model="complainstStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="complainstStore.columns"
option-value="name"
options-cover
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<TableComplaint :filterTable="filterTable" />
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
id="addComplaints"
for="addComplaints"
size="12px"
flat
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มเรื่องร้องเรียน </q-tooltip></q-btn
>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
id="filterTable"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
id="visibleColumns"
for="visibleColumns"
v-model="complainstStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="complainstStore.columns"
option-value="name"
options-cover
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12">
<TableComplaint :filterTable="filterTable" />
</div>
</q-card>
</template>

90
src/modules/11_discipline/components/4_Order/MainPage.vue
View file

@ -61,52 +61,52 @@ function redirectToPageadd() {
รายการออกคำสั่งลงโทษทางวินัย
</div>
<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>
<q-btn
id="addDisciplineOrder"
flat
size="12px"
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
>
</div>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
for="filterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
for="visibleColumns"
class="col-xs-12 col-sm-3 col-md-2"
v-model="OrderStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="OrderStore.columns"
option-value="name"
options-cover
/>
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div>
<q-btn
for="buttonAddDisciplineOrder"
flat
size="12px"
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มรายการออกคำสั่งลงโทษทางวินัย </q-tooltip></q-btn
>
</div>
<div class="col-12">
<tableOrder :filterTable="filterTable" />
</div>
</q-card>
<q-space />
<q-input
class="col-xs-12 col-sm-3 col-md-2"
for="inputFilterTable"
dense
outlined
v-model="filterTable"
label="ค้นหา"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
for="selectVisibleColumns"
class="col-xs-12 col-sm-3 col-md-2"
v-model="OrderStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="OrderStore.columns"
option-value="name"
options-cover
/>
</div>
<div class="col-12">
<tableOrder :filterTable="filterTable" />
</div>
</q-card>
</template>
<style scoped></style>

2
src/modules/11_discipline/components/4_Order/OrderPage.vue
View file

@ -25,6 +25,7 @@ const previousStep = async () => {
<template>
<div class="toptitle text-dark col-12 row items-center">
<q-btn
for="buttonBackToMain"
icon="mdi-arrow-left"
unelevated
round
@ -39,6 +40,7 @@ const previousStep = async () => {
<div class="col-12 q-mt-sm">
<q-card flat bordered>
<q-stepper
for="myStepper"
v-model="step"
ref="stepper"
animated

19
src/modules/11_discipline/components/4_Order/Step01.vue
View file

@ -116,7 +116,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
ประเภทคำสั่ง
<q-select
for="orderType"
for="selectOrderType"
ref="orderTypeRef"
dense
outlined
@ -134,7 +134,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
คำสั่งโดย
<q-select
for="orderBy"
for="selectOrderBy"
ref="orderByRef"
dense
outlined
@ -152,7 +152,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
เลือกรายการสอบสวนความผิดทางวินัย
<q-select
for="listInvestigation"
for="selectListInvestigation"
ref="listInvestigationRef"
dense
outlined
@ -172,7 +172,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
ผู้มีอำนาจลงนาม
<q-input
for="authority"
for="inputAuthority"
ref="authorityRef"
dense
outlined
@ -186,7 +186,7 @@ function onSubmit() {
<div class="col-6">
คำสั่งที่
<q-input
for="orderNumber"
for="inputOrderNumber"
ref="orderNumberRef"
outlined
dense
@ -215,6 +215,7 @@ function onSubmit() {
}}</template>
<template #trigger>
<q-input
for="inputDateYear"
ref="dateYearRef"
:model-value="
formData.dateYear ? formData.dateYear + 543 : null
@ -247,7 +248,7 @@ function onSubmit() {
</template>
<template #trigger>
<q-input
for="date"
for="inputDate"
ref="dateRef"
outlined
dense
@ -272,7 +273,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
ตำแหน่งผู้มีอำนาจลงนาม
<q-input
for="authorityPosition"
for="inputAuthorityPosition"
ref="authorityPositionRef"
dense
outlined
@ -285,7 +286,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-6">
คำสั่งเรื่อง
<q-input
for="subject"
for="inputSubject"
ref="subjectRef"
dense
outlined
@ -298,7 +299,7 @@ function onSubmit() {
<div class="col-xs-12 col-sm-12">
รายละเอียดการกระทำความผิด
<q-input
for="mistakeDetail"
for="inputMistakeDetail"
ref="mistakeDetailRef"
dense
outlined