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:
STW_TTTY\stwtt 2024-08-14 14:04:34 +07:00
parent fd68ca9a3c
commit dc8ce765b4
11 changed files with 113 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

89
src/modules/05_placement/components/probation/FormAssign.vue
View file

@ -1240,7 +1240,7 @@ onMounted(async () => {
borderless borderless
option-label="label" option-label="label"
option-value="value" option-value="value"
:outlined="isEdit == true" outlined
v-model="monthSelect" v-model="monthSelect"
:label="`ระยะเวลา (เดือน)`" :label="`ระยะเวลา (เดือน)`"
bg-color="white" bg-color="white"
@ -1267,8 +1267,8 @@ onMounted(async () => {
<q-input <q-input
dense dense
borderless borderless
outlined
:readonly="isEdit != true" :readonly="isEdit != true"
:outlined="isEdit == true"
:rules="[(val) => !!val || 'กรุณาเลือกวันที่']" :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
hide-bottom-space hide-bottom-space
class="full-width datepicker" class="full-width datepicker"
@ -1291,7 +1291,7 @@ onMounted(async () => {
:locale="'th'" :locale="'th'"
autoApply autoApply
borderless borderless
:readonly="isDatePicker2Readonly || isEdit != true" readonly
:enableTimePicker="false" :enableTimePicker="false"
week-start="0" week-start="0"
> >
@ -1305,8 +1305,7 @@ onMounted(async () => {
<q-input <q-input
hide-bottom-space hide-bottom-space
dense dense
borderless outlined
:outlined="isEdit == true"
readonly readonly
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="
@ -1344,8 +1343,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
hide-bottom-space hide-bottom-space
borderless outlined
:outlined="isEdit == true"
v-model="caretaker1" v-model="caretaker1"
:label="`ผู้ดูแลคนที่ 1`" :label="`ผู้ดูแลคนที่ 1`"
option-label="label" option-label="label"
@ -1373,7 +1371,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="caretaker2" v-model="caretaker2"
:label="`ผู้ดูแลคนที่ 2`" :label="`ผู้ดูแลคนที่ 2`"
@filter="filterFnCaretaker2" @filter="filterFnCaretaker2"
@ -1401,7 +1399,7 @@ onMounted(async () => {
dense dense
hide-bottom-space hide-bottom-space
borderless borderless
:outlined="isEdit" outlined
v-model="caretaker1" v-model="caretaker1"
:label="`ผู้ดูแลคนที่ 1`" :label="`ผู้ดูแลคนที่ 1`"
option-label="label" option-label="label"
@ -1417,7 +1415,7 @@ onMounted(async () => {
:readonly="!isEdit" :readonly="!isEdit"
dense dense
borderless borderless
:outlined="isEdit" outlined
v-model="caretaker2" v-model="caretaker2"
:label="`ผู้ดูแลคนที่ 2`" :label="`ผู้ดูแลคนที่ 2`"
/> />
@ -1464,7 +1462,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
class="bg-white" class="bg-white"
type="textarea" type="textarea"
v-model="activity_desc[index]" v-model="activity_desc[index]"
@ -1480,7 +1478,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
class="bg-white" class="bg-white"
type="textarea" type="textarea"
v-model="goal_desc[index]" v-model="goal_desc[index]"
@ -1550,7 +1548,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="knowledge[index]" v-model="knowledge[index]"
:label="`ความรู้ความสามารถในการปฏิบัติงาน ${ :label="`ความรู้ความสามารถในการปฏิบัติงาน ${
index + 1 index + 1
@ -1746,7 +1744,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="OtherLaw" v-model="OtherLaw"
type="textarea" type="textarea"
/> />
@ -1774,7 +1772,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="skill" v-model="skill"
label="ด้านที่ 1" label="ด้านที่ 1"
> >
@ -1805,7 +1803,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="skill2" v-model="skill2"
label="ด้านที่ 2" label="ด้านที่ 2"
> >
@ -1835,7 +1833,7 @@ onMounted(async () => {
dense dense
map-options map-options
borderless borderless
:outlined="isEdit == true" outlined
v-model="skill3" v-model="skill3"
label="ด้านที่ 3" label="ด้านที่ 3"
> >
@ -1865,7 +1863,7 @@ onMounted(async () => {
dense dense
map-options map-options
borderless borderless
:outlined="isEdit == true" outlined
v-model="skill4" v-model="skill4"
label="ด้านที่ 4" label="ด้านที่ 4"
> >
@ -1911,7 +1909,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="main" v-model="main"
label="ตัวที่ 1" label="ตัวที่ 1"
> >
@ -1942,7 +1940,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="main2" v-model="main2"
label="ตัวที่ 2" label="ตัวที่ 2"
> >
@ -1973,7 +1971,7 @@ onMounted(async () => {
dense dense
map-options map-options
borderless borderless
:outlined="isEdit == true" outlined
v-model="main3" v-model="main3"
label="ตัวที่ 3" label="ตัวที่ 3"
> >
@ -2004,7 +2002,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="main4" v-model="main4"
label="ตัวที่ 4" label="ตัวที่ 4"
> >
@ -2035,7 +2033,7 @@ onMounted(async () => {
dense dense
map-options map-options
borderless borderless
:outlined="isEdit == true" outlined
v-model="main5" v-model="main5"
label="ตัวที่ 5" label="ตัวที่ 5"
> >
@ -2071,7 +2069,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="group" v-model="group"
label="ตัวที่ 1" label="ตัวที่ 1"
> >
@ -2102,7 +2100,7 @@ onMounted(async () => {
dense dense
borderless borderless
map-options map-options
:outlined="isEdit == true" outlined
v-model="group2" v-model="group2"
label="ตัวที่ 2" label="ตัวที่ 2"
> >
@ -2133,7 +2131,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="group3" v-model="group3"
label="ตัวที่ 3" label="ตัวที่ 3"
> >
@ -2237,7 +2235,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="Other" v-model="Other"
bg-color="white" bg-color="white"
/> />
@ -2278,7 +2276,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="output_desc[index]" v-model="output_desc[index]"
label="ผลผลิตของงานที่คาดหวัง (ไม่เกิน 10 บรรทัด)" label="ผลผลิตของงานที่คาดหวัง (ไม่เกิน 10 บรรทัด)"
bg-color="white" bg-color="white"
@ -2296,7 +2294,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="indicator_desc[index]" v-model="indicator_desc[index]"
label="ตัวชี้วัดความสําเร็จของงาน (ไม่เกิน 10 บรรทัด)" label="ตัวชี้วัดความสําเร็จของงาน (ไม่เกิน 10 บรรทัด)"
/> />
@ -2388,7 +2386,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="Other5" v-model="Other5"
label="กรอกอื่นๆ" label="กรอกอื่นๆ"
bg-color="white" bg-color="white"
@ -2479,7 +2477,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="fullname" v-model="fullname"
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
bg-color="white" bg-color="white"
@ -2491,7 +2489,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="position" v-model="position"
label="ตำแหน่ง" label="ตำแหน่ง"
bg-color="white" bg-color="white"
@ -2520,7 +2518,7 @@ onMounted(async () => {
:rules="[(val) => !!val || 'กรุณาเลือกวันที่']" :rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
:outlined="isEdit == true" outlined
:model-value="date1 != null ? date2Thai(date1) : null" :model-value="date1 != null ? date2Thai(date1) : null"
label="ลงวันที่" label="ลงวันที่"
bg-color="white" bg-color="white"
@ -2555,7 +2553,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="caretaker1" v-model="caretaker1"
label="ผู้ดูแลคนที่ 1" label="ผู้ดูแลคนที่ 1"
@filter="filterFnCaretaker" @filter="filterFnCaretaker"
@ -2581,7 +2579,7 @@ onMounted(async () => {
:readonly="!isEdit" :readonly="!isEdit"
dense dense
borderless borderless
:outlined="isEdit" outlined
v-model="caretaker1" v-model="caretaker1"
label="ผู้ดูแลคนที่ 1" label="ผู้ดูแลคนที่ 1"
@filter="filterFnCaretaker" @filter="filterFnCaretaker"
@ -2621,7 +2619,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
:outlined="isEdit == true" outlined
:model-value="date2 != null ? date2Thai(date2) : null" :model-value="date2 != null ? date2Thai(date2) : null"
label="ลงวันที่" label="ลงวันที่"
@ -2649,7 +2647,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="caretaker2" v-model="caretaker2"
label="ผู้ดูแลคนที่ 2" label="ผู้ดูแลคนที่ 2"
@filter="filterFnCaretaker2" @filter="filterFnCaretaker2"
@ -2675,7 +2673,7 @@ onMounted(async () => {
:readonly="!isEdit" :readonly="!isEdit"
dense dense
borderless borderless
:outlined="isEdit" outlined
v-model="caretaker2" v-model="caretaker2"
label="ผู้ดูแลคนที่ 2" label="ผู้ดูแลคนที่ 2"
@filter="filterFnCaretaker2" @filter="filterFnCaretaker2"
@ -2712,8 +2710,7 @@ onMounted(async () => {
<template #trigger> <template #trigger>
<q-input <q-input
hide-bottom-space hide-bottom-space
:disable="!caretaker2" :readonly="isEdit != true || !caretaker2"
:readonly="isEdit != true"
dense dense
:rules=" :rules="
caretaker2 caretaker2
@ -2721,7 +2718,7 @@ onMounted(async () => {
: [] : []
" "
:outlined="isEdit == true" outlined
:model-value=" :model-value="
caretaker2 != null ? date2Thai(date3) : null caretaker2 != null ? date2Thai(date3) : null
@ -2759,7 +2756,7 @@ onMounted(async () => {
dense dense
borderless borderless
:rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']" :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
:outlined="isEdit == true" outlined
v-model="commander" v-model="commander"
label="ผู้บังคับบัญชา" label="ผู้บังคับบัญชา"
use-input use-input
@ -2786,7 +2783,7 @@ onMounted(async () => {
dense dense
:rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']" :rules="[(val) => !!val || 'กรุณาเลือกผู้บังคับบัญชา']"
borderless borderless
:outlined="isEdit" outlined
v-model="commander" v-model="commander"
label="ผู้บังคับบัญชา" label="ผู้บังคับบัญชา"
use-input use-input
@ -2827,7 +2824,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
:outlined="isEdit == true" outlined
:model-value="date4 != null ? date2Thai(date4) : null" :model-value="date4 != null ? date2Thai(date4) : null"
label="ลงวันที่" label="ลงวันที่"
@ -2862,7 +2859,7 @@ onMounted(async () => {
:readonly="isEdit != true" :readonly="isEdit != true"
dense dense
borderless borderless
:outlined="isEdit == true" outlined
v-model="chairman" v-model="chairman"
label="ประธานกรรมการ" label="ประธานกรรมการ"
:rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']" :rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']"
@ -2889,7 +2886,7 @@ onMounted(async () => {
:readonly="!isEdit" :readonly="!isEdit"
dense dense
borderless borderless
:outlined="isEdit" outlined
v-model="chairman" v-model="chairman"
:rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']" :rules="[(val) => !!val || 'กรุณาเลือก ประธานกรรมการ']"
label="ประธานกรรมการ" label="ประธานกรรมการ"

12
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
View file

@ -625,7 +625,7 @@ onMounted(async () => {
<q-item-section class="q-ml-md"> <q-item-section class="q-ml-md">
<q-item-label> <q-item-label>
<q-input <q-input
:disable="!status" :readonly="!status"
v-model="achievement_other.text" v-model="achievement_other.text"
label="กรอกอื่นๆ" label="กรอกอื่นๆ"
dense dense
@ -812,7 +812,7 @@ onMounted(async () => {
<q-item-section> <q-item-section>
<q-item-label> <q-item-label>
<q-input <q-input
:disable="!status" :readonly="!status"
v-model="behavio_orther.text" v-model="behavio_orther.text"
label="กรอกอื่นๆ" label="กรอกอื่นๆ"
dense dense
@ -858,7 +858,7 @@ onMounted(async () => {
จุดเด่น (ไม่เกิน 5 บรรทัด) จุดเด่น (ไม่เกิน 5 บรรทัด)
</div> </div>
<q-input <q-input
:disable="!status" :readonly="!status"
outlined outlined
dense dense
v-model="behavio_strength_desc" v-model="behavio_strength_desc"
@ -878,7 +878,7 @@ onMounted(async () => {
สิ่งที่ควรปรับปรุง (ไม่เกิน 5 บรรทัด) สิ่งที่ควรปรับปรุง (ไม่เกิน 5 บรรทัด)
</div> </div>
<q-input <q-input
:disable="!status" :readonly="!status"
outlined outlined
dense dense
v-model="behavior_improve_desc" v-model="behavior_improve_desc"
@ -1031,7 +1031,7 @@ onMounted(async () => {
:options="option" :options="option"
option-label="label" option-label="label"
label="ผู้บังคับบัญชา" label="ผู้บังคับบัญชา"
disable readonly
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
@ -1060,7 +1060,7 @@ onMounted(async () => {
dateAutherise != null ? date2Thai(dateAutherise) : null dateAutherise != null ? date2Thai(dateAutherise) : null
" "
:label="`${'ลงวันที่'}`" :label="`${'ลงวันที่'}`"
:disable="!status" :readonly="!status"
:rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
> >
<template v-slot:prepend> <template v-slot:prepend>

36
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
View file

@ -665,7 +665,7 @@ onMounted(async () => {
dense dense
lazy-rules lazy-rules
autogrow autogrow
:disable="!status" :readonly="!status"
hide-bottom-space hide-bottom-space
outlined outlined
class="bg-white" class="bg-white"
@ -852,7 +852,7 @@ onMounted(async () => {
<q-item-section> <q-item-section>
<q-item-label> <q-item-label>
<q-input <q-input
:disable="!status" :readonly="!status"
v-model="behavio_orther.text" v-model="behavio_orther.text"
label="กรอกอื่นๆ" label="กรอกอื่นๆ"
dense dense
@ -1036,7 +1036,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="orientation" v-model="orientation"
/> />
</div> </div>
@ -1045,7 +1045,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="orientation_percent" v-model="orientation_percent"
/> />
</div> </div>
@ -1058,7 +1058,7 @@ onMounted(async () => {
dense dense
outlined outlined
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="self_learning" v-model="self_learning"
/> />
</div> </div>
@ -1067,7 +1067,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="self_learning_percent" v-model="self_learning_percent"
/> />
</div> </div>
@ -1080,7 +1080,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="training_seminar" v-model="training_seminar"
/> />
</div> </div>
@ -1089,7 +1089,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="training_seminar_percent" v-model="training_seminar_percent"
/> />
</div> </div>
@ -1104,7 +1104,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="other_training" v-model="other_training"
/> />
</div> </div>
@ -1113,7 +1113,7 @@ onMounted(async () => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status" :readonly="!status"
v-model="other_training_percent" v-model="other_training_percent"
/> />
</div> </div>
@ -1137,7 +1137,7 @@ onMounted(async () => {
<div class="col-12 text-top0 items-center">สรุปผลการพัฒนา</div> <div class="col-12 text-top0 items-center">สรุปผลการพัฒนา</div>
<div class="col-12"> <div class="col-12">
<q-select <q-select
:disable="!status" :readonly="!status"
class="col-xs-12" class="col-xs-12"
dense dense
v-model="develop_result" v-model="develop_result"
@ -1160,7 +1160,7 @@ onMounted(async () => {
</div> </div>
<div class="col-12"> <div class="col-12">
<q-select <q-select
:disable="!status" :readonly="!status"
class="col-xs-12" class="col-xs-12"
dense dense
v-model="evaluate_result" v-model="evaluate_result"
@ -1195,7 +1195,7 @@ onMounted(async () => {
outlined outlined
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
option-label="label" option-label="label"
disable readonly
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<datepicker <datepicker
@ -1218,7 +1218,7 @@ onMounted(async () => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status" :readonly="!status"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
dateAutherise != null ? date2Thai(dateAutherise) : null dateAutherise != null ? date2Thai(dateAutherise) : null
@ -1253,7 +1253,7 @@ onMounted(async () => {
v-model="director_id2" v-model="director_id2"
outlined outlined
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
disable readonly
option-label="label" option-label="label"
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
@ -1277,7 +1277,7 @@ onMounted(async () => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status" :readonly="!status"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
director1_dated != null director1_dated != null
@ -1314,7 +1314,7 @@ onMounted(async () => {
v-model="director_id3" v-model="director_id3"
outlined outlined
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
disable readonly
option-label="label" option-label="label"
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
@ -1338,7 +1338,7 @@ onMounted(async () => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status" :readonly="!status"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
director2_dated != null director2_dated != null

22
src/modules/05_placement/components/probation/FormEvaluation/FormReport.vue
View file

@ -347,7 +347,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="
date_start != null ? date2Thai(date_start) : null date_start != null ? date2Thai(date_start) : null
@ -389,7 +389,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="
date_finish != null ? date2Thai(date_finish) : null date_finish != null ? date2Thai(date_finish) : null
@ -426,7 +426,7 @@ onMounted(() => {
class="col-xs-12 col-sm-6" class="col-xs-12 col-sm-6"
dense dense
borderless borderless
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
emit-value emit-value
map-options map-options
option-label="label" option-label="label"
@ -455,7 +455,7 @@ onMounted(() => {
]" ]"
hide-bottom-space hide-bottom-space
:options="optionsResult" :options="optionsResult"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
dense dense
borderless borderless
emit-value emit-value
@ -498,7 +498,7 @@ onMounted(() => {
dense dense
borderless borderless
outlined outlined
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="bg-white" class="bg-white"
type="textarea" type="textarea"
v-model="reson" v-model="reson"
@ -544,7 +544,7 @@ onMounted(() => {
:options="commander" :options="commander"
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
option-label="label" option-label="label"
disable readonly
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<datepicker <datepicker
@ -567,7 +567,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
chairman_dated != null ? date2Thai(chairman_dated) : null chairman_dated != null ? date2Thai(chairman_dated) : null
@ -602,7 +602,7 @@ onMounted(() => {
v-model="director_id2" v-model="director_id2"
outlined outlined
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
disable readonly
:options="optionDirector" :options="optionDirector"
option-label="label" option-label="label"
/> />
@ -627,7 +627,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
director1_dated != null director1_dated != null
@ -666,7 +666,7 @@ onMounted(() => {
outlined outlined
label="ชื่อ-นามสกุล" label="ชื่อ-นามสกุล"
:options="optionDirector" :options="optionDirector"
disable readonly
option-label="label" option-label="label"
/> />
@ -691,7 +691,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker col-3" class="full-width datepicker col-3"
:model-value=" :model-value="
director2_dated != null director2_dated != null

18
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
View file

@ -525,7 +525,7 @@ onMounted(async () => {
hide-bottom-space hide-bottom-space
:row="1" :row="1"
:rules="evaluate_ouptutRules" :rules="evaluate_ouptutRules"
:disable="!status" :readonly="!status"
/> />
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
@ -757,7 +757,7 @@ onMounted(async () => {
:rules="[ :rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ', (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]" ]"
:disable="!status" :readonly="!status"
/> />
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
@ -803,7 +803,7 @@ onMounted(async () => {
:row="5" :row="5"
:rules="achievement_strengthRules" :rules="achievement_strengthRules"
ref="achievement_strengthRef" ref="achievement_strengthRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
<div class="col-12 row"> <div class="col-12 row">
@ -822,7 +822,7 @@ onMounted(async () => {
label="กรอกสิ่งที่ควรปรับปรุง" label="กรอกสิ่งที่ควรปรับปรุง"
:row="5" :row="5"
ref="achievement_inproveRef" ref="achievement_inproveRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
</div> </div>
@ -986,7 +986,7 @@ onMounted(async () => {
:rules="[ :rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ', (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]" ]"
:disable="!status" :readonly="!status"
/> />
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
@ -1032,7 +1032,7 @@ onMounted(async () => {
:row="5" :row="5"
:rules="behavio_strengthRules" :rules="behavio_strengthRules"
ref="behavio_strengthRef" ref="behavio_strengthRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
<div class="col-12 row"> <div class="col-12 row">
@ -1051,7 +1051,7 @@ onMounted(async () => {
label="กรอกสิ่งที่ควรปรับปรุง" label="กรอกสิ่งที่ควรปรับปรุง"
:row="5" :row="5"
ref="behavio_inproveRef" ref="behavio_inproveRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
</div> </div>
@ -1193,7 +1193,7 @@ onMounted(async () => {
:options="option" :options="option"
label="ผู้บังคับบัญชา" label="ผู้บังคับบัญชา"
option-label="label" option-label="label"
disable readonly
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<datepicker <datepicker
@ -1222,7 +1222,7 @@ onMounted(async () => {
" "
:label="`${'ลงวันที่'}`" :label="`${'ลงวันที่'}`"
:rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
:disable="!status" :readonly="!status"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon <q-icon

18
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
View file

@ -539,7 +539,7 @@ onMounted(async () => {
hide-bottom-space hide-bottom-space
:row="1" :row="1"
:rules="evaluate_ouptutRules" :rules="evaluate_ouptutRules"
:disable="!status" :readonly="!status"
/> />
</q-item-section> </q-item-section>
<q-item-section side> <q-item-section side>
@ -771,7 +771,7 @@ onMounted(async () => {
:rules="[ :rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ', (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]" ]"
:disable="!status" :readonly="!status"
/> />
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
@ -817,7 +817,7 @@ onMounted(async () => {
:row="5" :row="5"
:rules="achievement_strengthRules" :rules="achievement_strengthRules"
ref="achievement_strengthRef" ref="achievement_strengthRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
<div class="col-12 row"> <div class="col-12 row">
@ -836,7 +836,7 @@ onMounted(async () => {
label="กรอกสิ่งที่ควรปรับปรุง" label="กรอกสิ่งที่ควรปรับปรุง"
:row="5" :row="5"
ref="achievement_inproveRef" ref="achievement_inproveRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
</div> </div>
@ -1003,7 +1003,7 @@ onMounted(async () => {
:rules="[ :rules="[
(val) => (val && val.length > 0) || 'กรุณากรอกข้อความ', (val) => (val && val.length > 0) || 'กรุณากรอกข้อความ',
]" ]"
:disable="!status" :readonly="!status"
/> />
</q-item-label> </q-item-label>
</q-item-section> </q-item-section>
@ -1049,7 +1049,7 @@ onMounted(async () => {
:row="5" :row="5"
:rules="behavio_strengthRules" :rules="behavio_strengthRules"
ref="behavio_strengthRef" ref="behavio_strengthRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
<div class="col-12 row"> <div class="col-12 row">
@ -1068,7 +1068,7 @@ onMounted(async () => {
label="กรอกสิ่งที่ควรปรับปรุง" label="กรอกสิ่งที่ควรปรับปรุง"
:row="5" :row="5"
ref="behavio_inproveRef" ref="behavio_inproveRef"
:disable="!status" :readonly="!status"
/> />
</div> </div>
</div> </div>
@ -1217,7 +1217,7 @@ onMounted(async () => {
:options="option" :options="option"
option-label="label" option-label="label"
label="ผู้บังคับบัญชา" label="ผู้บังคับบัญชา"
disable readonly
/> />
<div class="col-xs-12 col-sm-4"> <div class="col-xs-12 col-sm-4">
<datepicker <datepicker
@ -1246,7 +1246,7 @@ onMounted(async () => {
" "
:label="`${'ลงวันที่'}`" :label="`${'ลงวันที่'}`"
:rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]" :rules="[(val) => !!val || `${'กรุณาเลือกลงวันที่'}`]"
:disable="!status" :readonly="!status"
> >
<template v-slot:prepend> <template v-slot:prepend>
<q-icon <q-icon

18
src/modules/05_placement/components/probation/MainProbation.vue
View file

@ -594,28 +594,12 @@ onMounted(async () => {
icon="mdi-eye" icon="mdi-eye"
@click=" @click="
router.push( router.push(
`/probation/detail-view/${props.row.personal_id}` `/probation/detail/${props.row.personal_id}`
) )
" "
> >
<q-tooltip>รายละเอียด</q-tooltip> <q-tooltip>รายละเอียด</q-tooltip>
</q-btn> </q-btn>
<q-btn
v-if="
checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate
"
flat
dense
round
color="edit"
icon="edit"
@click="
router.push(`/probation/detail/${props.row.personal_id}`)
"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
</q-btn>
</q-td> </q-td>
<q-td v-for="col in props.cols" :key="col.name" :props="props"> <q-td v-for="col in props.cols" :key="col.name" :props="props">
<div v-if="col.name == 'no'"> <div v-if="col.name == 'no'">

8
src/modules/05_placement/components/probation/ProbationDetail.vue
View file

@ -367,7 +367,7 @@ onMounted(async () => {
<div class="row col-12 q-col-gutter-sm"> <div class="row col-12 q-col-gutter-sm">
<div> <div>
<q-btn <q-btn
v-if="!checkRoutePermisson" v-if="checkPermission($route)?.attrIsUpdate"
@click="router.push(`/probation/add/${personalId}`)" @click="router.push(`/probation/add/${personalId}`)"
flat flat
round round
@ -444,7 +444,6 @@ onMounted(async () => {
<q-tr :props="props"> <q-tr :props="props">
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
v-if="checkPermission($route)?.attrIsGet"
flat flat
dense dense
round round
@ -459,10 +458,7 @@ onMounted(async () => {
<q-tooltip>รายละเอียด</q-tooltip> <q-tooltip>รายละเอียด</q-tooltip>
</q-btn> </q-btn>
<q-btn <q-btn
v-if=" v-if="checkPermission($route)?.attrIsUpdate
checkPermission($route)?.attrIsGet &&
checkPermission($route)?.attrIsUpdate &&
!checkRoutePermisson
" "
flat flat
dense dense

24
src/modules/05_placement/components/probation/SummaryScore.vue
View file

@ -266,7 +266,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_orientation_score" v-model="develop_orientation_score"
/> />
</div> </div>
@ -276,7 +276,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_orientation_percent" v-model="develop_orientation_percent"
/> />
</div> </div>
@ -290,7 +290,7 @@ onMounted(() => {
dense dense
outlined outlined
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_self_learning_score" v-model="develop_self_learning_score"
/> />
</div> </div>
@ -300,7 +300,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_self_learning_percent" v-model="develop_self_learning_percent"
/> />
</div> </div>
@ -314,7 +314,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_training_seminar_score" v-model="develop_training_seminar_score"
/> />
</div> </div>
@ -324,7 +324,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_training_seminar_percent" v-model="develop_training_seminar_percent"
/> />
</div> </div>
@ -339,7 +339,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_other_training_score" v-model="develop_other_training_score"
/> />
</div> </div>
@ -349,7 +349,7 @@ onMounted(() => {
outlined outlined
dense dense
type="number" type="number"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
v-model="develop_other_training_percent" v-model="develop_other_training_percent"
/> />
</div> </div>
@ -386,7 +386,7 @@ onMounted(() => {
option-value="value" option-value="value"
map-options map-options
emit-value emit-value
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
/> />
</div> </div>
</div> </div>
@ -405,7 +405,7 @@ onMounted(() => {
autogrow autogrow
hide-bottom-space hide-bottom-space
:row="3" :row="3"
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
/> />
</div> </div>
@ -426,7 +426,7 @@ onMounted(() => {
option-value="value" option-value="value"
map-options map-options
emit-value emit-value
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
/> />
</div> </div>
</div> </div>
@ -455,7 +455,7 @@ onMounted(() => {
<q-input <q-input
outlined outlined
dense dense
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
class="full-width datepicker" class="full-width datepicker"
:model-value=" :model-value="
evaluate_date != null ? date2Thai(evaluate_date) : null evaluate_date != null ? date2Thai(evaluate_date) : null

4
src/modules/05_placement/components/probation/SummarySurvey.vue
View file

@ -126,7 +126,7 @@ onMounted(() => {
</div> </div>
<div class="col-12"> <div class="col-12">
<q-input <q-input
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
label="ความคิดเห็น" label="ความคิดเห็น"
class="bg-white" class="bg-white"
dense dense
@ -146,7 +146,7 @@ onMounted(() => {
</div> </div>
<div class="col-12"> <div class="col-12">
<q-input <q-input
:disable="!status || checkRoutePermisson" :readonly="!status || checkRoutePermisson"
label="ความคิดเห็น" label="ความคิดเห็น"
class="bg-white" class="bg-white"
dense dense

13
src/modules/05_placement/router.ts
View file

@ -16,9 +16,6 @@ const mainProbation = () =>
const probationDetail = () => const probationDetail = () =>
import("@/modules/05_placement/components/probation/ProbationDetail.vue"); import("@/modules/05_placement/components/probation/ProbationDetail.vue");
const probationDetailOnly = () =>
import("@/modules/05_placement/components/probation/ProbationDetail.vue");
const probationFormEvaluation = () => const probationFormEvaluation = () =>
import("@/modules/05_placement/components/probation/MainDetail.vue"); import("@/modules/05_placement/components/probation/MainDetail.vue");
const probationFormEvaluationDetail = () => const probationFormEvaluationDetail = () =>
@ -148,16 +145,6 @@ export default [
Role: "STAFF", Role: "STAFF",
}, },
}, },
{
path: "/probation/detail-view/:id",
name: "probationDetailOnly",
component: probationDetailOnly,
meta: {
Auth: true,
Key: "SYS_PROBATION",
Role: "STAFF",
},
},
{ {
path: "/probation/detail/:personalId/:form", path: "/probation/detail/:personalId/:form",
name: "probationForm", name: "probationForm",