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

fix bug calendar

Browse source
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2024-04-30 10:59:11 +07:00
parent 2737810c6c
commit 6f5f1f90c9
111 changed files with 2002 additions and 1866 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/04_registry/components/Coin.vue
View file

@ -144,7 +144,7 @@ a
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="issueDate + 543"
hide-bottom-space
@ -186,7 +186,7 @@ a
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(issueDate2)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่ได้รับ'}`]"
@ -293,7 +293,7 @@ a
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate)

2
src/modules/04_registry/components/DialogFormLeave.vue
View file

@ -130,7 +130,7 @@ watch(
<template #trigger>
<q-input
dense
lazy-rules
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณาเลือกปี'}`]"
:class="inputEdit(isReadonly)"

4
src/modules/04_registry/components/Discipline.vue
View file

@ -92,7 +92,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val:string) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี'}`]"
@ -219,7 +219,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
(refCommandDate && date2Thai(refCommandDate as Date)) || null

10
src/modules/04_registry/components/Education.vue
View file

@ -174,7 +174,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="Number(startDate) + 543"
:rules="[
@ -233,7 +233,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(startDate2 as Date)"
:rules="[
@ -297,7 +297,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="Number(endDate) + 543"
:rules="[
@ -355,7 +355,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(endDate2 as Date)"
:rules="[
@ -415,7 +415,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="finishDate ? date2Thai(finishDate as Date) : null"
hide-bottom-space

49
src/modules/04_registry/components/Information/Certicate.vue
View file

@ -11,7 +11,9 @@
v-model:inputvisible="visibleColumns"
:add="clickAdd"
:name="
profileType == 'employee' ? 'ใบอนุญาตของลูกจ้าง' : 'ใบอนุญาตประกอบวิชาชีพ'
profileType == 'employee'
? 'ใบอนุญาตของลูกจ้าง'
: 'ใบอนุญาตประกอบวิชาชีพ'
"
icon="mdi-book"
:statusEdit="statusEdit"
@ -59,7 +61,9 @@
<q-form ref="myForm">
<DialogHeader
:tittle="
profileType == 'employee' ? 'ใบอนุญาตของลูกจ้าง' : 'ใบอนุญาตประกอบวิชาชีพ'
profileType == 'employee'
? 'ใบอนุญาตของลูกจ้าง'
: 'ใบอนุญาตประกอบวิชาชีพ'
"
:close="clickClose"
/>
@ -192,7 +196,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(expireDate as Date)"
:label="`${'วันที่หมดอายุ'}`"
@ -515,14 +518,14 @@ const fetchData = async () => {
id: e.id,
certificateNo: e.certificateNo,
issuer: e.issuer,
issueDate: e.issueDate !== null ? new Date(e.issueDate):null,
expireDate: e.expireDate !== null ? new Date(e.expireDate):null,
issueDate: e.issueDate !== null ? new Date(e.issueDate) : null,
expireDate: e.expireDate !== null ? new Date(e.expireDate) : null,
certificateType: e.certificateType,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
});
console.log(rows.value)
console.log(data)
console.log(rows.value);
console.log(data);
});
})
.catch((e) => {
@ -564,8 +567,10 @@ const getData = () => {
issuer.value = row.issuer;
issueDate.value = row.issueDate;
expireDate.value = row.expireDate;
inputIssueDate.value = row.issueDate !== null ? convertDateDisplay(row.issueDate as Date):'';
inputExpireDate.value = row.expireDate !== null ? convertDateDisplay(row.expireDate as Date):'';
inputIssueDate.value =
row.issueDate !== null ? convertDateDisplay(row.issueDate as Date) : "";
inputExpireDate.value =
row.expireDate !== null ? convertDateDisplay(row.expireDate as Date) : "";
certificateType.value = row.certificateType;
id.value = row.id;
};
@ -626,8 +631,8 @@ const saveData = async () => {
id: id.value,
certificateNo: certificateNo.value,
issuer: issuer.value,
issueDate: issueDate.value ? dateToISO(issueDate.value as Date):null,
expireDate: expireDate.value ? dateToISO(expireDate.value as Date):null,
issueDate: issueDate.value ? dateToISO(issueDate.value as Date) : null,
expireDate: expireDate.value ? dateToISO(expireDate.value as Date) : null,
certificateType: certificateType.value,
})
.then((res) => {
@ -652,8 +657,8 @@ const editData = async () => {
id: id.value,
certificateNo: certificateNo.value,
issuer: issuer.value,
issueDate: issueDate.value ? dateToISO(issueDate.value as Date):null,
expireDate: expireDate.value ? dateToISO(expireDate.value as Date):null,
issueDate: issueDate.value ? dateToISO(issueDate.value as Date) : null,
expireDate: expireDate.value ? dateToISO(expireDate.value as Date) : null,
certificateType: certificateType.value,
})
.then((res) => {
@ -736,8 +741,14 @@ const selectData = async (props: DataProps) => {
issuer.value = props.row.issuer;
issueDate.value = props.row.issueDate;
expireDate.value = props.row.expireDate;
inputIssueDate.value = props.row.issueDate !== null ? convertDateDisplay(props.row.issueDate as Date):'';
inputExpireDate.value = props.row.expireDate !== null ? convertDateDisplay(props.row.expireDate as Date):'';
inputIssueDate.value =
props.row.issueDate !== null
? convertDateDisplay(props.row.issueDate as Date)
: "";
inputExpireDate.value =
props.row.expireDate !== null
? convertDateDisplay(props.row.expireDate as Date)
: "";
certificateType.value = props.row.certificateType;
id.value = props.row.id;
await checkRowPage();
@ -858,8 +869,8 @@ watch(
} else {
inputIssueDate.value = "";
}
}else if(value.length === 0){
issueDate.value = null
} else if (value.length === 0) {
issueDate.value = null;
}
}
);
@ -874,8 +885,8 @@ watch(
} else {
inputExpireDate.value = "";
}
}else if(value.length === 0){
expireDate.value = null
} else if (value.length === 0) {
expireDate.value = null;
}
}
);

