no message
This commit is contained in:
parent
5c1747262f
commit
b130568ef4
12 changed files with 938 additions and 472 deletions
|
|
@ -1,45 +1,57 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive } from "vue";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import type {
|
||||
FormAddHistory,
|
||||
FormAddHistoryEmployee,
|
||||
FormAddHistoryProject,
|
||||
} from "@/modules/15_development/interface/request/Main";
|
||||
import { useDevelopmentDataStore } from "@/modules/15_development/store/developmentStore";
|
||||
import { useDevelopmentDataStoreHistory } from "@/modules/15_development/store/developmentStoreHistory";
|
||||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
import DialogGov from "@/modules/15_development/components/history/DialogGov.vue"
|
||||
import DialogProject from "@/modules/15_development/components/history/DialogProject.vue";
|
||||
import DialogGov from "@/modules/15_development/components/historyEmployee/DialogGov.vue";
|
||||
import DialogProject from "@/modules/15_development/components/historyEmployee/DialogProject.vue";
|
||||
import { useQuasar, type QTableProps } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from '@/app.config'
|
||||
import config from "@/app.config";
|
||||
|
||||
const $q = useQuasar()
|
||||
const mixin = useCounterMixin()
|
||||
const { dialogConfirm,showLoader,hideLoader,messageError } = mixin
|
||||
const router = useRouter();
|
||||
const store = useDevelopmentDataStore();
|
||||
const route = useRoute();
|
||||
|
||||
const id = ref<string>(route.params.id as string);
|
||||
const $q = useQuasar();
|
||||
const mixin = useCounterMixin();
|
||||
const { dialogConfirm, showLoader, hideLoader, messageError, date2Thai } =
|
||||
mixin;
|
||||
const store = useDevelopmentDataStoreHistory();
|
||||
const modalDialogGov = ref<boolean>(false);
|
||||
const modalDialogProject = ref<boolean>(false);
|
||||
|
||||
const dateOrder = ref<Date | null>(null);
|
||||
const order = ref<string>("");
|
||||
const dateOrder = ref<string>("");
|
||||
|
||||
/** ตัวแปรข้อมูลข้าราชการ */
|
||||
const formMain = reactive<FormAddHistory>({
|
||||
citizenId: "1XXXXXXXXXXXX", //เลขประจําตัวประชาชน
|
||||
name: "นางสาวรัชภรณ์ ภักดี", //ชื่อ - นามสกุล
|
||||
position: "นักบริหาร", //ตําแหน่ง
|
||||
type: "บริหาร", //ประเภทตําแหน่ง
|
||||
level: "ชำนาญการพิเศษ", //ระดับตําแหน่ง
|
||||
positionSide: "นักบริหาร", //ตําแหน่งทางการบริหาร
|
||||
oc: "กลุ่มงานช่วยนักบริหาร", //หน่วยงานที่สังกัด
|
||||
const formMain = reactive<FormAddHistoryEmployee>({
|
||||
id: "",
|
||||
name: "", //ชื่อ - นามสกุล
|
||||
prefix: "", //คำนำหน้าชื่อ
|
||||
rank: "", //ยศ
|
||||
firstName: "", //ชื่อ
|
||||
lastName: "", //นามสกุล
|
||||
citizenId: "", //เลขประจําตัวประชาชน
|
||||
level: "", //ระดับตําแหน่ง
|
||||
type: "", //ประเภทตําแหน่ง
|
||||
posLevelId: "", //id ระดับตําแหน่ง
|
||||
posTypeId: "", //id ประเภทตําแหน่ง
|
||||
position: "", //ตําแหน่ง
|
||||
posNo: "", //เลขที่ตำแหน่ง
|
||||
oc: "", //หน่วยงานที่สังกัด
|
||||
});
|
||||
|
||||
/** ตัวแปรข้อมูลโครงสร้าง */
|
||||
const formMainProject = reactive<FormAddHistoryProject>({
|
||||
id: "",
|
||||
project: "", //ชื่อโครงการ/หลักสูตรการฝึกอบรม
|
||||
year: "", //ปีงบประมาณที่เข้ารับการฝึกอบรม
|
||||
trainingStart: "", //วันเริ่มต้นการฝึกอบรม
|
||||
|
|
@ -59,7 +71,6 @@ const fieldLabels = {
|
|||
type: "กลุ่มงาน",
|
||||
|
||||
level: "ระดับชั้นงาน",
|
||||
positionSide: "ตําแหน่งทางการบริหาร",
|
||||
oc: "หน่วยงานที่สังกัด",
|
||||
};
|
||||
|
||||
|
|
@ -139,15 +150,6 @@ const columnsGov = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "positionSide",
|
||||
align: "left",
|
||||
label: "ตําแหน่งทางการบริหาร",
|
||||
sortable: true,
|
||||
field: "positionSide",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
]);
|
||||
|
||||
const columnsProject = ref<QTableProps["columns"]>([
|
||||
|
|
@ -201,44 +203,82 @@ function getClass() {
|
|||
}
|
||||
/** save */
|
||||
function onSubmit() {
|
||||
// const body = {
|
||||
// citizenId:formMain.citizenId,
|
||||
// name:formMain.name,
|
||||
// position:formMain.position,
|
||||
// type:formMain.type,
|
||||
// level:formMain.level,
|
||||
// positionSide:formMain.positionSide,
|
||||
// oc:formMain.oc,
|
||||
const url = store.status
|
||||
? config.API.developmentHistoryList("employee") + `${id.value}`
|
||||
: config.API.developmentHistoryAdd("employee");
|
||||
|
||||
// project:formMainProject.project,
|
||||
// year:formMainProject.year,
|
||||
// trainingStart:formMainProject.trainingStart,
|
||||
// trainingEnd:formMainProject.trainingEnd,
|
||||
// totalTraining:formMainProject.totalTraining,
|
||||
// location:formMainProject.location,
|
||||
// topic:formMainProject.topic,
|
||||
// studyStart:formMainProject.studyStart,
|
||||
// studyEnd:formMainProject.studyEnd,
|
||||
// organizingTraining:formMainProject.organizingTraining,
|
||||
const body = {
|
||||
rank: null,
|
||||
prefix: formMain.prefix,
|
||||
firstName: formMain.firstName,
|
||||
lastName: formMain.lastName,
|
||||
citizenId: formMain.citizenId,
|
||||
position: formMain.position,
|
||||
// posExecutive:formMain.positionSide,
|
||||
posLevelId: formMain.posLevelId,
|
||||
posTypeId: formMain.posTypeId,
|
||||
|
||||
// order:order.value,
|
||||
// dateOrder:dateOrder.value,
|
||||
// }
|
||||
// dialogConfirm($q,()=>{
|
||||
// showLoader()
|
||||
// http
|
||||
// .post(config.API.,body)
|
||||
// .then((res)=>{
|
||||
|
||||
// }).catch((e)=>{
|
||||
// messageError($q,e)
|
||||
// }).finally(()=>{
|
||||
// hideLoader()
|
||||
// })
|
||||
// })
|
||||
|
||||
router.push(`/development/employee-history`)
|
||||
developmentId: formMainProject.id,
|
||||
order: order.value,
|
||||
dateOrder: dateOrder.value,
|
||||
};
|
||||
dialogConfirm($q, () => {
|
||||
showLoader();
|
||||
http[store.status ? "put" : "post"](url, body)
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
router.push(`/development/history`);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function upDate(data: FormAddHistoryEmployee) {
|
||||
formMain.id = data.id;
|
||||
formMain.citizenId = data.citizenId;
|
||||
formMain.name = data.name;
|
||||
formMain.prefix = data.prefix;
|
||||
formMain.firstName = data.firstName;
|
||||
formMain.lastName = data.lastName;
|
||||
formMain.position = data.position;
|
||||
formMain.posLevelId = data.posLevelId;
|
||||
formMain.posTypeId = data.posTypeId;
|
||||
formMain.type = data.type;
|
||||
formMain.level = data.level;
|
||||
}
|
||||
|
||||
function upDateProject(data: any) {
|
||||
formMainProject.id = data.id;
|
||||
formMainProject.project = data.project;
|
||||
formMainProject.year = data.year;
|
||||
}
|
||||
|
||||
function getDataEdit() {
|
||||
showLoader();
|
||||
http
|
||||
.get(config.API.developmentHistoryList("officer") + `${id.value}`)
|
||||
.then((res) => {
|
||||
console.log(res);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (store.status == true) {
|
||||
console.log(1);
|
||||
// getDataEdit()
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<template>
|
||||
<div class="toptitle text-dark">
|
||||
|
|
@ -252,22 +292,24 @@ router.push(`/development/employee-history`)
|
|||
class="q-mr-sm"
|
||||
@click="router.go(-1)"
|
||||
/>
|
||||
<span class=""
|
||||
>เพิ่มประวัติฝึกอบรม/ดูงานลูกจ้าง</span
|
||||
>
|
||||
<span>{{
|
||||
store.status
|
||||
? `แก้ไขประวัติฝึกอบรม/ดูงานลูกจ้าง`
|
||||
: `เพิ่มประวัติฝึกอบรม/ดูงานลูกจ้าง`
|
||||
}}</span>
|
||||
</div>
|
||||
<q-card flat bordered>
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit">
|
||||
<q-card-section>
|
||||
<q-card flat bordered style="border: 1px solid #d6dee1">
|
||||
<div class="col-12 text-weight-bold bg-grey-1 q-py-sm q-px-md">
|
||||
ข้อมูลข้าราชการ
|
||||
ข้อมูลลูกจ้าง
|
||||
|
||||
<q-btn
|
||||
flat
|
||||
class="btn-fixed-width"
|
||||
color="teal"
|
||||
label="เลือกข้าราชการ"
|
||||
label="เลือกลูกจ้าง"
|
||||
icon="add"
|
||||
@click="openDialogGov()"
|
||||
/>
|
||||
|
|
@ -339,7 +381,10 @@ router.push(`/development/employee-history`)
|
|||
}}</span>
|
||||
</div>
|
||||
<div class="col-12 col-sm-12 col-md-8">
|
||||
<span>{{
|
||||
<span v-if="index == 1">{{
|
||||
formMainProject[field] ? formMainProject[field] + 543 : "-"
|
||||
}}</span>
|
||||
<span v-else>{{
|
||||
formMainProject[field] ? formMainProject[field] : "-"
|
||||
}}</span>
|
||||
</div>
|
||||
|
|
@ -383,15 +428,42 @@ router.push(`/development/employee-history`)
|
|||
/>
|
||||
</div>
|
||||
<div class="col-3">
|
||||
<q-input
|
||||
label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="dateOrder"
|
||||
dense
|
||||
outlined
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
|
||||
/>
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
</template>
|
||||
<template #year-overlay-value="{ value }">
|
||||
{{ parseInt(value + 543) }}
|
||||
</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
outlined
|
||||
dense
|
||||
:class="getClass()"
|
||||
hide-bottom-space
|
||||
:model-value="dateOrder != null ? date2Thai(dateOrder) : null"
|
||||
:rules="[(val:string) => !!val || `${'กรุณากรอกคำสั่งลงวันที่/หนังสืออนุมัติลงวันที่'}`,]"
|
||||
label="คำสั่งลงวันที่/หนังสืออนุมัติลงวันที่"
|
||||
>
|
||||
<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>
|
||||
</q-card-section>
|
||||
|
|
@ -412,6 +484,6 @@ router.push(`/development/employee-history`)
|
|||
</q-form>
|
||||
</q-card>
|
||||
|
||||
<DialogGov v-model:modal="modalDialogGov" />
|
||||
<DialogProject v-model:modal="modalDialogProject" />
|
||||
<DialogGov v-model:modal="modalDialogGov" :up-date="upDate" />
|
||||
<DialogProject v-model:modal="modalDialogProject" :up-date="upDateProject" />
|
||||
</template>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue