From 14aa36fb66e79db9a63cd6fd2185f8e23b96b0f2 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 29 Dec 2025 14:07:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../BranchCompany/Average/Ledger/Add/index.js | 8 +++---- .../Average/Ledger/List/index.js | 9 ++++++-- .../Average/Rectification/Review/index.js | 22 +++++++++++-------- .../Average/Average/HiddenList/index.js | 7 +++++- 5 files changed, 31 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index ea6c363..d2549e7 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.1.4" + "zy-react-library": "^1.1.10" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 37aa299..64bb752 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -266,9 +266,9 @@ function Add(props) { hiddenImageFiles, }); form.setFieldValue("isAi", 1); - form.setFieldValue("hiddenDesc", selectHiddens.current[currentProcessHiddenIndex.current + 1].hiddenDescr); - form.setFieldValue("legalBasis", selectHiddens.current[currentProcessHiddenIndex.current + 1].legalBasis); - form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current + 1].rectificationSuggestions); + form.setFieldValue("hiddenDesc", selectHiddens.current[currentProcessHiddenIndex.current].hiddenDescr); + form.setFieldValue("legalBasis", selectHiddens.current[currentProcessHiddenIndex.current].legalBasis); + form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current].rectificationSuggestions); form.setFieldValue("hiddenFindDept", userInfo.current.departmentId); form.setFieldValue("creatorId", userInfo.current.id); form.setFieldValue("hiddenFindDeptName", userInfo.current.departmentName); @@ -530,7 +530,7 @@ function Add(props) { componentProps: { onChange: (value) => { if (isAi === 1) { - form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current + 1].rectificationSuggestions); + form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current].rectificationSuggestions); } if (value.target.value === 2) { if (isRelated === 0) { diff --git a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js index bf5b1c0..e47adf1 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/List/index.js @@ -95,7 +95,12 @@ function List(props) { ), }, { name: "creatorName", label: "隐患发现人" }, - { name: "state", label: "隐患状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_STATE_ENUM }, + { + name: "state", + label: "隐患状态", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: HIDDEN_STATE_ENUM.filter(item => !["98", "102"].includes(item.bianma)), + }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, { name: "rectificationDeptId", label: "整改部门", render: }, @@ -235,7 +240,7 @@ function List(props) { { title: "隐患状态", dataIndex: "state", - render: (_, record) => record.hiddenLevelName !== "忽略隐患" ? getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }) : "", + render: (_, record) => getLabelName({ list: HIDDEN_STATE_ENUM, status: record.state }), }, { title: "操作", diff --git a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js index 52bf764..0e8ad45 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/Review/index.js @@ -11,6 +11,7 @@ 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"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; +import useIsExistenceDuplicateSelection from "zy-react-library/hooks/useIsExistenceDuplicateSelection"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; import { NS_RECTIFICATION } from "~/enumerate/namespace"; @@ -21,10 +22,12 @@ function Rectification(props) { const isRectificationScheme = Form.useWatch("isRectificationScheme", form); const hiddenUserAddCmds = Form.useWatch("hiddenUserAddCmds", form); const { loading: uploadFileLoading, uploadFile } = useUploadFile(); + const { isExistenceDuplicateSelection } = useIsExistenceDuplicateSelection(); const [data, setData] = useState({}); const onSubmit = async (values) => { + await isExistenceDuplicateSelection({ data: values.hiddenUserAddCmds || [], key: "userId", message: "验收人不能重复" }); const { id: afterRectificationImageId } = await uploadFile({ single: false, files: values.afterRectificationImageFiles, @@ -99,6 +102,7 @@ function Rectification(props) { ), }, - { name: [field.name, "deptName"], deptName: "验收部门名称", onlyForLabel: true }, - { name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, - { name: [field.name, "userName"], deptName: "验收人名称", onlyForLabel: true }, + { name: [field.name, "deptName"], label: "验收部门名称", onlyForLabel: true }, + { name: [field.name, "type"], label: "用户类型", onlyForLabel: true }, + { name: [field.name, "userName"], label: "验收人名称", onlyForLabel: true }, { name: [field.name, "userId"], - deptName: "验收人", + label: "验收人", span: 12, rules: [{ validator: (_, value) => { // 获取已存在的用户名 - const confirmUserName = data?.hiddenConfirmUserCO?.rectifyUserId; + const confirmUserName = data.hiddenConfirmUserCO?.[0]?.rectifyUserId; const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId; // 验证是否与已有用户名相同 @@ -201,10 +205,10 @@ function Rectification(props) { 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: [field.name, "deptId"], label: "验收部门id", onlyForLabel: true }, + { name: [field.name, "type"], label: "用户类型", onlyForLabel: true }, + { name: [field.name, "userId"], label: "验收人id", onlyForLabel: true }, + { name: [field.name, "userName"], label: "验收人", span: 12, componentProps: { disabled: true } }, ]), }, }, diff --git a/src/pages/Container/Supervision/Average/Average/HiddenList/index.js b/src/pages/Container/Supervision/Average/Average/HiddenList/index.js index 7d8bff8..3ee517c 100644 --- a/src/pages/Container/Supervision/Average/Average/HiddenList/index.js +++ b/src/pages/Container/Supervision/Average/Average/HiddenList/index.js @@ -82,7 +82,12 @@ function HiddenList(props) { render: , }, { name: "creatorName", label: "隐患发现人" }, - { name: "state", label: "隐患状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: HIDDEN_STATE_ENUM }, + { + name: "state", + label: "隐患状态", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: HIDDEN_STATE_ENUM.filter(item => !["98", "102"].includes(item.bianma)), + }, { name: "confirmUserName", label: "确认人" }, { name: "rectificationUserName", label: "整改人" }, { name: "rectificationDeptId", label: "整改部门", render: },