4
src/modules/04_registry/components/Information/Government.vue
View file

@ -157,7 +157,7 @@
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
:model-value="
@ -228,7 +228,7 @@
hide-bottom-space
:outlined="edit"
dense
lazy-rules
l
:readonly="!edit"
:borderless="!edit"
:model-value="

2
src/modules/04_registry/components/Information/Information.vue
View file

@ -1187,7 +1187,7 @@ const getClass = (val: boolean) => {
};
// change date input
const inputBirthDate = ref<string>("");
const inputBirthDate = ref<any>("");
const dayChecked = ref<boolean>(false);
watch(
() => inputBirthDate.value,

8
src/modules/04_registry/components/Insignia.vue
View file

@ -101,7 +101,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="year !== 0 ? (year as number) + 543:null"
:rules="[
@ -160,7 +160,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(receiveDate as Date)"
:rules="[(val:string) => !!val || `${'กรุณากรอก วัน/เดือน/ปี ที่ได้รับ'}`]"
@ -341,7 +341,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateAnnounce as Date)"
hide-bottom-space
@ -426,7 +426,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate as Date)

2
src/modules/04_registry/components/Leave.vue
View file

@ -246,7 +246,7 @@
<template #trigger>
<q-input
dense
lazy-rules
hide-bottom-space
:rules="[(val:string) => !!val || `${'กรุณาเลือกปี'}`]"
:class="getClass(edit)"

2
src/modules/04_registry/components/Other.vue
View file

@ -87,7 +87,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:label="`${'วันที่'}`"

4
src/modules/04_registry/components/Profile.vue
View file

@ -692,7 +692,7 @@
class="full-width inputgreen cursor-pointer"
outlined
dense
lazy-rules
:model-value="date2Thai(leaveDate)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่พ้นราชการ'}`]"
hide-bottom-space
@ -757,7 +757,7 @@
class="full-width inputgreen cursor-pointer"
outlined
dense
lazy-rules
:model-value="date2Thai(leaveDateOrder)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่ออกคำสั่ง'}`]"
hide-bottom-space

4
src/modules/04_registry/components/Record.vue
View file

@ -98,7 +98,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[(val) => !!val || `${'กรุณาเลือก วัน/เดือน/ปี'}`]"
@ -208,7 +208,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate as Date)

2
src/modules/04_registry/components/Salary.vue
View file

