diff --git a/jjb.config.js b/jjb.config.js index 3bf9bf4..21f2e7b 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -28,7 +28,7 @@ module.exports = { // 应用Key appKey: "", // fileUrl: "http://192.168.20.240:9787/mnt/", - fileUrl: "https://jpfz.qhdsafety.com/gbsFileTest/", + fileUrl: "", }, // public/index.html注入全局变量 windowInject: { diff --git a/package.json b/package.json index 765d5bc..7afaea0 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "react-to-print": "^3.2.0", - "zy-react-library": "^1.3.14" + "zy-react-library": "^1.3.17" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js index 0d7c1b5..3c306f3 100644 --- a/src/enumerate/constant/index.js +++ b/src/enumerate/constant/index.js @@ -21,4 +21,9 @@ export const HIDDEN_STATE_ENUM = [ { bianma: "98", name: "安全环保检查/清单排查暂存" }, { bianma: "102", name: "安全环保检查,隐患待指派" }, ]; +// 隐患来源 +export const HIDDEN_SOURCE_ENUM_XGF = [ + { bianma: "1", name: "隐患快报" }, + { bianma: "7", name: "视频巡屏" }, +]; export {}; diff --git a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js index 1c63088..3f69e21 100644 --- a/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js +++ b/src/pages/Container/BranchCompany/Average/Ledger/Add/index.js @@ -300,7 +300,7 @@ function Add(props) { checkUserId: undefined, checkUserName: undefined, } - : values; + : values; await deleteFile({ single: false, files: deleteHiddenImageFiles.current }); await deleteFile({ single: false, files: deleteHiddenVideoFiles.current }); await deleteFile({ single: false, files: deleteAfterRectificationImageFiles.current }); @@ -461,43 +461,11 @@ function Add(props) { hidden: !(isAi === 1), componentProps: { disabled: true, maxLength: 9999 }, }, - { - name: "hiddenLevel", - dependencies: ["isRelated"], - label: "隐患级别", - render: ( - form.setFieldValue("hiddenLevelName", label)} - /> - ), - }, - { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, - { - name: "hiddenType", - label: "隐患类型", - render: ( - form.setFieldValue("hiddenTypeName", label)} - onGetNodePaths={(nodes) => { - form.setFieldValue("hiddenType2", nodes[0].dictValue); - form.setFieldValue("hiddenType2Name", nodes[0].dictLabel); - }} - /> - ), - }, - { name: "hiddenTypeName", label: "隐患类型名称", onlyForLabel: true }, - { name: "hiddenType2", label: "隐患类型名称", onlyForLabel: true }, - { name: "hiddenType2Name", label: "隐患类型名称", onlyForLabel: true }, { name: "isRelated", label: "是否相关方", render: FORM_ITEM_RENDER_ENUM.RADIO, + span: !isRelated ? 24 : 12, items: IS_RELATED_ENUM.map(item => ({ ...item, bianma: +item.bianma })), componentProps: { onChange: () => { @@ -536,6 +504,40 @@ function Add(props) { }, }, { name: "projectName", label: "相关方项目名称", onlyForLabel: true }, + { + name: "hiddenLevel", + dependencies: ["isRelated"], + label: "隐患级别", + render: ( + form.setFieldValue("hiddenLevelName", label)} + /> + ), + }, + { name: "hiddenLevelName", label: "隐患级别名称", onlyForLabel: true }, + { + name: "hiddenType", + label: "隐患类型", + render: ( + form.setFieldValue("hiddenTypeName", label)} + onGetNodePaths={(nodes) => { + form.setFieldValue("hiddenType2", nodes[0].dictValue); + form.setFieldValue("hiddenType2Name", nodes[0].dictLabel); + }} + /> + ), + }, + { name: "hiddenTypeName", label: "隐患类型名称", onlyForLabel: true }, + { name: "hiddenType2", label: "隐患类型名称", onlyForLabel: true }, + { name: "hiddenType2Name", label: "隐患类型名称", onlyForLabel: true }, + { name: "hiddenPart", span: 24, diff --git a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js index 7b1744d..1b4065a 100644 --- a/src/pages/Container/BranchCompany/Average/Rectification/List/index.js +++ b/src/pages/Container/BranchCompany/Average/Rectification/List/index.js @@ -2,7 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space } from "antd"; import dayjs from "dayjs"; -import { useState } from "react"; +import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; @@ -14,18 +14,21 @@ import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { HIDDEN_RECTIFICATION_TYPE_ENUM, HIDDEN_SOURCE_ENUM, HIDDEN_STATE_ENUM } from "zy-react-library/enum/hidden/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; +import useGetUserInfo from "zy-react-library/hooks/useGetUserInfo"; import useTable from "zy-react-library/hooks/useTable"; import useUploadFile from "zy-react-library/hooks/useUploadFile"; import { getLabelName } from "zy-react-library/utils"; -import { IS_RELATED_ENUM } from "~/enumerate/constant"; +import { HIDDEN_SOURCE_ENUM_XGF, IS_RELATED_ENUM } from "~/enumerate/constant"; import { NS_RECTIFICATION } from "~/enumerate/namespace"; function List(props) { const [form] = Form.useForm(); + const { getUserInfo } = useGetUserInfo(); const [temporarySafetyMeasuresModalOpen, setTemporarySafetyMeasuresModalOpen] = useState(false); const [requestAnExtensionModalOpen, setRequestAnExtensionModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); const [rectificationDeadTime, setRectificationDeadTime] = useState(""); + const [userId, setUserId] = useState(""); const { tableProps, getData } = useTable(props["rectificationList"], { form, transform: formData => ({ @@ -34,12 +37,21 @@ function List(props) { hiddenLevels: ["hiddenLevel1004", "hiddenLevel1002"], }), }); + const getInfoData = async () => { + const data = await getUserInfo(); + console.log(data.id); + setUserId(data.id); + }; + + useEffect(() => { + getInfoData(); + }, []); return ( }, @@ -114,7 +126,7 @@ function List(props) { 查看 )} - {props.permission(props.zgButton || "fgs-yqzg-zg") && ( + {props.permission(props.zgButton || "fgs-yqzg-zg") && userId === record.rectifyUserId && ( )} - {props.permission(props.lsaqcsButton || "fgs-yqzg-lsaqcs") && ( + {props.permission(props.lsaqcsButton || "fgs-yqzg-lsaqcs") && userId === record.rectifyUserId && ( )} - {props.permission(props.sqyqButton || "fgs-yqzg-sqyq") && !record.noReviewExtensionNum && ( + {props.permission(props.sqyqButton || "fgs-yqzg-sqyq") && !record.noReviewExtensionNum && userId === record.rectifyUserId && (