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

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-03-13 14:01:43 +07:00
commit b0b6eada67

View file

@ -9,7 +9,7 @@ import { usePagination } from "@/composables/usePagination";
import { useCounterMixin } from "@/stores/mixin";
import type { DataOption } from "@/modules/18_command/interface/index/Main";
import type { DataProfile} from "@/modules/18_command/interface/response/Main";
import type { DataProfile } from "@/modules/18_command/interface/response/Main";
import DialogHeader from "@/components/DialogHeader.vue";
@ -68,7 +68,7 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
{
name: "posNo",
align: "left",
label: "เลขที่ตำแหน่ง",
@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
{
name: "position",
align: "left",
label: "ตำแหน่งในสายงาน",
@ -86,7 +86,7 @@ const columns = ref<QTableProps["columns"]>([
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
{
name: "positionType",
align: "left",
label: "ประเภทตำแหน่ง",
@ -96,7 +96,9 @@ const columns = ref<QTableProps["columns"]>([
style: "font-size: 14px",
format(val, row) {
return row.posTypeName
? `${row.posTypeName} ${row.positionLevelName ? `(${row.positionLevelName})` : ""}`
? `${row.posTypeName} ${
row.positionLevelName ? `(${row.positionLevelName})` : ""
}`
: "-";
},
},
@ -119,7 +121,7 @@ async function fetchDataPerson() {
{
fieldName: type.value,
keyword: keyword.value.trim(),
system: (route.meta?.Key as string) || 'COMMAND',
system: (route.meta?.Key as string) || "COMMAND",
},
{
params: params.value,
@ -137,7 +139,7 @@ async function fetchDataPerson() {
function onSubmit() {
if (selected.value.length == 0) {
dialogMessageNotify($q, "กรุณาเลือกบุคคลที่ต้องการมอบหมายคำสั่ง");
dialogMessageNotify($q, "กรุณาเลือกบุคคลที่ต้องการมอบหมายคำสั่ง");
return;
}
dialogConfirm($q, async () => {
@ -148,7 +150,7 @@ function onSubmit() {
});
await props.fetchListCommand();
handleClose();
success($q, "มอบหมายคำสั่งสำเร็จ");
success($q, "มอบหมายคำสั่งสำเร็จ");
} catch (error) {
messageError($q, error);
} finally {
@ -180,7 +182,7 @@ watch(modal, (newVal) => {
<template>
<q-dialog v-model="modal" persistent>
<q-card style="width: 50vw; max-width: 50vw">
<DialogHeader tittle="มอบหมายคำสั่ง" :close="handleClose" />
<DialogHeader tittle="มอบหมายคำสั่ง" :close="handleClose" />
<q-separator />
<q-card-section style="max-height: 60vh">
<div class="row q-col-gutter-md">