Merge remote-tracking branch 'origin/master'

src/pages/Container/BranchCompany/Inspection/Records/List/index.js

@@ -15,10 +15,10 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
 import useTable from "zy-react-library/hooks/useTable";
 import useUrlQueryCriteria from "zy-react-library/hooks/useUrlQueryCriteria";
 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 { formatDate } from "~/utils/dateFormat";
 import "@xyflow/react/dist/style.css";
 
 function List(props) {
@@ -48,7 +48,7 @@ function List(props) {
     },
     onSuccess: () => {
       getCount();
-    }
+    },
   });
   const getCount = async () => {
     const { data } = await props["inspectionCount"]({
@@ -59,7 +59,7 @@ function List(props) {
       checkStartTime: query.checkStartTime || form.getFieldValue("checkTime")?.[0],
       checkEndTime: query.checkEndTime || form.getFieldValue("checkTime").checkTime?.[1],
       planType: query.planType,
-      ...form.getFieldsValue()
+      ...form.getFieldsValue(),
     });
     setCount(data);
   };
@@ -103,7 +103,7 @@ function List(props) {
           {
             name: "inspectedDepartmentId",
             label: "被检查单位",
-            render: <DepartmentSelectTree searchType={props.searchType} params={{enterpriseType: [2]}}/>
+            render: <DepartmentSelectTree searchType={props.searchType} params={{ enterpriseType: [2], eqCorpinfoId: query.corpId }} />,
           },
           { name: "inspectedUserName", label: "被检查单位现场负责人" },
           { name: "status", label: "检查状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: INSPECTION_STATE_ENUM },
@@ -161,8 +161,8 @@ function List(props) {
                   await downloadBlob("/inspection/safetyEnvironmentalInspection/exportList", {
                     params: {
                       ...exportParams,
-                      menuPath: window.location.pathname
-                    }
+                      menuPath: window.location.pathname,
+                    },
                   });
                 }}
               >
@@ -182,7 +182,7 @@ function List(props) {
           {
             title: "检查时间",
             width: 200,
-            render: (_, record) => (record.timeStart ? `自${formatDate(record.timeStart)}至${formatDate(record.timeEnd)}止` : "")
+            render: (_, record) => (record.timeStart ? `自${formatDate(record.timeStart)}至${formatDate(record.timeEnd)}止` : ""),
           },
           {
             title: "检查状态",
@@ -192,7 +192,7 @@ function List(props) {
           {
             title: "计划属性",
             dataIndex: "planType",
-            render: (_, record) => getLabelName({list: PLAN_ENUM, status: record.planType})
+            render: (_, record) => getLabelName({ list: PLAN_ENUM, status: record.planType }),
           },
           { title: "发现隐患数", dataIndex: "hiddenNumber" },
           {

src/pages/Container/Supervision/Statistics/InspectionRecordsList/index.js

@@ -1,7 +1,7 @@
 import RecordsList from "~/pages/Container/Supervision/Inspection/Records/List";
 
 function InspectionRecordsList(props) {
-  return <RecordsList {...props} />;
+  return <RecordsList searchType="current" {...props} />;
 }
 
 export default InspectionRecordsList;