แก้วินัย /รายการออกคำสั่งย้ายสับเปลี่ยนตำแหน่ง รอ API ส่งไปออกคำสั่ง
This commit is contained in:
STW_TTTY\stwtt
parent
877809c2b4
commit
19975a2af5
8 changed files with 457 additions and 376 deletions
|
|
@ -1,5 +1,5 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, onMounted } from "vue";
|
||||
import { ref, onMounted, watch } from "vue";
|
||||
import type { QTableProps } from "quasar";
|
||||
import { useQuasar } from "quasar";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
|
|
@ -11,15 +11,15 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
|
||||
import DialogOrgSelect from "@/components/Dialogs/DialogOrgSelect.vue";
|
||||
import DialogEvalute from '@/modules/05_placement/components/ChangePosition/DialogChange.vue'
|
||||
import DialogEvalute from "@/modules/05_placement/components/ChangePosition/DialogChange.vue";
|
||||
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const id = ref<string>(
|
||||
route.params.id ? route.params.id.toString() : ""
|
||||
);
|
||||
const id = ref<string>(route.params.id ? route.params.id.toString() : "");
|
||||
|
||||
const modalDialog = ref<boolean>(false)
|
||||
const total = ref<number>(0);
|
||||
const totalList = ref<number>(1);
|
||||
const modalDialog = ref<boolean>(false);
|
||||
const posType = ref<string>("");
|
||||
const posLevel = ref<string>("");
|
||||
const position = ref<string>("");
|
||||
|
|
@ -40,7 +40,6 @@ const {
|
|||
dialogRemove,
|
||||
} = mixin;
|
||||
|
||||
|
||||
const rows = ref<any>([]);
|
||||
const modalTree = ref<boolean>(false);
|
||||
const personalId = ref<string>("");
|
||||
|
|
@ -55,8 +54,8 @@ const visibleColumns = ref<string[]>([
|
|||
"citizenId",
|
||||
"fullname",
|
||||
"organizationName",
|
||||
"dateOfBirth",
|
||||
"createdAt",
|
||||
"birthDate",
|
||||
"lastUpdatedAt",
|
||||
"status",
|
||||
]);
|
||||
const pagination = ref({
|
||||
|
|
@ -103,20 +102,20 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "dateOfBirth",
|
||||
name: "birthDate",
|
||||
align: "left",
|
||||
label: "วัน/เดือน/ปี เกิด",
|
||||
sortable: true,
|
||||
field: "dateOfBirth",
|
||||
field: "birthDate",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "createdAt",
|
||||
name: "lastUpdatedAt",
|
||||
align: "left",
|
||||
label: "วันที่ดำเนินการ",
|
||||
sortable: true,
|
||||
field: "createdAt",
|
||||
field: "lastUpdatedAt",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -136,6 +135,7 @@ const resetFilter = () => {
|
|||
filterKeyword.value = "";
|
||||
filterKeyword2.value = "";
|
||||
filterRef.value.focus();
|
||||
fecthLists()
|
||||
};
|
||||
|
||||
//ปิด modal
|
||||
|
|
@ -145,18 +145,24 @@ const clickClose = () => {
|
|||
|
||||
// เพิ่มรายชื่อเพื่อย้ายสับเปลี่ยนตำแหน่ง
|
||||
const addPerson = () => {
|
||||
modalDialog.value = true
|
||||
modalDialog.value = true;
|
||||
};
|
||||
|
||||
//ดึงข้อมูล API
|
||||
const fecthLists = async () => {
|
||||
showLoader();
|
||||
rows.value = [];
|
||||
await http
|
||||
.get(config.API.changePosition+`/${id.value}`)
|
||||
.then((res) => {
|
||||
let response = res.data.result;
|
||||
rows.value = response;
|
||||
.get(
|
||||
config.API.changePositionById +
|
||||
`/${id.value}?page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&searchKeyword=${filterKeyword.value}`
|
||||
)
|
||||
.then(async(res) => {
|
||||
let response = await res.data.result;
|
||||
totalList.value = Math.ceil(
|
||||
res.data.result.total / pagination.value.rowsPerPage
|
||||
);
|
||||
total.value = response.total;
|
||||
rows.value = response.data;
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -164,161 +170,6 @@ const fecthLists = async () => {
|
|||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
|
||||
rows.value = [
|
||||
{
|
||||
id: "08dc7e02-08ff-4cb3-85a7-3feb2a38614d",
|
||||
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99511",
|
||||
prefix: "นางสาว",
|
||||
firstName: "นิรมล",
|
||||
lastName: "เต็มเปี่ยม",
|
||||
citizenId: "3140700369248",
|
||||
dateOfBirth: "1975-12-06T17:00:00",
|
||||
root: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
rootId: "3084a630-4715-413d-98ab-0ba59c5c115e",
|
||||
rootShortName: "สกก.",
|
||||
child1: "กองสรรหาบุคคล",
|
||||
child1Id: "2e49b10a-1a59-41ec-8b62-98c301af39e3",
|
||||
child1ShortName: "กสบ.",
|
||||
child2: null,
|
||||
child2Id: null,
|
||||
child2ShortName: null,
|
||||
child3: null,
|
||||
child3Id: null,
|
||||
child3ShortName: null,
|
||||
child4: null,
|
||||
child4Id: null,
|
||||
child4ShortName: null,
|
||||
orgRevisionId: "7cf4b332-694a-498b-8af2-d1b86d667506",
|
||||
positionId: "c905cfb7-63f5-4e9e-a1f4-e7a709d018f3",
|
||||
posMasterNo: 1,
|
||||
position: null,
|
||||
positionField: null,
|
||||
posTypeId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08081",
|
||||
posTypeName: "อำนวยการ",
|
||||
posLevelId: "1526d9d3-d8b1-43ab-81b5-a84dfbe09262",
|
||||
posLevelName: "ต้น",
|
||||
node: 1,
|
||||
nodeName: "กองสรรหาบุคคล",
|
||||
nodeId: "2e49b10a-1a59-41ec-8b62-98c301af39e3",
|
||||
nodeShortName: "กสบ.",
|
||||
rootOld: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
rootOldId: "3084a630-4715-413d-98ab-0ba59c5c115e",
|
||||
rootShortNameOld: "สกก.",
|
||||
child1Old: null,
|
||||
child1OldId: null,
|
||||
child1ShortNameOld: null,
|
||||
child2Old: null,
|
||||
child2OldId: null,
|
||||
child2ShortNameOld: null,
|
||||
child3Old: null,
|
||||
child3OldId: null,
|
||||
child3ShortNameOld: null,
|
||||
child4Old: null,
|
||||
child4OldId: null,
|
||||
child4ShortNameOld: null,
|
||||
posMasterNoOld: 12,
|
||||
posTypeOldId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08071",
|
||||
posTypeNameOld: "วิชาการ",
|
||||
posLevelOldId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08662",
|
||||
posLevelNameOld: "ชำนาญการ",
|
||||
status: "PENDING",
|
||||
amount: null,
|
||||
reportingDate: "2024-06-05T02:55:48.319",
|
||||
isActive: true,
|
||||
positionDate: "2018-06-11T02:56:00",
|
||||
reason: "1",
|
||||
educationOld: "-",
|
||||
salary: 10000,
|
||||
positionTypeOld: "วิชาการ",
|
||||
positionLevelOld: "ชำนาญการ",
|
||||
positionNumberOld: "12",
|
||||
organizationPositionOld:
|
||||
"นักวิชาการเงินและบัญชี-สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
amountOld: 10000,
|
||||
organizationOld: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
posmasterId: "bb753819-357b-4d12-a445-c93c2bc67096",
|
||||
positionOld: "นักวิชาการเงินและบัญชี",
|
||||
createdAt: "2024-05-27T11:03:58.545266",
|
||||
typeCommand: "MOVE",
|
||||
},
|
||||
{
|
||||
id: "08dc7b99-239c-4ae0-8246-45dbb2059fa4",
|
||||
profileId: "1526d9d3-d8b1-43ab-81b5-a84dfbe99500",
|
||||
prefix: "นาย",
|
||||
firstName: "ณัฐพงศ์",
|
||||
lastName: "ดิษยบุตร",
|
||||
citizenId: "3100903812600",
|
||||
dateOfBirth: "1964-05-13T17:00:00",
|
||||
root: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
rootId: "3084a630-4715-413d-98ab-0ba59c5c115e",
|
||||
rootShortName: "สกก.",
|
||||
child1: null,
|
||||
child1Id: null,
|
||||
child1ShortName: null,
|
||||
child2: null,
|
||||
child2Id: null,
|
||||
child2ShortName: null,
|
||||
child3: null,
|
||||
child3Id: null,
|
||||
child3ShortName: null,
|
||||
child4: null,
|
||||
child4Id: null,
|
||||
child4ShortName: null,
|
||||
orgRevisionId: "7cf4b332-694a-498b-8af2-d1b86d667506",
|
||||
positionId: "2f12e761-a0ee-45a9-8b96-7ad88f297660",
|
||||
posMasterNo: 1,
|
||||
position: null,
|
||||
positionField: null,
|
||||
posTypeId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08091",
|
||||
posTypeName: "บริหาร",
|
||||
posLevelId: "1526d9d3-d8b1-43ab-81b5-a84dfbe09362",
|
||||
posLevelName: "สูง",
|
||||
node: 0,
|
||||
nodeName: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
nodeId: "3084a630-4715-413d-98ab-0ba59c5c115e",
|
||||
nodeShortName: "สกก.",
|
||||
rootOld: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร",
|
||||
rootOldId: "3084a630-4715-413d-98ab-0ba59c5c115e",
|
||||
rootShortNameOld: "สกก.",
|
||||
child1Old: null,
|
||||
child1OldId: null,
|
||||
child1ShortNameOld: null,
|
||||
child2Old: null,
|
||||
child2OldId: null,
|
||||
child2ShortNameOld: null,
|
||||
child3Old: null,
|
||||
child3OldId: null,
|
||||
child3ShortNameOld: null,
|
||||
child4Old: null,
|
||||
child4OldId: null,
|
||||
child4ShortNameOld: null,
|
||||
posMasterNoOld: 1,
|
||||
posTypeOldId: "1526d9d3-d8b1-43ab-81b5-a84dfbe08091",
|
||||
posTypeNameOld: "บริหาร",
|
||||
posLevelOldId: "1526d9d3-d8b1-43ab-81b5-a84dfbe09362",
|
||||
posLevelNameOld: "สูง",
|
||||
status: "PENDING",
|
||||
amount: null,
|
||||
reportingDate: "2024-05-24T05:01:11.455",
|
||||
isActive: true,
|
||||
positionDate: "2024-05-07T02:31:00",
|
||||
reason: null,
|
||||
educationOld: "-",
|
||||
salary: 10,
|
||||
positionTypeOld: "บริหาร",
|
||||
positionLevelOld: "ต้น",
|
||||
positionNumberOld: "1",
|
||||
organizationPositionOld:
|
||||
"นักบริหาร-สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร/",
|
||||
amountOld: 10,
|
||||
organizationOld: "สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร/",
|
||||
posmasterId: "74a4ab16-1958-4e7b-b807-a39d8b15472d",
|
||||
positionOld: "นักบริหาร",
|
||||
createdAt: "2024-05-24T09:28:03.669054",
|
||||
typeCommand: "APPOINT",
|
||||
},
|
||||
];
|
||||
};
|
||||
|
||||
// เปิดโครงสร้าง
|
||||
|
|
@ -336,7 +187,7 @@ const clickDelete = (id: string) => {
|
|||
dialogRemove($q, () => {
|
||||
showLoader();
|
||||
http
|
||||
.delete(config.API.appointmentDelete(id))
|
||||
.delete(config.API.changePositionByIdProfile + `/${id}`)
|
||||
.then(() => {
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
})
|
||||
|
|
@ -358,22 +209,52 @@ const detailPage = (id: string) => {
|
|||
};
|
||||
|
||||
function onSave(data: any) {
|
||||
// showLoader();
|
||||
// http
|
||||
// .put(config.API.appointmentPosition(personalId.value), dataAppoint)
|
||||
// .then((res) => {
|
||||
// modalTree.value = false;
|
||||
// success($q, "บันทึกสำเร็จ");
|
||||
// })
|
||||
// .catch((e) => {
|
||||
// messageError($q, e);
|
||||
// })
|
||||
// .finally(async () => {
|
||||
// fecthLists();
|
||||
// hideLoader();
|
||||
// });
|
||||
console.log("🚀 ~ onSave ~ data:", data);
|
||||
showLoader();
|
||||
http
|
||||
.put(
|
||||
config.API.changePositionByIdProfile + `/position/${personalId.value}`,
|
||||
{
|
||||
node: data.node,
|
||||
nodeId: data.nodeId,
|
||||
posmasterId: data.posmasterId,
|
||||
posMasterNo: data.posMasterNo,
|
||||
positionId: data.positionId,
|
||||
orgRevisionId: data.orgRevisionId,
|
||||
position: data.positionName,
|
||||
positionField: data.positionField,
|
||||
posTypeId: data.posTypeId,
|
||||
posTypeName: data.posTypeName,
|
||||
posLevelId: data.posLevelId,
|
||||
posLevelName: data.posLevelName,
|
||||
}
|
||||
)
|
||||
.then((res) => {
|
||||
modalTree.value = false;
|
||||
success($q, "บันทึกสำเร็จ");
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(async () => {
|
||||
fecthLists();
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
function updatePagination(newPagination: any) {
|
||||
pagination.value.page = 1;
|
||||
pagination.value.rowsPerPage = newPagination.rowsPerPage;
|
||||
|
||||
}
|
||||
|
||||
watch(
|
||||
() => pagination.value.rowsPerPage,
|
||||
async() => {
|
||||
await fecthLists();
|
||||
}
|
||||
);
|
||||
|
||||
onMounted(() => {
|
||||
fecthLists();
|
||||
});
|
||||
|
|
@ -420,6 +301,7 @@ onMounted(() => {
|
|||
outlined
|
||||
debounce="300"
|
||||
placeholder="ค้นหา"
|
||||
@keyup.enter="fecthLists()"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
||||
|
|
@ -453,11 +335,25 @@ onMounted(() => {
|
|||
<d-table
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
:filter="filterKeyword"
|
||||
row-key="citizenId"
|
||||
row-key="id"
|
||||
:visible-columns="visibleColumns"
|
||||
v-model:pagination="pagination"
|
||||
:rows-per-page-options="[1, 25, 50, 100]"
|
||||
@update:pagination="updatePagination"
|
||||
>
|
||||
<template v-slot:pagination="scope">
|
||||
ทั้งหมด {{ total }} รายการ
|
||||
<q-pagination
|
||||
v-model="pagination.page"
|
||||
active-color="primary"
|
||||
color="dark"
|
||||
:max="Number(totalList)"
|
||||
size="sm"
|
||||
boundary-links
|
||||
direction-links
|
||||
:max-pages="5"
|
||||
@update:model-value="fecthLists"
|
||||
></q-pagination>
|
||||
</template>
|
||||
<template v-slot:header="props">
|
||||
<q-tr :props="props">
|
||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||
|
|
@ -475,7 +371,11 @@ onMounted(() => {
|
|||
@click="detailPage(props.row.id)"
|
||||
>
|
||||
<div v-if="col.name == 'no'">
|
||||
{{ props.rowIndex + 1 }}
|
||||
{{
|
||||
(pagination.page - 1) * pagination.rowsPerPage +
|
||||
props.rowIndex +
|
||||
1
|
||||
}}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'fullname'">
|
||||
{{
|
||||
|
|
@ -490,11 +390,9 @@ onMounted(() => {
|
|||
<div v-else-if="col.name == 'status'">
|
||||
{{ props.row.status ? statusText(props.row.status) : "-" }}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'dateOfBirth'">
|
||||
<div v-else-if="col.name == 'birthDate'">
|
||||
{{
|
||||
props.row.dateOfBirth
|
||||
? date2Thai(props.row.dateOfBirth)
|
||||
: "-"
|
||||
props.row.birthDate ? date2Thai(props.row.birthDate) : "-"
|
||||
}}
|
||||
</div>
|
||||
<div v-else-if="col.name == 'organizationName'">
|
||||
|
|
@ -508,20 +406,18 @@ onMounted(() => {
|
|||
}}
|
||||
</div>
|
||||
<div class="text-weight-light">
|
||||
{{ props.row.root ? props.row.root : "" }}
|
||||
{{
|
||||
props.row.nodeName !== null ? props.row.nodeName : ""
|
||||
}}
|
||||
{{
|
||||
props.row.nodeShortName !== null
|
||||
? `(${props.row.nodeShortName}${props.row.posMasterNo})`
|
||||
props.row.rootShortName
|
||||
? `(${props.row.rootShortName}${props.row.posMasterNo})`
|
||||
: ""
|
||||
}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else-if="col.name == 'createdAt'">
|
||||
<div v-else-if="col.name == 'lastUpdatedAt'">
|
||||
{{
|
||||
props.row.createdAt ? date2Thai(props.row.createdAt) : "-"
|
||||
props.row.lastUpdatedAt ? date2Thai(props.row.lastUpdatedAt) : "-"
|
||||
}}
|
||||
</div>
|
||||
<div v-else>
|
||||
|
|
@ -604,7 +500,7 @@ onMounted(() => {
|
|||
:onSubmit="onSave"
|
||||
/>
|
||||
|
||||
<DialogEvalute v-model:modal="modalDialog" />
|
||||
<DialogEvalute v-model:modal="modalDialog" :getData="fecthLists" />
|
||||
</template>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue