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