|
@@ -288,11 +288,7 @@ async function loadDetail(id: number) {
|
|
|
const startTime = formatT(item.startTime)
|
|
const startTime = formatT(item.startTime)
|
|
|
const endTime = formatT(item.endTime)
|
|
const endTime = formatT(item.endTime)
|
|
|
const reportDate = item.reportDate ?? data.value.createTime ?? dayjs().valueOf()
|
|
const reportDate = item.reportDate ?? data.value.createTime ?? dayjs().valueOf()
|
|
|
- const endDateTime =
|
|
|
|
|
- item.endDateTime ??
|
|
|
|
|
- (startTime && endTime && dayjs(`1970-01-01 ${endTime}`).isBefore(dayjs(`1970-01-01 ${startTime}`))
|
|
|
|
|
- ? dayjs(reportDate).add(1, 'day').valueOf()
|
|
|
|
|
- : reportDate)
|
|
|
|
|
|
|
+ const endDateTime = item.endDateTime ?? dayjs(reportDate).add(1, 'day').valueOf()
|
|
|
|
|
|
|
|
return {
|
|
return {
|
|
|
reportDate,
|
|
reportDate,
|
|
@@ -643,7 +639,7 @@ const addReportDetailRow = () => {
|
|
|
const reportDate = data.value.createTime ?? dayjs().valueOf()
|
|
const reportDate = data.value.createTime ?? dayjs().valueOf()
|
|
|
form.value.reportDetails.push({
|
|
form.value.reportDetails.push({
|
|
|
reportDate,
|
|
reportDate,
|
|
|
- endDateTime: reportDate,
|
|
|
|
|
|
|
+ endDateTime: dayjs(reportDate).add(1, 'day').valueOf(),
|
|
|
startTime: '',
|
|
startTime: '',
|
|
|
endTime: '',
|
|
endTime: '',
|
|
|
duration: 0,
|
|
duration: 0,
|