refactror(probation): add Check Box other_training
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m56s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 2m56s
This commit is contained in:
parent
6392659c23
commit
8272a2b291
2 changed files with 30 additions and 4 deletions
|
|
@ -97,6 +97,8 @@ const develop_result_option = ref<any>([
|
||||||
|
|
||||||
const isCheckFile = ref<boolean>(false);
|
const isCheckFile = ref<boolean>(false);
|
||||||
|
|
||||||
|
const isSelectionPartfour = ref<boolean>(false);
|
||||||
|
|
||||||
// score
|
// score
|
||||||
const score1 = computed(() => {
|
const score1 = computed(() => {
|
||||||
if (
|
if (
|
||||||
|
|
@ -216,7 +218,7 @@ const score4 = computed(() => {
|
||||||
Number(self_learning.value) +
|
Number(self_learning.value) +
|
||||||
Number(training_seminar.value) +
|
Number(training_seminar.value) +
|
||||||
Number(other_training.value)) /
|
Number(other_training.value)) /
|
||||||
4
|
(isSelectionPartfour.value ? 4 : 3)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
const score5 = computed(() => {
|
const score5 = computed(() => {
|
||||||
|
|
@ -225,7 +227,7 @@ const score5 = computed(() => {
|
||||||
Number(self_learning_percent.value) +
|
Number(self_learning_percent.value) +
|
||||||
Number(training_seminar_percent.value) +
|
Number(training_seminar_percent.value) +
|
||||||
Number(other_training_percent.value)) /
|
Number(other_training_percent.value)) /
|
||||||
4;
|
(isSelectionPartfour.value ? 4 : 3);
|
||||||
|
|
||||||
develop_result.value = total > 60 ? 1 : 0;
|
develop_result.value = total > 60 ? 1 : 0;
|
||||||
|
|
||||||
|
|
@ -1133,10 +1135,20 @@ onMounted(async () => {
|
||||||
<q-separator class="q-my-xs" />
|
<q-separator class="q-my-xs" />
|
||||||
<div class="row q-gutter-md align-center q-pl-md">
|
<div class="row q-gutter-md align-center q-pl-md">
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
|
<q-checkbox
|
||||||
|
class="q-mr-sm"
|
||||||
|
dense
|
||||||
|
v-model="isSelectionPartfour"
|
||||||
|
@update:model-value="
|
||||||
|
other_training = 0;
|
||||||
|
other_training_percent = 0;
|
||||||
|
"
|
||||||
|
/>
|
||||||
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<q-input
|
<q-input
|
||||||
|
:disable="!isSelectionPartfour"
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
type="number"
|
type="number"
|
||||||
|
|
@ -1148,6 +1160,7 @@ onMounted(async () => {
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<q-input
|
<q-input
|
||||||
|
:disable="!isSelectionPartfour"
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
type="number"
|
type="number"
|
||||||
|
|
|
||||||
|
|
@ -90,6 +90,8 @@ const develop_result_option = ref<any>([
|
||||||
// footer
|
// footer
|
||||||
const dateAutherise = ref<any>(null);
|
const dateAutherise = ref<any>(null);
|
||||||
|
|
||||||
|
const isSelectionPartfour = ref<boolean>(false);
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
fecthAssign(assignId.value);
|
fecthAssign(assignId.value);
|
||||||
});
|
});
|
||||||
|
|
@ -243,7 +245,7 @@ const score4 = computed(() => {
|
||||||
Number(self_learning.value) +
|
Number(self_learning.value) +
|
||||||
Number(training_seminar.value) +
|
Number(training_seminar.value) +
|
||||||
Number(other_training.value)) /
|
Number(other_training.value)) /
|
||||||
4
|
(isSelectionPartfour.value ? 4 : 3)
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
const score5 = computed(() => {
|
const score5 = computed(() => {
|
||||||
|
|
@ -252,7 +254,7 @@ const score5 = computed(() => {
|
||||||
Number(self_learning_percent.value) +
|
Number(self_learning_percent.value) +
|
||||||
Number(training_seminar_percent.value) +
|
Number(training_seminar_percent.value) +
|
||||||
Number(other_training_percent.value)) /
|
Number(other_training_percent.value)) /
|
||||||
4;
|
(isSelectionPartfour.value ? 4 : 3);
|
||||||
|
|
||||||
develop_result.value = total > 60 ? 1 : 0;
|
develop_result.value = total > 60 ? 1 : 0;
|
||||||
|
|
||||||
|
|
@ -1214,10 +1216,20 @@ watch(lengthdiscipline_level, (newLength) => {
|
||||||
<q-separator class="q-my-xs" />
|
<q-separator class="q-my-xs" />
|
||||||
<div class="row q-gutter-md align-center q-pl-md">
|
<div class="row q-gutter-md align-center q-pl-md">
|
||||||
<div class="col-8">
|
<div class="col-8">
|
||||||
|
<q-checkbox
|
||||||
|
class="q-mr-sm"
|
||||||
|
dense
|
||||||
|
v-model="isSelectionPartfour"
|
||||||
|
@update:model-value="
|
||||||
|
other_training = 0;
|
||||||
|
other_training_percent = 0;
|
||||||
|
"
|
||||||
|
/>
|
||||||
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
||||||
</div>
|
</div>
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<q-input
|
<q-input
|
||||||
|
:disable="!isSelectionPartfour"
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
type="number"
|
type="number"
|
||||||
|
|
@ -1231,6 +1243,7 @@ watch(lengthdiscipline_level, (newLength) => {
|
||||||
outlined
|
outlined
|
||||||
dense
|
dense
|
||||||
type="number"
|
type="number"
|
||||||
|
:disable="!isSelectionPartfour"
|
||||||
v-model="other_training_percent"
|
v-model="other_training_percent"
|
||||||
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
|
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
|
||||||
hide-bottom-space
|
hide-bottom-space
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue