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

แก้ ลบ วันที่ไม่หาย

Browse source
This commit is contained in:
setthawutttty 2024-02-20 11:42:11 +07:00
parent 998e654eb4
commit 8acdc13370
3 changed files with 76 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -858,6 +858,8 @@ watch(
} else { } else {
inputIssueDate.value = ""; inputIssueDate.value = "";
} }
}else if(value.length === 0){
issueDate.value = null
} }
} }
); );
@ -872,6 +874,8 @@ watch(
} else { } else {
inputExpireDate.value = ""; inputExpireDate.value = "";
} }
}else if(value.length === 0){
expireDate.value = null
} }
} }
); );

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

@ -79,6 +79,7 @@
:error="yearInputCheck" :error="yearInputCheck"
error-message="กรุณากรอก ปี ที่ยื่นขอพระราชทานเครื่องราชฯ" error-message="กรุณากรอก ปี ที่ยื่นขอพระราชทานเครื่องราชฯ"
/> />
<datepicker <datepicker
v-else v-else
menu-class-name="modalfix" menu-class-name="modalfix"
@ -102,7 +103,7 @@
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="!edit"
:model-value="year + 543" :model-value="year !== 0 ? (year as number) + 543:null"
:rules="[ :rules="[
(val:string) => (val:string) =>
!!val || !!val ||
@ -576,7 +577,7 @@ const OpsFilter = ref<InsigniaOps>({
insigniaOptions: [], insigniaOptions: [],
}); });
const insigniaType = ref<string>(); const insigniaType = ref<string>();
const year = ref<number>(0); const year = ref<number|null>(0);
const no = ref<string>(); const no = ref<string>();
const issue = ref<string>(); const issue = ref<string>();
const volumeNo = ref<string>(); const volumeNo = ref<string>();
@ -1043,6 +1044,7 @@ const fetchData = async () => {
createdAt: e.createdAt, createdAt: e.createdAt,
}); });
}); });
console.log(data)
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
@ -1081,7 +1083,7 @@ const getData = () => {
const row = rows.value[rowIndex.value]; const row = rows.value[rowIndex.value];
insigniaId.value = row.insigniaId; insigniaId.value = row.insigniaId;
insigniaType.value = row.insigniaType; insigniaType.value = row.insigniaType;
year.value = row.year; year.value = row.year == null ? null:row.year;
no.value = row.no; no.value = row.no;
issue.value = row.issue; issue.value = row.issue;
volumeNo.value = row.volumeNo; volumeNo.value = row.volumeNo;
@ -1093,7 +1095,7 @@ const getData = () => {
refCommandNo.value = row.refCommandNo; refCommandNo.value = row.refCommandNo;
refCommandDate.value = row.refCommandDate; refCommandDate.value = row.refCommandDate;
id.value = row.id; id.value = row.id;
yearInput.value = (Number(row.year) + 543).toLocaleString(); yearInput.value = row.year !== 0 ? (Number(row.year) + 543).toLocaleString():'';
receiveDateInput.value = row.receiveDate receiveDateInput.value = row.receiveDate
? convertDateDisplay(row.receiveDate) ? convertDateDisplay(row.receiveDate)
: ""; : "";
@ -1303,7 +1305,7 @@ const selectData = async (props: DataProps) => {
rowIndex.value = props.rowIndex; rowIndex.value = props.rowIndex;
insigniaId.value = props.row.insigniaId; insigniaId.value = props.row.insigniaId;
insigniaType.value = props.row.insigniaType; insigniaType.value = props.row.insigniaType;
year.value = props.row.year; year.value = props.row.year == 0 ? 0:props.row.year;
no.value = props.row.no; no.value = props.row.no;
issue.value = props.row.issue; issue.value = props.row.issue;
volumeNo.value = props.row.volumeNo; volumeNo.value = props.row.volumeNo;
@ -1318,7 +1320,7 @@ const selectData = async (props: DataProps) => {
props.row.refCommandDate == "-" ? null : props.row.refCommandDate; props.row.refCommandDate == "-" ? null : props.row.refCommandDate;
id.value = props.row.id; id.value = props.row.id;
yearInput.value = (Number(props.row.year) + 543).toLocaleString(); yearInput.value = props.row.year !== 0 ? (Number(props.row.year) + 543).toLocaleString():'';
receiveDateInput.value = convertDateDisplay(props.row.receiveDate); receiveDateInput.value = convertDateDisplay(props.row.receiveDate);
dateAnnounceInput.value = props.row.dateAnnounce dateAnnounceInput.value = props.row.dateAnnounce
? convertDateDisplay(props.row.dateAnnounce as Date) ? convertDateDisplay(props.row.dateAnnounce as Date)
@ -1466,6 +1468,9 @@ watch(
dateAnnounceInput.value = ""; dateAnnounceInput.value = "";
} }
} }
else if (value.length === 0) {
dateAnnounce.value = null;
}
} }
); );
watch( watch(
@ -1479,6 +1484,9 @@ watch(
refCommandDateInput.value = ""; refCommandDateInput.value = "";
} }
} }
else if (value.length === 0) {
refCommandDate.value = null;
}
} }
); );
@ -1506,6 +1514,9 @@ watch(
yearInputCheck.value = false; yearInputCheck.value = false;
year.value = dateVal; year.value = dateVal;
} }
else if (value.length === 0) {
year.value = 0;
}
} }
); );
</script> </script>

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

