zcloud_gbs
/
zcloud_gbs_inspection-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
fangjiakai 2026-03-03 10:25:15 +08:00
parent 9e69e787a5 589dbbe3ef
commit 6bb7efc048
2 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/pages/Container/BranchCompany/Inspection/Records/List/index.js
View File

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

2
src/pages/Container/Supervision/Statistics/InspectionRecordsList/index.js
View File

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