diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js index 3bece4d..978c09c 100644 --- a/src/enumerate/constant/index.js +++ b/src/enumerate/constant/index.js @@ -18,7 +18,7 @@ export const INSPECTION_STATE_ENUM = [ { bianma: "500", name: "检查归档" }, { bianma: "600", name: "检查核实打回" }, { bianma: "700", name: "被检查人申辩" }, - { bianma: "-1", name: "暂存" }, + { bianma: "98", name: "暂存" }, ]; export const PLAN_ENUM = [ diff --git a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js index fa211ed..5fd1a79 100644 --- a/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Acceptance/List/index.js @@ -50,7 +50,7 @@ function List(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status", render: () => "待验收" }, { title: "发现隐患数", dataIndex: "hiddenNumber" }, { diff --git a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js index d395bd1..e4664d5 100644 --- a/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Assign/List/index.js @@ -50,7 +50,7 @@ function List(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status", render: () => "待指派" }, { title: "发现隐患数", dataIndex: "hiddenNumber" }, { diff --git a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js index 47fd9fb..76fa838 100644 --- a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js @@ -62,7 +62,7 @@ function List(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status", render: () => "被检查单位负责人申辩" }, { title: "发现隐患数", dataIndex: "hiddenNumber" }, { diff --git a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js index 59ef63c..87a38ed 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspected/List/index.js @@ -58,7 +58,7 @@ function List(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status", render: () => "待确认" }, { title: "发现隐患数", dataIndex: "hiddenNumber" }, { diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js index a9e77dc..288e6da 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/Add/index.js @@ -384,6 +384,7 @@ function Add(props) { onGetLabel={label => form.setFieldValue(["personUnderInspection", "userName"], label)} /> ), + formItemProps: { labelCol: { span: 8 } }, }, { name: ["personUnderInspection", "userName"], label: "被检查单位现场负责人名称", onlyForLabel: true }, { name: "place", label: "检查场所", span: 24 }, diff --git a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js index 53c3f60..4e1424f 100644 --- a/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Inspection/List/index.js @@ -78,7 +78,7 @@ function List(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (record.timeStart && record.timeEnd ? `自${record.timeStart}至${record.timeEnd}止` : "") }, { title: "检查状态", dataIndex: "status", @@ -92,7 +92,7 @@ function List(props) { width: 200, render: (_, record) => ( - {(props.permission(props.updatePermissionKey || "inspection-qy-check-edit") && (record.status === -1 || record.status === 600)) && ( + {(props.permission(props.updatePermissionKey || "inspection-qy-check-edit") && (record.status === 98 || record.status === 600)) && ( - - - ) }, + { + title: "操作", render: (_, record) => ( + + + + + ) + }, ]} /> @@ -205,14 +214,14 @@ function InspectionView(props) { bordered styles={{ label: { width: 200 } }} items={[ - { label: "被检查单位现场负责人(签字)", children: () }, + { label: "被检查单位现场负责人(签字)", children: () }, ]} />
- {query.isExport !== "0" && } + {/* {query.isExport !== "0" && } */}
diff --git a/src/pages/Container/BranchCompany/Plan/Management/List/index.js b/src/pages/Container/BranchCompany/Plan/Management/List/index.js index 229c2e6..f202567 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/List/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/List/index.js @@ -358,12 +358,14 @@ const AddModalComponent = (props) => { params={{ corpinfoId: corpId }} isNeedCorpInfoId={true} isNeedDepartmentId={false} + extraParams={{ noMain: 1 }} {...commonProps} /> ) : ( ); diff --git a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js index 4774851..0f1e70e 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/PersonnelExecutionDetails/index.js @@ -30,7 +30,7 @@ function PersonnelExecutionDetails(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status", diff --git a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js index 278fe51..1632e09 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/PlanExecutionDetails/index.js @@ -31,7 +31,7 @@ function PlanExecutionDetails(props) { { title: "被检查单位", dataIndex: "inspectionSiteDepartmentName" }, { title: "被检查单位现场负责人", dataIndex: "inspectedSiteManagerName", width: 200 }, { title: "检查类型", dataIndex: "typeName" }, - { title: "检查时间", width: 200, render: (_, record) => (`${record.timeStart}至${record.timeEnd}`) }, + { title: "检查时间", width: 200, render: (_, record) => (`自${record.timeStart}至${record.timeEnd}止`) }, { title: "检查状态", dataIndex: "status",