hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source 
# Conflicts:
#	src/modules/05_placement/components/OrderPlacement/step/step03.vue
This commit is contained in:
Thanit Konmek 2023-06-30 08:33:17 +07:00
commit 61e010ad27
47 changed files with 2060 additions and 2554 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/05_placement/components/OrderPlacement/step/step01.vue
View file

@ -1,6 +1,6 @@
<template>
<div>
<div class="q-pa-md" style="min-height: 70vh; overflow-y: scroll">
<div class="q-pa-md" style="max-height: 68vh; overflow-y: scroll">
<q-form ref="myForm">
<div class="row col-12 q-col-gutter-x-lg q-col-gutter-y-md">
<div class="col-xs-12 col-md-6">
@ -369,15 +369,14 @@
</q-form>
</div>
<q-separator />
<div class="flex justify-end q-px-md q-gutter-sm">
<div class="flex justify-end q-pa-sm q-gutter-sm">
<q-btn
flat
round
unelevated
label="บันทึก"
color="public"
icon="mdi-content-save-outline"
@click="next"
>
<q-tooltip>บันทึก</q-tooltip>
><!-- icon="mdi-content-save-outline"
<q-tooltip>บันทึก</q-tooltip> -->
</q-btn>
<!-- <q-btn flat round color="primary" icon="chevron_left" @click="previous">
<q-tooltip>ย้อนกลับ</q-tooltip>

34
src/modules/05_placement/components/OrderPlacement/step/step02.vue
View file

@ -1,7 +1,7 @@
<template>
<div>
<div class="q-pa-md" style="min-height: 70vh; overflow-y: scroll">
<div class="col-12 row q-py-sm items-center">
<div class="q-pa-sm" style="max-height: 68vh; overflow-y: scroll">
<div class="col-12 row q-pb-sm items-center">
<q-btn flat round color="primary" @click="refresh" icon="mdi-refresh">
<q-tooltip>อัปเดตข้อมูล</q-tooltip>
</q-btn>
@ -144,22 +144,29 @@
</q-table>
</div>
<q-separator />
<div class="flex justify-end q-px-md q-gutter-sm">
<div class="flex justify-end q-pa-sm q-gutter-sm">
<q-btn
dense
outline
color="primary"
icon="chevron_left"
@click="previous"
class="q-pr-md"
label="กรอกรายละเอียด">
</q-btn>
<q-btn
flat
round
dense
unelevated
label="บันทึก"
color="public"
icon="mdi-content-save-outline"
@click="next"
>
<q-tooltip>บันทึก</q-tooltip>
class="q-px-md"
><!-- icon="mdi-content-save-outline"
<q-tooltip>บันทึก</q-tooltip> -->
</q-btn>
<q-btn flat round color="primary" icon="chevron_left" @click="previous">
<q-tooltip>ย้อนกลับ</q-tooltip>
</q-btn>
<q-btn flat round color="primary" icon="chevron_right" @click="next">
<!-- <q-btn dense flat round color="primary" icon="chevron_right" @click="next">
<q-tooltip>ต่อไป</q-tooltip>
</q-btn>
</q-btn> -->
</div>
</div>
</template>
@ -321,7 +328,6 @@ const getClass = (val: boolean) => {
color: #4154b3;
}
.custom-header-table {
max-height: 64vh;
.q-table tr:nth-child(odd) td {
background: white;
}

30
src/modules/05_placement/components/OrderPlacement/step/step03.vue
View file

@ -141,22 +141,30 @@
</q-table>
</div>
<q-separator />
<div class="flex justify-end q-px-md q-gutter-sm">
<div class="flex justify-end q-pa-sm q-gutter-sm">
<q-btn
flat
round
color="public"
icon="mdi-content-save-outline"
@click="next"
dense
outline
color="primary"
icon="chevron_left"
@click="previous"
class="q-pr-md"
label="เลือกรายชื่อ"
>
<q-tooltip>บันทึก</q-tooltip>
</q-btn>
<q-btn flat round color="primary" icon="chevron_left" @click="previous">
<q-tooltip>ย้อนกลับ</q-tooltip>
<q-btn
dense
unelevated
label="บันทึก"
color="public"
@click="next"
class="q-px-md"
><!-- icon="mdi-content-save-outline"
<q-tooltip>บันทึก</q-tooltip> -->
</q-btn>
<q-btn flat round color="primary" icon="chevron_right" @click="next">
<!-- <q-btn flat round color="primary" icon="chevron_right" @click="next">
<q-tooltip>ต่อไป</q-tooltip>
</q-btn>
</q-btn> -->
</div>
</div>

24
src/modules/05_placement/components/OrderPlacement/step/step04.vue
View file

@ -96,19 +96,25 @@
</q-splitter>
</div>
<q-separator />
<div class="flex justify-end q-px-md q-gutter-sm">
<div class="flex justify-end q-pa-sm q-gutter-sm">
<q-btn
dense
outline
color="primary"
icon="chevron_left"
@click="previous"
class="q-pr-md"
label="เลือกรายชื่อส่งสำเนา">
</q-btn>
<q-btn
flat
round
unelevated
label="บันทึก"
color="public"
icon="mdi-content-save-outline"
@click="next"
>
<q-tooltip>บันทึก</q-tooltip>
</q-btn>
<q-btn flat round color="primary" icon="chevron_left" @click="previous">
<q-tooltip>ย้อนกลับ</q-tooltip>
> <!-- icon="mdi-content-save-outline"
<q-tooltip>บันทึก</q-tooltip> -->
</q-btn>
<!-- <q-btn flat round color="primary" icon="chevron_right" @click="next">
<q-tooltip>ต่อไป</q-tooltip>
</q-btn> -->