diff --git a/src/components/HiddenFlowModal/index.js b/src/components/HiddenFlowModal/index.js
index 7cfda3a..b13922e 100644
--- a/src/components/HiddenFlowModal/index.js
+++ b/src/components/HiddenFlowModal/index.js
@@ -4,6 +4,7 @@ import { Button, message, Modal } from "antd";
import { useEffect, useState } from "react";
import { NS_INSPECTION } from "~/enumerate/namespace";
import { getFlowData } from "~/utils/flow";
+import "@xyflow/react/dist/style.css";
function HiddenFlowModal(props) {
const [nodes, setNodes] = useState([]);
diff --git a/src/components/InspectionFlowModal/index.js b/src/components/InspectionFlowModal/index.js
index 28ca559..ac9e4f0 100644
--- a/src/components/InspectionFlowModal/index.js
+++ b/src/components/InspectionFlowModal/index.js
@@ -4,6 +4,7 @@ import { Button, Modal } from "antd";
import { useEffect, useState } from "react";
import { NS_INSPECTION } from "~/enumerate/namespace";
import { getFlowData } from "~/utils/flow";
+import "@xyflow/react/dist/style.css";
function InspectionFlowModal(props) {
const [nodes, setNodes] = useState([]);
diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
index 0d26139..94598fd 100644
--- a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js
@@ -1,7 +1,7 @@
import { Permission } from "@cqsjjb/jjb-common-decorator/permission";
import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import { Button, Form, Space,Modal,message } from "antd";
+import { Button, Form, message, Modal, Space } from "antd";
import { useState } from "react";
import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Page from "zy-react-library/components/Page";
@@ -13,11 +13,10 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable";
import { getLabelName } from "zy-react-library/utils";
-import { formatDate } from "~/utils/dateFormat";
import InspectionFlowModal from "~/components/InspectionFlowModal";
import { INSPECTION_QUESTION_ENUM, INSPECTION_STATE_ENUM, PLAN_ENUM } from "~/enumerate/constant";
import { NS_INSPECTION } from "~/enumerate/namespace";
-import "@xyflow/react/dist/style.css";
+import { formatDate } from "~/utils/dateFormat";
function List(props) {
const query = useGetUrlQuery();
@@ -29,8 +28,8 @@ function List(props) {
const { tableProps, getData } = useTable(props["inspectionList"], {
form,
transform: formData => ({
- checkStartTime: formData.checkTime?.[0] ? (formData.checkTime[0] + " 00:00:00") : "",
- checkEndTime: formData.checkTime?.[1] ? (formData.checkTime[1] + " 23:59:59") : "",
+ checkStartTime: formData.checkTime?.[0] ? (`${formData.checkTime[0]} 00:00:00`) : "",
+ checkEndTime: formData.checkTime?.[1] ? (`${formData.checkTime[1]} 23:59:59`) : "",
}),
params: { status: "", planId: query.planId, entrance: props.entrance || (query.planId ? "3" : "1"), planType: query.planId ? 1 : 0 },
});
@@ -64,7 +63,7 @@ function List(props) {
{ name: "inspectionUserName", label: "检查人" },
{ name: "type", label: "检查类型", render: },
{ name: "checkTime", label: "检查时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
- { name: "inspectedDepartmentId", label: "被检查单位", render: },
+ { name: "inspectedDepartmentId", label: "被检查单位", render: },
{ name: "inspectedUserName", label: "被检查单位现场负责人" },
]}
form={form}
diff --git a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
index 1da10fb..5354f51 100644
--- a/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
+++ b/src/pages/Container/BranchCompany/Inspection/Records/List/index.js
@@ -19,7 +19,6 @@ import InspectionFlowModal from "~/components/InspectionFlowModal";
import { INSPECTION_QUESTION_ENUM, INSPECTION_STATE_ENUM, PLAN_ENUM } from "~/enumerate/constant";
import { NS_INSPECTION } from "~/enumerate/namespace";
import { formatDate } from "~/utils/dateFormat";
-import "@xyflow/react/dist/style.css";
function List(props) {
const query = useGetUrlQuery();