From 9cfa1c171e1ebadebfd06cd2915d4bf26bb048f0 Mon Sep 17 00:00:00 2001 From: fangjiakai <450850793@qq.com> Date: Wed, 28 Jan 2026 09:03:12 +0800 Subject: [PATCH] =?UTF-8?q?style(confirm-user):=20=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81=E6=A0=B7=E5=BC=8F=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 统一导入语句格式，调整空格和括号位置 - 优化表格列配置的对齐方式和间距 - 调整按钮图标组件的标签闭合格式 - 修复删除按钮的条件渲染换行格式 - 更新表单字段的标签列宽度配置 - 添加人员选择组件的额外参数支持 - 优化确认范围相关字段的标签显示设置 --- .../Average/ConfirmUser/index.js | 54 ++++++++++--------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js index 6698532..1020830 100644 --- a/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js +++ b/src/pages/Container/BranchCompany/Average/ConfirmUser/index.js @@ -1,7 +1,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 { useEffect, useState } from "react"; +import {Permission} from "@cqsjjb/jjb-common-decorator/permission"; +import {Connect} from "@cqsjjb/jjb-dva-runtime"; +import {Button, 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"; @@ -10,13 +10,13 @@ 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"; import useTable from "zy-react-library/hooks/useTable"; -import { NS_CONFIRM_USER } from "~/enumerate/namespace"; +import {NS_CONFIRM_USER} from "~/enumerate/namespace"; function HiddenConfirmUser(props) { const [form] = Form.useForm(); const [addModalOpen, setAddModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); - const { tableProps, getData } = useTable(props["confirmUserList"], { + const {tableProps, getData} = useTable(props["confirmUserList"], { form, transform: formData => ({ hiddenFindTime: formData.hiddenFindTime?.[0], @@ -29,7 +29,7 @@ function HiddenConfirmUser(props) { title: "删除确认", content: "确定要删除吗？", onOk: async () => { - const { success } = await props["confirmUserDelete"]({ id }); + const {success} = await props["confirmUserDelete"]({id}); if (success) { message.success("删除成功"); getData(); @@ -41,10 +41,10 @@ function HiddenConfirmUser(props) { return ( }, + {name: "likeName", label: "姓名"}, + {name: "eqDeptId", label: "部门", render: }, ]} form={form} onFinish={getData} @@ -55,7 +55,7 @@ function HiddenConfirmUser(props) { {props.permission("fgs-yhqrr-xz") && ( )} - {props.permission("fgs-yhqrr-sc") && } + {props.permission("fgs-yhqrr-sc") && + } ), }, @@ -112,7 +113,7 @@ const AddModalComponent = (props) => { const [form] = Form.useForm(); const deptId = Form.useWatch("deptId", form); const getData = async () => { - const { data } = await props["confirmUserView"]({ id: props.id }); + const {data} = await props["confirmUserView"]({id: props.id}); form.setFieldsValue({ ...data, confirmRange: data.confirmRange.split(","), @@ -123,7 +124,7 @@ const AddModalComponent = (props) => { props.id && getData(); }, []); const onSubmit = async (values) => { - const { success } = await props[!props.id ? "confirmUserAdd" : "confirmUserUpdate"]({ + const {success} = await props[!props.id ? "confirmUserAdd" : "confirmUserUpdate"]({ ...values, confirmRange: values.confirmRange.join(","), confirmRangeName: values.confirmRangeName.join(","), @@ -150,7 +151,7 @@ const AddModalComponent = (props) => { loading={props.confirmUser.confirmUserLoading} form={form} span={24} - labelCol={{ span: 12 }} + labelCol={{span: 12}} showActionButtons={false} onFinish={onSubmit} options={[ @@ -170,14 +171,15 @@ const AddModalComponent = (props) => { /> ), }, - { name: "deptName", label: "部门名称", onlyForLabel: true }, + {name: "deptName", label: "部门名称", onlyForLabel: true}, { name: "userId", label: "隐患确认人", render: ( { form.setFieldValue("name", option.name); form.setFieldValue("userName", option.username); @@ -187,10 +189,10 @@ const AddModalComponent = (props) => { /> ), }, - { name: "name", label: "确认人", onlyForLabel: true }, - { name: "userName", label: "确认人", onlyForLabel: true }, - { name: "postName", label: "确认人", onlyForLabel: true }, - { name: "postId", label: "确认人", onlyForLabel: true }, + {name: "name", label: "确认人", onlyForLabel: true}, + {name: "userName", label: "确认人", onlyForLabel: true}, + {name: "postName", label: "确认人", onlyForLabel: true}, + {name: "postId", label: "确认人", onlyForLabel: true}, { name: "confirmRange", label: "确认范围(部门)", @@ -204,7 +206,7 @@ const AddModalComponent = (props) => { /> ), }, - { name: "confirmRangeName", label: "确认范围(部门)名称", onlyForLabel: true }, + {name: "confirmRangeName", label: "确认范围(部门)名称", onlyForLabel: true}, ]} />