计划执行\检查记录增加一层路由
parent
85a95f8ef1
commit
601f5dec98
|
|
@ -32,7 +32,7 @@
|
|||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-to-print": "^3.2.0",
|
||||
"zy-react-library": "^1.0.171"
|
||||
"zy-react-library": "^1.0.175"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
|
|
|
|||
|
|
@ -33,9 +33,6 @@ function List(props) {
|
|||
params: { status: "", planId: query.planId, entrance: query.planId ? "2" : "1" },
|
||||
});
|
||||
|
||||
console.log((props.permission(props.addPermissionKey || "inspection-qy-check-add") && query.edit !== "0"));
|
||||
console.log(props.permission(props.addPermissionKey || "inspection-qy-check-add"));
|
||||
console.log(query.edit !== "0");
|
||||
return (
|
||||
<div style={{ padding: 20 }}>
|
||||
<Search
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
import HeaderBack from "zy-react-library/components/HeaderBack";
|
||||
import InspectionList from "../../../Inspection/Inspection/List";
|
||||
|
||||
function InspectionRecords(props) {
|
||||
return (
|
||||
<div>
|
||||
<HeaderBack title="检查记录" />
|
||||
<div style={{ paddingBottom: 10 }}>
|
||||
<InspectionList updatePermissionKey="inspection-qy-check-edit2" {...props} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default InspectionRecords;
|
||||
|
|
@ -91,7 +91,8 @@ function List(props) {
|
|||
&& (currentTime.isBefore(planEndTime, "day") || currentTime.isSame(planEndTime, "day"));
|
||||
return (
|
||||
<Space>
|
||||
{(props.permission(props.addPermissionKey || "inspection-qy-plan-execute-add") && isInProgress) && (
|
||||
{/* props.permission(props.addPermissionKey || "inspection-qy-plan-execute-add") && */}
|
||||
{(isInProgress) && (
|
||||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
|
|
@ -104,7 +105,7 @@ function List(props) {
|
|||
<Button
|
||||
type="link"
|
||||
onClick={() => {
|
||||
props.history.push(`../../inspection/inspection/list?planId=${record.id}&edit=0`);
|
||||
props.history.push(`./inspectionRecords?planId=${record.id}&edit=0`);
|
||||
}}
|
||||
>
|
||||
检查记录
|
||||
|
|
|
|||
|
|
@ -0,0 +1,15 @@
|
|||
import HeaderBack from "zy-react-library/components/HeaderBack";
|
||||
import InspectionList from "../../../Inspection/Inspection/List";
|
||||
|
||||
function InspectionRecords(props) {
|
||||
return (
|
||||
<div>
|
||||
<HeaderBack title="检查记录" />
|
||||
<div style={{ paddingBottom: 10 }}>
|
||||
<InspectionList updatePermissionKey="inspection-jg-check-edit2" {...props} />
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default InspectionRecords;
|
||||
Loading…
Reference in New Issue