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 2024-01-22 10:34:13 +07:00
commit f837551f4e
3 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -139,7 +139,7 @@ const formData = reactive<FormData>({
const rows = ref([]);
const dateEndInputStyle = computed(() => {
if(formData.investigationDateStart){
const currentDate = new Date(formData.investigationDateStart as Date);
const currentDate = new Date();
const investigationDateEnd = new Date(formData.investigationDateEnd as Date);
const isInNext7Days =

4
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -180,9 +180,9 @@ const emit = defineEmits(["submit:disciplinary"]);
const dateEndInputStyle = computed(() => {
if (formData.disciplinaryDateStart) {
const currentDate = new Date(formData.disciplinaryDateStart as Date);
const currentDate = new Date();
const investigationDateEnd = new Date(formData.disciplinaryDateEnd as Date);
const isInNext7Days =
investigationDateEnd >= currentDate &&
investigationDateEnd <=