Merge branch 'oat_dev' into develop
This commit is contained in:
oat_dev
commit
7e8f101616
6 changed files with 60 additions and 59 deletions
|
|
@ -337,7 +337,7 @@ function closeHistoryDialog() {
|
|||
label="ชื่อใบอนุญาต"
|
||||
bg-color="white"
|
||||
dense
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกชื่นใบอนุญาต'}`]"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกชื่อใบอนุญาต'}`]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
|
|
@ -349,7 +349,7 @@ function closeHistoryDialog() {
|
|||
bg-color="white"
|
||||
dense
|
||||
:rules="[
|
||||
(val) => !!val || `${'กรุณากรอกชื่อหน่วยงานผู้ออกใบอนุญาต'}`,
|
||||
(val) => !!val || `${'กรุณากรอกหน่วยงานผู้ออกใบอนุญาต'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
/>
|
||||
|
|
@ -394,9 +394,9 @@ function closeHistoryDialog() {
|
|||
: ''
|
||||
"
|
||||
:rules="[
|
||||
(val) => !!val || `${'กรุณาเลือกปีที่เริ่มต้นศึกษา'}`,
|
||||
(val) => !!val || `${'กรุณาเลือกวันที่ออกใบอนุญาต'}`,
|
||||
]"
|
||||
:label="`${'วัน/เดือน/ปี ที่ออกใบอนุญาต'}`"
|
||||
:label="`${'วันที่ออกใบอนุญาต'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -428,7 +428,6 @@ function closeHistoryDialog() {
|
|||
<template #trigger>
|
||||
<q-input
|
||||
dense
|
||||
lazy-rules
|
||||
outlined
|
||||
bg-color="white"
|
||||
hide-bottom-space
|
||||
|
|
@ -437,7 +436,7 @@ function closeHistoryDialog() {
|
|||
? date2Thai(profesLicenseData.expireDate)
|
||||
: ''
|
||||
"
|
||||
:label="`${'วัน/เดือน/ปี ที่หมดอายุ'}`"
|
||||
:label="`${'วันที่หมดอายุ'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -645,10 +645,10 @@ watch(
|
|||
:rules="[
|
||||
(val) =>
|
||||
!!val ||
|
||||
`${'กรุณาเลือกวัน/เดือน/ปี ที่เริ่มต้นการฝึกอบรม/ดูงาน'}`,
|
||||
`${'กรุณาเลือกวันที่เริ่มต้นการฝึกอบรม/ดูงาน'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
:label="`${'วัน/เดือน/ปี ที่เริ่มต้นการฝึกอบรม/ดูงาน'}`"
|
||||
:label="`${'วันที่เริ่มต้นการฝึกอบรม/ดูงาน'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -683,11 +683,10 @@ watch(
|
|||
:model-value="date2Thai(trainData.endDate)"
|
||||
:rules="[
|
||||
(val) =>
|
||||
!!val ||
|
||||
`${'กรุณาเลือกวัน/เดือน/ปี ที่จบการฝึกอบรม/ดูงาน'}`,
|
||||
!!val || `${'กรุณาเลือกวันที่จบการฝึกอบรม/ดูงาน'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
:label="`${'วัน/เดือน/ปี ที่จบการฝึกอบรม/ดูงาน'}`"
|
||||
:label="`${'วันที่จบการฝึกอบรม/ดูงาน'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -492,7 +492,7 @@ async function selectProvince(e: string | null, name: string) {
|
|||
myForm.value.resetValidation();
|
||||
await fetchDistrict(e, name);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
async function selectDistrict(e: string | null, name: string) {
|
||||
if (e != null) {
|
||||
|
|
@ -506,7 +506,7 @@ async function selectDistrict(e: string | null, name: string) {
|
|||
myForm.value.resetValidation();
|
||||
await fetchSubDistrict(e, name);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function selectSubDistrict(e: string | null, name: string) {
|
||||
if (e != null) {
|
||||
|
|
@ -520,7 +520,7 @@ function selectSubDistrict(e: string | null, name: string) {
|
|||
addressData.value.codec = namecode;
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
async function getNewData() {
|
||||
await fetchData();
|
||||
|
|
@ -640,7 +640,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<q-card bordered class="my-card bg-grey-1 q-pa-md">
|
||||
<q-card class="my-card bg-grey-1 q-pa-md">
|
||||
<div :class="$q.screen.gt.xs ? 'row' : 'column'">
|
||||
<!-- column 1 -->
|
||||
<div class="col-md-6 col-12 row">
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ const fatherData = reactive({
|
|||
job: "ตำรวจ",
|
||||
});
|
||||
const motherData = reactive({
|
||||
isHaveInfo: 0,
|
||||
isHaveInfo: 1,
|
||||
isDead: 0,
|
||||
citizenId: "1-1345-67891-01-2",
|
||||
prefix: "นาง",
|
||||
|
|
@ -155,12 +155,12 @@ function deleteChildren(items: any) {
|
|||
</div>
|
||||
</div>
|
||||
<div v-if="fatherData.isHaveInfo">
|
||||
<div class="col-12 row q-pb-sm q-pt-md">
|
||||
<div class="col-12 row q-pb-sm">
|
||||
<div class="q-mr-md text-weight-bold text-primary text-subtitle1">
|
||||
• บิดา
|
||||
</div>
|
||||
</div>
|
||||
<div class="bg-grey-1 q-gutter-md q-mb-lg">
|
||||
<q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
|
||||
<div class="row items-center">
|
||||
<div class="col-2">
|
||||
<div>เลขบัตรประจำตัวประชาชน</div>
|
||||
|
|
@ -204,7 +204,7 @@ function deleteChildren(items: any) {
|
|||
<div v-else>ถึงแก่กรรม</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
<div v-if="motherData.isHaveInfo">
|
||||
<div class="col-12 row q-pb-sm q-pt-md">
|
||||
|
|
@ -212,7 +212,7 @@ function deleteChildren(items: any) {
|
|||
• มารดา
|
||||
</div>
|
||||
</div>
|
||||
<div class="bg-grey-1 q-gutter-md q-mb-lg">
|
||||
<q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
|
||||
<div class="row items-center">
|
||||
<div class="col-2">
|
||||
<div>เลขบัตรประจำตัวประชาชน</div>
|
||||
|
|
@ -256,7 +256,7 @@ function deleteChildren(items: any) {
|
|||
<div v-else>ถึงแก่กรรม</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
<div v-if="spouseData.isHave">
|
||||
<div class="col-12 row q-pb-sm q-pt-md">
|
||||
|
|
@ -264,7 +264,7 @@ function deleteChildren(items: any) {
|
|||
• คู่สมรส
|
||||
</div>
|
||||
</div>
|
||||
<div class="bg-grey-1 q-gutter-md q-mb-lg">
|
||||
<q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
|
||||
<div class="row items-center">
|
||||
<div class="col-2">
|
||||
<div>เลขบัตรประจำตัวประชาชน</div>
|
||||
|
|
@ -308,7 +308,7 @@ function deleteChildren(items: any) {
|
|||
<div v-else>ถึงแก่กรรม</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
<div v-if="childrenData.childrens[0] !== undefined">
|
||||
<div class="col-12 row q-pb-sm q-pt-md">
|
||||
|
|
@ -320,7 +320,7 @@ function deleteChildren(items: any) {
|
|||
<div class="col-12 row q-gutter-sm q-pb-xs q-mt-xs">
|
||||
<div class="text-medium">บุตรคนที่ : {{ index + 1 }}</div>
|
||||
</div>
|
||||
<div class="bg-grey-1 q-gutter-md q-mb-lg">
|
||||
<q-card bordered class="bg-grey-1 q-gutter-md q-ma-none q-pb-md">
|
||||
<div class="row items-center">
|
||||
<div class="col-2">
|
||||
<div>เลขบัตรประจำตัวประชาชน</div>
|
||||
|
|
@ -364,7 +364,7 @@ function deleteChildren(items: any) {
|
|||
<div v-else>ถึงแก่กรรม</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -405,7 +405,7 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<q-card-section class="bg-grey-1">
|
||||
<q-card bordered class="bg-grey-1 q-pa-md">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="col">
|
||||
<q-input
|
||||
|
|
@ -470,9 +470,9 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row q-gutter-md">
|
||||
<div>สถานภาพการมีชีวิต</div>
|
||||
<div class>
|
||||
<div class="row">
|
||||
<div class="q-mr-sm">สถานภาพการมีชีวิต</div>
|
||||
<div>
|
||||
<q-radio
|
||||
:disable="!fatherData.isHaveInfo"
|
||||
class="q-mr-sm"
|
||||
|
|
@ -496,7 +496,7 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
<div class="col-12 row q-pb-sm q-pt-md q-mt-md">
|
||||
<div
|
||||
class="q-mr-md q-pl-md text-weight-bold text-primary text-subtitle1"
|
||||
|
|
@ -524,7 +524,7 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<q-card-section class="bg-grey-1">
|
||||
<q-card bordered class="bg-grey-1 q-pa-md">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="col">
|
||||
<q-input
|
||||
|
|
@ -573,7 +573,7 @@ function deleteChildren(items: any) {
|
|||
dense
|
||||
bg-color="white"
|
||||
lazy-rules
|
||||
v-model="motherData.lastName"
|
||||
v-model="fatherData.lastName"
|
||||
:rules="[(val) => !!val || 'กรุณากรอกนามสกุล']"
|
||||
label="นามสกุล"
|
||||
/>
|
||||
|
|
@ -589,9 +589,9 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row q-gutter-md">
|
||||
<div>สถานภาพการมีชีวิต</div>
|
||||
<div class="">
|
||||
<div class="row">
|
||||
<div class="q-mr-sm">สถานภาพการมีชีวิต</div>
|
||||
<div>
|
||||
<q-radio
|
||||
:disable="!motherData.isHaveInfo"
|
||||
class="q-mr-sm"
|
||||
|
|
@ -599,7 +599,7 @@ function deleteChildren(items: any) {
|
|||
checked-icon="task_alt"
|
||||
unchecked-icon="panorama_fish_eye"
|
||||
:val="1"
|
||||
label="ยังมีชัวิตอยู่"
|
||||
label="ยังมีชีวิตอยู่"
|
||||
dense
|
||||
:color="!motherData.isHaveInfo ? 'grey' : 'primary'"
|
||||
/>
|
||||
|
|
@ -615,7 +615,7 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
<div class="col-12 row q-pb-sm q-pt-md q-mt-md">
|
||||
<div
|
||||
class="q-mr-md q-pl-md text-weight-bold text-primary text-subtitle1"
|
||||
|
|
@ -643,7 +643,7 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<q-card-section class="bg-grey-1">
|
||||
<q-card bordered class="bg-grey-1 q-pa-md">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="col">
|
||||
<q-input
|
||||
|
|
@ -708,9 +708,9 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row q-gutter-md">
|
||||
<div>สถานภาพการมีชีวิต</div>
|
||||
<div class="">
|
||||
<div class="row">
|
||||
<div class="q-mr-sm">สถานภาพการมีชีวิต</div>
|
||||
<div>
|
||||
<q-radio
|
||||
:disable="!spouseData.isHave"
|
||||
class="q-mr-sm"
|
||||
|
|
@ -718,7 +718,7 @@ function deleteChildren(items: any) {
|
|||
checked-icon="task_alt"
|
||||
unchecked-icon="panorama_fish_eye"
|
||||
:val="1"
|
||||
label="ยังมีชัวิตอยู่"
|
||||
label="ยังมีชีวิตอยู่"
|
||||
dense
|
||||
:color="!spouseData.isHave ? 'grey' : 'primary'"
|
||||
/>
|
||||
|
|
@ -728,13 +728,13 @@ function deleteChildren(items: any) {
|
|||
checked-icon="task_alt"
|
||||
unchecked-icon="panorama_fish_eye"
|
||||
:val="0"
|
||||
:color="!spouseData.isHave ? 'grey' : 'red'"
|
||||
:color="!motherData.isHaveInfo ? 'grey' : 'red'"
|
||||
label="ถึงแก่กรรม"
|
||||
dense
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
<div class="col-12 row q-pb-sm q-pt-md items-center">
|
||||
<div
|
||||
class="q-mr-md q-pl-md text-weight-bold text-primary text-subtitle1"
|
||||
|
|
@ -757,8 +757,8 @@ function deleteChildren(items: any) {
|
|||
<div class="text-medium q-pl-md">บุตรคนที่ : {{ index + 1 }}</div>
|
||||
</div>
|
||||
<div class="row items-center">
|
||||
<q-card-section class="bg-grey-1 col-11 q-pb-sm">
|
||||
<div class="row q-col-gutter-sm">
|
||||
<q-card bordered class="bg-grey-1 q-pa-md col-11 q-mb-lg">
|
||||
<div class="row q-col-gutter-md">
|
||||
<div class="col">
|
||||
<q-input
|
||||
outlined
|
||||
|
|
@ -815,31 +815,33 @@ function deleteChildren(items: any) {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row q-gutter-md">
|
||||
<div>สถานภาพการมีชีวิต</div>
|
||||
<div class="">
|
||||
<div class="row">
|
||||
<div class="q-mr-sm">สถานภาพการมีชีวิต</div>
|
||||
<div>
|
||||
<q-radio
|
||||
:disable="!spouseData.isHave"
|
||||
class="q-mr-sm"
|
||||
v-model="items.isDead"
|
||||
v-model="spouseData.isDead"
|
||||
checked-icon="task_alt"
|
||||
unchecked-icon="panorama_fish_eye"
|
||||
:val="1"
|
||||
label="ยังมีชัวิตอยู่"
|
||||
label="ยังมีชีวิตอยู่"
|
||||
dense
|
||||
color="primary"
|
||||
:color="!spouseData.isHave ? 'grey' : 'primary'"
|
||||
/>
|
||||
<q-radio
|
||||
v-model="items.isDead"
|
||||
:disable="!spouseData.isHave"
|
||||
v-model="spouseData.isDead"
|
||||
checked-icon="task_alt"
|
||||
unchecked-icon="panorama_fish_eye"
|
||||
:val="0"
|
||||
color="red"
|
||||
:color="!motherData.isHaveInfo ? 'grey' : 'red'"
|
||||
label="ถึงแก่กรรม"
|
||||
dense
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
</q-card>
|
||||
<div class="col-1">
|
||||
<div class="row justify-center">
|
||||
<q-btn
|
||||
|
|
@ -858,8 +860,8 @@ function deleteChildren(items: any) {
|
|||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
|
||||
<q-card-actions align="right">
|
||||
<q-separator />
|
||||
<q-card-actions class="q-mt-md" align="right">
|
||||
<q-btn
|
||||
id="onSubmit"
|
||||
type="submit"
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@ watch(
|
|||
(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้นศึกษา'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
:label="`${'วัน/เดือน/ปี ที่เริ่มต้นศึกษา'}`"
|
||||
:label="`${'วันที่เริ่มต้นศึกษา'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -733,7 +733,7 @@ watch(
|
|||
(val) => !!val || `${'กรุณาเลือกวันที่จบการศึกษา'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
:label="`${'วัน/เดือน/ปี ที่จบการศึกษา'}`"
|
||||
:label="`${'วันที่จบการศึกษา'}`"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ const itemsMenu = ref<DataOption[]>([
|
|||
]);
|
||||
const input = document.createElement("input");
|
||||
input.type = "file";
|
||||
input.accept = ".jpg,.png,.tif,.pic";
|
||||
|
||||
function selectFile() {
|
||||
input.click();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue