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-04-24 10:18:21 +07:00
commit 2ec7426576
23 changed files with 1297 additions and 1271 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/04_registryPerson/components/detail/Achievement/01_ProfessionalLicense.vue
View file

@ -240,20 +240,17 @@ async function uploadfile(subId: string) {
//อัพโหลไฟล์
await uploadFile(uploadUrl, fileUpload.value);
await updateIsUpload();
await updateIsUpload(subId);
} catch (err) {
messageError($q, err);
}
}
/** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
async function updateIsUpload() {
async function updateIsUpload(subId: string) {
await http
.patch(
config.API.profileNewCertificateByCertificateId(
editId.value,
empType.value
),
config.API.profileNewCertificateByCertificateId(subId, empType.value),
{
isUpload: fileUpload.value ? true : false,
}

13
src/modules/04_registryPerson/components/detail/GovernmentInformation/02_Discipline.vue
View file

@ -400,21 +400,18 @@ async function uploadfile(id: string) {
//อัพโหลไฟล์
await uploadFile(uploadUrl, fileUpload.value);
await updateIsUpload();
await updateIsUpload(id);
} catch (err) {
messageError($q, err);
}
}
/** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
async function updateIsUpload() {
async function updateIsUpload(id: string) {
await http
.patch(
config.API.profileNewDisciplineByDisciplineId(id.value, empType.value),
{
isUpload: fileUpload.value ? true : false,
}
)
.patch(config.API.profileNewDisciplineByDisciplineId(id, empType.value), {
isUpload: fileUpload.value ? true : false,
})
.then(() => {
fileUpload.value = null;
});

36
src/modules/04_registryPerson/components/detail/PersonalInformation/02_NameChangeHistory.vue
View file

@ -618,7 +618,7 @@ onMounted(async () => {
<q-btn
v-if="scope.queuedFiles.length > 0"
icon="clear_all"
@click="scope.removeQueuedFiles"
@click="scope.removeQueuedFiles, (fileUpload = undefined)"
round
dense
flat
@ -628,7 +628,7 @@ onMounted(async () => {
<q-btn
v-if="scope.uploadedFiles.length > 0"
icon="done_all"
@click="scope.removeUploadedFiles"
@click="scope.removeUploadedFiles, (fileUpload = undefined)"
round
dense
flat
@ -663,7 +663,7 @@ onMounted(async () => {
<q-btn
v-if="scope.isUploading"
icon="clear"
@click="scope.abort"
@click="scope.abort, (fileUpload = undefined)"
round
dense
flat
@ -672,6 +672,36 @@ onMounted(async () => {
</q-btn>
</div>
</template>
<template v-slot:list="scope">
<q-list separator>
<q-item v-for="file in scope.files" :key="file.__key">
<q-item-section>
<q-item-label class="full-width ellipsis">
{{ file.name }}
</q-item-label>
<q-item-label caption>
{{ file.__sizeLabel }} / {{ file.__progressLabel }}
</q-item-label>
</q-item-section>
<q-item-section top side>
<q-btn
class="gt-xs"
size="12px"
flat
dense
round
icon="delete"
@click="
scope.removeFile(file), (fileUpload = undefined)
"
/>
</q-item-section>
</q-item>
</q-list>
</template>
</q-uploader>
<div
v-if="alertUpload && dialogStatus === 'create'"

2
src/modules/04_registryPerson/components/detail/PersonalInformation/DialogSortEducation.vue
View file

@ -307,7 +307,7 @@ watch(modal, async () => {
<q-tr :props="props">
<q-td>
<q-checkbox
:disable="props.rowIndex === 0"
:disable="props.rowIndex === 0 && rows.length > 1"
keep-color
color="primary"
dense

2
src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
View file

@ -679,6 +679,7 @@ function onSubmit() {
...formData,
commandDateAffect: convertDateToAPI(formData.commandDateAffect),
commandDateSign: convertDateToAPI(formData.commandDateSign),
commandName: store.convertCommandCodeName(formData.commandCode),
amount: Number(String(formData.amount)?.replace(/,/g, "")),
amountSpecial: Number(
String(formData.amountSpecial)?.replace(/,/g, "")
@ -690,6 +691,7 @@ function onSubmit() {
String(formData.mouthSalaryAmount)?.replace(/,/g, "")
),
});
await fetchListSalary();
onClickCloseDialog();
success($q, "บันทึกข้อมูลสำเร็จ");

6
src/modules/04_registryPerson/components/detail/Salary/02_NotReceiveSalary.vue
View file

@ -233,16 +233,16 @@ async function uploadfile(id: string) {
//อัพโหลไฟล์
await uploadFile(uploadUrl, fileUpload.value);
await updateIsUpload();
await updateIsUpload(id);
} catch (err) {
messageError($q, err);
}
}
/** ฟังก์ชันอัพเดทสถานะอัพโหลด*/
async function updateIsUpload() {
async function updateIsUpload(id: string) {
await http
.patch(config.API.profileNewNoPaidById(id.value, empType.value), {
.patch(config.API.profileNewNoPaidById(id, empType.value), {
isUpload: fileUpload.value ? true : false,
})
.then(() => {

20
src/modules/04_registryPerson/stores/RequestEdit.ts
View file

@ -3,16 +3,20 @@ import { ref } from "vue";
import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
export const useRequestEditStore = defineStore("requestEditStore", () => {
const profileId = ref<string>('')
const profileId = ref<string>("");
const optionTopic = ref<string[]>([
"ขอแก้ไขคำนำหน้านาม ชื่อ นามสกุล",
"ขอปรับปรุงข้อมูลจากกรมการปกครอง",
"ขอแก้ไขรูปภาพประจำตัว",
"ขอแก้ไขชื่อ - นามสกุล คู่สมรส",
"ขอแก้ไขชื่อ - นามสกุล บิดา",
"ขอแก้ไขชื่อ - นามสกุล มารดา",
"ขอแก้ไขข้อมูลการได้รับพระราชทานเครื่องราชอิสริยาภรณ์/เหรียญจักรพรรดิมาลา",
"ขอแก้ไขประกาศเกียรติคุณ",
"ขอแก้ไขข้อมูล คู่สมรส",
"ขอแก้ไขข้อมูล บิดา",
"ขอแก้ไขข้อมูล มารดา",
"ขอแก้ไขข้อมูลบุตร",
"ขอแก้ไขข้อมูลเครื่องราชฯ เหรียญจักรพรรดิมาลา",
"ขอแก้ไขข้อมูลประวัติการศึกษา",
"ขอแก้ไขข้อมูลประวัติการฝึกอบรม",
"ขอแก้ไขใบอนุญาตประกอบวิชาชีพ",
"ขอแก้ไขที่อยู่ปัจจุบัน",
"ขอแก้ไขใบอนุญาตประกอบวิชาชีพ",
]);
const optionStatus = ref<DataOption[]>([
{ id: "", name: "ทั้งหมด" },
@ -59,6 +63,6 @@ export const useRequestEditStore = defineStore("requestEditStore", () => {
optionStatus,
optionStatusIDP,
convertStatusIDP,
profileId
profileId,
};
});