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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2024-01-30 13:26:58 +07:00
commit 33ec68c868
31 changed files with 2505 additions and 2316 deletions
Download patch file Download diff file Expand all files Collapse all files

1
env.d.ts vendored
View file

@ -1 +1,2 @@
/// <reference types="vite/client" />
declare module 'quasar-ui-q-draggable-table';

1
package.json
View file

@ -58,6 +58,7 @@
"node-sass": "^9.0.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.7.1",
"quasar-ui-q-draggable-table": "^1.0.1",
"sass": "^1.69.4",
"start-server-and-test": "^1.15.2",
"typescript": "~4.7.4",

31
src/components/Dialogs/AddPersonal.vue
View file

@ -179,9 +179,9 @@ watch(
/>
</q-toolbar>
<q-separator />
<q-card-section class="q-pa-md bg-grey-1">
<q-card-section class="q-pa-md">
<div class="row col-12 q-col-gutter-sm items-start">
<div class="col-12 col-sm-6 col-md-3">
<div class="col-12 col-sm-5 col-md-3">
<q-select
label="ค้นหาจาก"
v-model="type"
@ -196,7 +196,7 @@ watch(
/>
</div>
<div class="col-12 col-sm-6 col-md-6">
<div class="col-12 col-sm-7 col-md-9">
<q-input
ref="searchRef"
v-model="search"
@ -205,22 +205,23 @@ watch(
dense
label="คำค้น"
:rules="[(val) => !!val || `กรุณากรอกคำค้น`]"
/>
</div>
<div class="col-12 col-sm-6 col-md-2">
<q-btn
color="primary"
icon="search"
label="ค้นหา"
class="full-width q-pa-sm"
@click="searchInput()"
>
</q-btn>
<template v-slot:after>
<q-btn
color="primary"
icon="search"
label="ค้นหา"
outline
class="full-width q-py-sm q-px-md"
@click="searchInput()"
>
</q-btn>
</template>
</q-input>
</div>
</div>
<div class="full-width q-mt-sm">
<div class="full-width">
<d-table
ref="table"
:columns="mainStore.columnsRespondent"

6
src/main.ts
View file

@ -2,7 +2,10 @@ import { createApp, defineAsyncComponent } from "vue";
import App from "./App.vue";
import router from "./router";
import { Dialog, Notify, Quasar, Loading } from "quasar";
import quasarUserOptions from "./quasar-user-options";
import "./quasar-user-options";
import qDraggableTable from 'quasar-ui-q-draggable-table';
import 'quasar-ui-q-draggable-table/dist/index.css';
import "quasar/src/css/index.sass";
import th from "quasar/lang/th";
@ -29,6 +32,7 @@ app.config.globalProperties.$filters = filters;
app.use(router);
app.use(pinia);
app.use(qDraggableTable);
app.use(
Quasar,

1
src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue
View file

@ -43,6 +43,7 @@ onMounted(async () => {
fetchData(id.value);
});
</script>
<template>
<div class="toptitle text-dark col-12 row items-center">
<q-btn

21
src/modules/01_metadataNew/components/insignia/InsigniaList.vue
View file

@ -5,6 +5,7 @@ import { useCounterMixin } from "@/stores/mixin";
import { useRouter, useRoute } from "vue-router";
import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
import dialogHeader from "@/components/DialogHeader.vue";
import TableDraggable from "@/modules/01_metadataNew/components/insignia/TableDraggable.vue";
import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
@ -181,7 +182,6 @@ async function fetchData(id: string) {
}
onMounted(async () => {
fetchData(id.value);
console.log(id.value);
});
async function onSubmit() {
@ -207,7 +207,7 @@ async function addData() {
name: name.value,
isActive: isActive.value,
shortName: shortName.value,
note: note.value == "" ? "-" : "",
note: note.value == "" ? "-" : note.value,
insigniaTypeId: id.value,
});
fetchData(id.value);
@ -218,7 +218,7 @@ async function editData(idData: string) {
name: name.value,
isActive: isActive.value,
shortName: shortName.value,
note: note.value == "" ? "-" : "",
note: note.value == "" ? "-" : note.value,
insigniaTypeId: id.value,
});
fetchData(id.value);
@ -232,10 +232,7 @@ async function deleteData(idData: string) {
import { defineEmits } from "vue";
const emit = defineEmits(["nameType"]);
const nameType = () => {
emit("nameType", insigniaTypeId.value);
};
const dialogOrder = ref<boolean>(false);
</script>
<template>
@ -255,6 +252,16 @@ const nameType = () => {
>
<q-tooltip> เพิ่มข้อมูล </q-tooltip>
</q-btn>
<q-btn
flat
round
color="blue-6"
icon="mdi-sort"
@click.stop="() => (dialogOrder = true)"
>
<q-tooltip> จัดลำดับการแสดงผล </q-tooltip>
</q-btn>
<TableDraggable v-model:modal="dialogOrder" />
<q-space />
<div class="row q-gutter-sm">
<q-input outlined dense v-model="filterKeyword" label="ค้นหา"></q-input>

1
src/modules/01_metadataNew/components/insignia/InsigniaType.vue
View file

@ -102,7 +102,6 @@ async function fetchData() {
await http
.get(config.API.insigniaTypeNew)
.then(async (res) => {
console.log(res.data.result);
store.fetchData(res.data.result);
})
.catch((err) => {

153
src/modules/01_metadataNew/components/insignia/TableDraggable.vue Normal file
View file

@ -0,0 +1,153 @@
<script setup lang="ts">
import { ref, watch } from "vue";
import type { QTableProps } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import { useRouter, useRoute } from "vue-router";
import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
import dialogHeader from "@/components/DialogHeader.vue";
import { useQuasar } from "quasar";
import DialogHeader from "@/components/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
const store = useInsigniaDataStore();
const mixin = useCounterMixin();
const { dialogRemove, dialogConfirm, showLoader, hideLoader, messageError } =
mixin;
const $q = useQuasar();
const route = useRoute();
const modal = defineModel("modal", { type: Boolean });
const columns = ref<QTableProps["columns"]>([
{
name: "name",
required: true,
label: "ชื่อเครื่องราชฯ",
align: "left",
field: "name",
sortable: true,
},
{
name: "shortName",
align: "center",
label: "ชื่อย่อ",
field: "shortName",
},
{
name: "insigniaType",
align: "left",
label: "ลำดับชั้นเครื่องราชฯ",
field: "insigniaType",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
sortable: true,
},
]);
function onDrop(from: any, to: any) {
onDropRow(from, to);
}
const rows = ref<any>([]);
function onDropRow(from: any, to: any) {
rows.value.splice(to, 0, rows.value.splice(from, 1)[0]);
}
async function save() {
const dataPost = await rows.value.map((obj:any) => {
return obj.id;
});
console.log("post data===>", dataPost);
modal.value = false
// showLoader();
// await http
// .put(config.API.insigniaTypeNewId(id), dataPost)
// .then(async (res) => {
// })
// .catch((err) => {
// messageError($q, err);
// })
// .finally(() => {
// hideLoader();
// });
}
async function onSubmit() {
dialogConfirm($q, async () => {
save();
});
}
watch(modal, () => {
if (modal.value === true) {
// rows.value = store.row;
rows.value = [...store.row]; // ดึงมาใช้ sort แล้วใน store ไม่เปลี่ยน
}
});
</script>
<template>
<q-dialog v-model="modal" class="dialog" persistent>
<q-card style="min-width: 50vw" class="bg-grey-11">
<form @submit.prevent="onSubmit">
<DialogHeader
tittle="จัดลำดับการแสดงผล"
:close="() => (modal = false)"
/>
<q-separator />
<q-card-section class="q-pa-md bg-grey-1">
<q-table
v-draggable-table="{
options: {
mode: 'row',
onlyBody: true,
dragHandler: 'th,td',
},
onDrop,
}"
flat
bordered
:rows="rows"
:columns="columns"
:rows-per-page-options="[100]"
row-key="name"
hide-bottom
hide-pagination
hide-header
/>
<!-- <q-table
v-draggable-table="{
options: {
mode: 'row',
onlyBody: true,
dragHandler: 'tr',
},
onDrop,
}"
ref="table"
:columns="columns"
:rows="rows"
row-key="name"
flat
bordered
hide-bottom
/> -->
</q-card-section>
<q-separator />
<q-card-actions align="right">
<q-btn
type="submit"
dense
unelevated
label="บันทึก"
color="public"
class="q-px-md"
>
<!-- icon="mdi-content-save-outline" -->
<q-tooltip>บันทึกข้อมูล</q-tooltip>
</q-btn>
</q-card-actions>
</form>
</q-card>
</q-dialog>
</template>

1
src/modules/01_metadataNew/interface/response/insignia/Insignia.ts
View file

@ -5,6 +5,7 @@ interface DataResponse {
lastUpdateFullName: String;
lastUpdatedAt: Date;
name: string;
level: Number;
}
interface DataRow {

8
src/modules/01_metadataNew/stores/InsigniaStore.ts
View file

@ -9,16 +9,18 @@ import { useCounterMixin } from "@/stores/mixin";
const { date2Thai } = useCounterMixin();
export const useInsigniaDataStore = defineStore("insigniaData", () => {
const row = ref<DataRow[]>();
const name1 = ref<string>("");
const row = ref<DataRow[]>([]);
function fetchData(data: DataResponse[], insigniaType?: string) {
data.forEach((row, index) => {
row.level = index + 1;
});
const list = data.map((e) => ({
...e,
insigniaType: insigniaType,
createdAt: e.createdAt ? date2Thai(e.createdAt) : "",
lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "",
}));
console.log("test");
list;
row.value = list;
}

2
src/modules/11_discipline/components/1_Complaint/AddComplaintPage.vue
View file

@ -87,6 +87,6 @@ async function onSubmit(data: any) {
เพิ่มเรื่องร้องเรียน
</div>
<Form :on-submit="onSubmit" />
<q-card bordered><Form :on-submit="onSubmit" /></q-card>
</div>
</template>

2
src/modules/11_discipline/components/1_Complaint/EditPage.vue
View file

@ -406,7 +406,7 @@ onMounted(() => {
</div>
</div>
<Form :on-submit="onSubmit" :data="data" :get-data="getData" />
<q-card bordered><Form :on-submit="onSubmit" :data="data" :get-data="getData" /></q-card>
<PopupSendToNext
:modal="modalPopup"
:close="closePopup"

1219
src/modules/11_discipline/components/1_Complaint/Form.vue
View file

File diff suppressed because it is too large Load diff

2
src/modules/11_discipline/components/2_InvestigateFacts/AddPage.vue
View file

@ -27,6 +27,6 @@ async function onSubmit(){
เพิ่มรายการสืบสวนข้อเท็จจริง
</div>
<Form :on-submit="onSubmit" />
<q-card bordered><Form :on-submit="onSubmit" /></q-card>
</div>
</template>

2
src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue
View file

@ -405,7 +405,7 @@ watch(
</div>
</div>
<q-card flat class="col-12">
<q-card bordered flat class="col-12">
<q-tabs
v-model="store.tabMenu"
dense

416
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -643,22 +643,23 @@ onMounted(async () => {
</script>
<template>
<div class="row col-12 bg-white">
<div class="col-sm-12 col-md-9">
<div v-if="isSave" class="q-pa-sm q-gutter-sm">
<q-banner
inline-actions
bordered
class="bg-red-1 text-red border-orange"
>
<q-icon name="mdi-information-outline" size="20px" /> แจ้งเตือน
ยังไม่ได้บันทึกข้อมูล
</q-banner>
</div>
<form @submit.prevent="validateForm">
<div class="col-12">
<q-card bordered>
<div class="col-12 row q-pa-md q-col-gutter-md">
<div v-if="isSave" class=" col-12">
<q-banner
inline-actions
bordered
rounded
class="bg-red-1 text-red border-orange q-ma-md"
>
<q-icon name="mdi-information-outline" size="20px" /> แจ้งเตือน
ยังไม่ได้บันทึกข้อมูล
</q-banner>
<q-separator />
</div>
<form @submit.prevent="validateForm">
<div class="col-12 row">
<div class="col-sm-12 col-md-9 row no-wrap">
<div class="col-12 row q-pa-md">
<div class="row q-col-gutter-md">
<div class="col-xs-12 row q-col-gutter-md">
<div class="col-xs-12 col-sm-3" id="respondentType">
<q-select
@ -1365,215 +1366,214 @@ onMounted(async () => {
</div>
</q-card>
</div>
<q-separator />
<div v-if="!isReadonly" class="row col-12 q-pa-sm">
<q-space />
<q-btn
id="onSubmit"
type="submit"
label="บันทึก"
color="secondary"
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>
</div>
</div>
</q-card>
</div>
<div class="col-12 row"><q-separator vertical /></div>
</div>
</form>
</div>
<div class="col-xs-12 col-sm-12 col-md-3">
<div class="q-col-gutter-md row q-pa-md">
<div class="col-xs-12">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารที่เกี่ยวข้องกับการสืบสวน
</div>
<div class="col-12"><q-separator /></div>
<!-- อัพโหลดไฟล์ -->
<div class="col-xs-12 col-sm-12 col-md-3">
<q-card flat bordered class="q-pa-md q-mb-sm">
<div class="col-xs-12 q-mb-sm">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารที่เกี่ยวข้องกับการสืบสวน
</div>
<div class="col-12"><q-separator /></div>
<div
v-if="!isReadonly && formData.id !== ''"
class="col-12 q-pa-sm row"
>
<q-file
class="col-11"
for="#evidenceFiles"
outlined
dense
v-model="formData.evidenceFiles"
label="เอกสารที่เกี่ยวข้องกับการสืบสวน"
hide-bottom-space
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
</q-file>
<div class="col-1 self-center">
<q-btn
v-if="formData.evidenceFiles"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFileRelevant"
><q-tooltip>อัปโหลดเอกสาร</q-tooltip></q-btn
<div
v-if="!isReadonly && formData.id !== ''"
class="col-12 q-pa-sm row"
>
</div>
</div>
<div
v-if="props.data.disciplineInvestigateRelevantDocs.length > 0"
class="col-xs-12 q-pa-sm row"
>
<q-list
v-for="file in props.data.disciplineInvestigateRelevantDocs"
:key="file.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ file.fileName }}</q-item-section>
<q-item-section avatar>
<div class="row">
<div>
<q-file
class="col-11"
for="#evidenceFiles"
outlined
dense
v-model="formData.evidenceFiles"
label="เอกสารที่เกี่ยวข้องกับการสืบสวน"
hide-bottom-space
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
<template v-slot:after>
<q-btn
dense
v-if="formData.evidenceFiles"
size="14px"
flat
round
size="12px"
color="blue"
icon="mdi-download-outline"
@click="downloadFileRelevant(file.pathName)"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>
</div>
<div>
<q-btn
v-if="!isReadonly"
dense
flat
round
size="12px"
color="red"
icon="mdi-delete-outline"
@click="deleteFileRelevant(file.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</div>
</div>
</q-item-section>
</q-item>
</q-list>
</div>
color="add"
icon="mdi-upload"
@click="uploadFileRelevant"
><q-tooltip>อัปโหลดเอกสาร</q-tooltip></q-btn>
</template>
</q-file>
</div>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</div>
<div class="col-xs-12">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารหลักฐาน
</div>
<div class="col-12"><q-separator /></div>
<div
v-if="!isReadonly && formData.id !== ''"
class="col-12 q-pa-sm row"
>
<q-file
for="inputFiles"
class="col-11"
outlined
dense
v-model="formData.documentFile"
@added="uploadFile"
label="ไฟล์เอกสารหลักฐาน"
accept=".pdf,.xlsx,.doc"
clearable
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
</q-file>
<div class="col-1 self-center">
<q-btn
v-if="formData.documentFile"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
<div
v-if="props.data.disciplineInvestigateRelevantDocs.length > 0"
class="col-xs-12 q-pa-sm row"
>
</div>
</div>
<q-list
v-for="file in props.data.disciplineInvestigateRelevantDocs"
:key="file.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ file.fileName }}</q-item-section>
<q-item-section avatar>
<div class="row">
<div>
<q-btn
dense
flat
round
size="12px"
color="blue"
icon="mdi-download-outline"
@click="downloadFileRelevant(file.pathName)"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>
</div>
<div>
<q-btn
v-if="!isReadonly"
dense
flat
round
size="12px"
color="red"
icon="mdi-delete-outline"
@click="deleteFileRelevant(file.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</div>
</div>
</q-item-section>
</q-item>
</q-list>
</div>
<div
v-if="props.data.disciplineInvestigateDocs.length > 0"
class="col-xs-12 q-pa-sm row"
>
<q-list
v-for="file in props.data.disciplineInvestigateDocs"
:key="file.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ file.fileName }}</q-item-section>
<q-item-section avatar>
<div class="row">
<div>
<q-btn
dense
flat
round
size="12px"
color="blue"
icon="mdi-download-outline"
@click="downloadFile(file.pathName)"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>
</div>
<div>
<q-btn
v-if="!isReadonly"
dense
flat
round
size="12px"
color="red"
icon="mdi-delete-outline"
@click="deleteFile(file.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</div>
</div>
</q-item-section>
</q-item>
</q-list>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</div>
<div class="col-xs-12">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารหลักฐาน
</div>
<div class="col-12"><q-separator /></div>
<div
v-if="!isReadonly && formData.id !== ''"
class="col-12 q-pa-sm row"
>
<q-file
for="inputFiles"
class="col-11"
outlined
dense
v-model="formData.documentFile"
@added="uploadFile"
label="ไฟล์เอกสารหลักฐาน"
accept=".pdf,.xlsx,.doc"
clearable
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
</q-file>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
<div class="col-1 self-center">
<q-btn
v-if="formData.documentFile"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div>
<div
v-if="props.data.disciplineInvestigateDocs.length > 0"
class="col-xs-12 q-pa-sm row"
>
<q-list
v-for="file in props.data.disciplineInvestigateDocs"
:key="file.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ file.fileName }}</q-item-section>
<q-item-section avatar>
<div class="row">
<div>
<q-btn
dense
flat
round
size="12px"
color="blue"
icon="mdi-download-outline"
@click="downloadFile(file.pathName)"
>
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
</q-btn>
</div>
<div>
<q-btn
v-if="!isReadonly"
dense
flat
round
size="12px"
color="red"
icon="mdi-delete-outline"
@click="deleteFile(file.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</div>
</div>
</q-item-section>
</q-item>
</q-list>
</div>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</div>
</q-card>
</div>
</div>
</q-card>
</div>
<div class="col-12 "><q-separator /></div>
<div class="row col-12 q-pa-sm" v-if="!isReadonly">
<q-space />
<q-btn
id="onSubmit"
type="submit"
label="บันทึก"
color="secondary"
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>
</div>
</div>
</form>
</div>
<!-- อัพโหลดไฟล์ -->
<DialogDuty
:modal="modalEditDirector"
:close-popup="closeEditDirector"

2
src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue
View file

@ -109,7 +109,7 @@ onMounted(async () => {
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="col-2">
<div class="col-xs-12 col-sm-4 col-md-3">
<q-select
v-model="statusFilter"
label="สถานะ"

2
src/modules/11_discipline/components/3_InvestigateDisciplinary/AddPage.vue
View file

@ -25,6 +25,6 @@ const onSubmit = async () => {
เพิ่มการสอบสวนความผิดทางวินัย
</div>
<Form :on-submit="onSubmit" />
<q-card bordered><Form :on-submit="onSubmit" /></q-card>
</div>
</template>

2
src/modules/11_discipline/components/3_InvestigateDisciplinary/EditPage.vue
View file

@ -459,7 +459,7 @@ onMounted(async () => {
</div>
</div>
<q-card flat class="col-12">
<q-card bordered flat class="col-12">
<q-tabs
v-model="store.tabMenu"
dense

1977
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

File diff suppressed because it is too large Load diff

2
src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue
View file

@ -128,7 +128,7 @@ function filterFn() {
<template>
<div class="q-pb-sm row q-col-gutter-sm">
<div class="col-2">
<div class="col-xs-12 col-sm-4 col-md-3">
<q-select
v-model="statusFilter"
label="สถานะ"

2
src/modules/11_discipline/components/4_Result/EditPage.vue
View file

@ -293,7 +293,7 @@ onMounted(async () => {
/> -->
</div>
</div>
<q-card flat class="col-12">
<q-card bordered flat class="col-12">
<q-tabs
v-model="store.tabMenu"
dense

628
src/modules/11_discipline/components/4_Result/Form.vue
View file

@ -260,346 +260,354 @@ function updatemodalPersonal(modal: boolean) {
</script>
<template>
<div class="row q-col-gutter-sm">
<div class="col-sm-12 col-md-9">
<div v-if="isSave" class="q-pa-sm q-gutter-sm">
<q-banner
inline-actions
bordered
class="bg-red-1 text-red border-orange"
>
<q-icon name="mdi-information-outline" size="20px" /> แจ้งเตือน
ยังไม่ได้บันทึกข้อมูล
</q-banner>
</div>
<div v-if="isSave" class=" col-12">
<q-banner
inline-actions
bordered
rounded
class="bg-red-1 text-red border-orange q-ma-md"
>
<q-icon name="mdi-information-outline" size="20px" /> แจ้งเตือน
ยังไม่ได้บันทึกข้อมูล
</q-banner>
<q-separator />
</div>
<form @submit.prevent="validateForm">
<q-card bordered>
<div class="q-pa-md">
<div class="row col-12 q-gutter-sm">
<div class="col-xs-12 col-sm-2">
<q-select
readonly
for="SelectrespondentType"
v-model="respondentType"
ref="respondentTypeRef"
dense
outlined
label="ผู้ถูกร้องเรียน"
option-value="id"
option-label="name"
emit-value
use-input
map-options
hide-bottom-space
:options="dataStore.complainantoptions"
@update:model-value="selectComplainant(respondentType)"
@filter="(inputValue: any,
doneFn: Function) => dataStore.filterSelector(inputValue, doneFn, 'filterrespondentType'
)"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
ไม่มีข้อมูล
</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div
class="col-xs-12 col-sm-3"
v-if="respondentType === 'ORGANIZATION'"
id="organizationId"
>
<q-select
for="inputOffice"
name="organizationId"
ref="organizationIdRef"
dense
hide-bottom-space
outlined
option-label="name"
option-value="id"
emit-value
map-options
v-model="organizationId"
:options="organizationOption"
label="เลือกสำนักงาน"
/>
</div>
<div class="row col-12" v-if="respondentType === 'PERSON'">
<q-card
bordered
class="row col-12"
style="border: 1px solid #d6dee1"
>
<div class="col-12 row">
<div class="col-sm-12 col-md-9 row no-wrap">
<div class="row col-12 q-pa-md">
<div class="row q-col-gutter-md">
<div class="col-xs-12 col-sm-4">
<q-select
readonly
for="SelectrespondentType"
v-model="respondentType"
ref="respondentTypeRef"
dense
outlined
label="ผู้ถูกร้องเรียน"
option-value="id"
option-label="name"
emit-value
use-input
map-options
hide-bottom-space
:options="dataStore.complainantoptions"
@update:model-value="selectComplainant(respondentType)"
@filter="(inputValue: any,
doneFn: Function) => dataStore.filterSelector(inputValue, doneFn, 'filterrespondentType'
)"
>
<template v-slot:no-option>
<q-item>
<q-item-section class="text-grey">
ไม่มีข้อมูล
</q-item-section>
</q-item>
</template>
</q-select>
</div>
<div
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
class="col-xs-12 col-sm-3"
v-if="respondentType === 'ORGANIZATION'"
id="organizationId"
>
ผู้ถูกร้องเรียน
<q-select
for="inputOffice"
name="organizationId"
ref="organizationIdRef"
dense
hide-bottom-space
outlined
option-label="name"
option-value="id"
emit-value
map-options
v-model="organizationId"
:options="organizationOption"
label="เลือกสำนักงาน"
/>
</div>
<div class="col-12"><q-separator /></div>
<div class="col-xs-12 q-pa-sm">
<d-table
ref="table"
:columns="mainStore.columnsRespondent"
:rows="mainStore.rowsAdd"
row-key="idcard"
flat
<div class="row col-12" v-if="respondentType === 'PERSON'">
<q-card
bordered
:paging="true"
dense
class="custom-header-table"
:visible-columns="mainStore.visibleColumnsRespondent"
class="row col-12"
style="border: 1px solid #d6dee1"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th auto-width></q-th>
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
style="color: #000000; font-weight: 500"
>
<span class="text-weight-medium">{{
col.label
}}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<td>
<q-btn
dense
flat
round
color="info"
icon="info"
@click="onclickViewinfo(props.row.personId)"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
</td>
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click="openDetial(props.row.personId)"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div
class="col-xs-12 col-sm-12 text-weight-medium bg-grey-1 q-py-xs q-px-md"
>
ผู้ถูกร้องเรียน
</div>
<div class="col-12"><q-separator /></div>
<div class="col-xs-12 q-pa-sm">
<d-table
ref="table"
:columns="mainStore.columnsRespondent"
:rows="mainStore.rowsAdd"
row-key="idcard"
flat
bordered
:paging="true"
dense
class="custom-header-table"
:visible-columns="mainStore.visibleColumnsRespondent"
>
<template v-slot:header="props">
<q-tr :props="props">
<q-th auto-width></q-th>
<q-th
v-for="col in props.cols"
:key="col.name"
:props="props"
style="color: #000000; font-weight: 500"
>
<span class="text-weight-medium">{{
col.label
}}</span>
</q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<td>
<q-btn
dense
flat
round
color="info"
icon="info"
@click="onclickViewinfo(props.row.personId)"
>
<q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
</q-btn>
</td>
<q-td
v-for="col in props.cols"
:key="col.name"
:props="props"
@click="openDetial(props.row.personId)"
>
<div v-if="col.name == 'no'">
{{ props.rowIndex + 1 }}
</div>
<div
v-else-if="col.name === 'organization'"
class="table_ellipsis"
>
{{ props.row.organization }}
</div>
<div v-else-if="col.name === 'salary'">
{{ props.row.salary.toLocaleString() }}
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
</q-tr>
</template>
</d-table>
<div
v-else-if="col.name === 'organization'"
class="table_ellipsis"
>
{{ props.row.organization }}
</div>
<div v-else-if="col.name === 'salary'">
{{ props.row.salary.toLocaleString() }}
</div>
<div v-else>
{{ col.value }}
</div>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</q-card>
</div>
</q-card>
</div>
<div class="col-12">
<q-input
:class="inputEdit(isReadonly)"
type="textarea"
dense
outlined
ref="detailRef"
v-model="formData.resultDescription"
for="#detail"
label="สรุปผลการพิจารณา"
hide-bottom-space
@update:model-value="changeFormData()"
/>
</div>
<div class="col-12">
<div class="row q-col-gutter-sm">
<div class="col-3">
<div class="col-12">
<q-input
v-model="formData.disciplineType"
dense
:class="inputEdit(isReadonly)"
outlined
label="ประเภทวินัย"
/>
</div>
<div class="col-3">
<q-input
v-model="formData.titleType"
type="textarea"
dense
outlined
:class="inputEdit(isReadonly)"
label="ประเภทของเรื่อง"
ref="detailRef"
v-model="formData.resultDescription"
for="#detail"
label="สรุปผลการพิจารณา"
hide-bottom-space
@update:model-value="changeFormData()"
/>
</div>
<div class="col-4">
<q-input
v-model="formData.oc"
dense
outlined
:class="inputEdit(isReadonly)"
label="หน่วยงาน/ส่วนราชการ"
/>
</div>
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="formData.year"
class="col-2"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<div class="col-12">
<div class="row q-col-gutter-sm">
<div class="col-3">
<q-input
v-model="formData.disciplineType"
dense
:class="inputEdit(isReadonly)"
outlined
:model-value="
formData.year === 0
? null
: Number(formData.year) + 543
"
:label="`${'ปีงบประมาณ'}`"
label="ประเภทวินัย"
/>
</div>
<div class="col-3">
<q-input
v-model="formData.titleType"
dense
outlined
:class="inputEdit(isReadonly)"
label="ประเภทของเรื่อง"
/>
</div>
<div class="col-4">
<q-input
v-model="formData.oc"
dense
outlined
:class="inputEdit(isReadonly)"
label="หน่วยงาน/ส่วนราชการ"
/>
</div>
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="formData.year"
class="col-2"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
>
<template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
dense
:class="inputEdit(isReadonly)"
outlined
:model-value="
formData.year === 0
? null
: Number(formData.year) + 543
"
:label="`${'ปีงบประมาณ'}`"
>
</q-icon>
<template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
>
</q-icon>
</template>
<template v-if="formData.year" v-slot:append>
<q-icon
name="cancel"
@click.stop.prevent="formData.year = 0"
class="cursor-pointer"
/>
</template>
</q-input>
</template>
<template v-if="formData.year" v-slot:append>
<q-icon
name="cancel"
@click.stop.prevent="formData.year = 0"
class="cursor-pointer"
/>
</template>
</q-input>
</template>
</datepicker>
</datepicker>
</div>
</div>
</div>
</div>
</div>
<div class="col-12 row"><q-separator vertical /></div>
</div>
<!-- อัพโหลดไฟล์ -->
<div class="col-sm-12 col-md-3 q-pa-md">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารหลักฐาน
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm row">
<q-file
for="inputFiles"
class="col-12"
outlined
dense
v-model="formData.file"
@added="uploadFile"
label="ไฟล์เอกสารหลักฐาน"
hide-bottom-space
accept=".pdf,.xlsx,.docx,.png,.jpg"
clearable
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
<template v-slot:after>
<q-btn
v-if="formData.file"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn>
</template>
</q-file>
</div>
<div
v-if="formData.disciplineDisciplinary_DocResults.length > 0"
class="col-xs-12 q-pa-sm row"
>
<q-list
v-for="data in formData.disciplineDisciplinary_DocResults"
:key="data.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ data.fileName }}</q-item-section>
<q-space />
<q-btn
size="12px"
flat
round
dense
color="blue"
icon="mdi-download"
@click="downloadFile(data.pathName)"
><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
>
<q-btn
size="12px"
flat
round
dense
color="red"
class="q-ml-sm"
icon="mdi-delete-outline"
@click="deleteFile(data.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</q-item>
</q-list>
</div>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</div>
<div class="col-12 "><q-separator /></div>
<div class="row col-12 q-pa-sm">
<q-space />
<q-btn
for="ButtonOnSubmit"
id="formSubmit"
color="secondary"
label="บันทึก"
type="submit"
><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
>
</div>
</div>
<q-separator />
<div class="row col-12 q-pa-sm">
<q-space />
<q-btn
for="ButtonOnSubmit"
id="formSubmit"
color="secondary"
label="บันทึก"
type="submit"
><q-tooltip>บับทึกข้อมูล</q-tooltip></q-btn
>
</div>
</q-card>
</form>
</div>
<!-- อัพโหลดไฟล์ -->
<div class="col-sm-12 col-md-3">
<q-card bordered class="row col-12" style="border: 1px solid #d6dee1">
<div class="col-12 text-weight-medium bg-grey-1 q-py-sm q-px-md">
อัปโหลดไฟล์เอกสารหลักฐาน
</div>
<div class="col-12"><q-separator /></div>
<div class="col-12 q-pa-sm row">
<q-file
for="inputFiles"
class="col-11"
outlined
dense
v-model="formData.file"
@added="uploadFile"
label="ไฟล์เอกสารหลักฐาน"
hide-bottom-space
accept=".pdf,.xlsx,.docx,.png,.jpg"
clearable
>
<template v-slot:prepend>
<q-icon name="attach_file" color="primary" />
</template>
</q-file>
<div class="col-1 self-center text-center">
<q-btn
v-if="formData.file"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div>
<div
v-if="formData.disciplineDisciplinary_DocResults.length > 0"
class="col-xs-12 q-pa-sm row"
>
<q-list
v-for="data in formData.disciplineDisciplinary_DocResults"
:key="data.id"
class="full-width"
bordered
separator
>
<q-item clickable v-ripple>
<q-item-section>{{ data.fileName }}</q-item-section>
<q-space />
<q-btn
size="12px"
flat
round
dense
color="blue"
icon="mdi-download"
@click="downloadFile(data.pathName)"
><q-tooltip>ดาวน์โหลดไฟล์</q-tooltip></q-btn
>
<q-btn
size="12px"
flat
round
dense
color="red"
class="q-ml-sm"
icon="mdi-delete-outline"
@click="deleteFile(data.id)"
><q-tooltip>ลบไฟล์</q-tooltip></q-btn
>
</q-item>
</q-list>
</div>
<div class="col-12 q-pa-sm" v-else>
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</div>
</div>
<PopupPersonal
:modal="modalPersonal"
:id="personId"

2
src/modules/11_discipline/components/4_Result/Table.vue
View file

@ -112,7 +112,7 @@ function filterFn() {
<template>
<div class="q-pb-sm row q-col-gutter-sm">
<div class="q-gutter-sm" v-if="nornmalData == true"></div>
<div class="col-2">
<div class="col-xs-12 col-sm-4 col-md-3">
<q-select
v-model="statusFilter"
label="สถานะ"

33
src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
View file

@ -292,10 +292,10 @@ function updatemodalPersonal(modal: boolean) {
<template>
<form @submit.prevent.stop="onValidate">
<q-card bordered>
<div class="col-12 q-pa-md">
<div class="col-12 row q-pa-md">
<div class="row col-12 q-col-gutter-md">
<div class="col-12 q-gutter-y-sm" v-if="data === null">
<div class="row q-col-gutter-md items-start">
<div class="col-12" v-if="data === null">
<div class="row q-col-gutter-sm">
<div class="col-12 col-sm-6 col-md-3">
<q-select
label="ค้นหาจาก"
@ -311,7 +311,7 @@ function updatemodalPersonal(modal: boolean) {
/>
</div>
<div class="col-12 col-sm-6 col-md-6">
<div class="col-12 col-sm-6 col-md-9">
<q-input
ref="searchRef"
v-model="search"
@ -321,22 +321,22 @@ function updatemodalPersonal(modal: boolean) {
dense
label="คำค้น"
:rules="[(val) => !!val || `กรุณากรอกคำค้น`]"
/>
</div>
<div class="col-12 col-sm-6 col-md-3">
<q-btn
color="primary"
icon="search"
label="ค้นหา"
class="full-width q-pa-sm"
@click="searchInput()"
>
</q-btn>
<template v-slot:after>
<q-btn
color="primary"
icon="search"
label="ค้นหา"
class="full-width q-py-sm q-px-md"
@click="searchInput()"
>
</q-btn>
</template>
</q-input>
</div>
</div>
<div class="col-12">
<div class="col-12 q-pt-sm">
<d-table
ref="table"
:columns="columnsRespondent"
@ -398,6 +398,7 @@ function updatemodalPersonal(modal: boolean) {
</d-table>
</div>
</div>
<!-- <div class="col-12"><q-separator /></div> -->
<div class="col-3">
<q-input

7
src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
View file

@ -168,8 +168,8 @@ onMounted(() => {
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader tittle="ส่งไปออกคำสั่ง" :close="closeModal" />
<q-separator />
<q-card-section class="q-pt-none">
<div class="row justify-between">
<q-card-section class="q-pa-md">
<div class="row">
<div class="col-5">
<q-toolbar style="padding: 0">
<q-select
@ -194,6 +194,7 @@ onMounted(() => {
</q-select>
</q-toolbar>
</div>
<q-space />
<div class="col-5">
<q-toolbar style="padding: 0">
@ -281,7 +282,7 @@ onMounted(() => {
</template>
</d-table>
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white text-teal">
<q-btn
label="ส่งไปออกคำสั่ง"

3
src/modules/11_discipline/components/8_AppealComplain/Form.vue
View file

@ -339,7 +339,7 @@ onMounted(() => {
</script>
<template>
<div class="row q-col-gutter-xs">
<div class="col-sm-12 col-md-9">
<div class="col-12">
<form @submit.prevent="validateForm">
<q-card bordered>
<div class="q-pa-md">
@ -690,6 +690,7 @@ onMounted(() => {
</template>
<style lang="scss">
.icon-color {
color: #4154b3;
}

249
src/modules/11_discipline/components/8_AppealComplain/MainPage.vue
View file

@ -276,134 +276,137 @@ onMounted(async () => {
รายการอุทธรณ์/ร้องทุกข์
</div>
<q-card flat bordered class="col-12 q-mt-sm q-pa-md">
<div class="row q-mb-sm">
<div>
<q-btn
id="addComplaints"
for="addComplaints"
size="12px"
flat
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
<div class="row q-mb-sm q-col-gutter-sm">
<div>
<q-btn
id="addComplaints"
for="addComplaints"
size="12px"
flat
round
color="primary"
icon="mdi-plus"
@click="redirectToPageadd()"
><q-tooltip>เพิ่มการอุทธรณ์/ร้องทุกข์</q-tooltip></q-btn
>
</div>
<q-space />
<q-input
for="#search"
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
placeholder="ค้นหา"
@keydown.enter.prevent="filterFn"
>
</div>
</div>
<div class="row col-12 q-col-gutter-sm q-mb-sm">
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="formData.year"
class="col-2"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
@update:model-value="dataUpdate"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
dense
lazy-rules
outlined
:model-value="
formData.year === 0 ? null : Number(formData.year) + 543
"
:label="`${'ปีงบประมาณ'}`"
>
<template v-if="formData.year" v-slot:append>
<q-icon
name="cancel"
@click.stop.prevent="yearAll"
class="cursor-pointer"
/>
</template>
<template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
>
</q-icon>
</template>
</q-input>
<template v-slot:append>
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</datepicker>
</div>
</q-input>
<div class="col-2">
<q-select
v-model="formData.type"
label="ประเภท"
dense
id="visibleColumns"
for="visibleColumns"
v-model="dataStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
option-label="name"
option-value="id"
:options="type"
@update:model-value="dataUpdate"
:options="dataStore.columns"
option-value="name"
options-cover
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-2">
<q-select
v-model="formData.status"
label="สถานะ"
dense
outlined
emit-value
map-options
option-label="name"
option-value="id"
:options="dataStore.statusOptions"
@update:model-value="dataUpdate"
/>
</div>
<q-space />
<q-input
for="#search"
class="col-xs-12 col-sm-3 col-md-2"
standout
dense
v-model="filterKeyword"
ref="filterRef"
outlined
placeholder="ค้นหา"
@keydown.enter.prevent="filterFn"
>
<template v-slot:append>
<q-icon
v-if="filterKeyword !== ''"
name="clear"
class="cursor-pointer"
@click="resetFilter"
/>
</template>
</q-input>
<q-select
id="visibleColumns"
for="visibleColumns"
v-model="dataStore.visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="dataStore.columns"
option-value="name"
options-cover
class="col-xs-12 col-sm-3 col-md-2"
/>
</div>
<div class="col-12 row q-mb-sm">
<q-card bordered class="col-12 filter-card q-pa-sm">
<div class="row col-12 q-col-gutter-sm">
<div class="col-2">
<datepicker
menu-class-name="modalfix"
v-model="formData.year"
class="col-2"
:locale="'th'"
autoApply
year-picker
:enableTimePicker="false"
@update:model-value="dataUpdate"
>
<template #year="{ year }">{{ year + 543 }}</template>
<template #year-overlay-value="{ value }">{{
parseInt(value + 543)
}}</template>
<template #trigger>
<q-input
dense
lazy-rules
outlined
:model-value="
formData.year === 0 ? null : Number(formData.year) + 543
"
:label="`${'ปีงบประมาณ'}`"
>
<template v-if="formData.year" v-slot:append>
<q-icon
name="cancel"
@click.stop.prevent="yearAll"
class="cursor-pointer"
/>
</template>
<template v-slot:prepend>
<q-icon
name="event"
class="cursor-pointer"
style="color: var(--q-primary)"
>
</q-icon>
</template>
</q-input>
</template>
</datepicker>
</div>
<div class="col-2">
<q-select
v-model="formData.type"
label="ประเภท"
dense
outlined
emit-value
map-options
option-label="name"
option-value="id"
:options="type"
@update:model-value="dataUpdate"
/>
</div>
<div class="col-2">
<q-select
v-model="formData.status"
label="สถานะ"
dense
outlined
emit-value
map-options
option-label="name"
option-value="id"
:options="dataStore.statusOptions"
@update:model-value="dataUpdate"
/>
</div>
</div>
</q-card>
</div>
<div class="col-12">
@ -481,4 +484,8 @@ onMounted(async () => {
<DialogStatus :modal="modalStatusEdit" :data="dataRow" :close="close" />
</template>
<style scoped></style>
<style scoped>
.filter-card {
background-color: #f1f1f1b0;
}
</style>

39
src/modules/11_discipline/components/UploadFile.vue
View file

@ -127,16 +127,16 @@ function downloadFile(link: string) {
</script>
<template>
<q-card flat class="q-pa-md" bordered>
<div>
<q-card bordered style="border: 1px solid #d6dee1">
<div class="text-weight-medium bg-grey-1 q-py-sm q-px-md">
{{ title }}
</div>
<div class="col-12"><q-separator /></div>
<div v-if="!isReadonly" class="row">
<div class="col-12 q-pa-sm row">
<div class="col-12 q-px-sm q-pt-sm row">
<q-file
class="col-11"
class="col-12"
outlined
dense
ref="fileRef"
@ -150,21 +150,20 @@ function downloadFile(link: string) {
<template v-slot:prepend>
<q-icon name="attach_file" />
</template>
<template v-slot:after>
<q-btn
v-if="file"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile()"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</template>
</q-file>
<div class="col-1 self-center">
<q-btn
v-if="file"
size="14px"
flat
round
dense
color="add"
icon="mdi-upload"
@click="uploadFile()"
><q-tooltip>อัปโหลดไฟล์</q-tooltip></q-btn
>
</div>
</div>
</div>
@ -212,9 +211,9 @@ function downloadFile(link: string) {
</q-list>
</div>
<div class="col-12 q-ma-xs" v-if="props.files.length == 0">
<q-card class="q-pa-md" bordered> ไม่มีรายการเอกสาร </q-card>
<div class="col-12 q-pa-sm" v-if="props.files.length == 0">
<q-card class="q-py-sm q-px-md" bordered> ไม่มีรายการเอกสาร </q-card>
</div>
</q-card>
</q-card>
</div>
</template>

4
src/views/Dashboard.vue
View file

@ -164,19 +164,17 @@ const thaiOptions: Intl.DateTimeFormatOptions = {
<div
v-if="totalInbox != 0"
ref="scrollTargetRef"
class="q-pa-md"
style="max-height: 90%; overflow: auto"
>
<q-infinite-scroll
@load="onLoad"
:offset="250"
class="q-pa-md"
class="q-pa-sm"
:scroll-target="scrollTargetRef"
>
<q-list
v-for="(contact, index) in inboxList"
:key="contact.no"
class="q-pt-sm"
>
<q-item
clickable

2
tsconfig.json
View file

@ -13,6 +13,8 @@
],
"compilerOptions": {
"typeRoots": ["./typings", "./node_modules/@types"],
"types": ["quasar-ui-q-draggable-table"],
/* other configs */
"paths": {
"@/*": [