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

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-13 17:31:13 +07:00
commit d611b2c438
45 changed files with 2337 additions and 2629 deletions

View file

@ -1,4 +1,6 @@
<script setup lang="ts">
import DialogHeader from "@/components/DialogHeader.vue";
const props = defineProps({
modal: {
type: Boolean,
@ -20,19 +22,18 @@ const props = defineProps({
<template>
<q-dialog v-model="props.modal" persistent>
<q-card style="width: 500px; max-width: 500px">
<q-toolbar class="q-py-md">
<q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
<q-btn icon="close" unelevated round dense @click="clickClose" style="color: #ff8080; background-color: #ffdede" />
</q-toolbar>
<q-card style="width: 35vw; max-width: 35vw">
<q-form ref="myForm">
<DialogHeader :tittle="props.title" :close="clickClose" />
<q-separator />
<q-card-section class="q-pa-md bg-grey-1">
<div class="row col-12">
<q-separator />
<q-card-section class="q-p-sm">
<div class="row col-12">
{{ props.desc }}
</div>
</q-card-section>
<q-separator />
{{ props.desc }}
</div>
</q-card-section>
</q-form>
</q-card>
</q-dialog>
</template>

View file

@ -1,5 +1,6 @@
<script setup lang="ts">
import { ref, watch } from "vue";
import DialogHeader from "@/components/DialogHeader.vue";
const reason = ref<string>("");
const props = defineProps({
@ -17,11 +18,11 @@ const props = defineProps({
},
clickClose: {
type: Function,
default: () => {},
default: () => { },
},
savaForm: {
type: Function,
default: () => {},
default: () => { },
},
});
watch(props, () => {
@ -42,43 +43,30 @@ const submit = () => {
<template>
<q-dialog v-model="props.modal" persistent>
<q-card style="width: 500px; max-width: 500px">
<q-toolbar class="q-py-md">
<q-toolbar-title class="header-text">{{ props.title }}</q-toolbar-title>
<q-btn
icon="close"
unelevated
round
dense
@click="clickClose"
style="color: #ff8080; background-color: #ffdede"
/>
</q-toolbar>
<q-separator />
<q-card style="width: 40vw; max-width: 40vw">
<q-form ref="myForm">
<q-card-section class="q-p-sm">
<div class="row col-12">
<q-input
type="textarea"
class="full-width inputgreen cursor-pointer"
hide-bottom-space
outlined
dense
lazy-rules
:rules="[(val) => !!val || `กรุณากรอก${label}`]"
v-model="reason"
:label="`${label}`"
/>
<DialogHeader :tittle="props.title" :close="clickClose" />
<q-separator />
<q-card-section class="q-pa-sm bg-grey-1">
<div class="row col-12 q-col-gutter-sm">
<div class="col-xs-12">
<div class="col-12 row q-py-sm items-center q-col-gutter-sm">
<q-input type="textarea" class="full-width inputgreen cursor-pointer" hide-bottom-space outlined dense
lazy-rules :rules="[(val) => !!val || `กรุณากรอก${label}`]" v-model="reason" :label="`${label}`" />
</div>
</div>
</div>
</q-card-section>
<q-separator />
<q-toolbar class="text-primary">
<q-space />
<q-btn label="บันทึก" color="secondary" @click="submit" />
</q-toolbar>
<q-card-actions align="right">
<q-btn dense unelevated label="บันทึก" color="public" @click="submit" class="q-px-md">
<!-- icon="mdi-content-save-outline" -->
<q-tooltip>นท</q-tooltip>
</q-btn>
</q-card-actions>
</q-form>
</q-card>
</q-dialog>