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

Merge branch 'working' into develop

Browse source
This commit is contained in:
Tanyalak 2024-01-18 13:59:04 +07:00
commit 19e41782c0
7 changed files with 87 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/11_discipline/components/8_AppealComplain/Form.vue
View file

@ -489,9 +489,9 @@ onMounted(() => {
outlined
hide-bottom-space
v-model="formData.title"
:rules="[(val) => !!val || 'กรุณากรอกอุทธรณ์/ร้องทุกข์']"
:rules="[(val) => !!val || 'กรุณากรอกเรื่องอุทธรณ์/ร้องทุกข์']"
lazy-rules
label="อุทธรณ์/ร้องทุกข์"
label="เรื่องอุทธรณ์/ร้องทุกข์"
/>
</div>
</div>

36
src/modules/12_evaluatePersonal/components/Detail/step/step8.vue
View file

@ -411,9 +411,9 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="row col-12 q-pa-sm">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="row col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row col-12">
<q-file
ref="fileEvaluation81Ref"
v-model="fileEvaluation81"
@ -497,9 +497,9 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row col-12">
<q-file
ref="fileEvaluation82Ref"
v-model="fileEvaluation82"
@ -581,9 +581,9 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row col-12">
<q-file
ref="fileEvaluation83Ref"
v-model="fileEvaluation83"
@ -666,9 +666,9 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row col-12">
<q-file
ref="fileEvaluation84Ref"
v-model="fileEvaluation84"
@ -751,10 +751,10 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row q-col-gutter-md col-12">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="row col-12">
<q-file
ref="fileEvaluation85Ref"
v-model="fileEvaluation85"
@ -835,9 +835,9 @@ onMounted(async () => {
</div>
</div>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm">
<div v-if="store.currentStep == 8" class="row col-12">
<div class="col-12" v-if="store.currentStep == 8"><q-separator /></div>
<div class="col-12 q-pa-sm" v-if="store.currentStep == 8">
<div class="row col-12">
<q-file
ref="fileEvaluation86Ref"
v-model="fileEvaluation86"

6
src/modules/12_evaluatePersonal/components/Detail/step/step9.vue
View file

@ -26,13 +26,13 @@ function copyLink() {
<template>
<div class="row q-pa-md">
<div class="col-12 row items-center justify-center">
<div class="row"><strong>Public URL : </strong>
<div class="col-12 row items-center justify-center q-col-gutter-sm">
<div class="row q-pr-md"><strong>Public URL : </strong>
<a :href="`${link}/${id}`" class="q-pl-sm"> {{link}}/{{ id }}
</a>
</div>
<q-space/>
<div class="q-pt-sm">
<div>
<q-btn
outline
icon="mdi-content-copy"

2
src/modules/12_evaluatePersonal/components/Meeting/AddPage.vue
View file

@ -55,7 +55,7 @@ function addData(formData: any) {
class="q-mr-sm"
@click="$router.push(`/evaluate/meeting`)"
/>
เพิ่มรายการการประชุม
เพิ่มการประชุม
</div>
<Form :on-submit="onSubmit" />

6
src/modules/12_evaluatePersonal/components/Meeting/Form.vue
View file

@ -273,6 +273,7 @@ onMounted(() => {
<template #trigger>
<q-input
for="selectDate"
ref="dateMeetingStartRef"
dense
outlined
lazy-rules
@ -283,6 +284,7 @@ onMounted(() => {
"
hide-bottom-space
:label="`${'วันเวลาที่เริ่มต้นการประชุม'}`"
:rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาที่เริ่มต้นการประชุม'}`]"
>
<template v-slot:prepend>
<q-icon name="event" class="cursor-pointer text-primary">
@ -309,6 +311,7 @@ onMounted(() => {
<template #trigger>
<q-input
for="selectDate"
ref="dateMeetingEndRef"
dense
outlined
lazy-rules
@ -318,7 +321,8 @@ onMounted(() => {
: null
"
hide-bottom-space
:label="`${'วันเวลาที่สิ้นสุด'}`"
:label="`${'วันเวลาสิ้นสุดการประชุม'}`"
:rules="[(val: string) => !!val || `${'กรุณาเลือกวันเวลาสิ้นสุดการประชุม'}`]"
>
<template v-slot:prepend>
<q-icon name="event" class="cursor-pointer text-primary">

2
src/modules/12_evaluatePersonal/components/Meeting/MainPage.vue
View file

@ -140,7 +140,7 @@ function filterFn() {
color="add"
icon="mdi-plus"
>
<q-tooltip>เพิ่มรายชื่อกรรมการ</q-tooltip>
<q-tooltip>เพิ่มการประชุม</q-tooltip>
</q-btn>
</div>
<q-space />