diff --git a/jjb.config.js b/jjb.config.js index 9808fa5..24f8ebd 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -9,6 +9,7 @@ module.exports = { // 应用后端分支名称，部署上线需要 javaGitBranch: "", // 接口服务地址 + // API_HOST: "http://192.168.20.100:30140", API_HOST: "https://gbs-gateway.qhdsafety.com", }, production: { @@ -62,7 +63,7 @@ module.exports = { // 全局主题色 "colorPrimary": "#1677ff", // 全局圆角 - "borderRadius": 2, + "borderRadius": 4, }, }, // webpack diff --git a/package.json b/package.json index 1abfcde..ea6c363 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.0.178" + "zy-react-library": "^1.1.4" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/ledger/index.js b/src/api/ledger/index.js index 017da81..c8f3836 100644 --- a/src/api/ledger/index.js +++ b/src/api/ledger/index.js @@ -36,3 +36,7 @@ export const xgfProjectInfo = declareRequest( "xgfProjectLoading", `Get > /xgfManager/project/{id}`, ); +export const hiddenPrintList = declareRequest( + "xgfProjectLoading", + `Post > @/hidden/hidden/printList`, +); diff --git a/src/main.js b/src/main.js index c1cdccb..7f79acf 100644 --- a/src/main.js +++ b/src/main.js @@ -6,6 +6,7 @@ import "dayjs/locale/zh-cn"; import "../blessed_by_buddha"; require("antd/dist/reset.css"); +require("zy-react-library/css/common.less"); dayjs.locale("zh-cn"); setJJBCommonAntdMessage(message); diff --git a/src/pages/Container/BranchCompany/Average/Acceptance/List/index.js b/src/pages/Container/BranchCompany/Average/Acceptance/List/index.js index 92449f7..43dd95e 100644 --- a/src/pages/Container/BranchCompany/Average/Acceptance/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Acceptance/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import dayjs from "dayjs"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -26,7 +27,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js b/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js index ad01aaf..97fb296 100644 --- a/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Acceptance/Review/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Divider, Form, message } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; @@ -21,14 +21,15 @@ function Rectification(props) { const [data, setData] = useState({}); const onSubmit = async (values) => { - await uploadFile({ + const { id } = await uploadFile({ single: false, files: values.files, - params: { type: UPLOAD_FILE_TYPE_ENUM["5"], foreignKey: query.hiddenId }, + params: { type: UPLOAD_FILE_TYPE_ENUM["5"], foreignKey: "" }, }); const { success } = await props["acceptanceReview"]({ id: query.id, hiddenId: query.hiddenId, + hiddenUserId: id, ...values, }); if (success) { @@ -36,58 +37,55 @@ function Rectification(props) { props.history.goBack(); } }; + return ( -
- + { setData(data); }} /> 隐患验收 -
- !(formValues.status === 0), - }, - ...( - status === 1 - ? [ - { name: "descr", label: "验收描述" }, - { - name: "rectificationTime", - label: "验收时间", - render: FORM_ITEM_RENDER_ENUM.DATETIME, - rules: [validatorEndTime(data.rectificationTime, "验收时间不能早于整改时间")], - }, - { name: "files", label: "验收图片", required: false, render: }, - ] - : [] - ), - ]} - /> -
-
+ !(formValues.status === 0), + }, + ...( + status === 1 + ? [ + { name: "descr", label: "验收描述" }, + { + name: "rectificationTime", + label: "验收时间", + render: FORM_ITEM_RENDER_ENUM.DATETIME, + rules: [validatorEndTime(data.rectificationTime, "验收时间不能早于整改时间")], + }, + { name: "files", label: "验收图片", required: false, render: }, + ] + : [] + ), + ]} + /> + ); } diff --git a/src/pages/Container/BranchCompany/Average/Confirm/List/index.js b/src/pages/Container/BranchCompany/Average/Confirm/List/index.js index a8aa0de..0a86cbc 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import dayjs from "dayjs"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -25,7 +26,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js index a26c441..8b0f537 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Divider, Form, message, Modal } from "antd"; import { useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import HiddenLevelSelectTree from "zy-react-library/components/SelectTree/HiddenLevel/Gwj"; @@ -84,14 +84,6 @@ function Confirm(props) { render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 2, name: "否" }], span: 24, - componentProps: { - onChange: () => { - if (data.isRelated === 0) { - form.setFieldValue("checkDeptName", ""); - form.setFieldValue("checkUserName", ""); - } - }, - }, }, ...commonDeptUserFields, { @@ -165,74 +157,77 @@ function Confirm(props) { return (
- - { - setData(data); - data.isRelated === 1 && getXgfProjectInfo(data.projectId); - setIsFromInspection(data.source === 4 || data.source === 5); - const hiddenUserPresetsCO = data.hiddenUserPresetsCO || {}; - form.setFieldValue("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); - form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); - form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); - form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); - form.setFieldValue("checkDeptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); - form.setFieldValue("checkDeptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); - form.setFieldValue("checkUserId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); - form.setFieldValue("checkUserName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); - }} - /> - 隐患确认 -
- { - Object.keys(data).length > 0 - ? ( - setRejectModalOpen(true)}>打回, - ]} - options={[ - ...(!isFromInspection - ? [ - { - name: "hiddenLevel", - label: "隐患级别", - span: 24, - render: ( - { - if (event === "hiddenLevel1001") { - form.setFieldValue("deptName", ""); - form.setFieldValue("userName", ""); - form.setFieldValue("checkDeptName", ""); - form.setFieldValue("checkUserName", ""); - } - }} - onGetLabel={(label) => { - form.setFieldValue("hiddenLevelName", label); - }} - /> - ), - }, - ] - : []), - { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, - ...decideOption(), - ]} - /> - ) - : null - } -
+ + { + setData(data); + data.isRelated === 1 && getXgfProjectInfo(data.projectId); + setIsFromInspection(data.source === 4 || data.source === 5); + const hiddenUserPresetsCO = data.hiddenUserPresetsCO || {}; + form.setFieldValue("deptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); + form.setFieldValue("deptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); + form.setFieldValue("userId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); + form.setFieldValue("userName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); + form.setFieldValue("checkDeptId", hiddenUserPresetsCO.rectifyDeptId || data.hiddenFindDept); + form.setFieldValue("checkDeptName", hiddenUserPresetsCO.rectifyDeptName || data.hiddenFindDeptName); + form.setFieldValue("checkUserId", hiddenUserPresetsCO.rectifyUserId || data.creatorId); + form.setFieldValue("checkUserName", hiddenUserPresetsCO.rectifyUserName || data.creatorName); + }} + /> + 隐患确认 +
+ { + Object.keys(data).length > 0 + ? ( + setRejectModalOpen(true)}>打回, + ]} + values={{ + rectificationType: 1, + }} + options={[ + ...(!isFromInspection + ? [ + { + name: "hiddenLevel", + label: "隐患级别", + span: 24, + render: ( + { + if (event === "hiddenLevel1001") { + form.setFieldValue("deptName", ""); + form.setFieldValue("userName", ""); + form.setFieldValue("checkDeptName", ""); + form.setFieldValue("checkUserName", ""); + } + }} + onGetLabel={(label) => { + form.setFieldValue("hiddenLevelName", label); + }} + /> + ), + }, + ] + : []), + { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, + ...decideOption(), + ]} + /> + ) + : null + } +
+ {rejectModalOpen && setRejectModalOpen(false)} data={data} />}
); @@ -259,12 +254,14 @@ const RejectModalComponent = (props) => { + )} - + ); } @@ -138,17 +139,18 @@ const AddModalComponent = (props) => { return ( { { name: "postId", label: "确认人", onlyForLabel: true }, { name: "confirmRange", - label: "确认范围（部门）", + label: "确认范围(部门)", render: ( { /> ), }, - { name: "confirmRangeName", label: "确认范围（部门）", onlyForLabel: true }, + { name: "confirmRangeName", label: "确认范围(部门)名称", onlyForLabel: true }, ]} /> diff --git a/src/pages/Container/BranchCompany/Average/HiddenView/index.js b/src/pages/Container/BranchCompany/Average/HiddenView/index.js index deee2e4..753e3ea 100644 --- a/src/pages/Container/BranchCompany/Average/HiddenView/index.js +++ b/src/pages/Container/BranchCompany/Average/HiddenView/index.js @@ -1,13 +1,14 @@ import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; function HiddenView() { const query = useGetUrlQuery(); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Average/Ignore/List/index.js b/src/pages/Container/BranchCompany/Average/Ignore/List/index.js index 842f5c9..1969b4a 100644 --- a/src/pages/Container/BranchCompany/Average/Ignore/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ignore/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import dayjs from "dayjs"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -25,7 +26,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 6fad6b9..37aa299 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Col, Form, Image, Input, message, Modal, Row } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import Map from "zy-react-library/components/Map"; +import Page from "zy-react-library/components/Page"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -282,8 +282,7 @@ function Add(props) { return (
- -
+ -
+ { aiHiddenModalOpen && ( + + ), }, { name: "creatorName", label: "隐患发现人" }, @@ -141,13 +141,13 @@ function List(props) {
+ ); } @@ -329,14 +328,15 @@ const ExportByColumnModalComponent = (props) => { return ( { ); }; -const PrintModal = (props) => { +const PrintModalComponent = (props) => { + const [list, setList] = useState([]); const contentRef = useRef(null); const handlePrint = useReactToPrint({ contentRef, @@ -375,6 +376,18 @@ const PrintModal = (props) => { `, documentTitle: "", }); + + const getData = async () => { + const { data } = await props["hiddenPrintList"]({ + ids: props.data.join(","), + }); + setList(data); + }; + + useEffect(() => { + getData(); + }, []); + const getIsQualified = (isQualified) => { if (isQualified === "1") return "合格"; @@ -382,6 +395,7 @@ const PrintModal = (props) => { return "不合格"; return ""; }; + return ( { { { title: "责任部门", dataIndex: "hiddenFindDeptName" }, { title: "事故隐患", dataIndex: "hiddenDesc" }, { title: "隐患等级", dataIndex: "hiddenLevelName" }, - { title: "治理措施", dataIndex: "tempSafeMeasure" }, + { title: "治理措施", dataIndex: "rectificationDesc" }, { title: "完成时限", dataIndex: "rectificationDeadline", @@ -427,7 +441,7 @@ const PrintModal = (props) => { { title: "验收结果", dataIndex: "isQualified", - render: (_, record) => record.state === 301 ? getIsQualified(record.isQualified) : "", + render: (_, record) => record.hiddenLevelName !== "忽略隐患" ? (record.state === 301 ? getIsQualified(record.isQualified) : "") : "", }, ]} /> @@ -449,14 +463,14 @@ const PrintModal = (props) => { - {(props.data || []).map(item => ( + {list.map(item => ( - + @@ -471,5 +485,6 @@ const PrintModal = (props) => { ); }; +const PrintModal = Connect([NS_LEDGER], true)(PrintModalComponent); const ExportByColumnModal = Connect([NS_LEDGER], true)(ExportByColumnModalComponent); export default Connect([NS_LEDGER], true)(Permission(List)); diff --git a/src/pages/Container/BranchCompany/Average/Part/index.js b/src/pages/Container/BranchCompany/Average/Part/index.js index ca57d3b..e6e3610 100644 --- a/src/pages/Container/BranchCompany/Average/Part/index.js +++ b/src/pages/Container/BranchCompany/Average/Part/index.js @@ -7,6 +7,7 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import BackIcon from "zy-react-library/components/Icon/BackIcon"; import BasicLeftTree from "zy-react-library/components/LeftTree/Basic"; +import Page from "zy-react-library/components/Page"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Table from "zy-react-library/components/Table"; @@ -76,7 +77,7 @@ function Part(props) { }; return ( -
+
@@ -92,7 +93,8 @@ function Part(props) { />
-
+
+
{item.hiddenFindTime ? dayjs(item.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : ""} {item.createName} {item.hiddenFindDeptName} {item.hiddenDesc} {item.hiddenLevelName}{item.tempSafeMeasure}{item.rectificationDesc} {item.rectificationDeadline ? dayjs(item.rectificationDeadline).format("YYYY-MM-DD HH:mm:ss") : ""} {item.rectifyUserName} {item.state === 301 ? item.hiddenYUserName : ""}
( <> @@ -182,7 +184,7 @@ function Part(props) { }} /> )} - + ); } @@ -210,14 +212,15 @@ const AddModalComponent = (props) => { return ( + - + ); } diff --git a/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js b/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js index 5576e83..645d94a 100644 --- a/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Postponement/Review/index.js @@ -1,9 +1,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Modal, Space } from "antd"; +import { Button, Form, message, Modal } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { NS_SPECIAL_DISPOSAL } from "~/enumerate/namespace"; @@ -28,18 +28,30 @@ function Review(props) { }, }); }; + return (
- - -
- - - - - -
- {rejectModalOpen && setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} />} + + + setRejectModalOpen(true)} + > + 打回 + + )} + onFinish={onSubmit} + loading={props.specialDisposal.specialDisposalLoading} + /> + + { + rejectModalOpen && ( setRejectModalOpen(false)} data={{ id: query.id, hiddenId: query.hiddenId }} />) + }
); } @@ -64,12 +76,14 @@ const RejectModalComponent = (props) => { + )} - + ); } @@ -189,17 +190,18 @@ const TemporarySafetyMeasuresModalComponent = (props) => { return ( { return ( - + { setData(data); form.setFieldValue("tempSafeMeasure", data.tempSafeMeasure); @@ -97,152 +96,150 @@ function Rectification(props) { }} /> 隐患整改 -
- current && current > dayjs().endOf("day"), + disabledTime, }, - { - name: "rectificationTime", - label: "整改时间", - render: FORM_ITEM_RENDER_ENUM.DATETIME, - componentProps: { - disabledDate: current => current && current > dayjs().endOf("day"), - disabledTime, - }, - }, - { name: "tempSafeMeasure", label: "临时安全措施", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, - { name: "afterRectificationImageFiles", label: "整改后图片", render: }, - ...( - data.isRelated === 0 - ? [ - { - name: "hiddenUserAddCmds", - render: FORM_ITEM_RENDER_ENUM.FORM_LIST, - formListUniqueProps: { - addDefaultValue: { type: 300 }, - options: field => ([ - { - name: [field.name, "deptId"], - label: "验收部门", - span: 12, - render: ( - { - form.setFieldValue(["hiddenUserAddCmds", field.name, "userId"], ""); - form.setFieldValue(["hiddenUserAddCmds", field.name, "userName"], ""); - }} - onGetLabel={(label) => { - form.setFieldValue(["hiddenUserAddCmds", field.name, "deptName"], label); - }} - /> - ), - }, - { name: [field.name, "deptName"], deptName: "验收部门名称", onlyForLabel: true }, - { name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, - { name: [field.name, "userName"], deptName: "验收人名称", onlyForLabel: true }, - { - name: [field.name, "userId"], - deptName: "验收人", - span: 12, - rules: [{ - validator: (_, value) => { - // 获取已存在的用户名 - const confirmUserName = data?.hiddenConfirmUserCO?.rectifyUserId; - const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId; + }, + { name: "tempSafeMeasure", label: "临时安全措施", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, + { name: "afterRectificationImageFiles", label: "整改后图片", render: }, + ...( + data.isRelated === 0 + ? [ + { + name: "hiddenUserAddCmds", + render: FORM_ITEM_RENDER_ENUM.FORM_LIST, + formListUniqueProps: { + addDefaultValue: { type: 300 }, + options: field => ([ + { + name: [field.name, "deptId"], + label: "验收部门", + span: 12, + render: ( + { + form.setFieldValue(["hiddenUserAddCmds", field.name, "userId"], ""); + form.setFieldValue(["hiddenUserAddCmds", field.name, "userName"], ""); + }} + onGetLabel={(label) => { + form.setFieldValue(["hiddenUserAddCmds", field.name, "deptName"], label); + }} + /> + ), + }, + { name: [field.name, "deptName"], deptName: "验收部门名称", onlyForLabel: true }, + { name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, + { name: [field.name, "userName"], deptName: "验收人名称", onlyForLabel: true }, + { + name: [field.name, "userId"], + deptName: "验收人", + span: 12, + rules: [{ + validator: (_, value) => { + // 获取已存在的用户名 + const confirmUserName = data?.hiddenConfirmUserCO?.rectifyUserId; + const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId; - // 验证是否与已有用户名相同 - if (value && (value === confirmUserName || value === presetUserName)) { - return Promise.reject(new Error("验收人不能与整改人相同")); - } + // 验证是否与已有用户名相同 + if (value && (value === confirmUserName || value === presetUserName)) { + return Promise.reject(new Error("验收人不能与整改人相同")); + } - return Promise.resolve(); - }, - }], - render: ( - form.setFieldValue(["hiddenUserAddCmds", field.name, "userName"], label)} - /> - ), - }, - ]), - }, + return Promise.resolve(); + }, + }], + render: ( + form.setFieldValue(["hiddenUserAddCmds", field.name, "userName"], label)} + /> + ), + }, + ]), }, - ] - : [ - { - name: "hiddenUserAddCmds", - render: FORM_ITEM_RENDER_ENUM.FORM_LIST, - formListUniqueProps: { - showAddButton: false, - showRemoveButton: false, - options: field => ([ - { name: [field.name, "deptName"], label: "验收部门", span: 12, componentProps: { disabled: true } }, - { name: [field.name, "deptId"], deptName: "验收部门id", onlyForLabel: true }, - { name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, - { name: [field.name, "userId"], deptName: "验收人id", onlyForLabel: true }, - { name: [field.name, "userName"], deptName: "验收人", span: 12, componentProps: { disabled: true } }, - ]), - }, + }, + ] + : [ + { + name: "hiddenUserAddCmds", + render: FORM_ITEM_RENDER_ENUM.FORM_LIST, + formListUniqueProps: { + showAddButton: false, + showRemoveButton: false, + options: field => ([ + { name: [field.name, "deptName"], label: "验收部门", span: 12, componentProps: { disabled: true } }, + { name: [field.name, "deptId"], deptName: "验收部门id", onlyForLabel: true }, + { name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, + { name: [field.name, "userId"], deptName: "验收人id", onlyForLabel: true }, + { name: [field.name, "userName"], deptName: "验收人", span: 12, componentProps: { disabled: true } }, + ]), }, - ] - ), - { - name: "isRectificationScheme", - label: "整改方案", - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], - }, - ...( - isRectificationScheme !== undefined - ? ( - isRectificationScheme === 1 - ? [ - { name: "governStanDards", label: "治理标准" }, - { name: "governMethod", label: "治理方法" }, - { name: "expenditure", label: "经费落实" }, - { name: "principal", label: "负责人员" }, - { name: "programming", label: "工时安排" }, - { name: "timeLimitFor", label: "时限要求" }, - { name: "jobRequireMent", label: "工作要求" }, - { name: "otherBusiness", label: "其他事项" }, - { name: "rectificationPlanImageFiles", label: "方案图片", render: }, - ] - : [] - ) - : [] - ), - ] - ), - ]} - /> -
- + }, + ] + ), + { + name: "isRectificationScheme", + label: "整改方案", + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + }, + ...( + isRectificationScheme !== undefined + ? ( + isRectificationScheme === 1 + ? [ + { name: "governStanDards", label: "治理标准" }, + { name: "governMethod", label: "治理方法" }, + { name: "expenditure", label: "经费落实" }, + { name: "principal", label: "负责人员" }, + { name: "programming", label: "工时安排" }, + { name: "timeLimitFor", label: "时限要求" }, + { name: "jobRequireMent", label: "工作要求" }, + { name: "otherBusiness", label: "其他事项" }, + { name: "rectificationPlanImageFiles", label: "方案图片", render: }, + ] + : [] + ) + : [] + ), + ] + ), + ]} + /> + ); } diff --git a/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js b/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js index e610c55..c40e2e6 100644 --- a/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js +++ b/src/pages/Container/BranchCompany/Average/SpecialDisposal/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import dayjs from "dayjs"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -27,7 +28,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js b/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js index 202dd43..5ad075a 100644 --- a/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/SpecialDisposal/Review/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Divider, Form, message } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Upload from "zy-react-library/components/Upload"; @@ -36,117 +36,113 @@ function Review(props) { }; return ( -
- + { setData(data); form.setFieldValue("tempSafeMeasure", data.tempSafeMeasure); }} /> 特殊处理审核 -
- { - form.setFieldValue("modifyRectifyPerson", 0); - form.setFieldValue("deptId", ""); - form.setFieldValue("deptName", ""); - form.setFieldValue("rectifyPersonId", ""); - form.setFieldValue("rectifyPersonName", ""); - }, + { + form.setFieldValue("modifyRectifyPerson", 0); + form.setFieldValue("deptId", ""); + form.setFieldValue("deptName", ""); + form.setFieldValue("rectifyPersonId", ""); + form.setFieldValue("rectifyPersonName", ""); }, }, - { - name: "disposalPlan", - label: "处置方案", - span: 24, - render: FORM_ITEM_RENDER_ENUM.TEXTAREA, - dependencies: ["state"], - hidden: formValues => !(formValues.state === 3), - }, - { - name: "files", - label: "处置方案附件", - span: 24, - render: , - dependencies: ["state"], - hidden: formValues => !(formValues.state === 3), - }, - ...( - data.isRelated === 0 - ? [ - { - name: "modifyRectifyPerson", - label: "是否更换整改负责人", - span: 24, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], - componentProps: { - onChange: () => { - form.setFieldValue("deptId", ""); - form.setFieldValue("deptName", ""); + }, + { + name: "disposalPlan", + label: "处置方案", + span: 24, + render: FORM_ITEM_RENDER_ENUM.TEXTAREA, + dependencies: ["state"], + hidden: formValues => !(formValues.state === 3), + }, + { + name: "files", + label: "处置方案附件", + span: 24, + render: , + dependencies: ["state"], + hidden: formValues => !(formValues.state === 3), + }, + ...( + data.isRelated === 0 + ? [ + { + name: "modifyRectifyPerson", + label: "是否更换整改负责人", + span: 24, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + componentProps: { + onChange: () => { + form.setFieldValue("deptId", ""); + form.setFieldValue("deptName", ""); + form.setFieldValue("rectifyPersonId", ""); + form.setFieldValue("rectifyPersonName", ""); + }, + }, + dependencies: ["state"], + hidden: formValues => !(formValues.state === 4), + }, + { + name: "deptId", + label: "整改部门", + render: ( + { form.setFieldValue("rectifyPersonId", ""); form.setFieldValue("rectifyPersonName", ""); - }, - }, - dependencies: ["state"], - hidden: formValues => !(formValues.state === 4), - }, - { - name: "deptId", - label: "整改部门", - render: ( - { - form.setFieldValue("rectifyPersonId", ""); - form.setFieldValue("rectifyPersonName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("deptName", label); - }} - /> - ), - dependencies: ["state", "modifyRectifyPerson"], - hidden: formValues => !(formValues.state === 4 && formValues.modifyRectifyPerson === 1), - }, - { name: "deptName", label: "整改部门名称", onlyForLabel: true }, - { - name: "rectifyPersonId", - label: "整改人", - render: ( - form.setFieldValue("rectifyPersonName", label)} - /> - ), - dependencies: ["state", "modifyRectifyPerson"], - hidden: formValues => !(formValues.state === 4 && formValues.modifyRectifyPerson === 1), - }, - { name: "rectifyPersonName", label: "整改人名称", onlyForLabel: true }, - ] - : [ - { name: "modifyRectifyPerson", label: "是否更换整改负责人", onlyForLabel: true }, - ] - ), - ]} - /> -
-
+ }} + onGetLabel={(label) => { + form.setFieldValue("deptName", label); + }} + /> + ), + dependencies: ["state", "modifyRectifyPerson"], + hidden: formValues => !(formValues.state === 4 && formValues.modifyRectifyPerson === 1), + }, + { name: "deptName", label: "整改部门名称", onlyForLabel: true }, + { + name: "rectifyPersonId", + label: "整改人", + render: ( + form.setFieldValue("rectifyPersonName", label)} + /> + ), + dependencies: ["state", "modifyRectifyPerson"], + hidden: formValues => !(formValues.state === 4 && formValues.modifyRectifyPerson === 1), + }, + { name: "rectifyPersonName", label: "整改人名称", onlyForLabel: true }, + ] + : [ + { name: "modifyRectifyPerson", label: "是否更换整改负责人", onlyForLabel: true }, + ] + ), + ]} + /> + ); } diff --git a/src/pages/Container/Supervision/Average/AIHazardIdentification/List/index.js b/src/pages/Container/Supervision/Average/AIHazardIdentification/List/index.js index 809c1f1..6351037 100644 --- a/src/pages/Container/Supervision/Average/AIHazardIdentification/List/index.js +++ b/src/pages/Container/Supervision/Average/AIHazardIdentification/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_AVERAGE } from "~/enumerate/namespace"; @@ -10,38 +11,36 @@ function List(props) { const { tableProps } = useTable(props["averageAiHiddenRecord"], { form, }); - return ( -
-
-
( - - {props.permission("jgd-aiyh-ck") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - - + return ( + +
( + + {props.permission("jgd-aiyh-ck") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js b/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js index 52a57ed..2e92809 100644 --- a/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js +++ b/src/pages/Container/Supervision/Average/AIHazardIdentification/ListView/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Form } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import { Button, Form } from "antd"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -15,38 +15,36 @@ function ListView(props) { corpId: query.id, }, }); - return ( -
- -
-
`企业名称:${query.corpName}`} - columns={[ - { title: "使用人", dataIndex: "userName" }, - { title: "使用时间", dataIndex: "useTime" }, - { - title: "生成隐患数", - dataIndex: "hiddenNum", - render: (_, record) => { - return ( - <> - { - props.history.push(`./ViewContent?userId=${record.userId}`); - }} - > - {record.hiddenNum} - - - ); - }, - }, - ]} - {...tableProps} - /> - - + return ( + +
{ + return ( + <> + + + ); + }, + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Average/AIHazardIdentification/ViewContent/index.js b/src/pages/Container/Supervision/Average/AIHazardIdentification/ViewContent/index.js index cf290d6..a6fe6bc 100644 --- a/src/pages/Container/Supervision/Average/AIHazardIdentification/ViewContent/index.js +++ b/src/pages/Container/Supervision/Average/AIHazardIdentification/ViewContent/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -15,21 +15,18 @@ function ViewContent(props) { userId: query.userId, }, }); - return ( -
- -
-
- - + return ( + +
+ ); } diff --git a/src/pages/Container/Supervision/Average/Average/CorpInfoList/index.js b/src/pages/Container/Supervision/Average/Average/CorpInfoList/index.js index b99b1a7..ee8d637 100644 --- a/src/pages/Container/Supervision/Average/Average/CorpInfoList/index.js +++ b/src/pages/Container/Supervision/Average/Average/CorpInfoList/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; @@ -11,7 +12,7 @@ function CorpInfoList(props) { const { tableProps, getData } = useTable(props["averageCorpInfoCountList"], { form }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Average/Average/HiddenList/index.js b/src/pages/Container/Supervision/Average/Average/HiddenList/index.js index 07484d7..7d8bff8 100644 --- a/src/pages/Container/Supervision/Average/Average/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/Average/HiddenList/index.js @@ -3,9 +3,9 @@ import { Button, Form, message, Modal, Space, Spin } from "antd"; import dayjs from "dayjs"; import { useRef, useState } from "react"; import { useReactToPrint } from "react-to-print"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import ExportIcon from "zy-react-library/components/Icon/ExportIcon"; import PrintIcon from "zy-react-library/components/Icon/PrintIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -58,137 +58,135 @@ function HiddenList(props) { }; return ( -
- -
- - }, - { - name: "hiddenType", - label: "隐患类型", - render: , - }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, - { - name: "hiddenLevel", - label: "隐患级别", - render: , - }, - { name: "creatorName", label: "隐患发现人" }, - { name: "state", label: "隐患状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_STATE_ENUM }, - { name: "confirmUserName", label: "确认人" }, - { name: "rectificationUserName", label: "整改人" }, - { name: "rectificationDeptId", label: "整改部门", render: }, - { name: "checkUserName", label: "验收人" }, - { - name: "isRelated", - label: "是否相关方", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: IS_RELATED_ENUM, - }, - ]} - form={form} - onFinish={getData} - /> -
{ - setSelectedRowKeys(selectedRowKeys); - }, - }} - headerTitle={`公司名称：${query.corpName}`} - toolBarRender={() => ( - - - - - )} - columns={[ - { - title: "隐患来源", - dataIndex: "source", - render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 }, - { title: "隐患类型", dataIndex: "hiddenTypeName" }, - { title: "隐患部位", dataIndex: "hiddenPartName" }, - { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, - { title: "隐患发现人", dataIndex: "createName", width: 130 }, - { - title: "隐患发现时间", - dataIndex: "hiddenFindTime", - render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", - }, - { - title: "整改类型", - dataIndex: "rectificationType", - width: 100, - render: (_, record) => getLabelName({ list: HIDDEN_RECTIFICATION_TYPE_ENUM, status: record.rectificationType }), - }, - { title: "确认人", dataIndex: "confirmUserName", width: 100 }, - { title: "整改人", dataIndex: "rectifyUserName", width: 100 }, - { title: "整改时间", dataIndex: "rectificationTime" }, - { title: "验收人", dataIndex: "hiddenYUserName", width: 100 }, - { - title: "隐患状态", - dataIndex: "state", - render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), - }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> - - + + + }, + { + name: "hiddenType", + label: "隐患类型", + render: , + }, + { + name: "hiddenPart", + label: "隐患部位", + render: , + }, + { + name: "hiddenLevel", + label: "隐患级别", + render: , + }, + { name: "creatorName", label: "隐患发现人" }, + { name: "state", label: "隐患状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_STATE_ENUM }, + { name: "confirmUserName", label: "确认人" }, + { name: "rectificationUserName", label: "整改人" }, + { name: "rectificationDeptId", label: "整改部门", render: }, + { name: "checkUserName", label: "验收人" }, + { + name: "isRelated", + label: "是否相关方", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: IS_RELATED_ENUM, + }, + ]} + form={form} + onFinish={getData} + /> +
{ + setSelectedRowKeys(selectedRowKeys); + }, + }} + headerTitle={`公司名称：${query.corpName}`} + toolBarRender={() => ( + + + + + )} + columns={[ + { + title: "隐患来源", + dataIndex: "source", + render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 }, + { title: "隐患类型", dataIndex: "hiddenTypeName" }, + { title: "隐患部位", dataIndex: "hiddenPartName" }, + { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, + { title: "隐患发现人", dataIndex: "createName", width: 130 }, + { + title: "隐患发现时间", + dataIndex: "hiddenFindTime", + render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", + }, + { + title: "整改类型", + dataIndex: "rectificationType", + width: 100, + render: (_, record) => getLabelName({ list: HIDDEN_RECTIFICATION_TYPE_ENUM, status: record.rectificationType }), + }, + { title: "确认人", dataIndex: "confirmUserName", width: 100 }, + { title: "整改人", dataIndex: "rectifyUserName", width: 100 }, + { title: "整改时间", dataIndex: "rectificationTime" }, + { title: "验收人", dataIndex: "hiddenYUserName", width: 100 }, + { + title: "隐患状态", + dataIndex: "state", + render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), + }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + {printModalOpen && ( )} - + ); } diff --git a/src/pages/Container/Supervision/Average/DuplicateHazard/List/index.js b/src/pages/Container/Supervision/Average/DuplicateHazard/List/index.js index 1073384..a4067f9 100644 --- a/src/pages/Container/Supervision/Average/DuplicateHazard/List/index.js +++ b/src/pages/Container/Supervision/Average/DuplicateHazard/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; import { NS_AVERAGE } from "~/enumerate/namespace"; @@ -10,38 +11,36 @@ function List(props) { const { tableProps } = useTable(props["averageRepeatHiddenCount"], { form, }); - return ( -
-
-
( - - {props.permission("jgd-cfyh-ck") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - - + return ( + +
( + + {props.permission("jgd-cfyh-ck") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js b/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js index 28b62a4..aa56c4b 100644 --- a/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js +++ b/src/pages/Container/Supervision/Average/DuplicateHazard/ListView/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import { HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -17,44 +17,41 @@ function ListView(props) { corpId: query.id, }, }); - return ( -
- -
-
`企业名称:${query.corpName}`} - columns={[ - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患来源", dataIndex: "source", render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }) }, - { title: "隐患级别", dataIndex: "hiddenLevelName" }, - { title: "隐患类型", dataIndex: "hiddenTypeName" }, - { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, - { title: "隐患发现人", dataIndex: "createName" }, - { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, - { title: "隐患状态", dataIndex: "state", render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> - - + return ( + +
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }) }, + { title: "隐患级别", dataIndex: "hiddenLevelName" }, + { title: "隐患类型", dataIndex: "hiddenTypeName" }, + { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, + { title: "隐患发现人", dataIndex: "createName" }, + { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, + { title: "隐患状态", dataIndex: "state", render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }) }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Average/HiddenView/index.js b/src/pages/Container/Supervision/Average/HiddenView/index.js index 41db77d..aa91bb4 100644 --- a/src/pages/Container/Supervision/Average/HiddenView/index.js +++ b/src/pages/Container/Supervision/Average/HiddenView/index.js @@ -1,10 +1,11 @@ import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; function HiddenView() { return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Average/Ignore/CorpInfoList/index.js b/src/pages/Container/Supervision/Average/Ignore/CorpInfoList/index.js index ed45ebb..2140910 100644 --- a/src/pages/Container/Supervision/Average/Ignore/CorpInfoList/index.js +++ b/src/pages/Container/Supervision/Average/Ignore/CorpInfoList/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; @@ -11,7 +12,7 @@ function CorpInfoList(props) { const { tableProps, getData } = useTable(props["ignoreCorpInfoCountList"], { form }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js b/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js index d8596f5..6e23b5f 100644 --- a/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/Ignore/HiddenList/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space, Spin } from "antd"; import dayjs from "dayjs"; import { useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import ExportIcon from "zy-react-library/components/Icon/ExportIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -52,104 +52,102 @@ function HiddenList(props) { }; return ( -
- -
- - }, - { - name: "hiddenType", - label: "隐患类型", - render: , - }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, - { name: "creatorName", label: "隐患发现人" }, - { name: "confirmUserName", label: "确认人" }, - { - name: "isRelated", - label: "是否相关方", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: IS_RELATED_ENUM, - }, - ]} - form={form} - onFinish={getData} - /> -
{ - setSelectedRowKeys(selectedRowKeys); - }, - }} - headerTitle={`公司名称：${query.corpName}`} - toolBarRender={() => ( - - )} - columns={[ - { - title: "隐患来源", - dataIndex: "source", - render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患类型", dataIndex: "hiddenTypeName" }, - { title: "隐患部位", dataIndex: "hiddenPartName" }, - { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, - { title: "隐患发现人", dataIndex: "createName", width: 130 }, - { - title: "隐患发现时间", - dataIndex: "hiddenFindTime", - render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", - }, - { title: "确认人", dataIndex: "confirmUserName", width: 100 }, - { - title: "确认时间", - dataIndex: "confirmTime", - render: (_, record) => record.confirmTime ? dayjs(record.confirmTime).format("YYYY-MM-DD HH:mm:ss") : "", - }, - { title: "隐患状态", dataIndex: "state", render: () => "已忽略" }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> - - - + + + }, + { + name: "hiddenType", + label: "隐患类型", + render: , + }, + { + name: "hiddenPart", + label: "隐患部位", + render: , + }, + { name: "creatorName", label: "隐患发现人" }, + { name: "confirmUserName", label: "确认人" }, + { + name: "isRelated", + label: "是否相关方", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: IS_RELATED_ENUM, + }, + ]} + form={form} + onFinish={getData} + /> +
{ + setSelectedRowKeys(selectedRowKeys); + }, + }} + headerTitle={`公司名称：${query.corpName}`} + toolBarRender={() => ( + + )} + columns={[ + { + title: "隐患来源", + dataIndex: "source", + render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患类型", dataIndex: "hiddenTypeName" }, + { title: "隐患部位", dataIndex: "hiddenPartName" }, + { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, + { title: "隐患发现人", dataIndex: "createName", width: 130 }, + { + title: "隐患发现时间", + dataIndex: "hiddenFindTime", + render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", + }, + { title: "确认人", dataIndex: "confirmUserName", width: 100 }, + { + title: "确认时间", + dataIndex: "confirmTime", + render: (_, record) => record.confirmTime ? dayjs(record.confirmTime).format("YYYY-MM-DD HH:mm:ss") : "", + }, + { title: "隐患状态", dataIndex: "state", render: () => "已忽略" }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + + ); } diff --git a/src/pages/Container/Supervision/Average/SpecialDisposal/CorpInfoList/index.js b/src/pages/Container/Supervision/Average/SpecialDisposal/CorpInfoList/index.js index ef9a288..5abcec6 100644 --- a/src/pages/Container/Supervision/Average/SpecialDisposal/CorpInfoList/index.js +++ b/src/pages/Container/Supervision/Average/SpecialDisposal/CorpInfoList/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; @@ -11,7 +12,7 @@ function CorpInfoList(props) { const { tableProps, getData } = useTable(props["specialDisposalCorpInfoCountList"], { form }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js b/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js index 7dd260e..41f7ffa 100644 --- a/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/SpecialDisposal/HiddenList/index.js @@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space, Spin } from "antd"; import dayjs from "dayjs"; import { useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import ExportIcon from "zy-react-library/components/Icon/ExportIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -51,114 +51,112 @@ function HiddenList(props) { }; return ( -
- -
- - }, - { - name: "hiddenType", - label: "隐患类型", - render: , - }, - { - name: "hiddenPart", - label: "隐患部位", - render: , - }, - { - name: "hiddenLevel", - label: "隐患级别", - render: , - }, - { name: "creatorName", label: "隐患发现人" }, - { name: "confirmUserName", label: "确认人" }, - { name: "rectificationUserName", label: "整改人" }, - { name: "rectificationDeptId", label: "整改部门", render: }, - { - name: "isRelated", - label: "是否相关方", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: IS_RELATED_ENUM, - }, - ]} - form={form} - onFinish={getData} - /> -
{ - setSelectedRowKeys(selectedRowKeys); - }, - }} - headerTitle={`公司名称：${query.corpName}`} - toolBarRender={() => ( - - )} - columns={[ - { - title: "隐患来源", - dataIndex: "source", - render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 }, - { title: "隐患类型", dataIndex: "hiddenTypeName" }, - { title: "隐患部位", dataIndex: "hiddenPartName" }, - { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, - { title: "隐患发现人", dataIndex: "createName", width: 130 }, - { - title: "隐患发现时间", - dataIndex: "hiddenFindTime", - render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", - }, - { - title: "整改类型", - dataIndex: "rectificationType", - width: 100, - render: (_, record) => getLabelName({ list: HIDDEN_RECTIFICATION_TYPE_ENUM, status: record.rectificationType }), - }, - { title: "确认人", dataIndex: "confirmUserName", width: 100 }, - { title: "整改人", dataIndex: "rectifyUserName", width: 100 }, - { title: "隐患状态", dataIndex: "state", render: () => "待处理特殊隐患" }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> - - - + + + }, + { + name: "hiddenType", + label: "隐患类型", + render: , + }, + { + name: "hiddenPart", + label: "隐患部位", + render: , + }, + { + name: "hiddenLevel", + label: "隐患级别", + render: , + }, + { name: "creatorName", label: "隐患发现人" }, + { name: "confirmUserName", label: "确认人" }, + { name: "rectificationUserName", label: "整改人" }, + { name: "rectificationDeptId", label: "整改部门", render: }, + { + name: "isRelated", + label: "是否相关方", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: IS_RELATED_ENUM, + }, + ]} + form={form} + onFinish={getData} + /> +
{ + setSelectedRowKeys(selectedRowKeys); + }, + }} + headerTitle={`公司名称：${query.corpName}`} + toolBarRender={() => ( + + )} + columns={[ + { + title: "隐患来源", + dataIndex: "source", + render: (_, record) => getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患级别", dataIndex: "hiddenLevelName", width: 100 }, + { title: "隐患类型", dataIndex: "hiddenTypeName" }, + { title: "隐患部位", dataIndex: "hiddenPartName" }, + { title: "隐患发现部门", dataIndex: "hiddenFindDeptName" }, + { title: "隐患发现人", dataIndex: "createName", width: 130 }, + { + title: "隐患发现时间", + dataIndex: "hiddenFindTime", + render: (_, record) => record.hiddenFindTime ? dayjs(record.hiddenFindTime).format("YYYY-MM-DD HH:mm:ss") : "", + }, + { + title: "整改类型", + dataIndex: "rectificationType", + width: 100, + render: (_, record) => getLabelName({ list: HIDDEN_RECTIFICATION_TYPE_ENUM, status: record.rectificationType }), + }, + { title: "确认人", dataIndex: "confirmUserName", width: 100 }, + { title: "整改人", dataIndex: "rectifyUserName", width: 100 }, + { title: "隐患状态", dataIndex: "state", render: () => "待处理特殊隐患" }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + + ); } diff --git a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js index 3baa255..6126832 100644 --- a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/HiddenList/index.js @@ -1,8 +1,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Descriptions, Form, message, Modal, Space } from "antd"; +import { Button, Descriptions, Form, message, Modal, Space, Spin } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -16,7 +16,7 @@ import { getLabelName } from "zy-react-library/utils"; import { NS_HIDDEN_EVALUATION } from "~/enumerate/namespace"; import ViewEvaluationModal from "../../components/ViewEvaluationModal"; -function List(props) { +function HiddenList(props) { const query = useGetUrlQuery(); const [viewEvaluationModalOpen, setViewEvaluationModalOpen] = useState(false); const [evaluationModalOpen, setEvaluationModalOpen] = useState(false); @@ -35,125 +35,123 @@ function List(props) { leFinalDoneTime: formData.finalDoneTime?.[1], }), }); + return ( -
- -
- ) }, - { name: "likeFindUserName", label: "隐患发现人" }, - { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - { - name: "eqHiddenTypeC", - label: "隐患类型", - render: , + + ) }, + { name: "likeFindUserName", label: "隐患发现人" }, + { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + { + name: "eqHiddenTypeC", + label: "隐患类型", + render: , + }, + { + name: "eqEvaState", + label: "考评结果", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [ + { bianma: "1", name: "是" }, + { bianma: "2", name: "否" }, + { bianma: "3", name: "考评合格" }, + { bianma: "4", name: "考评不合格" }, + ], + }, + { + name: "eqSelf", + label: "本人是否考评", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], + }, + { name: "finalDoneTime", label: "考评完成时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + ]} + form={form} + onFinish={getData} + /> +
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, + { title: "隐患发现人", dataIndex: "findUserName" }, + { title: "隐患验收人", dataIndex: "finalCheckOr" }, + { + title: "隐患状态", + dataIndex: "state", + render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), + }, + { title: "已考评组成员", dataIndex: "alreadyEvaluate" }, + { title: "待考评组成员", dataIndex: "notEvaluate" }, + { + title: "考评结果", + dataIndex: "finalResult", + render: (_, record) => { + switch (record.finalResult) { + case 1: + return "考评合格"; + case 0: + return "考评不合格"; + default: + return "考核未完成"; + } }, - { - name: "eqEvaState", - label: "考评结果", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [ - { bianma: "1", name: "是" }, - { bianma: "2", name: "否" }, - { bianma: "3", name: "考评合格" }, - { bianma: "4", name: "考评不合格" }, - ], - }, - { - name: "eqSelf", - label: "本人是否考评", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], - }, - { name: "finalDoneTime", label: "考评完成时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - ]} - form={form} - onFinish={getData} - /> -
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, - { title: "隐患发现人", dataIndex: "findUserName" }, - { title: "隐患验收人", dataIndex: "finalCheckOr" }, - { - title: "隐患状态", - dataIndex: "state", - render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), - }, - { title: "已考评组成员", dataIndex: "alreadyEvaluate" }, - { title: "待考评组成员", dataIndex: "notEvaluate" }, - { - title: "考评结果", - dataIndex: "finalResult", - render: (_, record) => { - switch (record.finalResult) { - case 1: - return "考评合格"; - case 0: - return "考评不合格"; - default: - return "考核未完成"; + }, + { + title: "操作", + width: 230, + fixed: "right", + render: (_, record) => ( + + + + { + record.isPermission === 1 && ( + + ) } - }, - }, - { - title: "操作", - width: 230, - fixed: "right", - render: (_, record) => ( - - - - { - record.isPermission === 1 && ( - - ) - } - - ), - }, - ]} - {...tableProps} - /> - + + ), + }, + ]} + {...tableProps} + /> {viewEvaluationModalOpen && setViewEvaluationModalOpen(false)} hiddenId={currentHiddenId} url="hiddenEvaluationHiddenEvaluationView" />} {evaluationModalOpen && setEvaluationModalOpen(false)} hiddenId={currentHiddenId} getData={getData} />} - + ); } @@ -189,64 +187,66 @@ const EvaluationModalComponent = (props) => { return ( - ([ - { label: "考评人员", children: item.evaluateMemberName }, + + ([ + { label: "考评人员", children: item.evaluateMemberName }, + { + label: "是否符合", + children: (() => { + switch (item.evaluateResult) { + case 1: + return "考评合格"; + case 0: + return "考评不合格"; + default: + return "考核未完成"; + } + })(), + }, + ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), + ])), + ]} + /> + { - switch (item.evaluateResult) { - case 1: - return "考评合格"; - case 0: - return "考评不合格"; - default: - return "考核未完成"; - } - })(), + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: 1, name: "符合" }, { bianma: 0, name: "不符合" }], }, - ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), - ])), - ]} - /> - !(formValues.result === 0), - }, - ]} - /> + { + name: "resultCase", + label: "不符合原因", + render: FORM_ITEM_RENDER_ENUM.TEXTAREA, + dependencies: ["result"], + hidden: formValues => !(formValues.result === 0), + }, + ]} + /> + ); }; const EvaluationModal = Connect([NS_HIDDEN_EVALUATION], true)(EvaluationModalComponent); -export default Connect([NS_HIDDEN_EVALUATION], true)(List); +export default Connect([NS_HIDDEN_EVALUATION], true)(HiddenList); diff --git a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/List/index.js b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/List/index.js index 570eff3..8a2b442 100644 --- a/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/List/index.js +++ b/src/pages/Container/Supervision/Enterprise/HiddenEvaluation/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -20,56 +21,54 @@ function List(props) { }); return ( -
-
- -
( - <> - {record.hiddenType === "aqyh" && "安全类"} - {record.hiddenType === "wshb" && "环保类"} - - ) }, - { title: "安全环保奖惩监管端", dataIndex: "superviseTotal", render: (_, record) => (`${record.superviseDone}/${record.superviseTotal}`) }, - { title: "安全环保奖惩企业端", dataIndex: "enterpriseTotal", render: (_, record) => (`${record.enterpriseDone}/${record.enterpriseTotal}`) }, - { title: "隐患排查", dataIndex: "troubleshootTotal", render: (_, record) => (`${record.troubleshootDone}/${record.troubleshootTotal}`) }, - { title: "隐患快报", dataIndex: "bulletinTotal", render: (_, record) => (`${record.bulletinDone}/${record.bulletinTotal}`) }, - { title: "消防检查", dataIndex: "fireControlTotal", render: (_, record) => (`${record.fireControlDone}/${record.fireControlTotal}`) }, - { title: "考评组成员", dataIndex: "members" }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - {props.permission("fgs-kp-kp") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - - + + +
( + <> + {record.hiddenType === "aqyh" && "安全类"} + {record.hiddenType === "wshb" && "环保类"} + + ) }, + { title: "安全环保奖惩监管端", dataIndex: "superviseTotal", render: (_, record) => (`${record.superviseDone}/${record.superviseTotal}`) }, + { title: "安全环保奖惩企业端", dataIndex: "enterpriseTotal", render: (_, record) => (`${record.enterpriseDone}/${record.enterpriseTotal}`) }, + { title: "隐患排查", dataIndex: "troubleshootTotal", render: (_, record) => (`${record.troubleshootDone}/${record.troubleshootTotal}`) }, + { title: "隐患快报", dataIndex: "bulletinTotal", render: (_, record) => (`${record.bulletinDone}/${record.bulletinTotal}`) }, + { title: "消防检查", dataIndex: "fireControlTotal", render: (_, record) => (`${record.fireControlDone}/${record.fireControlTotal}`) }, + { title: "考评组成员", dataIndex: "members" }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + {props.permission("fgs-kp-kp") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Enterprise/HiddenView/index.js b/src/pages/Container/Supervision/Enterprise/HiddenView/index.js index 41db77d..aa91bb4 100644 --- a/src/pages/Container/Supervision/Enterprise/HiddenView/index.js +++ b/src/pages/Container/Supervision/Enterprise/HiddenView/index.js @@ -1,10 +1,11 @@ import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; function HiddenView() { return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Enterprise/components/ViewEvaluationModal/index.js b/src/pages/Container/Supervision/Enterprise/components/ViewEvaluationModal/index.js index a32c6c9..bec423d 100644 --- a/src/pages/Container/Supervision/Enterprise/components/ViewEvaluationModal/index.js +++ b/src/pages/Container/Supervision/Enterprise/components/ViewEvaluationModal/index.js @@ -18,11 +18,10 @@ const ViewEvaluationModal = (props) => { return ( 取消 diff --git a/src/pages/Container/Supervision/Evaluation/EvaluationTeamConfig/List/index.js b/src/pages/Container/Supervision/Evaluation/EvaluationTeamConfig/List/index.js index c6d634d..18ab015 100644 --- a/src/pages/Container/Supervision/Evaluation/EvaluationTeamConfig/List/index.js +++ b/src/pages/Container/Supervision/Evaluation/EvaluationTeamConfig/List/index.js @@ -1,9 +1,10 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Col, Descriptions, Form, message, Modal, Row, Space } from "antd"; +import { Button, Descriptions, Form, message, Modal, Space } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; @@ -37,105 +38,103 @@ function List(props) { }); return ( -
-
- -
( - props.permission("jgd-yhkp-kpz-tjqy") && ( - - ) - )} - columns={[ - { title: "分公司名称", dataIndex: "corpinfoName" }, - { - title: "安全类隐患考评组分配状态", - dataIndex: "safetyFlag", - width: 220, - render: (_, record) => (record.safetyFlag === 1 ? "已分配" : "未分配"), - }, - { title: "考评组成员", dataIndex: "safetyMembers" }, - { - title: "环保类隐患考评组分配状态", - dataIndex: "environmentalFlag", - width: 220, - render: (_, record) => (record.safetyFlag === 1 ? "已分配" : "未分配"), - }, - { title: "考评组成员", dataIndex: "environmentalMembers" }, - { - title: "操作", - width: 330, - fixed: "right", - render: (_, record) => ( - - {props.permission("jgd-yhkp-kpz-ck") && ( - - )} - {props.permission("jgd-yhkp-kpz-aqz") && ( - - )} - {props.permission("jgd-yhkp-kpz-hbz") && ( - - )} - {props.permission("jgd-yhkp-kpz-bgjl") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - + + +
( + props.permission("jgd-yhkp-kpz-tjqy") && ( + + ) + )} + columns={[ + { title: "分公司名称", dataIndex: "corpinfoName" }, + { + title: "安全类隐患考评组分配状态", + dataIndex: "safetyFlag", + width: 220, + render: (_, record) => (record.safetyFlag === 1 ? "已分配" : "未分配"), + }, + { title: "考评组成员", dataIndex: "safetyMembers" }, + { + title: "环保类隐患考评组分配状态", + dataIndex: "environmentalFlag", + width: 220, + render: (_, record) => (record.safetyFlag === 1 ? "已分配" : "未分配"), + }, + { title: "考评组成员", dataIndex: "environmentalMembers" }, + { + title: "操作", + width: 330, + fixed: "right", + render: (_, record) => ( + + {props.permission("jgd-yhkp-kpz-ck") && ( + + )} + {props.permission("jgd-yhkp-kpz-aqz") && ( + + )} + {props.permission("jgd-yhkp-kpz-hbz") && ( + + )} + {props.permission("jgd-yhkp-kpz-bgjl") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> {configModalOpen && ( )} - + ); } @@ -213,9 +212,10 @@ const ConfigModalComponent = (props) => { onCancel={props.onCancel} maskClosable={false} onOk={form.submit} - loading={props.evaluationTeamConfig.evaluationTeamConfigLoading} + confirmLoading={props.evaluationTeamConfig.evaluationTeamConfigLoading} > { options={[ { name: "configType", label: "隐患考评组类型", componentProps: { disabled: true }, span: 24 }, { - key: "evaluateGroupUserConfigUpdateCmdList", - customizeRender: true, + name: "evaluateGroupUserConfigUpdateCmdList", span: 24, - render: ( - <> - - {fields => ( - <> - {fields.map(field => ( - - - - { - form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberId"], ""); - form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberName"], ""); - }} - onGetLabel={(label) => { - form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberDeptName"], label); - }} - /> - - - - - - - - form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberName"], label)} - /> - - - - - - - - - - ))} - - )} - - - ), + render: FORM_ITEM_RENDER_ENUM.FORM_LIST, + formListUniqueProps: { + showRemoveButton: false, + showAddButton: false, + options: field => ([ + { + name: [field.name, "memberDeptId"], + label: "考评部门", + render: ( + { + form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberId"], ""); + form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberName"], ""); + }} + onGetLabel={(label) => { + form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberDeptName"], label); + }} + /> + ), + }, + { name: [field.name, "memberDeptName"], label: "考评部门名称", onlyForLabel: true }, + { + name: [field.name, "memberId"], + label: "考评人员", + render: ( + form.setFieldValue(["evaluateGroupUserConfigUpdateCmdList", field.name, "memberName"], label)} + /> + ), + }, + { name: [field.name, "memberName"], label: "考评人员名称", onlyForLabel: true }, + { name: [field.name, "type"], label: "用户类型", onlyForLabel: true }, + ]), + }, }, ]} /> @@ -315,14 +297,15 @@ const AddModalComponent = (props) => { return ( { return ( { styles={{ label: { width: 200 } }} items={[ { label: "隐患考评组类型", children: "安全类" }, - { label: "考评组成员", children: ( -
- {safetyList.map(item => ( - item.memberDeptName && ( -
- {item.memberDeptName} - {" "} - - - {" "} - {item.memberName} -
- ) - ))} -
- ) }, + { + label: "考评组成员", + children: ( +
+ {safetyList.map(item => ( + item.memberDeptName && ( +
+ {item.memberDeptName} + {" "} + - + {" "} + {item.memberName} +
+ ) + ))} +
+ ), + }, ]} /> { styles={{ label: { width: 200 } }} items={[ { label: "隐患考评组类型", children: "环保类" }, - { label: "考评组成员", children: ( -
- {environmentalList.map(item => ( - item.memberDeptName && ( -
- {item.memberDeptName} - {" "} - - - {" "} - {item.memberName} -
- ) - ))} -
- ) }, + { + label: "考评组成员", + children: ( +
+ {environmentalList.map(item => ( + item.memberDeptName && ( +
+ {item.memberDeptName} + {" "} + - + {" "} + {item.memberName} +
+ ) + ))} +
+ ), + }, ]} /> @@ -454,11 +442,10 @@ const ChangeLogModalComponent = (props) => { return ( 关闭, ]} diff --git a/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/HiddenList/index.js b/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/HiddenList/index.js index 44c40d9..483bcb9 100644 --- a/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/HiddenList/index.js +++ b/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/HiddenList/index.js @@ -1,8 +1,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Descriptions, Form, message, Modal, Space } from "antd"; +import { Button, Descriptions, Form, message, Modal, Space, Spin } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -16,7 +16,7 @@ import { getLabelName } from "zy-react-library/utils"; import { NS_HIDDEN_EVALUATION } from "~/enumerate/namespace"; import ViewEvaluationModal from "../../components/ViewEvaluationModal"; -function List(props) { +function HiddenList(props) { const query = useGetUrlQuery(); const [viewEvaluationModalOpen, setViewEvaluationModalOpen] = useState(false); const [evaluationModalOpen, setEvaluationModalOpen] = useState(false); @@ -35,124 +35,122 @@ function List(props) { leFinalDoneTime: formData.finalDoneTime?.[1], }), }); + return ( -
- -
- ) }, - { name: "likeFindUserName", label: "隐患发现人" }, - { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - { - name: "eqHiddenTypeC", - label: "隐患类型", - render: , + + ) }, + { name: "likeFindUserName", label: "隐患发现人" }, + { name: "hiddenFindTime", label: "隐患发现时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + { + name: "eqHiddenTypeC", + label: "隐患类型", + render: , + }, + { + name: "eqEvaState", + label: "考评结果", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [ + { bianma: "1", name: "是" }, + { bianma: "2", name: "否" }, + { bianma: "3", name: "考评合格" }, + { bianma: "4", name: "考评不合格" }, + ], + }, + { + name: "eqSelf", + label: "本人是否考评", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], + }, + { name: "finalDoneTime", label: "考评完成时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + ]} + form={form} + onFinish={getData} + /> +
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, + { title: "隐患发现人", dataIndex: "findUserName" }, + { + title: "隐患状态", + dataIndex: "state", + render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), + }, + { title: "已考评组成员", dataIndex: "alreadyEvaluate" }, + { title: "待考评组成员", dataIndex: "notEvaluate" }, + { + title: "考评结果", + dataIndex: "finalResult", + render: (_, record) => { + switch (record.finalResult) { + case 1: + return "考评合格"; + case 0: + return "考评不合格"; + default: + return "考核未完成"; + } }, - { - name: "eqEvaState", - label: "考评结果", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [ - { bianma: "1", name: "是" }, - { bianma: "2", name: "否" }, - { bianma: "3", name: "考评合格" }, - { bianma: "4", name: "考评不合格" }, - ], - }, - { - name: "eqSelf", - label: "本人是否考评", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ bianma: "1", name: "是" }, { bianma: "0", name: "否" }], - }, - { name: "finalDoneTime", label: "考评完成时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - ]} - form={form} - onFinish={getData} - /> -
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.source }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患发现时间", dataIndex: "hiddenFindTime" }, - { title: "隐患发现人", dataIndex: "findUserName" }, - { - title: "隐患状态", - dataIndex: "state", - render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), - }, - { title: "已考评组成员", dataIndex: "alreadyEvaluate" }, - { title: "待考评组成员", dataIndex: "notEvaluate" }, - { - title: "考评结果", - dataIndex: "finalResult", - render: (_, record) => { - switch (record.finalResult) { - case 1: - return "考评合格"; - case 0: - return "考评不合格"; - default: - return "考核未完成"; + }, + { + title: "操作", + width: 230, + fixed: "right", + render: (_, record) => ( + + + + { + record.isPermission === 1 && ( + + ) } - }, - }, - { - title: "操作", - width: 230, - fixed: "right", - render: (_, record) => ( - - - - { - record.isPermission === 1 && ( - - ) - } - - ), - }, - ]} - {...tableProps} - /> - + + ), + }, + ]} + {...tableProps} + /> {viewEvaluationModalOpen && setViewEvaluationModalOpen(false)} hiddenId={currentHiddenId} url="hiddenEvaluationHiddenEvaluationView" />} {evaluationModalOpen && setEvaluationModalOpen(false)} hiddenId={currentHiddenId} getData={getData} />} - + ); } @@ -188,64 +186,66 @@ const EvaluationModalComponent = (props) => { return ( - ([ - { label: "考评人员", children: item.evaluateMemberName }, + + ([ + { label: "考评人员", children: item.evaluateMemberName }, + { + label: "是否符合", + children: (() => { + switch (item.evaluateResult) { + case 1: + return "考评合格"; + case 0: + return "考评不合格"; + default: + return "考核未完成"; + } + })(), + }, + ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), + ])), + ]} + /> + { - switch (item.evaluateResult) { - case 1: - return "考评合格"; - case 0: - return "考评不合格"; - default: - return "考核未完成"; - } - })(), + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: 1, name: "符合" }, { bianma: 0, name: "不符合" }], }, - ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), - ])), - ]} - /> - !(formValues.result === 0), - }, - ]} - /> + { + name: "resultCase", + label: "不符合原因", + render: FORM_ITEM_RENDER_ENUM.TEXTAREA, + dependencies: ["result"], + hidden: formValues => !(formValues.result === 0), + }, + ]} + /> + ); }; const EvaluationModal = Connect([NS_HIDDEN_EVALUATION], true)(EvaluationModalComponent); -export default Connect([NS_HIDDEN_EVALUATION], true)(List); +export default Connect([NS_HIDDEN_EVALUATION], true)(HiddenList); diff --git a/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/List/index.js b/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/List/index.js index 21c0a46..8146358 100644 --- a/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/List/index.js +++ b/src/pages/Container/Supervision/Evaluation/HiddenEvaluation/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -20,56 +21,54 @@ function List(props) { }); return ( -
-
- -
( - <> - {record.hiddenType === "aqyh" && "安全类"} - {record.hiddenType === "wshb" && "环保类"} - - ) }, - { title: "安全环保奖惩监管端", dataIndex: "superviseTotal", render: (_, record) => (`${record.superviseDone}/${record.superviseTotal}`) }, - { title: "安全环保奖惩企业端", dataIndex: "enterpriseTotal", render: (_, record) => (`${record.enterpriseDone}/${record.enterpriseTotal}`) }, - { title: "隐患排查", dataIndex: "troubleshootTotal", render: (_, record) => (`${record.troubleshootDone}/${record.troubleshootTotal}`) }, - { title: "隐患快报", dataIndex: "bulletinTotal", render: (_, record) => (`${record.bulletinDone}/${record.bulletinTotal}`) }, - { title: "消防检查", dataIndex: "fireControlTotal", render: (_, record) => (`${record.fireControlDone}/${record.fireControlTotal}`) }, - { title: "考评组成员", dataIndex: "members" }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - {props.permission("jgd-yhkp-kp") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - - + + +
( + <> + {record.hiddenType === "aqyh" && "安全类"} + {record.hiddenType === "wshb" && "环保类"} + + ) }, + { title: "安全环保奖惩监管端", dataIndex: "superviseTotal", render: (_, record) => (`${record.superviseDone}/${record.superviseTotal}`) }, + { title: "安全环保奖惩企业端", dataIndex: "enterpriseTotal", render: (_, record) => (`${record.enterpriseDone}/${record.enterpriseTotal}`) }, + { title: "隐患排查", dataIndex: "troubleshootTotal", render: (_, record) => (`${record.troubleshootDone}/${record.troubleshootTotal}`) }, + { title: "隐患快报", dataIndex: "bulletinTotal", render: (_, record) => (`${record.bulletinDone}/${record.bulletinTotal}`) }, + { title: "消防检查", dataIndex: "fireControlTotal", render: (_, record) => (`${record.fireControlDone}/${record.fireControlTotal}`) }, + { title: "考评组成员", dataIndex: "members" }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + {props.permission("jgd-yhkp-kp") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Evaluation/HiddenView/index.js b/src/pages/Container/Supervision/Evaluation/HiddenView/index.js index 41db77d..aa91bb4 100644 --- a/src/pages/Container/Supervision/Evaluation/HiddenView/index.js +++ b/src/pages/Container/Supervision/Evaluation/HiddenView/index.js @@ -1,10 +1,11 @@ import HiddenInfo from "zy-react-library/components/HiddenInfo/gwj"; +import Page from "zy-react-library/components/Page"; function HiddenView() { return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/HiddenEvaluationList/index.js b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/HiddenEvaluationList/index.js index dc4b943..10b455f 100644 --- a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/HiddenEvaluationList/index.js +++ b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/HiddenEvaluationList/index.js @@ -1,8 +1,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Descriptions, Form, message, Modal, Space } from "antd"; +import { Button, Descriptions, Form, message, Modal, Space, Spin } from "antd"; import { useEffect, useRef, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import DictionarySelectTree from "zy-react-library/components/SelectTree/Dictionary"; @@ -16,7 +16,7 @@ import { getLabelName } from "zy-react-library/utils"; import { NS_HIDDEN_EVALUATION } from "~/enumerate/namespace"; import ViewEvaluationModal from "../../components/ViewEvaluationModal"; -function List(props) { +function HiddenEvaluationList(props) { const query = useGetUrlQuery(); const [viewEvaluationModalOpen, setViewEvaluationModalOpen] = useState(false); const [evaluationModalOpen, setEvaluationModalOpen] = useState(false); @@ -32,80 +32,78 @@ function List(props) { leExchangeTime: formData.hiddenFindTime?.[1], }), }); + return ( -
- -
- ) }, - { name: "likeFindUserRealName", label: "隐患发现人" }, - { - name: "eqHiddenTypeC", - label: "隐患类型", - render: , + + ) }, + { name: "likeFindUserRealName", label: "隐患发现人" }, + { + name: "eqHiddenTypeC", + label: "隐患类型", + render: , + }, + { name: "hiddenFindTime", label: "兑换时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, + ]} + form={form} + onFinish={getData} + /> +
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.hiddenSource }), + }, + { title: "隐患描述", dataIndex: "hiddenDesc" }, + { title: "隐患发现时间", dataIndex: "findTime" }, + { title: "隐患发现人", dataIndex: "findUserName" }, + { title: "隐患验收人", dataIndex: "checkUserRealName" }, + { + title: "隐患状态", + dataIndex: "state", + render: () => { + return "已验收"; }, - { name: "hiddenFindTime", label: "兑换时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - ]} - form={form} - onFinish={getData} - /> -
getLabelName({ list: HIDDEN_SOURCE_ENUM, status: record.hiddenSource }), - }, - { title: "隐患描述", dataIndex: "hiddenDesc" }, - { title: "隐患发现时间", dataIndex: "findTime" }, - { title: "隐患发现人", dataIndex: "findUserName" }, - { title: "隐患验收人", dataIndex: "checkUserRealName" }, - { - title: "隐患状态", - dataIndex: "state", - render: () => { - return "已验收"; - }, - }, - { title: "考评组成员", dataIndex: "groupMembers" }, - { title: "兑换状态", dataIndex: "exchangeFlag", render: (_, record) => record.exchangeFlag === 1 ? "已兑换" : "未兑换" }, - { - title: "操作", - width: 230, - fixed: "right", - render: (_, record) => ( - - - - - ), - }, - ]} - {...tableProps} - /> - + }, + { title: "考评组成员", dataIndex: "groupMembers" }, + { title: "兑换状态", dataIndex: "exchangeFlag", render: (_, record) => record.exchangeFlag === 1 ? "已兑换" : "未兑换" }, + { + title: "操作", + width: 230, + fixed: "right", + render: (_, record) => ( + + + + + ), + }, + ]} + {...tableProps} + /> {viewEvaluationModalOpen && setViewEvaluationModalOpen(false)} hiddenId={currentHiddenId} />} {evaluationModalOpen && setEvaluationModalOpen(false)} hiddenId={currentHiddenId} getData={getData} />} - + ); } @@ -141,64 +139,66 @@ const EvaluationModalComponent = (props) => { return ( - ([ - { label: "考评人员", children: item.evaluateMemberName }, + + ([ + { label: "考评人员", children: item.evaluateMemberName }, + { + label: "是否符合", + children: (() => { + switch (item.evaluateResult) { + case 1: + return "考评合格"; + case 0: + return "考评不合格"; + default: + return "考核未完成"; + } + })(), + }, + ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), + ])), + ]} + /> + { - switch (item.evaluateResult) { - case 1: - return "考评合格"; - case 0: - return "考评不合格"; - default: - return "考核未完成"; - } - })(), + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [{ bianma: 1, name: "符合" }, { bianma: 0, name: "不符合" }], }, - ...(item.evaluateResult === 0 ? [{ label: "不符合原因", children: `111`, span: 2 }] : []), - ])), - ]} - /> - !(formValues.result === 0), - }, - ]} - /> + { + name: "resultCase", + label: "不符合原因", + render: FORM_ITEM_RENDER_ENUM.TEXTAREA, + dependencies: ["result"], + hidden: formValues => !(formValues.result === 0), + }, + ]} + /> + ); }; const EvaluationModal = Connect([NS_HIDDEN_EVALUATION], true)(EvaluationModalComponent); -export default Connect([NS_HIDDEN_EVALUATION], true)(List); +export default Connect([NS_HIDDEN_EVALUATION], true)(HiddenEvaluationList); diff --git a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/List/index.js b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/List/index.js index d0637bd..6e55c3b 100644 --- a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/List/index.js +++ b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/List/index.js @@ -1,6 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form } from "antd"; import { useMemo } from "react"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useTable from "zy-react-library/hooks/useTable"; @@ -102,21 +103,19 @@ function List(props) { ]; return ( -
-
- -
- - + + +
+ ); } diff --git a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeList/index.js b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeList/index.js index 565d3a5..a954d07 100644 --- a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeList/index.js +++ b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeList/index.js @@ -1,173 +1,9 @@ -import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Modal, Space, Spin } from "antd"; -import { useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; -import EditIcon from "zy-react-library/components/Icon/EditIcon"; -import ExportIcon from "zy-react-library/components/Icon/ExportIcon"; -import Search from "zy-react-library/components/Search"; -import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; -import Table from "zy-react-library/components/Table"; -import useDownloadBlob from "zy-react-library/hooks/useDownloadBlob"; -import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import useTable from "zy-react-library/hooks/useTable"; -import useUrlQueryCriteria from "zy-react-library/hooks/useUrlQueryCriteria"; -import { NS_HIDDEN_EVALUATION, NS_PERSONNEL_EVALUATION } from "~/enumerate/namespace"; - -function List(props) { - const query = useGetUrlQuery(); - const { loading: downloadBlobLoading, downloadBlob } = useDownloadBlob(); - const { getUrlCriteriaQuery } = useUrlQueryCriteria(); - const [selectedRowKeys, setSelectedRowKeys] = useState([]); - const [form] = Form.useForm(); - const { tableProps, getData } = useTable(props["personnelEvaluationUserExchangeList"], { - form, - params: { - eqCorpId: query.corpinfoId, - }, - }); - - const onBatchExchange = async () => { - if (!selectedRowKeys.length) { - message.warning("请选择需要兑换的人员"); - return; - } - Modal.confirm({ - title: "兑换确认", - content: "确定要兑换吗？", // 确定要兑换所有人得分吗 - onOk: async () => { - const success = await props["personnelEvaluationExchange"]({ userIds: selectedRowKeys }); - if (success) { - message.success("兑换成功"); - getData(); - } - }, - onCancel: () => { - message.warning("已取消兑换"); - }, - }); - }; - const OnRedeemAll = async () => { - Modal.confirm({ - title: "兑换确认", - content: "确定要兑换所有人得分吗?", // 确定要兑换所有人得分吗 - onOk: async () => { - const searchForm = getUrlCriteriaQuery("searchFormKeys", "searchFormValues"); - const success = await props["viewUserEvaluateConditionList"]({ likeFindUserRealName: searchForm.likeFindUserRealName, eqFindUserDeptId: searchForm.eqFindUserDeptId, corpId: query.corpinfoId }); - if (success) { - message.success("兑换成功"); - getData(); - } - }, - onCancel: () => { - message.warning("已取消兑换"); - }, - }); - }; - const onExportExcel = async () => { - if (!selectedRowKeys.length) { - message.warning("请选择需要导出的人员"); - return; - } - Modal.confirm({ - title: "导出确认", - content: "确定要导出excel吗？", - onOk: async () => { - await downloadBlob("/hidden/viewUserEvaluateConditionList/exportEvaluate", { params: { findUserIds: selectedRowKeys.join(",") } }); - message.success("导出成功"); - }, - onCancel: () => { - message.warning("已取消导出"); - }, - }); - }; +import UserExchangeListPage from "../../PersonnelEvaluation/UserExchangeList"; +function UserExchangeList(props) { return ( -
- -
- - ) }, - { name: "likeFindUserRealName", label: "姓名" }, - ]} - form={form} - onFinish={getData} - /> -
{ - setSelectedRowKeys(selectedRowKeys); - }, - }} - rowKey="findUserId" - toolBarRender={() => ( - - - - - - )} - columns={[ - { title: "用户名", dataIndex: "findUserName" }, - { title: "姓名", dataIndex: "findUserRealName" }, - { title: "部门", dataIndex: "findUserDeptName" }, - { title: "岗位", dataIndex: "findUserPositionsName" }, - { title: "奖励总得分", dataIndex: "totalScore" }, - { title: "已兑换分数", dataIndex: "alreadyExchange" }, - { title: "未兑换奖励数", dataIndex: "notExchanged", render: (_, record) => record.totalScore - record.alreadyExchange }, - { - title: "操作", - width: 200, - fixed: "right", - render: (_, record) => ( - - - - - ), - }, - ]} - {...tableProps} - /> - - - + ); } -export default Connect([NS_PERSONNEL_EVALUATION, NS_HIDDEN_EVALUATION], true)(List); +export default UserExchangeList; diff --git a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeRecordList/index.js b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeRecordList/index.js index 10c2ecf..2bcfe8f 100644 --- a/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeRecordList/index.js +++ b/src/pages/Container/Supervision/Evaluation/PerformanceEvaluationList/UserExchangeRecordList/index.js @@ -1,68 +1,9 @@ -import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; -import Search from "zy-react-library/components/Search"; -import Table from "zy-react-library/components/Table"; -import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; -import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import useTable from "zy-react-library/hooks/useTable"; -import { NS_PERSONNEL_EVALUATION } from "~/enumerate/namespace"; - -function List(props) { - const query = useGetUrlQuery(); - const [form] = Form.useForm(); - const { tableProps, getData } = useTable(props["personnelEvaluationUserExchangeRecordList"], { - form, - params: { - eqBelongerId: query.findUserId, - }, - transform: formData => ({ - geExchangeTime: formData.dates?.[0], - leExchangeTime: formData.dates?.[1], - }), - }); +import UserExchangeRecordListPage from "../../PersonnelEvaluation/UserExchangeRecordList"; +function UserExchangeRecordList(props) { return ( -
- -
- -
( - - - - ), - }, - ]} - {...tableProps} - /> - - + ); } -export default Connect([NS_PERSONNEL_EVALUATION], true)(List); +export default UserExchangeRecordList; diff --git a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/List/index.js b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/List/index.js index 4511bc8..3d08468 100644 --- a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/List/index.js +++ b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Table from "zy-react-library/components/Table"; @@ -14,53 +15,51 @@ function List(props) { }); return ( -
-
- ) }, - { name: "likeSafetyMembers", label: "考评组人员" }, - ]} - form={form} - onFinish={getData} - /> -
(`${record.alreadyExchange}/${record.alreadyExchange + record.notExchange}`), - }, - { title: "安全类隐患考评组成员", dataIndex: "safetyMembers" }, - { title: "环保类隐患考评组成员", dataIndex: "environmentalMembers" }, - { - title: "操作", - width: 100, - fixed: "right", - render: (_, record) => ( - - {props.permission("permission") && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - - + + ) }, + { name: "likeSafetyMembers", label: "考评组人员" }, + ]} + form={form} + onFinish={getData} + /> +
(`${record.alreadyExchange}/${record.alreadyExchange + record.notExchange}`), + }, + { title: "安全类隐患考评组成员", dataIndex: "safetyMembers" }, + { title: "环保类隐患考评组成员", dataIndex: "environmentalMembers" }, + { + title: "操作", + width: 100, + fixed: "right", + render: (_, record) => ( + + {props.permission("permission") && ( + + )} + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeList/index.js b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeList/index.js index 565d3a5..c752809 100644 --- a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeList/index.js +++ b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeList/index.js @@ -1,9 +1,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space, Spin } from "antd"; import { useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import EditIcon from "zy-react-library/components/Icon/EditIcon"; import ExportIcon from "zy-react-library/components/Icon/ExportIcon"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import Table from "zy-react-library/components/Table"; @@ -13,7 +13,7 @@ import useTable from "zy-react-library/hooks/useTable"; import useUrlQueryCriteria from "zy-react-library/hooks/useUrlQueryCriteria"; import { NS_HIDDEN_EVALUATION, NS_PERSONNEL_EVALUATION } from "~/enumerate/namespace"; -function List(props) { +function UserExchangeList(props) { const query = useGetUrlQuery(); const { loading: downloadBlobLoading, downloadBlob } = useDownloadBlob(); const { getUrlCriteriaQuery } = useUrlQueryCriteria(); @@ -82,92 +82,89 @@ function List(props) { }; return ( -
- -
- - ) }, - { name: "likeFindUserRealName", label: "姓名" }, - ]} - form={form} - onFinish={getData} - /> -
{ - setSelectedRowKeys(selectedRowKeys); - }, - }} - rowKey="findUserId" - toolBarRender={() => ( - - - - - - )} - columns={[ - { title: "用户名", dataIndex: "findUserName" }, - { title: "姓名", dataIndex: "findUserRealName" }, - { title: "部门", dataIndex: "findUserDeptName" }, - { title: "岗位", dataIndex: "findUserPositionsName" }, - { title: "奖励总得分", dataIndex: "totalScore" }, - { title: "已兑换分数", dataIndex: "alreadyExchange" }, - { title: "未兑换奖励数", dataIndex: "notExchanged", render: (_, record) => record.totalScore - record.alreadyExchange }, - { - title: "操作", - width: 200, - fixed: "right", - render: (_, record) => ( - - - - - ), - }, - ]} - {...tableProps} - /> - - - + + + ) }, + { name: "likeFindUserRealName", label: "姓名" }, + ]} + form={form} + onFinish={getData} + /> +
{ + setSelectedRowKeys(selectedRowKeys); + }, + }} + rowKey="findUserId" + toolBarRender={() => ( + + + + + + )} + columns={[ + { title: "用户名", dataIndex: "findUserName" }, + { title: "姓名", dataIndex: "findUserRealName" }, + { title: "部门", dataIndex: "findUserDeptName" }, + { title: "岗位", dataIndex: "findUserPositionsName" }, + { title: "奖励总得分", dataIndex: "totalScore" }, + { title: "已兑换分数", dataIndex: "alreadyExchange" }, + { title: "未兑换奖励数", dataIndex: "notExchanged", render: (_, record) => record.totalScore - record.alreadyExchange }, + { + title: "操作", + width: 200, + fixed: "right", + render: (_, record) => ( + + + + + ), + }, + ]} + {...tableProps} + /> + + ); } -export default Connect([NS_PERSONNEL_EVALUATION, NS_HIDDEN_EVALUATION], true)(List); +export default Connect([NS_PERSONNEL_EVALUATION, NS_HIDDEN_EVALUATION], true)(UserExchangeList); diff --git a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeRecordList/index.js b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeRecordList/index.js index 10c2ecf..5569c0d 100644 --- a/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeRecordList/index.js +++ b/src/pages/Container/Supervision/Evaluation/PersonnelEvaluation/UserExchangeRecordList/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -8,7 +8,7 @@ import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; import { NS_PERSONNEL_EVALUATION } from "~/enumerate/namespace"; -function List(props) { +function UserExchangeRecordList(props) { const query = useGetUrlQuery(); const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["personnelEvaluationUserExchangeRecordList"], { @@ -23,46 +23,43 @@ function List(props) { }); return ( -
- -
- -
( - - - - ), - }, - ]} - {...tableProps} - /> - - + + +
( + + + + ), + }, + ]} + {...tableProps} + /> + ); } -export default Connect([NS_PERSONNEL_EVALUATION], true)(List); +export default Connect([NS_PERSONNEL_EVALUATION], true)(UserExchangeRecordList); diff --git a/src/pages/Container/Supervision/Evaluation/components/ViewEvaluationModal/index.js b/src/pages/Container/Supervision/Evaluation/components/ViewEvaluationModal/index.js index a32c6c9..bec423d 100644 --- a/src/pages/Container/Supervision/Evaluation/components/ViewEvaluationModal/index.js +++ b/src/pages/Container/Supervision/Evaluation/components/ViewEvaluationModal/index.js @@ -18,11 +18,10 @@ const ViewEvaluationModal = (props) => { return ( 取消