zcloud_gbs
/
zcloud_gbs_hidden-react
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复

master
LiuJiaNan 2025-12-29 14:07:55 +08:00
parent 3a99f0b5ff
commit 14aa36fb66
5 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -31,7 +31,7 @@
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"react-to-print": "^3.2.0", "react-to-print": "^3.2.0",
"zy-react-library": "^1.1.4" "zy-react-library": "^1.1.10"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",

8
src/pages/Container/BranchCompany/Average/Ledger/Add/index.js
View File

@ -266,9 +266,9 @@ function Add(props) {
hiddenImageFiles, hiddenImageFiles,
}); });
form.setFieldValue("isAi", 1); form.setFieldValue("isAi", 1);
form.setFieldValue("hiddenDesc", selectHiddens.current[currentProcessHiddenIndex.current + 1].hiddenDescr); form.setFieldValue("hiddenDesc", selectHiddens.current[currentProcessHiddenIndex.current].hiddenDescr);
form.setFieldValue("legalBasis", selectHiddens.current[currentProcessHiddenIndex.current + 1].legalBasis); form.setFieldValue("legalBasis", selectHiddens.current[currentProcessHiddenIndex.current].legalBasis);
form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current + 1].rectificationSuggestions); form.setFieldValue("rectificationDescr", selectHiddens.current[currentProcessHiddenIndex.current].rectificationSuggestions);
form.setFieldValue("hiddenFindDept", userInfo.current.departmentId); form.setFieldValue("hiddenFindDept", userInfo.current.departmentId);
form.setFieldValue("creatorId", userInfo.current.id); form.setFieldValue("creatorId", userInfo.current.id);
form.setFieldValue("hiddenFindDeptName", userInfo.current.departmentName); form.setFieldValue("hiddenFindDeptName", userInfo.current.departmentName);
@ -530,7 +530,7 @@ function Add(props) {
componentProps: { componentProps: {
onChange: (value) => { onChange: (value) => {
if (isAi === 1) { 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 (value.target.value === 2) {
if (isRelated === 0) { if (isRelated === 0) {

9
src/pages/Container/BranchCompany/Average/Ledger/List/index.js
View File

@ -95,7 +95,12 @@ function List(props) {
), ),
}, },
{ name: "creatorName", label: "隐患发现人" }, { 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: "confirmUserName", label: "确认人" },
{ name: "rectificationUserName", label: "整改人" }, { name: "rectificationUserName", label: "整改人" },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> }, { name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> },
@ -235,7 +240,7 @@ function List(props) {
{ {
title: "隐患状态", title: "隐患状态",
dataIndex: "state", 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: "操作", title: "操作",

22
src/pages/Container/BranchCompany/Average/Rectification/Review/index.js
View File

@ -11,6 +11,7 @@ import Upload from "zy-react-library/components/Upload";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; 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 useUploadFile from "zy-react-library/hooks/useUploadFile";
import { NS_RECTIFICATION } from "~/enumerate/namespace"; import { NS_RECTIFICATION } from "~/enumerate/namespace";
@ -21,10 +22,12 @@ function Rectification(props) {
const isRectificationScheme = Form.useWatch("isRectificationScheme", form); const isRectificationScheme = Form.useWatch("isRectificationScheme", form);
const hiddenUserAddCmds = Form.useWatch("hiddenUserAddCmds", form); const hiddenUserAddCmds = Form.useWatch("hiddenUserAddCmds", form);
const { loading: uploadFileLoading, uploadFile } = useUploadFile(); const { loading: uploadFileLoading, uploadFile } = useUploadFile();
const { isExistenceDuplicateSelection } = useIsExistenceDuplicateSelection();
const [data, setData] = useState({}); const [data, setData] = useState({});
const onSubmit = async (values) => { const onSubmit = async (values) => {
await isExistenceDuplicateSelection({ data: values.hiddenUserAddCmds || [], key: "userId", message: "验收人不能重复" });
const { id: afterRectificationImageId } = await uploadFile({ const { id: afterRectificationImageId } = await uploadFile({
single: false, single: false,
files: values.afterRectificationImageFiles, files: values.afterRectificationImageFiles,
@ -99,6 +102,7 @@ function Rectification(props) {
<FormBuilder <FormBuilder
values={{ values={{
status: 1, status: 1,
isRectificationScheme: 0,
}} }}
span={24} span={24}
form={form} form={form}
@ -160,17 +164,17 @@ function Rectification(props) {
/> />
), ),
}, },
{ name: [field.name, "deptName"], deptName: "验收部门名称", onlyForLabel: true }, { name: [field.name, "deptName"], label: "验收部门名称", onlyForLabel: true },
{ name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, { name: [field.name, "type"], label: "用户类型", onlyForLabel: true },
{ name: [field.name, "userName"], deptName: "验收人名称", onlyForLabel: true }, { name: [field.name, "userName"], label: "验收人名称", onlyForLabel: true },
{ {
name: [field.name, "userId"], name: [field.name, "userId"],
deptName: "验收人", label: "验收人",
span: 12, span: 12,
rules: [{ rules: [{
validator: (_, value) => { validator: (_, value) => {
// 获取已存在的用户名 // 获取已存在的用户名
const confirmUserName = data?.hiddenConfirmUserCO?.rectifyUserId; const confirmUserName = data.hiddenConfirmUserCO?.[0]?.rectifyUserId;
const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId; const presetUserName = data?.hiddenUserPresetsCO?.rectifyUserId;
// 验证是否与已有用户名相同 // 验证是否与已有用户名相同
@ -201,10 +205,10 @@ function Rectification(props) {
showRemoveButton: false, showRemoveButton: false,
options: field => ([ options: field => ([
{ name: [field.name, "deptName"], label: "验收部门", span: 12, componentProps: { disabled: true } }, { name: [field.name, "deptName"], label: "验收部门", span: 12, componentProps: { disabled: true } },
{ name: [field.name, "deptId"], deptName: "验收部门id", onlyForLabel: true }, { name: [field.name, "deptId"], label: "验收部门id", onlyForLabel: true },
{ name: [field.name, "type"], deptName: "用户类型", onlyForLabel: true }, { name: [field.name, "type"], label: "用户类型", onlyForLabel: true },
{ name: [field.name, "userId"], deptName: "验收人id", onlyForLabel: true }, { name: [field.name, "userId"], label: "验收人id", onlyForLabel: true },
{ name: [field.name, "userName"], deptName: "验收人", span: 12, componentProps: { disabled: true } }, { name: [field.name, "userName"], label: "验收人", span: 12, componentProps: { disabled: true } },
]), ]),
}, },
}, },

7
src/pages/Container/Supervision/Average/Average/HiddenList/index.js
View File

@ -82,7 +82,12 @@ function HiddenList(props) {
render: <HiddenLevelSelectTree isShowNeglect={false} isShowLarger={false} isShowMajor={false} />, render: <HiddenLevelSelectTree isShowNeglect={false} isShowLarger={false} isShowMajor={false} />,
}, },
{ name: "creatorName", label: "隐患发现人" }, { 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: "confirmUserName", label: "确认人" },
{ name: "rectificationUserName", label: "整改人" }, { name: "rectificationUserName", label: "整改人" },
{ name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> }, { name: "rectificationDeptId", label: "整改部门", render: <DepartmentSelectTree /> },