From 0fba48d93ef02af0b163062ca7bc8a50b3fad9e7 Mon Sep 17 00:00:00 2001 From: LiuJiaNan <15703339975@163.com> Date: Mon, 22 Dec 2025 14:52:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=9A12737=E3=80=81126?= =?UTF-8?q?53=E3=80=8112641=E3=80=8112640=E3=80=8112634=E3=80=8112630?= =?UTF-8?q?=E3=80=8112622=E3=80=8112621=E3=80=8112620=E3=80=8112613?= =?UTF-8?q?=E3=80=8112607=E3=80=8112604=E3=80=8112433=E3=80=8112418?= =?UTF-8?q?=E3=80=8112402?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/api/specialDisposal/index.js | 4 - .../Average/Confirm/Review/index.js | 334 +++++++++--------- .../BranchCompany/Average/Ledger/Add/index.js | 58 +-- .../BranchCompany/Average/Part/index.js | 2 - .../Average/Postponement/List/index.js | 2 +- .../Average/SpecialDisposal/List/index.js | 2 +- .../SpecialDisposal/HiddenList/index.js | 6 +- 8 files changed, 213 insertions(+), 197 deletions(-) diff --git a/package.json b/package.json index 88cbed4..069aa3a 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.164" + "zy-react-library": "^1.0.176" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/api/specialDisposal/index.js b/src/api/specialDisposal/index.js index 89999a6..90cb4b9 100644 --- a/src/api/specialDisposal/index.js +++ b/src/api/specialDisposal/index.js @@ -16,7 +16,3 @@ export const specialDisposalCorpInfoCountList = declareRequest( "specialDisposalLoading", "Post > @/hidden/hidden/extensionHiddenListByCorp", ); -export const specialDisposalByCorpInfoList = declareRequest( - "ignoreLoading", - "Post > @/hidden/hidden/extensionHiddenList", -); diff --git a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js index 51f3e27..aa4b503 100644 --- a/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js +++ b/src/pages/Container/BranchCompany/Average/Confirm/Review/index.js @@ -61,172 +61,178 @@ function Confirm(props) { /> 隐患确认
- setRejectModalOpen(true)}>打回, - ]} - options={[ - ...(!isFromInspection - ? [ - { - name: "hiddenLevel", - label: "隐患级别", - span: 24, - render: ( - { - form.setFieldValue("deptName", ""); - form.setFieldValue("userName", ""); - form.setFieldValue("deptName", ""); - form.setFieldValue("userName", ""); - form.setFieldValue("checkDeptName", ""); - form.setFieldValue("checkUserName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("hiddenLevelName", label); - }} - /> - ), - }, - ] - : []), - { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, - ...( - hiddenLevel !== "hiddenLevel1001" - ? [ - ...( - data.rectificationType === 2 - ? [ - { - name: "deptId", - label: "整改负责人部门", - render: ( - { - form.setFieldValue("userId", ""); + { + Object.keys(data).length > 0 + ? ( + setRejectModalOpen(true)}>打回, + ]} + options={[ + ...(!isFromInspection + ? [ + { + name: "hiddenLevel", + label: "隐患级别", + span: 24, + render: ( + { + if (event === "hiddenLevel1001") { + form.setFieldValue("deptName", ""); form.setFieldValue("userName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("deptName", label); - }} - /> - ), - }, - { name: "deptName", label: "整改负责人部门名称", onlyForLabel: true }, - { - name: "userId", - label: "整改负责人", - render: ( - form.setFieldValue("userName", label)} - /> - ), - }, - { name: "userName", label: "整改负责人名称", onlyForLabel: true }, - { - name: "rectificationDeadline", - label: "整改完成期限", - render: FORM_ITEM_RENDER_ENUM.DATE, - span: 24, - }, - ] - : [ - { - name: "rectificationType", - label: "是否立即整改", - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 1, name: "是" }, { bianma: 2, name: "否" }], - span: 24, - componentProps: { - onChange: () => { - form.setFieldValue("checkDeptName", ""); - form.setFieldValue("checkUserName", ""); - }, - }, - }, - { - name: "deptId", - label: "整改负责人部门", - render: ( - { - form.setFieldValue("userId", ""); - form.setFieldValue("userName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("deptName", label); - }} - /> - ), - }, - { name: "deptName", label: "整改负责人部门名称", onlyForLabel: true }, - { - name: "userId", - label: "整改负责人", - render: ( - form.setFieldValue("userName", label)} - /> - ), - }, - { name: "userName", label: "整改负责人名称", onlyForLabel: true }, - { - name: "rectificationDeadline", - label: "整改完成期限", - render: FORM_ITEM_RENDER_ENUM.DATE, - span: 24, - dependencies: ["rectificationType"], - hidden: formValues => !(formValues.rectificationType === 2), - }, - { - name: "checkDeptId", - label: "验收部门", - required: false, - dependencies: ["rectificationType"], - hidden: formValues => !(formValues.rectificationType === 1), - render: ( - { - form.setFieldValue("checkUserId", ""); + form.setFieldValue("checkDeptName", ""); form.setFieldValue("checkUserName", ""); - }} - onGetLabel={(label) => { - form.setFieldValue("checkDeptName", label); - }} - /> - ), - }, - { name: "checkDeptName", label: "验收部门名称", onlyForLabel: true }, - { - name: "checkUserId", - label: "验收人", - required: false, - dependencies: ["rectificationType"], - hidden: formValues => !(formValues.rectificationType === 1), - render: ( - form.setFieldValue("checkUserName", label)} - /> - ), - }, - { name: "checkUserName", label: "验收人名称", onlyForLabel: true }, - ]), - ] - : [] - ), - ]} - /> + } + }} + onGetLabel={(label) => { + form.setFieldValue("hiddenLevelName", label); + }} + /> + ), + }, + ] + : []), + { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, + ...( + hiddenLevel !== "hiddenLevel1001" + ? [ + ...( + data.rectificationType === 2 + ? [ + { + name: "deptId", + label: "整改负责人部门", + render: ( + { + form.setFieldValue("userId", ""); + form.setFieldValue("userName", ""); + }} + onGetLabel={(label) => { + form.setFieldValue("deptName", label); + }} + /> + ), + }, + { name: "deptName", label: "整改负责人部门名称", onlyForLabel: true }, + { + name: "userId", + label: "整改负责人", + render: ( + form.setFieldValue("userName", label)} + /> + ), + }, + { name: "userName", label: "整改负责人名称", onlyForLabel: true }, + { + name: "rectificationDeadline", + label: "整改完成期限", + render: FORM_ITEM_RENDER_ENUM.DATE, + span: 24, + }, + ] + : [ + { + name: "rectificationType", + label: "是否立即整改", + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 2, name: "否" }], + span: 24, + componentProps: { + onChange: () => { + form.setFieldValue("checkDeptName", ""); + form.setFieldValue("checkUserName", ""); + }, + }, + }, + { + name: "deptId", + label: "整改负责人部门", + render: ( + { + form.setFieldValue("userId", ""); + form.setFieldValue("userName", ""); + }} + onGetLabel={(label) => { + form.setFieldValue("deptName", label); + }} + /> + ), + }, + { name: "deptName", label: "整改负责人部门名称", onlyForLabel: true }, + { + name: "userId", + label: "整改负责人", + render: ( + form.setFieldValue("userName", label)} + /> + ), + }, + { name: "userName", label: "整改负责人名称", onlyForLabel: true }, + { + name: "rectificationDeadline", + label: "整改完成期限", + render: FORM_ITEM_RENDER_ENUM.DATE, + span: 24, + dependencies: ["rectificationType"], + hidden: formValues => !(formValues.rectificationType === 2), + }, + { + name: "checkDeptId", + label: "验收部门", + required: false, + dependencies: ["rectificationType"], + hidden: formValues => !(formValues.rectificationType === 1), + render: ( + { + form.setFieldValue("checkUserId", ""); + form.setFieldValue("checkUserName", ""); + }} + onGetLabel={(label) => { + form.setFieldValue("checkDeptName", label); + }} + /> + ), + }, + { name: "checkDeptName", label: "验收部门名称", onlyForLabel: true }, + { + name: "checkUserId", + label: "验收人", + required: false, + dependencies: ["rectificationType"], + hidden: formValues => !(formValues.rectificationType === 1), + render: ( + form.setFieldValue("checkUserName", label)} + /> + ), + }, + { name: "checkUserName", label: "验收人名称", onlyForLabel: true }, + ]), + ] + : [] + ), + ]} + /> + ) + : null + }
{rejectModalOpen && setRejectModalOpen(false)} data={data} />} diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 0f6bd12..e3d6b73 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -19,7 +19,7 @@ import useGetFile from "zy-react-library/hooks/useGetFile"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; -import { createGuid, getLabelName } from "zy-react-library/utils"; +import { createGuid, getFileUrl, getLabelName } from "zy-react-library/utils"; import ai_recognize from "~/assets/images/ai_recognize.png"; import { IS_RELATED_ENUM } from "~/enumerate/constant"; import { NS_CONFIRM_USER, NS_LEDGER, NS_PART } from "~/enumerate/namespace"; @@ -43,6 +43,7 @@ function Add(props) { const [uploadedImages, setUploadedImages] = useState([]); const [modalTitle, setModalTitle] = useState("选择图片进行AI识别"); const [isShowAiButton, setIsShowAiButton] = useState(true); + const [userInfo, setUserInfo] = useState({}); const [hiddenPartType, setHiddenPartType] = useState("select"); const [confirmUserList, setConfirmUserList] = useState([]); @@ -51,8 +52,6 @@ function Add(props) { const deleteHiddenVideoFiles = useRef([]); const deleteAfterRectificationImageFiles = useRef([]); - const hiddenUserId = useRef(""); - const { getUserInfo } = useGetUserInfo(); const { loading: deleteFileLoading, deleteFile } = useDeleteFile(); const { loading: uploadFileLoading, uploadFile } = useUploadFile(); @@ -63,9 +62,9 @@ function Add(props) { const { data } = await props["hiddenView"]({ id: query.id }); const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["3"], eqForeignKey: query.hiddenId }); const hiddenVideoFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["102"], eqForeignKey: query.hiddenId }); + // const hiddenConfirmUserCO = data?.hiddenConfirmUserCO?.[0] || {}; const hiddenRectifyUserCO = data?.hiddenRectifyUserCO?.[0] || {}; - const hiddenAcceptUserCO = data?.hiddenAcceptUserCO?.[0] || {}; - const hiddenConfirmUserCO = data?.hiddenConfirmUserCO?.[0] || {}; + // const hiddenAcceptUserCO = data?.hiddenAcceptUserCO?.[0] || {}; let afterRectificationImageFiles = []; if (hiddenRectifyUserCO.hiddenUserId) { afterRectificationImageFiles = await getFile({ @@ -78,22 +77,37 @@ function Add(props) { hiddenImageFiles, hiddenVideoFiles, afterRectificationImageFiles, - confirmUserId: hiddenConfirmUserCO.userId, - rectificationDeptId: hiddenRectifyUserCO.deptId, - rectificationDeptName: hiddenRectifyUserCO.deptName, - rectificationUserId: hiddenRectifyUserCO.userId, - rectificationUserName: hiddenRectifyUserCO.userName, + confirmUserId: "", + confirmUserName: "", + confirmDeptName: "", + confirmDeptId: "", + rectificationDeptId: "", + rectificationDeptName: "", + rectificationUserId: "", + rectificationUserName: "", + checkDeptId: "", + checkDeptName: "", + checkUserId: "", + checkUserName: "", + // confirmUserId: hiddenConfirmUserCO.userId, + // confirmUserName: hiddenConfirmUserCO.userName, + // confirmDeptId: hiddenConfirmUserCO.deptId, + // confirmDeptName: hiddenConfirmUserCO.deptName, + // rectificationDeptId: hiddenRectifyUserCO.deptId, + // rectificationDeptName: hiddenRectifyUserCO.deptName, + // rectificationUserId: hiddenRectifyUserCO.userId, + // rectificationUserName: hiddenRectifyUserCO.userName, + // checkDeptId: hiddenAcceptUserCO.deptId, + // checkDeptName: hiddenAcceptUserCO.deptName, + // checkUserId: hiddenAcceptUserCO.userId, + // checkUserName: hiddenAcceptUserCO.userName, rectificationDescr: hiddenRectifyUserCO.descr, - checkDeptId: hiddenAcceptUserCO.deptId, - checkDeptName: hiddenAcceptUserCO.deptName, - checkUserId: hiddenAcceptUserCO.userId, - checkUserName: hiddenAcceptUserCO.userName, isRelated: data.isRelated.toString(), }); - hiddenUserId.current = hiddenRectifyUserCO.hiddenUserId; } else { const userInfo = await getUserInfo(); + setUserInfo(userInfo); form.setFieldsValue({ hiddenFindDept: userInfo.departmentId, creatorId: userInfo.id, @@ -124,15 +138,15 @@ function Add(props) { }; const getAIHiddenImageRecognize = async (imageToProcess) => { - // const { filePath } = await uploadFile({ files: [imageToProcess], params: { type: UPLOAD_FILE_TYPE_ENUM["3"] } }); - const { data } = await props["hiddenAiRecognize"]({ hiddenUrl: "https://pic.rmb.bdstatic.com/bjh/news/0a68c2681805fcaea506d922f024420c.png" }); - // const { data } = await props["hiddenAiRecognize"]({ hiddenUrl: getFileUrl() + filePath }); + const { filePath } = await uploadFile({ files: [imageToProcess], params: { type: UPLOAD_FILE_TYPE_ENUM["3"] } }); + // const { data } = await props["hiddenAiRecognize"]({ hiddenUrl: "https://pic.rmb.bdstatic.com/bjh/news/0a68c2681805fcaea506d922f024420c.png" }); + const { data } = await props["hiddenAiRecognize"]({ hiddenUrl: getFileUrl() + filePath }); if (data?.aiHiddens) { processedImageUids.current.push(imageToProcess.uid); setAiHiddens(data?.aiHiddens.map(item => ({ ...JSON.parse(item), id: createGuid() }))); setAiHiddenModalOpen(true); clearHiddenRecognizeState(); - // await deleteFile({ files: [{ filePath }] }); + await deleteFile({ files: [{ filePath }] }); } }; @@ -211,7 +225,7 @@ function Add(props) { const { id: afterRectificationImageId } = await uploadFile({ single: false, files: values.afterRectificationImageFiles, - params: { type: UPLOAD_FILE_TYPE_ENUM["4"], foreignKey: hiddenUserId.current }, + params: { type: UPLOAD_FILE_TYPE_ENUM["4"], foreignKey: "" }, }); let hiddenPart = values.hiddenPart; if (hiddenPartType === "input") { @@ -255,6 +269,10 @@ function Add(props) { form.setFieldValue("hiddenDesc", selectHiddens[currentProcessHiddenIndex + 1].hiddenDescr); form.setFieldValue("legalBasis", selectHiddens[currentProcessHiddenIndex + 1].legalBasis); form.setFieldValue("rectificationDescr", selectHiddens[currentProcessHiddenIndex + 1].rectificationSuggestions); + form.setFieldValue("hiddenFindDept", userInfo.departmentId); + form.setFieldValue("creatorId", userInfo.id); + form.setFieldValue("hiddenFindDeptName", userInfo.departmentName); + form.setFieldValue("creatorName", userInfo.name); } else { props.history.goBack(); diff --git a/src/pages/Container/BranchCompany/Average/Part/index.js b/src/pages/Container/BranchCompany/Average/Part/index.js index 9629b27..ca57d3b 100644 --- a/src/pages/Container/BranchCompany/Average/Part/index.js +++ b/src/pages/Container/BranchCompany/Average/Part/index.js @@ -229,7 +229,6 @@ const AddModalComponent = (props) => { { name: "responsibleDeptId", label: "负责部门", - span: 12, required: false, render: ( { { name: "responsibleUserId", label: "负责人", - span: 12, required: false, render: ( ({ hiddenFindTime: formData.hiddenFindTime?.[0], hiddenFindTimeLe: formData.hiddenFindTime?.[1], }), - params: { - corpId: query.corpId, - }, + params: { corpId: query.corpId, entry: 1 }, }); const onExportExcel = async () => {