diff --git a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js index 361666b..5a35b19 100644 --- a/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js +++ b/src/pages/Container/BranchCompany/Inspection/Defense/List/index.js @@ -231,7 +231,7 @@ function DefenseHandlingModalComponent(props) { }, { name: "signature", - label: "确认人", + label: "检查人", required: false, rules: [{ required: true, message: "请签名" }], dependencies: ["status"], diff --git a/src/pages/Container/BranchCompany/InspectionView/index.js b/src/pages/Container/BranchCompany/InspectionView/index.js index 6499d58..784fe88 100644 --- a/src/pages/Container/BranchCompany/InspectionView/index.js +++ b/src/pages/Container/BranchCompany/InspectionView/index.js @@ -62,7 +62,7 @@ function InspectionView(props) { } } data.inspectorVerificationList.forEach((item) => { - setCurrentInspectorUserName(prev => [...prev, `${item.userName}(${item.phone})` || ""]); + setCurrentInspectorUserName(prev => [...prev, `${item.userName}(${item.phone || "-"})` || ""]); }); setInfo(data); const { data: hiddenList } = await props["hiddenList"]({ foreignKey: query.inspectionId, pageIndex: 1, pageSize: 999 }); @@ -90,7 +90,7 @@ function InspectionView(props) { { label: "牵头检查部门", children: info.inspector?.departmentName }, { label: "检查人", children: currentInspectorUserName.join(",") }, { label: "检查类型", children: info.typeName }, - { label: "检查时间", children: (info.timeStart && info.timeEnd) ? `自${formatDate(record.timeStart)}至${formatDate(record.timeEnd)}止` : "" }, + { label: "检查时间", children: (info.timeStart && info.timeEnd) ? `自${formatDate(info.timeStart)}至${formatDate(info.timeEnd)}止` : "" }, { label: "检查场所", children: info.place, span: 2 }, { label: "计划属性", children: getLabelName({ list: PLAN_ENUM, status: info.planType }), span: 2 }, ...(info.planType === 1 ? [{ label: "计划名称", children: info.planName, span: 2 }] : []), @@ -178,8 +178,8 @@ function InspectionView(props) { options={false} columns={[ { title: "审核人员", dataIndex: "userName" }, - { title: "审核意见", dataIndex: "userRemarks" }, - { title: "签字", render: (_, record) => (record.signature && ) }, + { title: "审核意见", dataIndex: "userRemarks", render: (_, record) => record.status ? record.userRemarks : "-" }, + { title: "签字", render: (_, record) => (record.signature && ) }, ]} /> @@ -210,7 +210,7 @@ function InspectionView(props) { bordered styles={{ label: { width: 200 } }} items={[ - { label: "被检查单位现场负责人(签字)", children: () }, + { label: "被检查单位现场负责人(签字)", children: () }, ]} /> diff --git a/src/pages/Container/BranchCompany/Plan/Management/List/index.js b/src/pages/Container/BranchCompany/Plan/Management/List/index.js index d579ed8..e66a0cd 100644 --- a/src/pages/Container/BranchCompany/Plan/Management/List/index.js +++ b/src/pages/Container/BranchCompany/Plan/Management/List/index.js @@ -91,6 +91,7 @@ function List(props) { { title: "计划类型", dataIndex: "planTypeName" }, { title: "计划开始时间", dataIndex: "planStartTime" }, { title: "计划结束时间", dataIndex: "planEndTime" }, + { title: "计划执行单位", dataIndex: "corpName" ,hidden: props.supervision !== "1"}, { title: "计划执行总次数", dataIndex: "planExecuteTotal", @@ -123,12 +124,12 @@ function List(props) { title: "计划状态", dataIndex: "status", render: (_, record) => { - const { planExecuteTotal, userExecuteNum, planStartTime, planEndTime } = record; + const { planExecuteTotal, userExecuteNum,userExecuteTotal, planStartTime, planEndTime } = record; const currentTime = dayjs(); let statusText = ""; - if (planExecuteTotal === userExecuteNum && planExecuteTotal > 0) { + if (userExecuteTotal <= userExecuteNum && planExecuteTotal > 0) { statusText = "已完成"; } else if (currentTime.isBefore(planStartTime, "day")) {