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

บรรจุ => ปรับ form

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-06-12 13:12:12 +07:00
parent 076d71830c
commit d16d99df9d
18 changed files with 100 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/05_placement/components/AppointEmployee/Dialogbody.vue
View file

@ -5,7 +5,7 @@ import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import type { UserData } from "@/modules/05_placement/interface/response/AppointMent";
import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
@ -158,9 +158,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่ง" :close="clickClose" />
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-between">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -307,14 +307,15 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="clickAddlist"
color="public"
:disable="checkSelected"
/>
><q-tooltip>ส่งไปออกคำสั่ง</q-tooltip></q-btn
>
</q-card-actions>
</q-card>
</q-dialog>

5
src/modules/05_placement/components/AppointEmployee/Main.vue
View file

@ -7,7 +7,8 @@ import { useCounterMixin } from "@/stores/mixin";
import { useTransferDataStore } from "@/modules/05_placement/store";
import Dialogbody from "@/modules/05_placement/components/AppointEmployee/Dialogbody.vue";
// import DialogOrgTree from "@/modules/05_placement/components/AppointEmployee/Modal.vue";
import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import type {
listAppointType,
resData,
@ -772,7 +773,7 @@ function onSave(data: any) {
</q-card>
<q-dialog v-model="ModalEmployee" persistent>
<q-card style="width: 70vw; max-width: 70vw">
<DialogHeader title="กำหนดตำแหน่ง" :close="clickClose" />
<DialogHeader :tittle="'กำหนดตำแหน่ง'" :close="clickClose" />
<q-separator />
<q-card-section class="q-pa-sm">
<div class="row justify-end">

5
src/modules/05_placement/components/AppointEmployee/Modal.vue
View file

@ -1,7 +1,8 @@
<script setup lang="ts">
import { useQuasar, QForm } from "quasar";
import { onMounted, reactive, ref, watch } from "vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
@ -389,7 +390,7 @@ function findByPerson(element: any): any {
<q-dialog v-model="props.modal" persistent>
<q-card style="width: 900px; max-width: 80vw">
<q-form ref="myFormPosition">
<DialogHeader title="เลือกหน่วยงาน" :close="closeModal" />
<DialogHeader :tittle="'เลือกหน่วยงาน'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pa-sm bg-grey-1">
<div class="row col-12 q-col-gutter-sm">

4
src/modules/05_placement/components/AppointMent/AppointmentModal.vue
View file

@ -1,7 +1,7 @@
<script setup lang="ts">
import { useQuasar, QForm } from "quasar";
import { onMounted, reactive, ref, watch } from "vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
@ -403,7 +403,7 @@ onMounted(async () => {
<q-card style="width: 900px; max-width: 80vw">
<q-form ref="myFormPosition">
<DialogHeader
title="เลือกหน่วยงานที่แต่งตั้ง - เลื่อน"
:tittle="'เลือกหน่วยงานที่แต่งตั้ง - เลื่อน'"
:close="closeModal"
/>
<q-separator />

14
src/modules/05_placement/components/AppointMent/Dialogbody.vue
View file

@ -4,8 +4,8 @@ import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import type { UserDataNew } from "@/modules/05_placement/interface/response/AppointMent";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue";
import { useTransferDataStore } from "@/modules/05_placement/store";
import http from "@/plugins/http";
@ -175,9 +175,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่ง" :close="clickClose" />
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-between">
<div class="col-5">
<!-- <q-toolbar style="padding: 0">
@ -329,14 +329,16 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="sendToCommand"
color="public"
:disable="checkSelected"
/>
>
<q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>

5
src/modules/05_placement/components/ChangePosition/Modal.vue
View file

@ -1,7 +1,8 @@
<script setup lang="ts">
import { useQuasar, QForm } from "quasar";
import { onMounted, reactive, ref, watch } from "vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
@ -403,7 +404,7 @@ onMounted(async () => {
<q-card style="width: 900px; max-width: 80vw">
<q-form ref="myFormPosition">
<DialogHeader
title="เลือกหน่วยงานที่แต่งตั้ง - เลื่อน"
:tittle="'เลือกหน่วยงานที่แต่งตั้ง - เลื่อน'"
:close="closeModal"
/>
<q-separator />

15
src/modules/05_placement/components/ChangePosition/SendToCommand.vue
View file

@ -5,7 +5,8 @@ import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import type { UserDataNew } from "@/modules/05_placement/interface/response/AppointMent";
import DialogHeader from "@/modules/05_placement/components/AppointMent/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import { useTransferDataStore } from "@/modules/05_placement/store";
import http from "@/plugins/http";
@ -130,9 +131,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่ง" :close="clickClose" />
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-between">
<div class="col-5">
<!-- <q-toolbar style="padding: 0">
@ -284,14 +285,16 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="sendToCommand"
color="public"
:disable="checkSelected"
/>
>
<q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>

14
src/modules/05_placement/components/Other/Dialogbody.vue
View file

@ -2,7 +2,7 @@
import { ref, computed, watchEffect } from "vue";
import { useQuasar } from "quasar";
import type { QTableProps } from "quasar";
import DialogHeader from "@/modules/05_placement/components/Receive/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import { useTransferDataStore } from "@/modules/05_placement/store";
import { useCounterMixin } from "@/stores/mixin";
@ -193,9 +193,9 @@ function filterFnOptionsType(val: string, update: any) {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่งอื่นๆ" :close="props.clickClose" />
<DialogHeader :tittle="'ส่งไปออกคำสั่งอื่นๆ'" :close="props.clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-between">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -308,14 +308,16 @@ function filterFnOptionsType(val: string, update: any) {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="clickAddlist"
:disable="checkSelected"
color="public"
/>
>
<q-tooltip>ส่งไปออกคำสั่ง</q-tooltip>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>

4
src/modules/05_placement/components/Other/OtherModal.vue
View file

@ -1,7 +1,7 @@
<script setup lang="ts">
import { useQuasar, QForm } from "quasar";
import { onMounted, reactive, ref, watch } from "vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";
@ -419,7 +419,7 @@ function findByPerson(element: any): any {
<q-dialog v-model="props.modal" persistent>
<q-card style="width: 900px; max-width: 80vw">
<q-form ref="myFormPosition">
<DialogHeader title="เลือกหน่วยงานที่รับโอน" :close="closeModal" />
<DialogHeader :tittle="'เลือกหน่วยงานที่รับโอน'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pa-sm bg-grey-1">
<div class="row col-12 q-col-gutter-sm">

2
src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue
View file

@ -440,7 +440,7 @@ watch(
</q-card-section>
<q-separator />
<q-card-actions align="right" class="bg-white text-teal">
<q-card-actions align="right">
<q-btn label="บันทึก" color="secondary" @click="onClickSubmit"
><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
>

4
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -1486,8 +1486,8 @@ onMounted(async () => {
</template> -->
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งรายชื่อ"
@click="savelist"

21
src/modules/05_placement/components/PersonalList/TableDetail.vue
View file

@ -3,7 +3,7 @@ import { ref, watch } from "vue";
import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
@ -79,7 +79,7 @@ const columns = ref<QTableProps["columns"]>([
]);
/** get ข้อมูลการศึกษา */
async function fetchData(){
async function fetchData() {
showLoader();
await http
.get(config.API.getDatapersonal(props.personalId))
@ -100,13 +100,13 @@ async function fetchData(){
.finally(() => {
hideLoader();
});
};
}
/**
* convert text
* @param val type
*/
function formBmaofficer(val: string){
function formBmaofficer(val: string) {
switch (val) {
case "OFFICER":
return "ขรก.กทม. สามัญ";
@ -117,16 +117,16 @@ function formBmaofficer(val: string){
default:
return "";
}
};
}
/** ปิด POPUP ข้อมูล */
async function close(){
async function close() {
props.close();
selection.value = [];
rows.value = [];
};
}
/** เมื่อ props.Modal จะเรียกข้อมูลการศึกษา */
/** เมื่อ props.Modal จะเรียกข้อมูลการศึกษา */
watch(props, () => {
if (props.Modal === true) {
fetchData();
@ -139,7 +139,7 @@ watch(props, () => {
<q-form ref="myForm">
<div class="row">
<DialogHeader
:title="`รายละเอียดของ ${personalForm.fullName}`"
:tittle="`รายละเอียดของ ${personalForm.fullName}`"
@click="close"
/>
</div>
@ -187,7 +187,6 @@ watch(props, () => {
{{ personalForm.gender }}
</div>
</div>
</div>
</q-card>
</div>
@ -222,7 +221,7 @@ watch(props, () => {
</q-table>
</q-card>
</div>
<div class="contanier-box-mini">
<q-card bordered class="card-panding">
<div class="row items-center q-pa-xs header-text">การสอบ</div>

14
src/modules/05_placement/components/Receive/Dialogbody.vue
View file

@ -4,7 +4,8 @@ import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import type { QTableProps } from "quasar";
import type { ResponseRow } from "@/modules/05_placement/interface/response/Receive";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
// import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
import { useTransferDataStore } from "@/modules/05_placement/store";
@ -176,9 +177,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่งรับโอน" :close="clickClose" />
<DialogHeader :tittle="'ส่งไปออกคำสั่งรับโอน'" :close="clickClose" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -311,14 +312,15 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
><q-tooltip>ส่งไปออกคำสั่ง</q-tooltip></q-btn
>
</q-card-actions>
</q-card>
</q-dialog>

14
src/modules/05_placement/components/Relocation/RelocationMain.vue
View file

@ -8,7 +8,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
import http from "@/plugins/http";
import config from "@/app.config";
import DialogOrgTree from "@/modules/05_placement/components/Relocation/RelocationModal.vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import type { relocationType } from "@/modules/05_placement/interface/response/Relocation";
@ -581,9 +581,9 @@ const pagination = ref({
<q-dialog v-model="modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่งย้าย" :close="closeModal" />
<DialogHeader :tittle="'ส่งไปออกคำสั่งย้าย'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -709,14 +709,16 @@ const pagination = ref({
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
>
<q-tooltpi>ส่งไปออกคำสั่ง</q-tooltpi>
</q-btn>
</q-card-actions>
</q-card>
</q-dialog>

15
src/modules/05_placement/components/Repatriate/Dialogbody.vue
View file

@ -7,7 +7,8 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
import type { QTableProps } from "quasar";
import type { officerType } from "@/modules/05_placement/interface/response/officer";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
@ -194,9 +195,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่งส่งตัวกลับ" :close="closeModal" />
<DialogHeader :tittle="'ส่งไปออกคำสั่งส่งตัวกลับ'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -288,14 +289,16 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
>
<q-tooltip>ส่งไปออกคำสั่ง</q-tooltip></q-btn
>
</q-card-actions>
</q-card>
</q-dialog>

13
src/modules/05_placement/components/Transfer/Dialogbody.vue
View file

@ -6,7 +6,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
import type { QTableProps } from "quasar";
import type { ResponseData } from "@/modules/05_placement/interface/response/Transfer";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import http from "@/plugins/http";
import config from "@/app.config";
@ -182,9 +182,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่ง" :close="closeModal" />
<DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -276,14 +276,15 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
><q-tooltip>ส่งไปออกคำสั่ง</q-tooltip></q-btn
>
</q-card-actions>
</q-card>
</q-dialog>

13
src/modules/05_placement/components/helpgovernment/Dialogbody.vue
View file

@ -8,7 +8,7 @@ import config from "@/app.config";
import type { QTableProps } from "quasar";
import type { officerType } from "@/modules/05_placement/interface/response/officer";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import DialogHeader from "@/components/DialogHeader.vue";
import { useTransferDataStore } from "@/modules/05_placement/store";
@ -227,9 +227,9 @@ watchEffect(() => {
<template>
<q-dialog v-model="props.Modal">
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader title="ส่งไปออกคำสั่งช่วยราชการ" :close="closeModal" />
<DialogHeader :tittle="'ส่งไปออกคำสั่งช่วยราชการ'" :close="closeModal" />
<q-separator />
<q-card-section class="q-pt-none">
<q-card-section>
<div class="row justify-end">
<div class="col-5">
<q-toolbar style="padding: 0">
@ -323,14 +323,15 @@ watchEffect(() => {
</template>
</d-table>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-separator />
<q-card-actions align="right">
<q-btn
label="ส่งไปออกคำสั่ง"
:disable="checkSelected"
color="public"
@click="saveOrder"
/>
><q-tooltip>ส่งไปออกคำสั่ง</q-tooltip></q-btn
>
</q-card-actions>
</q-card>
</q-dialog>