diff --git a/src/pages/Container/BranchCompany/InspectionView/index.js b/src/pages/Container/BranchCompany/InspectionView/index.js index 784fe88..f08606b 100644 --- a/src/pages/Container/BranchCompany/InspectionView/index.js +++ b/src/pages/Container/BranchCompany/InspectionView/index.js @@ -73,7 +73,7 @@ function InspectionView(props) { }, []); return ( - + 打印}>
@@ -214,12 +214,6 @@ function InspectionView(props) { ]} />
-
- - - {/* {query.isExport !== "0" && } */} - -
{hiddenViewModalOpen && ( { - props.history.push(`../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`); + props.history.push(props.supervision === "1" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`); }} > 查看 diff --git a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js index ed0a4a1..64bddbf 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js @@ -5,10 +5,10 @@ import Table from "zy-react-library/components/Table"; 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 { INSPECTION_STATE_ENUM } from "~/enumerate/constant"; import { NS_INSPECTION } from "~/enumerate/namespace"; import ViewInfo from "~/pages/Container/BranchCompany/Plan/ViewInfo"; +import { formatDate } from "~/utils/dateFormat"; function PlanExecutionDetails(props) { const query = useGetUrlQuery(); @@ -19,7 +19,7 @@ function PlanExecutionDetails(props) { return ( 计划信息 - + 计划执行详情 { - props.history.push(`../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`); + props.history.push(props.supervision === "1" ? `../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}` : `../../inspectionView?id=${record.id}&inspectionId=${record.inspectionId}`); }} > 查看 diff --git a/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js b/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js new file mode 100644 index 0000000..31a3946 --- /dev/null +++ b/src/pages/Container/Supervision/Statistics/PersonnelExecutionDetails/index.js @@ -0,0 +1,7 @@ +import PersonnelExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails"; + +function PersonnelExecutionDetails(props) { + return ; +} + +export default PersonnelExecutionDetails; diff --git a/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js b/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js new file mode 100644 index 0000000..b6bce4c --- /dev/null +++ b/src/pages/Container/Supervision/Statistics/PersonnelExecutionRecords/index.js @@ -0,0 +1,7 @@ +import PersonnelExecutionRecordsA from "~/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionRecords"; + +function PersonnelExecutionRecords(props) { + return ; +} + +export default PersonnelExecutionRecords; diff --git a/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js b/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js new file mode 100644 index 0000000..7e40bc6 --- /dev/null +++ b/src/pages/Container/Supervision/Statistics/PlanExecutionDetails/index.js @@ -0,0 +1,7 @@ +import PlanExecutionDetailsA from "~/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails"; + +function PlanExecutionDetails(props) { + return ; +} + +export default PlanExecutionDetails;