diff --git a/src/pages/Container/Enterprise/CorpInfo/Info/index.js b/src/pages/Container/Enterprise/CorpInfo/Info/index.js
index 10d337c..d19a418 100644
--- a/src/pages/Container/Enterprise/CorpInfo/Info/index.js
+++ b/src/pages/Container/Enterprise/CorpInfo/Info/index.js
@@ -29,11 +29,11 @@ function Info(props) {
{ label: "主要负责人手机号", children: "Zhou" },
{ label: "安全负责人", children: "Zhou" },
{ label: "安全负责人手机号", children: "Zhou" },
- { label: "隶属关系", children: "Zhou" },
{ label: "是否规模以上", children: "Zhou" },
{ label: "企事业单位经营地址", children: "Zhou" },
{ label: "企业状态", children: "Zhou" },
{ label: "营业执照", children: "Zhou" },
+ { label: "营业执照有效期", children: "Zhou" },
]}
/>
企业相关属性
diff --git a/src/pages/Container/Enterprise/CorpInfo/Update/index.js b/src/pages/Container/Enterprise/CorpInfo/Update/index.js
index 97d2f03..36103eb 100644
--- a/src/pages/Container/Enterprise/CorpInfo/Update/index.js
+++ b/src/pages/Container/Enterprise/CorpInfo/Update/index.js
@@ -25,18 +25,35 @@ function Update() {
{
- form.setFieldValue("FOUR_IMAGES", undefined);
- },
- },
- },
- {
- label: "四色图",
- name: "FOUR_IMAGES",
- required: false,
- span: 24,
- dependencies: ["FOURTYPE"],
- hidden: formValues => !(formValues.FOURTYPE === "1"),
- render: ({ value, onChange }) => ,
- },
+ { label: "企事业单位经营地址", name: "ADDRESS_BUSINESS" },
+ { label: "成立时间", name: "CREATE_DATE", render: FORM_ITEM_RENDER_ENUM.DATE },
{
label: "营业执照",
name: "BUS_IMAGES",
span: 24,
- render: ({ value, onChange }) => ,
+ render: ({ value, onChange }) => ,
},
{ label: "企业相关属性", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
{
@@ -154,6 +143,7 @@ function Update() {
required: false,
render: FORM_ITEM_RENDER_ENUM.RADIO,
items: WHETHER_ENUM,
+ formItemProps: {},
},
{
label: "是否涉及危化品",
diff --git a/src/pages/Container/Enterprise/IndustryQualification/List/index.js b/src/pages/Container/Enterprise/IndustryQualification/List/index.js
index 80228d3..9e3cb69 100644
--- a/src/pages/Container/Enterprise/IndustryQualification/List/index.js
+++ b/src/pages/Container/Enterprise/IndustryQualification/List/index.js
@@ -1,4 +1,5 @@
import { Button, Form, message, Modal, Space } from "antd";
+import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
@@ -26,10 +27,11 @@ function List(props) {
{ name: "name", label: "证书有效期", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE },
]}
form={form}
+ onFinish={getData}
/>
(
-
+ } onClick={() => props.history.push("./add")}>新增
)}
columns={[
{ title: "证书名称", dataIndex: "name" },
diff --git a/src/pages/Container/Enterprise/OrganizationStructure/index.js b/src/pages/Container/Enterprise/OrganizationStructure/index.js
index 8b98c1c..4f682e5 100644
--- a/src/pages/Container/Enterprise/OrganizationStructure/index.js
+++ b/src/pages/Container/Enterprise/OrganizationStructure/index.js
@@ -1,12 +1,13 @@
import { Button, Form, message, Modal, Space, Tag } 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 BackIcon from "zy-react-library/components/Icon/BackIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable";
-import { PHONE } from "zy-react-library/regular";
const DEPARTMENT_LEVEL_ENUM = [
{ id: "departmentLevel0001", name: "分公司" },
@@ -44,23 +45,25 @@ function OrganizationStructure() {
},
]}
form={form}
+ onFinish={getData}
/>
(
<>
}
onClick={() => {
setAddModalOpen(true);
}}
>
新增
-
+ }>返回
>
)}
columns={[
- { title: "名称", dataIndex: "name" },
+ { title: "部门名称", dataIndex: "name" },
{ title: "部门级别", dataIndex: "name" },
{ title: "主管领导", dataIndex: "name" },
{
@@ -124,19 +127,21 @@ function AddModalComponent(props) {
width={800}
>
(111) },
- { name: "name", label: "名称" },
- { name: "name", label: "部门级别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: DEPARTMENT_LEVEL_ENUM },
- { name: "name", label: "安全监管部门", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ id: "0", name: "是" }, { id: "2", name: "否" }], tip: "安全监管部门负责人在“安委会办公室副主任核实”菜单处理重大较大隐患" },
- { name: "name", label: "部门负责人", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ id: "1-10人", name: "1-10人" }] },
- { name: "name", label: "部门负责人手机号", required: false, rules: [{ pattern: PHONE, message: "请输入正确的手机号" }] },
- { name: "name", label: "排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
+ { name: "parentName", label: "上级部门", render: () => (111) },
+ { name: "name", label: "部门名称" },
+ { name: "level", label: "部门级别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: DEPARTMENT_LEVEL_ENUM },
+ { name: "isRegulatory", label: "是否安全监管部门", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ id: "0", name: "是" }, { id: "2", name: "否" }], tip: "安全监管部门负责人在“安委会办公室副主任核实”菜单处理重大较大隐患" },
+ { name: "bz", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
+ { name: "sort", label: "排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
]}
/>
diff --git a/src/pages/Container/Enterprise/Position/index.js b/src/pages/Container/Enterprise/Post/index.js
similarity index 84%
rename from src/pages/Container/Enterprise/Position/index.js
rename to src/pages/Container/Enterprise/Post/index.js
index e04e492..974c4af 100644
--- a/src/pages/Container/Enterprise/Position/index.js
+++ b/src/pages/Container/Enterprise/Post/index.js
@@ -1,13 +1,15 @@
import { Button, Form, message, Modal, Space, Tag } 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 BackIcon from "zy-react-library/components/Icon/BackIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable";
-function Position() {
+function Post() {
const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState("");
const [form] = Form.useForm();
@@ -30,7 +32,7 @@ function Position() {
(
<>
}
onClick={() => {
setAddModalOpen(true);
}}
>
新增
-
+ }>返回
>
)}
columns={[
@@ -119,17 +123,19 @@ function AddModalComponent(props) {
width={800}
>
(111) },
- { name: "name", label: "岗位名称" },
- { name: "name", label: "岗位职责" },
+ { name: "parentName", label: "部门名称", render: () => (111) },
+ { name: "post", label: "岗位名称" },
{
- name: "name",
+ name: "status",
label: "状态",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: [{ id: "0", name: "启用" }, { id: "1", name: "禁用" }],
@@ -137,20 +143,10 @@ function AddModalComponent(props) {
{
name: "regPost",
label: "是否监管岗位",
- render: FORM_ITEM_RENDER_ENUM.SELECT,
+ render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ id: "1", name: "是" }, { id: "2", name: "否" }],
- componentProps: {
- onChange: () => {
- form.setFieldValue("name", undefined);
- },
- },
- },
- {
- name: "name",
- label: "数据权限",
- dependencies: ["regPost"],
- hidden: formValues => !(formValues.regPost === "1"),
},
+ { name: "bz", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]}
/>
@@ -158,4 +154,4 @@ function AddModalComponent(props) {
}
const AddModal = AddModalComponent;
-export default Position;
+export default Post;
diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js
index 17ce1fc..7754f33 100644
--- a/src/pages/Container/Enterprise/User/Add/index.js
+++ b/src/pages/Container/Enterprise/User/Add/index.js
@@ -1,13 +1,10 @@
import { tools } from "@cqsjjb/jjb-common-lib";
-import { Button, Col, Form, Row, Select, Switch } from "antd";
-import { useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack";
-import SelectCreate from "zy-react-library/components/SelectCreate";
+import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
import Upload from "zy-react-library/components/Upload";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import { ID_NUMBER } from "zy-react-library/regular";
-import Scheduling from "~/pages/Container/Enterprise/User/components/Scheduling";
const { query } = tools.router;
const WHETHER_ENUM = [
@@ -16,8 +13,6 @@ const WHETHER_ENUM = [
];
function Add() {
- const [form] = Form.useForm();
- const [schedulingOpen, setSchedulingOpen] = useState(false);
const onSubmit = (values) => {
console.log(values);
};
@@ -26,21 +21,17 @@ function Add() {
},
{
name: "postId",
- label: "岗位",
+ label: "所属岗位",
required: false,
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: [{ name: "一级部门", id: "1" }],
@@ -56,8 +47,6 @@ function Add() {
{
name: "userIdCard",
label: "身份证号",
- dependencies: ["facePermissions"],
- required: formValues => formValues.facePermissions === "1",
rules: [{ pattern: ID_NUMBER, message: "请输入正确的身份证号" }],
},
{
@@ -74,44 +63,11 @@ function Add() {
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: [{ name: "一级部门", id: "1" }],
},
- {
- name: "inHrUser",
- label: "是否对接人资系统",
- required: false,
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- componentProps: { disabled: true },
- },
- {
- name: "isHazardconfirmer",
- label: "是否为隐患确认人",
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- },
- {
- name: "facePermissions",
- label: "是否具备人脸权限",
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- },
- {
- name: "mkmjVehicleReviewer",
- label: "是否为口门门禁车辆审核人",
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- },
- {
- name: "isAccessauditor",
- label: "是否为临时访客审核人",
- render: FORM_ITEM_RENDER_ENUM.RADIO,
- items: WHETHER_ENUM,
- },
{
name: "faceFile",
label: "上传人脸照片",
+ required: false,
span: 24,
- dependencies: ["facePermissions"],
- required: formValues => formValues.facePermissions === "1",
render: ({ value, onChange }) => (
(
- <>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- >
- ),
- },
+ { name: "isHeadOfDepartment", label: "是否为部门负责人", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM },
{ name: "bz", label: "备注", span: 24, required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
- {
- name: "isStudent",
- label: "是否在线学习人员",
- span: 24,
- required: false,
- render: Switch,
- componentProps: {
- onChange: () => {
- form.setFieldValue("politicalOutlook", undefined);
- form.setFieldValue("dateOfBirth", undefined);
- form.setFieldValue("incumbency", undefined);
- form.setFieldValue("duties", undefined);
- form.setFieldValue("title", undefined);
- form.setFieldValue("typeOfWork", undefined);
- form.setFieldValue("entryDate", undefined);
- form.setFieldValue("workingDate", undefined);
- form.setFieldValue("userCerFile", undefined);
- },
- },
- },
- {
- name: "politicalOutlook",
- label: "政治面貌",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: FORM_ITEM_RENDER_ENUM.SELECT,
- items: [{ name: "一级部门", id: "1" }],
- },
- {
- name: "dateOfBirth",
- label: "出生年月",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: FORM_ITEM_RENDER_ENUM.DATE,
- },
- {
- name: "incumbency",
- label: "在职情况",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: FORM_ITEM_RENDER_ENUM.SELECT,
- items: [{ name: "一级部门", id: "1" }],
- },
- {
- name: "duties",
- label: "职务",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: () => (
- {
- console.log(option);
- }}
- />
- ),
- },
- {
- name: "title",
- label: "职称",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: () => (
- {
- console.log(option);
- }}
- />
- ),
- },
- {
- name: "typeOfWork",
- label: "工种",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: () => (
- {
- console.log(option);
- }}
- />
- ),
- },
- {
- name: "entryDate",
- label: "入职日期",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: FORM_ITEM_RENDER_ENUM.DATE,
- },
- {
- name: "workingDate",
- label: "参加工作日期",
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: FORM_ITEM_RENDER_ENUM.DATE,
- },
- {
- name: "userCerFile",
- label: "证书信息",
- span: 24,
- required: false,
- dependencies: ["isStudent"],
- hidden: formValues => !formValues.isStudent,
- render: ({ value, onChange }) => ,
- },
]}
/>
- setSchedulingOpen(false)} />
>
);
}
diff --git a/src/pages/Container/Enterprise/User/List/index.js b/src/pages/Container/Enterprise/User/List/index.js
index 8f384c0..07e99a6 100644
--- a/src/pages/Container/Enterprise/User/List/index.js
+++ b/src/pages/Container/Enterprise/User/List/index.js
@@ -1,16 +1,16 @@
import { Button, Form, message, Modal, Space } from "antd";
import { useState } from "react";
+import AddIcon from "zy-react-library/components/Icon/AddIcon";
+import ExportIcon from "zy-react-library/components/Icon/ExportIcon";
+import ImportIcon from "zy-react-library/components/Icon/ImportIcon";
import ImportFile from "zy-react-library/components/ImportFile";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search";
import Table from "zy-react-library/components/Table";
-import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable";
-import Scheduling from "~/pages/Container/Enterprise/User/components/Scheduling";
function List(props) {
const [importOpen, setImportOpen] = useState(false);
- const [schedulingOpen, setSchedulingOpen] = useState(false);
const [form] = Form.useForm();
const { tableProps, getData } = useTable(() => {}, { form });
const onDelete = (id) => {
@@ -56,35 +56,16 @@ function List(props) {
(
<>
}
onClick={() => {
props.history.push("./add");
}}
@@ -93,13 +74,14 @@ function List(props) {
}
onClick={() => {
setImportOpen(true);
}}
>
导入
-
+ } onClick={() => onExportExcel()}>导出Excel
>
)}
columns={[
@@ -107,21 +89,12 @@ function List(props) {
{ title: "姓名", dataIndex: "name" },
{ title: "部门", dataIndex: "name" },
{ title: "岗位", dataIndex: "name" },
- { title: "排班类型", dataIndex: "name" },
{
title: "操作",
width: 300,
render: (_, record) => (
-
,
- ]}
- >
-
-
- );
-}
-
-export default Scheduling;
diff --git a/src/pages/Container/Supervision/Supervision/Department/index.js b/src/pages/Container/Supervision/Supervision/Department/index.js
new file mode 100644
index 0000000..bec7a08
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/Department/index.js
@@ -0,0 +1,152 @@
+import { Button, Form, message, Modal, Space, Tag } 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 BackIcon from "zy-react-library/components/Icon/BackIcon";
+import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
+import Search from "zy-react-library/components/Search";
+import Table from "zy-react-library/components/Table";
+import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+import useTable from "zy-react-library/hooks/useTable";
+
+function Department() {
+ const [addModalOpen, setAddModalOpen] = useState(false);
+ const [currentId, setCurrentId] = useState("");
+ const [form] = Form.useForm();
+ const { tableProps, getData } = useTable(() => {
+ }, { form });
+ const onDelete = (id) => {
+ Modal.confirm({
+ title: "提示",
+ content: "确定删除吗?",
+ onOk: () => {
+ message.success("删除成功");
+ getData();
+ },
+ });
+ };
+ return (
+
+
+
+
+
+
(
+ <>
+ }
+ onClick={() => {
+ setAddModalOpen(true);
+ }}
+ >
+ 新增
+
+ }>返回
+ >
+ )}
+ columns={[
+ { title: "部门名称", dataIndex: "name" },
+ {
+ title: "操作",
+ width: 200,
+ render: (_, record) => (
+
+ {
+ setAddModalOpen(true);
+ setCurrentId(record.id);
+ }}
+ >
+ 修改
+
+ onDelete(record.id)}>删除
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
+
+ {
+ setAddModalOpen(false);
+ setCurrentId("");
+ }}
+ getData={getData}
+ />
+
+ );
+}
+
+function AddModalComponent(props) {
+ const [form] = Form.useForm();
+ useEffect(() => {
+ if (props.currentId) {
+ console.log(props.currentId);
+ }
+ }, [props.currentId]);
+ const onCancel = () => {
+ form.resetFields();
+ props.onCancel();
+ };
+ const onSubmit = async (values) => {
+ console.log(values);
+ onCancel();
+ props.getData();
+ };
+ return (
+
+ (111) },
+ { name: "department", label: "部门名称" },
+ { name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ id: "1", name: "一级部门" }] },
+ { name: "sort", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
+ {
+ name: "regDepartment",
+ label: "是否安全管理部门",
+ required: false,
+ render: FORM_ITEM_RENDER_ENUM.RADIO,
+ items: [{ id: "1", name: "是" }, { id: "2", name: "否" }],
+ },
+ { name: "bz", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
+ ]}
+ />
+
+ );
+}
+
+const AddModal = AddModalComponent;
+export default Department;
diff --git a/src/pages/Container/Supervision/Supervision/Post/index.js b/src/pages/Container/Supervision/Supervision/Post/index.js
new file mode 100644
index 0000000..d93af30
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/Post/index.js
@@ -0,0 +1,146 @@
+import { Button, Form, message, Modal, Space, Tag } 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 BackIcon from "zy-react-library/components/Icon/BackIcon";
+import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
+import Search from "zy-react-library/components/Search";
+import Table from "zy-react-library/components/Table";
+import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+import useTable from "zy-react-library/hooks/useTable";
+
+function Post() {
+ const [addModalOpen, setAddModalOpen] = useState(false);
+ const [currentId, setCurrentId] = useState("");
+ const [form] = Form.useForm();
+ const { tableProps, getData } = useTable(() => {
+ }, { form });
+ const onDelete = (id) => {
+ Modal.confirm({
+ title: "提示",
+ content: "确定删除吗?",
+ onOk: () => {
+ message.success("删除成功");
+ getData();
+ },
+ });
+ };
+ return (
+
+
+
+
+
+
(
+ <>
+ }
+ onClick={() => {
+ setAddModalOpen(true);
+ }}
+ >
+ 新增
+
+ }>返回
+ >
+ )}
+ columns={[
+ { title: "所属部门", dataIndex: "name" },
+ { title: "岗位名称", dataIndex: "name" },
+ {
+ title: "操作",
+ width: 200,
+ render: (_, record) => (
+
+ {
+ setAddModalOpen(true);
+ setCurrentId(record.id);
+ }}
+ >
+ 修改
+
+ onDelete(record.id)}>删除
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
+
+ {
+ setAddModalOpen(false);
+ setCurrentId("");
+ }}
+ getData={getData}
+ />
+
+ );
+}
+
+function AddModalComponent(props) {
+ const [form] = Form.useForm();
+ useEffect(() => {
+ if (props.currentId) {
+ console.log(props.currentId);
+ }
+ }, [props.currentId]);
+ const onCancel = () => {
+ form.resetFields();
+ props.onCancel();
+ };
+ const onSubmit = async (values) => {
+ console.log(values);
+ onCancel();
+ props.getData();
+ };
+ return (
+
+ (111) },
+ { name: "department", label: "岗位名称" },
+ {
+ name: "regPost",
+ label: "是否监管岗位",
+ required: false,
+ render: FORM_ITEM_RENDER_ENUM.RADIO,
+ items: [{ id: "1", name: "是" }, { id: "2", name: "否" }],
+ },
+ { name: "permission", label: "数据权限", required: false, dependencies: ["regPost"], hidden: formValues => !(formValues.regPost === "1") },
+ { name: "bz", label: "岗位职责", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
+ ]}
+ />
+
+ );
+}
+
+const AddModal = AddModalComponent;
+export default Post;
diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js
new file mode 100644
index 0000000..6ab8be8
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js
@@ -0,0 +1,104 @@
+import { tools } from "@cqsjjb/jjb-common-lib";
+import FormBuilder from "zy-react-library/components/FormBuilder";
+import HeaderBack from "zy-react-library/components/HeaderBack";
+import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj";
+import Upload from "zy-react-library/components/Upload";
+import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
+import { ID_NUMBER, PHONE } from "zy-react-library/regular";
+
+const { query } = tools.router;
+const WHETHER_ENUM = [
+ { id: "1", name: "是" },
+ { id: "0", name: "否" },
+];
+
+function Add() {
+ const onSubmit = (values) => {
+ console.log(values);
+ };
+ return (
+ <>
+
+
+
(
+
+ * 图像格式:JPG、JPEG、PNG
+ * 图像大小:不超过4M。
+ * 照片大小: 推荐 500*500
+ * 人脸无遮挡(如戴帽子、口罩、眼镜等)、无修图
+ * 人脸需双眼睁开、表情自然、露额,头发不要遮挡
+
+ )}
+ />
+ ),
+ },
+ { name: "sort", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
+ { name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ name: "一级部门", id: "1" }] },
+ { name: "email", label: "邮箱", required: false, rules: [{ type: "email", message: "请输入正确的邮箱" }] },
+ { name: "isHeadOfDepartment", label: "是否为部门负责人", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM },
+ { name: "isDeputyInCharge", label: "是否为分管领导", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM },
+ { name: "bz", label: "备注", span: 24, required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
+ ]}
+ />
+
+ >
+ );
+}
+
+export default Add;
diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js
new file mode 100644
index 0000000..07e99a6
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/User/List/index.js
@@ -0,0 +1,126 @@
+import { Button, Form, message, Modal, Space } from "antd";
+import { useState } from "react";
+import AddIcon from "zy-react-library/components/Icon/AddIcon";
+import ExportIcon from "zy-react-library/components/Icon/ExportIcon";
+import ImportIcon from "zy-react-library/components/Icon/ImportIcon";
+import ImportFile from "zy-react-library/components/ImportFile";
+import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
+import Search from "zy-react-library/components/Search";
+import Table from "zy-react-library/components/Table";
+import useTable from "zy-react-library/hooks/useTable";
+
+function List(props) {
+ const [importOpen, setImportOpen] = useState(false);
+ const [form] = Form.useForm();
+ const { tableProps, getData } = useTable(() => {}, { form });
+ const onDelete = (id) => {
+ Modal.confirm({
+ title: "提示",
+ content: "确定删除吗?",
+ onOk: () => {
+ message.success("删除成功");
+ getData();
+ },
+ });
+ };
+ const onExportExcel = () => {
+ Modal.confirm({
+ title: "提示",
+ content: "确定要导出到excel吗?",
+ onOk: () => {
+
+ },
+ });
+ };
+ const onResetPassword = () => {
+ Modal.confirm({
+ title: "提示",
+ content: "确定要重置密码为Aa@123456789吗?",
+ onOk: () => {
+ message.success("重置密码成功");
+ },
+ });
+ };
+ const onUnlock = (id) => {
+ message.success("解锁成功");
+ };
+ const onImportFileConfirm = (values) => {
+ console.log(values);
+ message.success("导入成功");
+ };
+ return (
+
+
+
+
+
+
(
+ <>
+ }
+ onClick={() => {
+ props.history.push("./add");
+ }}
+ >
+ 新增
+
+ }
+ onClick={() => {
+ setImportOpen(true);
+ }}
+ >
+ 导入
+
+ } onClick={() => onExportExcel()}>导出Excel
+ >
+ )}
+ columns={[
+ { title: "用户名", dataIndex: "name" },
+ { title: "姓名", dataIndex: "name" },
+ { title: "部门", dataIndex: "name" },
+ { title: "岗位", dataIndex: "name" },
+ {
+ title: "操作",
+ width: 300,
+ render: (_, record) => (
+
+ onResetPassword(record.id)}>重置密码
+ {
+ props.history.push(`./add?id=${record.id}`);
+ }}
+ >
+ 编辑
+
+ onUnlock(record.id)}>解锁
+ onDelete(record.id)}>删除
+
+ ),
+ },
+ ]}
+ {...tableProps}
+ />
+
+
+ { setImportOpen(false); }}
+ />
+
+ );
+}
+
+export default List;
diff --git a/src/pages/Container/Supervision/Supervision/User/index.js b/src/pages/Container/Supervision/Supervision/User/index.js
new file mode 100644
index 0000000..e30c0f4
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/User/index.js
@@ -0,0 +1,9 @@
+function User(props) {
+ return (
+
+ {props.children}
+
+ );
+}
+
+export default User;
diff --git a/src/pages/Container/Supervision/Supervision/index.js b/src/pages/Container/Supervision/Supervision/index.js
new file mode 100644
index 0000000..eda14bf
--- /dev/null
+++ b/src/pages/Container/Supervision/Supervision/index.js
@@ -0,0 +1,9 @@
+function Supervision(props) {
+ return (
+
+ {props.children}
+
+ );
+}
+
+export default Supervision;