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

Merge branch 'develop' into nice

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-03-10 18:30:46 +07:00
commit c4e1a9f5c4
5 changed files with 85 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/modules/03_recruiting/views/01_compete/PeriodAdd.vue
View file

@ -18,8 +18,15 @@ const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
const route = useRoute();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
convertDateToAPI,
} = mixin;
const myForm = ref<QForm | null>(null); //form data input
const name = ref<string>("");
@ -220,30 +227,38 @@ function sendData() {
const valueData: RequestPeriodCompete = {
announcementEndDate:
dateAnnouncement.value !== null
? dateToISO(dateAnnouncement.value[1])
? convertDateToAPI(dateAnnouncement.value[1])
: null,
announcementStartDate:
dateAnnouncement.value !== null
? dateToISO(dateAnnouncement.value[0])
? convertDateToAPI(dateAnnouncement.value[0])
: null,
examDate: dateExam.value !== null ? dateToISO(dateExam.value) : null,
examDate: dateExam.value !== null ? convertDateToAPI(dateExam.value) : null,
detail: editor.value,
fee: fee.value ? (fee.value as number) : (0 as number),
id: "",
name: name.value,
note: note.value,
paymentEndDate:
datePayment.value !== null ? dateToISO(datePayment.value[1]) : null,
datePayment.value !== null
? convertDateToAPI(datePayment.value[1])
: null,
paymentStartDate:
datePayment.value !== null ? dateToISO(datePayment.value[0]) : null,
datePayment.value !== null
? convertDateToAPI(datePayment.value[0])
: null,
registerEndDate:
dateRegister.value !== null ? dateToISO(dateRegister.value[1]) : null,
dateRegister.value !== null
? convertDateToAPI(dateRegister.value[1])
: null,
registerStartDate:
dateRegister.value !== null ? dateToISO(dateRegister.value[0]) : null,
dateRegister.value !== null
? convertDateToAPI(dateRegister.value[0])
: null,
order: round.value,
year: yearly.value,
announcementDate:
dateAnnounce.value !== null ? dateToISO(dateAnnounce.value) : null,
dateAnnounce.value !== null ? convertDateToAPI(dateAnnounce.value) : null,
};
return valueData;
}

17
src/modules/03_recruiting/views/02_qualify/DisablePeriodAdd.vue
View file

@ -26,6 +26,7 @@ const {
messageError,
showLoader,
hideLoader,
convertDateToAPI
} = mixin;
const myForm = ref<QForm | null>(null); //form data input
const name = ref<string>("");
@ -127,30 +128,30 @@ function sendData() {
const valueData: RequestPeriodDisable = {
announcementEndDate:
dateAnnouncement.value !== null
? dateToISO(dateAnnouncement.value[1])
? convertDateToAPI(dateAnnouncement.value[1])
: null,
announcementStartDate:
dateAnnouncement.value !== null
? dateToISO(dateAnnouncement.value[0])
? convertDateToAPI(dateAnnouncement.value[0])
: null,
examDate: dateExam.value !== null ? dateToISO(dateExam.value) : null,
examDate: dateExam.value !== null ? convertDateToAPI(dateExam.value) : null,
detail: editor.value,
fee: fee.value,
id: "",
name: name.value,
note: note.value,
paymentEndDate:
datePayment.value !== null ? dateToISO(datePayment.value[1]) : null,
datePayment.value !== null ? convertDateToAPI(datePayment.value[1]) : null,
paymentStartDate:
datePayment.value !== null ? dateToISO(datePayment.value[0]) : null,
datePayment.value !== null ? convertDateToAPI(datePayment.value[0]) : null,
registerEndDate:
dateRegister.value !== null ? dateToISO(dateRegister.value[1]) : null,
dateRegister.value !== null ? convertDateToAPI(dateRegister.value[1]) : null,
registerStartDate:
dateRegister.value !== null ? dateToISO(dateRegister.value[0]) : null,
dateRegister.value !== null ? convertDateToAPI(dateRegister.value[0]) : null,
round: round.value,
year: yearly.value,
announcementDate:
dateAnnounce.value !== null ? dateToISO(dateAnnounce.value) : null,
dateAnnounce.value !== null ? convertDateToAPI(dateAnnounce.value) : null,
};
return valueData;
}

44
src/modules/03_recruiting/views/02_qualify/PeriodAdd.vue
View file

