Bladeren bron

调整瑞都默认时间多一天

Zimo 2 weken geleden
bovenliggende
commit
1955625f14
1 gewijzigde bestanden met toevoegingen van 20 en 13 verwijderingen
  1. 20 13
      pages/ruiDu/compontents/report-form.vue

+ 20 - 13
pages/ruiDu/compontents/report-form.vue

@@ -420,17 +420,21 @@ const formatDateTimestamp = (val) => {
 
 const getDefaultReportDate = () =>
   formatDateTimestamp(props.reportData.createTime);
-
-const addReportDetailRow = () => {
-  if (!form.reportDetails) {
-    form.reportDetails = [];
-  }
-  form.reportDetails.push({
-    reportDate: getDefaultReportDate(),
-    endDateTime: getDefaultReportDate(),
-    startTime: "08:00",
-    endTime: "08:00",
-    duration: 0,
+
+const getDefaultEndDateTime = (reportDate) =>
+  dayjs(reportDate).add(1, "day").startOf("day").valueOf();
+
+const addReportDetailRow = () => {
+  if (!form.reportDetails) {
+    form.reportDetails = [];
+  }
+  const reportDate = getDefaultReportDate();
+  form.reportDetails.push({
+    reportDate,
+    endDateTime: getDefaultEndDateTime(reportDate),
+    startTime: "08:00",
+    endTime: "08:00",
+    duration: 0,
     constructionDetail: "",
   });
 };
@@ -510,11 +514,14 @@ const formDataFormat = () => {
   form.constructionBrief = props.reportData.constructionBrief || ""; // 施工简介
 
   form.reportDetails = (props.reportData.reportDetails || []).map((item) => {
+    const reportDate = formatDateTimestamp(item.reportDate);
     return {
       duration: item.duration || 0,
       constructionDetail: item.constructionDetail || "",
-      reportDate: formatDateTimestamp(item.reportDate),
-      endDateTime: formatDateTimestamp(item.endDateTime || item.reportDate),
+      reportDate,
+      endDateTime: item.endDateTime
+        ? formatDateTimestamp(item.endDateTime)
+        : getDefaultEndDateTime(reportDate),
       startTime: formatT(item.startTime),
       endTime: formatT(item.endTime),
     };