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

no message

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2023-09-21 11:00:05 +07:00
parent d4a59110c0
commit 9ba0bf2468
5 changed files with 88 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/modules/05_placement/components/PersonalList/OrgTree.vue
View file

@ -26,6 +26,8 @@ const myFormPosition = ref<any>();
const selected = ref<string>("");
const selectedFile = ref<string>("");
const dataRespone = ref<any>();
const search = ref<string>("");
const filterRef = ref<any>(null);
// Set form field
let dataForm = reactive({
@ -105,14 +107,6 @@ const fetchplacementPosition = async () => {
});
};
const search = ref<string>("");
//reset Tree Filter
const filterRef = ref<any>(null);
// const resetFilter = () => {
// search.value = "";
// filterRef.value.focus();
// };
const props = defineProps({
personalId: String,
modal: Boolean,
@ -122,10 +116,9 @@ const props = defineProps({
},
personal: Object,
});
// filter หน่วยงาน
const myFilterMethod = (node: any, filter: string) => {
const filt = filter;
return (
// ((node.name && node.name == null) || !node.name) &&
(node.name && node.name.indexOf(filt) > -1) ||
@ -156,7 +149,7 @@ const validateData = async () => {
}
});
};
// ยืนยันการเลือกหน่วยงาน
const saveAppoint = async () => {
myFormPosition.value.validate().then(async (result: boolean) => {
if (result) {
@ -170,31 +163,29 @@ const saveAppoint = async () => {
positionPathSideId: dataForm.positionPathSideId,
positionTypeId: dataForm.positionTypeId,
};
showLoader();
await http
.post(config.API.placementPass(), dataAppoint)
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
messageError($q, e);
})
.finally(async () => {
await closeAndClear();
await fetchPublishFile();
await loadTreeData();
await fetchplacementPosition();
hideLoader();
});
dialogConfirm($q, async () => {
showLoader();
await http
.post(config.API.placementPass(), dataAppoint)
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
messageError($q, e);
})
.finally(async () => {
await closeAndClear();
await fetchPublishFile();
await loadTreeData();
await fetchplacementPosition();
hideLoader();
});
});
}
});
};
const editDataStatus = ref<boolean>(false);
const clickEditRow = () => {
editDataStatus.value = true;
};
const closeModal = () => {
if (editDataStatus.value == true) {
@ -221,7 +212,6 @@ const closeAndClear = async () => {
dataForm.positionLineId = "";
dataForm.positionPathSideId = "";
dataForm.positionTypeId = "";
editDataStatus.value = false;
};
// ตำแหน่งเลขที่
const posNoOptions = ref<Object[]>([
@ -265,7 +255,7 @@ const positionLevelOptions = ref<Object[]>([
value: "",
},
]);
// เลือกหน่วยงาน
const selectedPosition = async (data: any) => {
if (data.name == null && selected.value != data.keyId) {
editDataStatus.value = true;
@ -366,7 +356,6 @@ watch(props, () => {
personal.value = data;
});
}
if (
personal.value &&
personal.value.draft === false &&
@ -385,7 +374,7 @@ watch(props, () => {
});
}
});
// หาตำหน่วยงานที่เลือก
function findByPerson(element: any): any {
if (
element.positionNumId &&
@ -406,6 +395,7 @@ function findByPerson(element: any): any {
}
return null;
}
// ยืนยันการคืนตำแหน่ง
const clearPosition = () => {
dialogConfirm(
$q,
@ -414,6 +404,7 @@ const clearPosition = () => {
"ต้องการยืนยันการคืนตำแหน่งนี้ใช่หรือไม่ ?"
);
};
// คืนตำแหน่ง
const postClearPosition = async () => {
showLoader();
await http
@ -421,7 +412,6 @@ const postClearPosition = async () => {
.then(() => {
success($q, "คืนตำแหน่งสำเร็จ");
})
.catch((e: Object) => {
messageError($q, e);
})

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

@ -172,7 +172,7 @@ const columns = ref<QTableProps["columns"]>([
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
},
]);
// แปลงสถานะพนักงาน
const convertBmaOfficer = (val: string) => {
switch (val) {
case "OFFICER":
@ -185,6 +185,7 @@ const convertBmaOfficer = (val: string) => {
return "บุคคลภายนอก";
}
};
// แปลงสถานะบรรจุ
const convertContainStatus = (val: string) => {
switch (val) {
case "UN-CONTAIN":
@ -199,6 +200,7 @@ const convertContainStatus = (val: string) => {
return "-";
}
};
// แปลงสถานะการส่งรายชื่อ
const convertDraft = (val: boolean) => {
switch (val) {
case false:
@ -209,7 +211,7 @@ const convertDraft = (val: boolean) => {
return "-";
}
};
// เรียกข้อมูลรายชื่อผู้สอบผ่าย
const getTable = async () => {
showLoader();
await http
@ -253,10 +255,11 @@ const getTable = async () => {
rowsAll.value.push(rowData);
});
// ราชชื่อทั้งหมด
rows.value = roleAdmin
? rowsAll.value
: rowsAll.value.filter((x: any) => x.statusId != "CONTAIN");
// รายชื่อไปยังหน่วยงาน
rowsFilter.value = rows.value.filter(
(e: any) =>
e.draft == "รอส่งตัว" &&
@ -273,6 +276,7 @@ const getTable = async () => {
};
const appointModal = ref<boolean>(false);
// ยืนยันการผ่อนผัน
const saveDeferment = async () => {
myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -285,6 +289,7 @@ const saveDeferment = async () => {
}
});
};
// post ผ่อนผัน
const postDeferment = async () => {
const formData = new FormData();
formData.append("personalId", personalId.value);
@ -307,7 +312,7 @@ const postDeferment = async () => {
hideLoader();
});
};
// ยืนยันการสละสิทธิ์
const saveDisclaim = async () => {
myForm.value.validate().then(async (result: boolean) => {
if (result) {
@ -320,6 +325,7 @@ const saveDisclaim = async () => {
}
});
};
// post การสละสิทธิ์
const postDisclaimf = async () => {
const dataPost = {
note: userNote.value,
@ -446,7 +452,6 @@ const clickCloseSendModal = () => {
const clickClose = async () => {
userNote.value = "";
if (editRow.value == true) {
dialogConfirm(
$q,
@ -501,6 +506,7 @@ const selected = ref<any>([]);
const personal_selected = ref<any>([]);
const filterlistAdd = ref<string>("");
const paging = ref<boolean>(true);
// ยืนยันส่งราชชื่อไปหน่วยงาน
const savelist = () => {
selected.value.map((e: any) => {
personal_selected.value.push(e.personalId);
@ -528,16 +534,17 @@ const savelist = () => {
);
}
};
// เปิด popup ส่งรายชื่อไปยังหน่วยงาน
const handleModalAddListUpdate = (val: boolean) => {
modaladdlist.value = val;
(selected.value = []), (personal_selected.value = []);
};
// เช็ตสถานะการเลือกคนไปยังหน่วยงาน
const checkSelected = computed(() => {
if (selected.value.length === 0) {
return true;
}
});
const paginationLabel = (start: number, end: number, total: number) => {
if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total;
@ -821,7 +828,7 @@ const pagination = ref({
:validate="validateData"
/>
</q-form>
<q-dialog v-model="modalDefermentDisclaim" persistent>
<q-card style="width: 800px">
<q-form ref="myForm">

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

@ -2,7 +2,6 @@
import { ref, watch } from "vue";
import DialogHeader from "@/modules/05_placement/components/PersonalList/DialogHeader.vue";
import { useQuasar } from "quasar";
import DialogFooter from "@/modules/05_placement/components/PersonalList/DialogFooter.vue";
import type { QTableProps } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import http from "@/plugins/http";

10
src/modules/05_placement/components/PersonalList/TableView.vue
View file

@ -1,6 +1,6 @@
<script setup lang="ts">
import { ref, useAttrs } from "vue";
import { useQuasar } from "quasar";
import { QTooltip, useQuasar } from "quasar";
const $q = useQuasar();
const attrs = ref<any>(useAttrs());
const paging = ref<boolean>(true);
@ -106,10 +106,6 @@ const paginationLabel = (start: string, end: string, total: string) => {
else return start + "-" + end + " ใน " + total;
};
const refresh = () => props.refresh();
const initialPagination = ref<any>({
// descending: false,
rowsPerPage: props.paging == true ? 25 : 0,
});
const emit = defineEmits([
"update:inputfilter",
@ -161,7 +157,9 @@ const updateModaladdlist = () => {
icon="mdi-account-arrow-right"
@click="updateModaladdlist"
v-if="displayAdd"
/>
>
<q-tooltip>ส่งรายชื่อไปยังหน่วยงาน</q-tooltip>
</q-btn>
</div>
<q-space />
<div class="items-center" style="display: flex">

84
src/modules/07_insignia/components/5_Borrow/Main.vue
View file

@ -91,7 +91,7 @@ const fecthInsignia = async () => {
);
});
};
//ระดีบเครื่องราชฯ Tab
//ระดับเครื่องราชฯ Tab
const fecthInsigniaType = async () => {
await http(config.API.insigniaType)
.then(async (res) => {
@ -138,6 +138,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ลำดับ",
field: "no",
sortable: false,
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "citizenId",
@ -145,8 +147,8 @@ const columns = ref<QTableProps["columns"]>([
label: "เลขประจำตัวประชาชน",
field: "citizenId",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "name",
@ -154,8 +156,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ชื่อ - นามสกุล",
field: "name",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "employeeType",
@ -163,8 +165,8 @@ const columns = ref<QTableProps["columns"]>([
label: "สถานภาพ",
field: "employeeType",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "type",
@ -172,8 +174,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ประเภทเครื่องราชฯ",
field: "type",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "dateReceive",
@ -181,8 +183,8 @@ const columns = ref<QTableProps["columns"]>([
label: "วันที่ได้รับพระราชทาน",
field: "dateReceive",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
@ -191,8 +193,8 @@ const columns = ref<QTableProps["columns"]>([
label: "วันที่ในราชกิจนุเบกษา",
field: "date",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "volumeNo",
@ -200,8 +202,8 @@ const columns = ref<QTableProps["columns"]>([
label: "เล่มที่ในราชกิจนุเบกษา",
field: "volumeNo",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "section",
@ -209,8 +211,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ตอนที่ในราชกิจนุเบกษา",
field: "section",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "page",
@ -218,8 +220,8 @@ const columns = ref<QTableProps["columns"]>([
label: "หน้าในราชกิจนุเบกษา",
field: "page",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "number",
@ -227,8 +229,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ลำดับที่ในราชกิจจานุเบกษา",
field: "number",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "vatnumber",
@ -236,8 +238,8 @@ const columns = ref<QTableProps["columns"]>([
label: "หมายเลขใบกำกับ",
field: "vatnumber",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "datepay",
@ -245,8 +247,8 @@ const columns = ref<QTableProps["columns"]>([
label: "วันที่จ่ายใบกำกับฯ",
field: "datepay",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "typepay",
@ -254,8 +256,8 @@ const columns = ref<QTableProps["columns"]>([
label: "รูปแบบการจ่าย",
field: "typepay",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "address",
@ -263,8 +265,8 @@ const columns = ref<QTableProps["columns"]>([
label: "ที่อยู่ที่จ่าย",
field: "address",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "borrowOrganization",
@ -272,8 +274,8 @@ const columns = ref<QTableProps["columns"]>([
label: "หน่วยงานที่ยืม",
field: "borrowOrganization",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "borrowDate",
@ -281,8 +283,8 @@ const columns = ref<QTableProps["columns"]>([
label: "วันที่ยืม",
field: "borrowDate",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "returnOrganization",
@ -290,8 +292,8 @@ const columns = ref<QTableProps["columns"]>([
label: "หน่วยงานที่คืน",
field: "returnOrganization",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "returnDate",
@ -299,8 +301,8 @@ const columns = ref<QTableProps["columns"]>([
label: "วันที่คืน",
field: "returnDate",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "returnReason",
@ -308,8 +310,8 @@ const columns = ref<QTableProps["columns"]>([
label: "เหตุผลการคืน",
field: "returnReason",
sortable: true,
sort: (a: string, b: string) =>
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "action",
@ -328,6 +330,7 @@ watch(tab, async () => {
});
const yearRound = ref<number>();
// เลือกรอบ
const selectorRound = async (round: number) => {
roundYear.value = round;
await fecthlistInsignia();
@ -549,9 +552,10 @@ const paginationLabel = (start: number, end: number, total: number) => {
:columns="columns"
:visible-columns="visibleColumns"
:filter="filter"
row-key="name"
row-key="id"
:pagination-label="paginationLabel"
v-model:pagination="pagination"
:paging="true"
>
<template v-slot:body-cell="props">
<q-td :props="props">