Merge branch 'nice_dev' into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-08-28 11:15:09 +07:00
commit a79d2e0b35

View file

@ -93,7 +93,6 @@ watch(props, () => {
}
});
const validateData = () => {
const selectedIds = personalForm.value.isProperty;
@ -280,7 +279,7 @@ const putpersonalForm = async () => {
<div>ภาค </div>
<div>รวมทงหมด</div>
</div>
<div class="col-4 q-pa-xs">
<div class="col-4 q-pa-xs text-right">
<div class="header-sub-text-exam-2">คะแนนทได</div>
<div class="sub-text-exam">
{{ personalForm.pointTotalA }}
@ -295,8 +294,12 @@ const putpersonalForm = async () => {
{{ personalForm.pointTotal }}
</div>
</div>
<div class="col-4 q-pa-xs header-sub-text-exam-2">
<div class="header-sub-text-exam-2">ผลการสอบ</div>
<div
class="col-4 q-pa-xs header-sub-text-exam-2 text-right"
>
<div class="header-sub-text-exam-2 text-right">
ผลการสอบ
</div>
<div class="sub-text-exam">
{{ personalForm.pointA }}
</div>
@ -335,18 +338,18 @@ const putpersonalForm = async () => {
</div>
<!-- <div class="contanier-box-mini"> -->
<!-- <q-card bordered class="card-panding">
<!-- <q-card bordered class="card-panding">
<div class="col-12 row items-center q-pa-sm header-text">
เอกสารเพมเต
</div> -->
<!-- <div v-for="(item, index) of personalForm.isProperty" :key="index" class="q-pa-sm">
<!-- <div v-for="(item, index) of personalForm.isProperty" :key="index" class="q-pa-sm">
<q-checkbox size="xs" v-model="item.value" :val="item.value" :label="item.name" keep-color color="teal"
:rules="[isRequired]" class="checkbox-group" />
<q-separator />
</div> -->
<!-- </q-card>
<!-- </q-card>
</div> -->
</div>
</div>
<!-- <q-separator />
<div>
<DialogFooter