|
|
@@ -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),
|
|
|
};
|