Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-11-11 10:14:12 +07:00
commit 4478b16233
2 changed files with 8 additions and 8 deletions

View file

@ -86,7 +86,7 @@ async function onSubmit() {
if (dataStore.officerType == "OFFICER") {
router.push(`/retire/result/${id}`);
} else {
router.push(`/retire/result`);
router.push(`/retire/${id}`);
}
success($q, "บันทึกข้อมูลสำเร็จ");
})
@ -171,7 +171,7 @@ onMounted(async () => {
flat
color="primary"
class="q-mr-sm"
@click="router.go(-1)"
@click="router.push('/retire')"
/>
<div v-if="routeName == 'AddRetire'">เพิ่มเรื่องลาออก</div>
<div v-else>รายละเอียดเรื่องลาออก</div>

View file

@ -294,7 +294,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
@ -335,7 +335,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
@ -366,7 +366,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
@ -427,7 +427,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
@ -457,7 +457,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>
@ -488,7 +488,7 @@ onMounted(async () => {
outlined
class="bg-white"
:rules="[
(val) =>
(val:string) =>
(val && val.length > 0) || 'กรุณากรอกข้อความ',
]"
/>