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 2025-02-20 14:47:11 +07:00
commit 4ec3a66df9
6 changed files with 318 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue
View file

@ -1,5 +1,5 @@
<script setup lang="ts">
import { onMounted, ref, reactive, computed, readonly } from "vue";
import { onMounted, ref, reactive, computed } from "vue";
import { useQuasar } from "quasar";
import { useRouter, useRoute } from "vue-router";
@ -80,8 +80,8 @@ async function fetchDataRequest() {
typeEmp.value == "employee" ? "-employee" : ""
) + `${requestId.value}`
)
.then((res) => {
const data = res.data.result;
.then(async (res) => {
const data = await res.data.result;
dataRequest.value = data;
formData.status = data.status;
@ -93,7 +93,7 @@ async function fetchDataRequest() {
isReadOnly.value = false;
}
onDownloadFile(requestId.value);
await onDownloadFile(requestId.value);
})
.catch((err) => {
messageError($q, err);
@ -161,7 +161,7 @@ const fileDownloadName = ref<string>("");
* function หาชื่อไฟล์
* @param id รายการยื่นคำร้องขอแก้ไขข้อมูล
*/
function onDownloadFile(id: string) {
async function onDownloadFile(id: string) {
http
.get(
config.API.file(

1
src/modules/04_registryPerson/store.ts
View file

@ -83,6 +83,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
retireYear: "",
node: "เลือกหน่วยงาน",
retireType: "ทั้งหมด",
sortName: "ลำดับการแสดงผล",
});
function convertTypeRetired(val: string) {

12
src/modules/04_registryPerson/views/listView.vue
View file

@ -237,6 +237,7 @@ function selectType() {
if (store.formFilter.type != empType.value) {
store.labelOption.posType = "ทั้งหมด";
store.labelOption.posLevel = "ทั้งหมด";
store.labelOption.sortName = "ลำดับการแสดงผล";
store.formFilter.type = empType.value;
store.formFilter.dateAppoint = "";
store.labelOption.node =
@ -299,6 +300,7 @@ function selectRetireType(item: DataOption) {
}
function selectDisplayOrderType(item: DataOption) {
store.labelOption.sortName = item.name;
store.formFilter.page = 1;
store.formFilter.dateAppoint = item.id;
fetchDataPerson();
@ -755,15 +757,7 @@ onMounted(async () => {
class="q-px-sm"
>
<template v-slot:label>
{{
`ลำดับการแสดผล ${
store.formFilter.dateAppoint
? store.formFilter.dateAppoint === "ASC"
? "เก่า-ล่าสุด"
: "ล่าสุด-เก่า"
: ""
}`
}}
{{ store.labelOption.sortName }}
</template>
<q-list>
<q-item

289
src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue Normal file
View file

@ -0,0 +1,289 @@
<script setup lang="ts">
import { ref, computed, watchEffect } from "vue";
import { useQuasar } from "quasar";
import type { QTableProps } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
import { useCounterMixin } from "@/stores/mixin";
import { useTransferDataStore } from "@/modules/05_placement/store";
import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
import DialogHeader from "@/components/DialogHeader.vue";
/** props*/
const props = defineProps({
closeModal: Function,
fecthlistRecevice: Function,
});
const modal = defineModel<boolean>("modal", { required: true });
const rows = defineModel<ResponseData[]>("rows", { required: true });
const rowsData = defineModel<ResponseData[]>("rowsData", { required: true });
const filterKeyword = defineModel<string>("filterKeyword2", { required: true });
/** use */
const $q = useQuasar();
const { statusText } = useTransferDataStore();
const selected = ref<ResponseItems[]>([]);
const dataMapToSend = computed(() => {
return selected.value.map((i: any) => ({
id: i.id,
profileId: i.profileId,
prefix: i.prefix,
firstName: i.firstName,
lastName: i.lastName,
citizenId: i.citizenId,
remarkVertical: i.reason,
position: i.positionOld,
posType: i.positionTypeOld,
posLevel: i.positionLevelOld,
}));
});
const mixin = useCounterMixin();
const {
showLoader,
success,
messageError,
dialogConfirm,
hideLoader,
date2Thai,
onSearchDataTable,
} = mixin;
/** คอลัมน์ */
const columns = ref<QTableProps["columns"]>([
{
name: "no",
align: "left",
label: "ลำดับ",
sortable: false,
field: "no",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "fullname",
align: "left",
label: "ชื่อ-นามสกุล",
sortable: true,
field: "fullname",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
return `${row.prefix}${row.firstName} ${row.lastName}`;
},
},
{
name: "positionLevel",
align: "left",
label: "กลุ่มงาน",
sortable: true,
field: "positionLevel",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format(val, row) {
let name = "";
if (row.positionTypeOld && row.positionLevelOld) {
name = `${row.positionTypeOld} (${row.positionLevelOld})`;
} else if (row.positionTypeOld) {
name = `${row.positionTypeOld}`;
} else if (row.positionLevelOld) {
name = `(${row.positionLevelOld})`;
} else name = "-";
return name;
},
},
{
name: "organizationPositionOld",
align: "left",
label: "ตำแหน่ง/สังกัดเดิม",
sortable: true,
field: "organizationPositionOld",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
{
name: "createdAt",
align: "left",
label: "วันที่ดำเนินการ",
sortable: true,
field: "createdAt",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val) => date2Thai(val),
},
{
name: "status",
align: "left",
label: "สถานะ",
sortable: true,
field: "status",
headerStyle: "font-size: 14px",
style: "font-size: 14px",
format: (val) => statusText(val),
},
]);
/** คอลัมน์ที่แสดง */
const visibleColumns = ref<string[]>([
"no",
"fullname",
"positionLevel",
"organizationPositionOld",
"createdAt",
"status",
]);
const modalCommand = ref<boolean>(false);
/**
* ฟังก์ชั่นการ Selected Data
*/
const checkSelected = computed(() => {
if (selected.value.length === 0) {
return true;
}
});
//popup ยืนยันส่งัว
function saveOrder() {
dialogConfirm(
$q,
() => {
modalCommand.value = true;
props.closeModal?.();
},
"ยืนยันส่งไปออกคำสั่ง",
"ต้องการยืนยันส่งไปออกคำสั่งใช่หรือไม่?"
);
}
const emit = defineEmits(["update:filterKeyword2", "update:selected"]);
function updateInput(value: any) {
emit("update:filterKeyword2", value);
}
//รีเซ็ตค่าในช่องค้นหา
function Reset() {
emit("update:filterKeyword2", "");
}
function onSearch() {
rows.value = onSearchDataTable(
filterKeyword.value,
rowsData.value,
columns.value ? columns.value : []
);
}
watchEffect(() => {
if (modal.value === true) {
selected.value = [];
updateInput("");
}
});
</script>
<template>
<q-dialog v-model="modal" persistent>
<q-card style="width: 1200px; max-width: 80vw">
<DialogHeader tittle="ส่งไปออกคำสั่งให้ออก" :close="closeModal" />
<q-separator />
<q-card-section>
<div class="row col-12 q-col-gutter-sm">
<div class="row col-12">
<q-space />
<q-input
borderless
outlined
dense
v-model="filterKeyword"
placeholder="ค้นหา"
@keydown.enter="onSearch"
>
<template v-slot:append>
<q-icon name="search" />
</template>
</q-input>
<q-select
v-model="visibleColumns"
multiple
outlined
dense
options-dense
:display-value="$q.lang.table.columns"
emit-value
map-options
:options="columns"
option-value="name"
style="min-width: 140px"
class="gt-xs q-ml-sm"
/>
</div>
<div class="col-12">
<d-table
:columns="columns"
:rows="rows"
row-key="id"
:visible-columns="visibleColumns"
selection="multiple"
v-model:selected="selected"
>
<template v-slot:header-selection="scope">
<q-checkbox
keep-color
color="primary"
dense
v-model="scope.selected"
/>
</template>
<template v-slot:body="props">
<q-tr :props="props" class="cursor-pointer">
<q-td>
<q-checkbox
keep-color
color="primary"
dense
v-model="props.selected"
/>
</q-td>
<q-td v-for="col in props.cols" :key="col.id">
<div v-if="col.name === 'no'">
{{ props.rowIndex + 1 }}
</div>
<div
v-else
:class="col.name === 'org' ? 'table_ellipsis' : ''"
>
{{ col.value ? col.value : "-" }}
</div>
</q-td>
</q-tr>
</template>
</d-table>
</div>
</div>
</q-card-section>
<q-card-actions align="right" class="bg-white text-teal">
<q-btn
label="ส่งไปออกคำสั่ง"
@click="saveOrder"
:disable="checkSelected"
color="public"
/>
</q-card-actions>
</q-card>
</q-dialog>
<DialogCreateCommand
v-model:modal="modalCommand"
:command-type-code="'C-PM-23'"
:persons="dataMapToSend"
/>
</template>

6
src/modules/06_retirement/views/08_dismissOrderEmp.vue
View file

@ -12,7 +12,7 @@ import { useTransferDataStore } from "@/modules/05_placement/store";
import type { ResponseData } from "@/modules/06_retirement/interface/response/out";
import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue";
import DialogSendToCommand from "@/modules/06_retirement/components/06_dismissOrder/DialogSendToCommandEmp.vue";
/** use */
const $q = useQuasar();
@ -306,7 +306,9 @@ onMounted(async () => {
color="edit"
icon="edit"
@click="
router.push(`/retirementEmployee/dismiss-order/${props.row.id}`)
router.push(
`/retirementEmployee/dismiss-order/${props.row.id}`
)
"
>
<q-tooltip>แก้ไขข้อมูล</q-tooltip>

26
src/modules/07_insignia/views/06_ReportMain.vue
View file

@ -196,6 +196,8 @@ async function onUpdateFilter() {
) {
isLoadPDF.value = true;
pdfSrc.value = undefined;
numOfPages.value = 1;
detailReport.value = null;
await http
.post(
@ -222,6 +224,8 @@ async function onUpdateFilter() {
} else if (roundId2.value && nodeId.value) {
isLoadPDF.value = true;
pdfSrc.value = undefined;
numOfPages.value = 1;
detailReport.value = null;
await http
.post(
@ -236,7 +240,6 @@ async function onUpdateFilter() {
.then(async (res) => {
const data = await res.data.result;
detailReport.value = data;
await fetchDocumentTemplate(data, "xlsx");
})
.catch(async (e) => {
@ -294,12 +297,14 @@ function downloadReport(type: string, download: "docx" | "" | "xlsx" = "") {
const fileName =
optionReport.value.find((e) => e.id === typeReport.value.id)?.name || "";
if (type === "xlsx" && download === "") {
genReportXLSX(detailReport.value, fileName, type);
} else if (type === "pdf" && download === "xlsx") {
genReportXLSX(detailReport.value, fileName, "pdf");
} else {
genReport(detailReport.value, fileName, type);
if (detailReport.value) {
if (type === "xlsx" && download === "") {
genReportXLSX(detailReport.value, fileName, type);
} else if (type === "pdf" && download === "xlsx") {
genReportXLSX(detailReport.value, fileName, "pdf");
} else {
genReport(detailReport.value, fileName, type);
}
}
}
@ -333,6 +338,7 @@ onMounted(async () => {
</q-select>
<q-space />
<q-btn
flat
round
@ -350,9 +356,9 @@ onMounted(async () => {
@click="
downloadReport(
'pdf',
typeReport.val != 'report1' ||
typeReport.val != 'report2' ||
typeReport.val != 'report3'
!['report1', 'report2', 'report3'].includes(
typeReport.val
)
? 'xlsx'
: 'docx'
)