@ -29,7 +29,9 @@
? props.row.startDate2 !== null ? props.row.startDate2 !== null
? date2Thai(props.row.startDate2) ? date2Thai(props.row.startDate2)
: "-" : "-"
: props.row.startDate2 !== null ? col.value + 543:'-' : props.row.startDate2 !== null
? col.value + 543
: "-"
}} }}
</div> </div>
<div v-else-if="col.name == 'endDate'" class="table_ellipsis"> <div v-else-if="col.name == 'endDate'" class="table_ellipsis">
@ -38,7 +40,9 @@
? props.row.endDate2 !== null ? props.row.endDate2 !== null
? date2Thai(props.row.endDate2) ? date2Thai(props.row.endDate2)
: "-" : "-"
: props.row.endDate2 !== null ? col.value + 543:'-' : props.row.endDate2 !== null
? col.value + 543
: "-"
}} }}
</div> </div>
@ -166,7 +170,9 @@
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="!edit"
:model-value="startDate !== 0 ? Number(startDate) + 543:null" :model-value="
startDate !== 0 ? Number(startDate) + 543 : null
"
:label="`${'ปี เริ่มต้นการฝึกอบรม/ดูงาน'}`" :label="`${'ปี เริ่มต้นการฝึกอบรม/ดูงาน'}`"
> >
<template v-slot:prepend> <template v-slot:prepend>
@ -278,7 +284,9 @@
dense dense
lazy-rules lazy-rules
:borderless="!edit" :borderless="!edit"
:model-value="endDate !== 0 ? Number(endDate) + 543:null" :model-value="
endDate !== 0 ? Number(endDate) + 543 : null
"
:rules="[ :rules="[
(val) => (val) =>
!!val || !!val ||
@ -1046,8 +1054,8 @@ const getData = () => {
numberOrder.value = row.numberOrder; numberOrder.value = row.numberOrder;
dateOrder.value = row.dateOrder; dateOrder.value = row.dateOrder;
isDate.value = row.isDate; isDate.value = row.isDate;
startDate.value = row.startDate !== null ? row.startDate as number:0; startDate.value = row.startDate !== null ? (row.startDate as number) : 0;
endDate.value = row.endDate !== null ? row.endDate as number:0; endDate.value = row.endDate !== null ? (row.endDate as number) : 0;
startDate2.value = row.startDate2; startDate2.value = row.startDate2;
endDate2.value = row.endDate2; endDate2.value = row.endDate2;
id.value = row.id; id.value = row.id;
@ -1146,13 +1154,17 @@ const saveData = async () => {
? startDate2.value ? startDate2.value
? dateToISO(startDate2.value as Date) ? dateToISO(startDate2.value as Date)
: null : null
: startDate.value !== 0 ? new Date(`${startDate.value}-01-01`):null, : startDate.value !== 0
? new Date(`${startDate.value}-01-01`)
: null,
endDate: endDate:
isDate.value == "true" isDate.value == "true"
? endDate2.value ? endDate2.value
? dateToISO(endDate2.value as Date) ? dateToISO(endDate2.value as Date)
: null : null
: endDate.value !== 0 ? new Date(`${endDate.value}-01-01`):null, : endDate.value !== 0
? new Date(`${endDate.value}-01-01`)
: null,
}) })
.then((res) => { .then((res) => {
success($q, "บันทึกข้อมูลสำเร็จ"); success($q, "บันทึกข้อมูลสำเร็จ");
@ -1185,17 +1197,21 @@ const editData = async () => {
dateOrder: dateOrder.value, dateOrder: dateOrder.value,
isDate: isDate.value == "true" ? true : false, isDate: isDate.value == "true" ? true : false,
startDate: startDate:
isDate.value == "true" isDate.value == "true"
? startDate2.value ? startDate2.value
? dateToISO(startDate2.value as Date) ? dateToISO(startDate2.value as Date)
: null : null
: startDate.value !== 0 ? new Date(`${startDate.value}-01-01`):null, : startDate.value !== 0
endDate: ? new Date(`${startDate.value}-01-01`)
isDate.value == "true" : null,
? endDate2.value endDate:
? dateToISO(endDate2.value as Date) isDate.value == "true"
: null ? endDate2.value
: endDate.value !== 0 ? new Date(`${endDate.value}-01-01`):null, ? dateToISO(endDate2.value as Date)
: null
: endDate.value !== 0
? new Date(`${endDate.value}-01-01`)
: null,
}) })
.then((res) => { .then((res) => {
success($q, "บันทึกข้อมูลสำเร็จ"); success($q, "บันทึกข้อมูลสำเร็จ");
@ -1268,7 +1284,7 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก * @param props ค่า props ใน row ที่เลือก
*/ */
const selectData = async (props: DataProps) => { const selectData = async (props: DataProps) => {
console.log(props) console.log(props);
modalEdit.value = true; modalEdit.value = true;
modal.value = true; modal.value = true;
edit.value = false; edit.value = false;
@ -1284,8 +1300,10 @@ const selectData = async (props: DataProps) => {
numberOrder.value = props.row.numberOrder; numberOrder.value = props.row.numberOrder;
dateOrder.value = props.row.dateOrder; dateOrder.value = props.row.dateOrder;
isDate.value = props.row.isDate; isDate.value = props.row.isDate;
startDate.value = props.row.startDate !== null ? props.row.startDate as number:0; startDate.value =
endDate.value = props.row.endDate !== null ? props.row.endDate as number:0; props.row.startDate !== null ? (props.row.startDate as number) : 0;
endDate.value =
props.row.endDate !== null ? (props.row.endDate as number) : 0;
startDate2.value = props.row.startDate2; startDate2.value = props.row.startDate2;
endDate2.value = props.row.endDate2; endDate2.value = props.row.endDate2;
inputStartDate.value = inputStartDate.value =
@ -1448,6 +1466,9 @@ watch(
inputStartDate2.value = ""; inputStartDate2.value = "";
} }
} }
else if (value.length === 0) {
startDate2.value = null;
}
} }
); );
watch( watch(
@ -1461,6 +1482,9 @@ watch(
inputEndDate2.value = ""; inputEndDate2.value = "";
} }
} }
else if (value.length === 0) {
endDate2.value = null;
}
} }
); );
watch( watch(
@ -1483,6 +1507,9 @@ watch(
const dateVal = Number(value) - 543; const dateVal = Number(value) - 543;
startDate.value = dateVal; startDate.value = dateVal;
} }
else if (value.length === 0) {
startDate.value = 0;
}
} }
); );
watch( watch(
@ -1492,6 +1519,9 @@ watch(
const dateVal = Number(value) - 543; const dateVal = Number(value) - 543;
endDate.value = dateVal; endDate.value = dateVal;
} }
else if (value.length === 0) {
endDate.value = 0;
}
} }
); );
@ -1501,6 +1531,9 @@ watch(
if (value.length === 4) { if (value.length === 4) {
const dateVal = Number(value) - 543; const dateVal = Number(value) - 543;
yearly.value = dateVal; yearly.value = dateVal;
}
else if (value.length === 0) {
yearly.value = 0;
} }
} }
); );