@ -150,7 +150,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(formDataSalary.date)"
:rules="[

2
src/modules/04_registry/components/SalaryEmployee.vue
View file

@ -142,7 +142,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[

2
src/modules/04_registry/components/SalaryEmployeeTemp.vue
View file

@ -142,7 +142,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[

24
src/modules/04_registry/components/Train.vue
View file

@ -168,7 +168,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
startDate !== 0 ? Number(startDate) + 543 : null
@ -221,7 +220,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="startDate2 ? date2Thai(startDate2 as Date):null"
:rules="[
@ -282,7 +280,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
endDate !== 0 ? Number(endDate) + 543 : null
@ -340,7 +337,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="endDate2 ? date2Thai(endDate2 as Date):null"
:rules="[
@ -402,7 +398,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="yearly == 0 ? null : Number(yearly + 543)"
:label="`${'ปีงบประมาณ'}`"
@ -520,7 +515,6 @@
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateOrder as Date)"
:label="`${'คำสั่งลง วัน/เดือน/ปี /หนังสืออนุมัติลงวันที่'}`"
@ -1465,8 +1459,7 @@ watch(
} else {
inputStartDate2.value = "";
}
}
else if (value.length === 0) {
} else if (value.length === 0) {
startDate2.value = null;
}
}
@ -1481,8 +1474,7 @@ watch(
} else {
inputEndDate2.value = "";
}
}
else if (value.length === 0) {
} else if (value.length === 0) {
endDate2.value = null;
}
}
@ -1497,8 +1489,7 @@ watch(
} else {
dateOrderInput.value = "";
}
}
else if (value.length === 0) {
} else if (value.length === 0) {
dateOrder.value = null;
}
}
@ -1509,8 +1500,7 @@ watch(
if (value.length === 4) {
const dateVal = Number(value) - 543;
startDate.value = dateVal;
}
else if (value.length === 0) {
} else if (value.length === 0) {
startDate.value = 0;
}
}
@ -1521,8 +1511,7 @@ watch(
if (value.length === 4) {
const dateVal = Number(value) - 543;
endDate.value = dateVal;
}
else if (value.length === 0) {
} else if (value.length === 0) {
endDate.value = 0;
}
}
@ -1534,8 +1523,7 @@ watch(
if (value.length === 4) {
const dateVal = Number(value) - 543;
yearly.value = dateVal;
}
else if (value.length === 0) {
} else if (value.length === 0) {
yearly.value = 0;
}
}

3
src/modules/04_registry/components/Work.vue
View file

@ -97,7 +97,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateStart)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่เริ่มต้น'}`]"
@ -154,7 +153,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(dateEnd)"
:rules="[(val) => !!val || `${'กรุณาเลือกวันที่สิ้นสุด'}`]"
@ -264,7 +262,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="
refCommandDate == null ? null : date2Thai(refCommandDate as Date)

2
src/modules/04_registry/components/salaryNew/SalaryEmployee.vue
View file

@ -142,7 +142,7 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[

11
src/modules/04_registry/components/salaryNew/SalaryEmployeeTemp.vue
View file

@ -142,7 +142,6 @@
:class="getClass(edit)"
:outlined="edit"
dense
lazy-rules
:borderless="!edit"
:model-value="date2Thai(date)"
:rules="[
@ -506,7 +505,7 @@
</q-form>
</q-card>
</q-dialog>
<HistoryTable
:rows="rowsHistory"
:columns="columnsHistory"
@ -1446,7 +1445,7 @@ const nodeTree = async () => {
messageError($q, e);
})
.finally(() => {
store.isLoad++
store.isLoad++;
});
};
@ -1568,7 +1567,7 @@ const fetchData = async () => {
refCommandNo: e.refCommandNo,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
salaryStatus: null
salaryStatus: null,
});
});
})
@ -1576,7 +1575,7 @@ const fetchData = async () => {
messageError($q, e);
})
.finally(() => {
store.isLoad++
store.isLoad++;
});
}
};
@ -2067,7 +2066,7 @@ const clickHistory = async (row: RequestItemsEmployee) => {
refCommandNo: e.refCommandNo,
createdFullName: e.createdFullName,
createdAt: new Date(e.createdAt),
salaryStatus: null
salaryStatus: null,
});
});
})