소스 검색

瑞都日报填报,默认日期调整

Zimo 1 주 전
부모
커밋
949a480805
1개의 변경된 파일2개의 추가작업 그리고 6개의 파일을 삭제
  1. 2 6
      src/views/pms/iotrddailyreport/FillDailyReportForm.vue

+ 2 - 6
src/views/pms/iotrddailyreport/FillDailyReportForm.vue

@@ -288,11 +288,7 @@ async function loadDetail(id: number) {
       const startTime = formatT(item.startTime)
       const endTime = formatT(item.endTime)
       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 {
         reportDate,
@@ -643,7 +639,7 @@ const addReportDetailRow = () => {
   const reportDate = data.value.createTime ?? dayjs().valueOf()
   form.value.reportDetails.push({
     reportDate,
-    endDateTime: reportDate,
+    endDateTime: dayjs(reportDate).add(1, 'day').valueOf(),
     startTime: '',
     endTime: '',
     duration: 0,