@ -33,8 +33,15 @@ const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
const route = useRoute();
const { date2Thai, success, dateToISO, messageError, showLoader, hideLoader } =
mixin;
const {
date2Thai,
success,
dateToISO,
messageError,
showLoader,
hideLoader,
convertDateToAPI,
} = mixin;
const checkRoutePermisson = ref<boolean>(
route.name == "qualifyPeriodEditDetail"
@ -400,16 +407,16 @@ function sendData() {
}
const valueData: any = {
announcementDate:
dateAnnounce.value != null ? dateToISO(dateAnnounce.value) : null,
dateAnnounce.value != null ? convertDateToAPI(dateAnnounce.value) : null,
announcementEndDate:
dateAnnouncement.value != null
? dateToISO(dateAnnouncement.value[1])
? convertDateToAPI(dateAnnouncement.value[1])
: null,
announcementStartDate:
dateAnnouncement.value != null
? dateToISO(dateAnnouncement.value[0])
? convertDateToAPI(dateAnnouncement.value[0])
: null,
examDate: dateExam.value != null ? dateToISO(dateExam.value) : null,
examDate: dateExam.value != null ? convertDateToAPI(dateExam.value) : null,
bankExam: rowsPayment.value,
checkDisability: checkDisability.value,
announcementExam: announcementExam.value,
@ -427,15 +434,19 @@ function sendData() {
organizationId: organizationName.value?.id,
organizationName: organizationName.value?.name,
paymentEndDate:
datePayment.value != null ? dateToISO(datePayment.value[1]) : null,
datePayment.value != null ? convertDateToAPI(datePayment.value[1]) : null,
paymentKrungThai: pay.value,
paymentStartDate:
datePayment.value != null ? dateToISO(datePayment.value[0]) : null,
datePayment.value != null ? convertDateToAPI(datePayment.value[0]) : null,
positionExam: positionData,
registerEndDate:
dateRegister.value != null ? dateToISO(dateRegister.value[1]) : null,
dateRegister.value != null
? convertDateToAPI(dateRegister.value[1])
: null,
registerStartDate:
dateRegister.value != null ? dateToISO(dateRegister.value[0]) : null,
dateRegister.value != null
? convertDateToAPI(dateRegister.value[0])
: null,
round: round.value,
year: yearly.value,
category: category.value,
@ -534,10 +545,9 @@ async function uploadDocData() {
.finally(async () => {
hideLoader();
});
}
}
}
/** อัปโหลดไฟล์เอกสาร */
async function uploadBarCodes() {
const formData = new FormData();
@ -545,17 +555,17 @@ async function uploadBarCodes() {
formData.append("", barCodes.value);
showLoader();
await http
.put(config.API.periodExambarcode(id.value), formData)
.then((res) => {
console.log(1)
console.log(1);
})
.catch((e) => {})
.finally(async () => {
hideLoader();
});
}
}
}
/** อัปโหลดไฟล์เอกสาร */
@ -568,13 +578,13 @@ async function uploadQrCodes() {
await http
.put(config.API.periodExamqrcode(id.value), formData)
.then((res) => {
console.log(2)
console.log(2);
})
.catch((e) => {})
.finally(async () => {
hideLoader();
});
}
}
}
/**

8
src/modules/09_leave/components/03_ChangeRound/DialogForm.vue
View file

@ -24,6 +24,7 @@ const {
showLoader,
hideLoader,
success,
convertDateToAPI,
} = mixin;
const emit = defineEmits(["update:change-page"]);
@ -112,12 +113,14 @@ function onSubmit() {
/** Function เปลี่ยนรอบเวลา*/
async function changeRound() {
const formattedDateForAPI = await convertDateToAPI(formData.effectiveDate);
showLoader();
await http
.post(config.API.leaveRound(), {
profileId: props.personId,
roundId: formData.round,
effectiveDate: formData.effectiveDate,
effectiveDate: formattedDateForAPI,
remark: formData.reson,
})
.then(() => {
@ -278,10 +281,11 @@ watch(
class="inputgreen"
menu-class-name="modalfix"
v-model="formData.effectiveDate"
:timezone="'Asia/Bangkok'"
:locale="'th'"
autoApply
borderless
:enableTimePicker="false"
:enable-time-picker="false"
week-start="0"
:min-date="
dataToday