},
+ { label: "所属区域", required: false, name: "city", render: (
+
{ setCityData(data); }}
+ />
+
+ ) },
{
label: "邮政编码",
name: "postalCode",
@@ -149,9 +221,14 @@ function Update(props) {
{
label: "所属行业",
name: "INDUSTRYALL",
- required: false,
- render: FORM_ITEM_RENDER_ENUM.SELECT,
- items: [{ bianma: "1-10人", name: "1-10人" }],
+ render: (
+ {
+ setIndustryData(node);
+ }}
+ />
+ ),
},
{ label: "法定代表人", name: "lrName", required: false },
{
@@ -179,9 +256,13 @@ function Update(props) {
{ label: "企事业单位经营地址", name: "addressBusiness" },
{
label: "营业执照",
- name: "BUS_IMAGES",
- required: false,
- render: ,
+ name: "licenseFile",
+ render: (
+ {
+ setDeleteLicenseImageFiles([...deleteLicenseImageFiles, file]);
+ }}
+ />
+ ),
},
{
label: "营业执照有效期",
diff --git a/src/pages/Container/Enterprise/OrganizationStructure/index.js b/src/pages/Container/Enterprise/OrganizationStructure/index.js
index c898f63..b0521b4 100644
--- a/src/pages/Container/Enterprise/OrganizationStructure/index.js
+++ b/src/pages/Container/Enterprise/OrganizationStructure/index.js
@@ -165,8 +165,6 @@ function AddModalComponent(props) {
};
const onSubmit = async (values) => {
values.levelName = getLabelName({ status: values.level, list: levelData, idKey: "dictValue", nameKey: "dictLabel" });
- values.level = 1;
- values.levelName = "11";
values.parentId = props.parentId;
if (props.currentId) {
diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js
index 65c7c9f..19fdf85 100644
--- a/src/pages/Container/Enterprise/User/Add/index.js
+++ b/src/pages/Container/Enterprise/User/Add/index.js
@@ -6,7 +6,9 @@ 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 { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
+import useUploadFile from "zy-react-library/hooks/useUploadFile";
import nation from "zy-react-library/json/nation.json";
import { ID_NUMBER, PHONE } from "zy-react-library/regular";
import { getLabelName, idCardGetDateAndGender } from "zy-react-library/utils";
@@ -29,13 +31,39 @@ function Add(props) {
const [userTypeData, setUserTypeData] = useState([]);
const [userID, setUserID] = useState(null);
const queryParams = useGetUrlQuery();
+
+ const { loading: uploadFileLoading, uploadFile } = useUploadFile();
+
useEffect(() => {
if (queryParams["id"]) {
const fetchData = async () => {
- const res = await props["userDetails"]({ id: queryParams["id"] });
- console.log(res.data);
- setUserID(res.data.userId);
- form.setFieldsValue(res.data);
+ const { data } = await props["userDetails"]({ id: queryParams["id"] });
+ // const hiddenImageFiles = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["13"], eqForeignKey: queryParams["id"] });
+ const filepath = data.filepath
+ ? [
+ {
+ name: data.name,
+ url: data.filepath,
+ },
+ ]
+ : [];
+
+ const values = {
+ filepath,
+
+ ...data,
+ };
+ values.faceFile = [
+ {
+ name: data.name,
+ url: data.filepath,
+ },
+ ];
+ setUserID(data.userId);
+ form.setFieldsValue({
+ ...values,
+
+ });
};
fetchData();
}
@@ -60,8 +88,12 @@ function Add(props) {
values.personnelTypeName = getLabelName({ status: values.personnelType, list: userTypeData, idKey: "dictValue", nameKey: "dictLabel" });
// values.rank_level_name = getLabelName({ status: values.rank_level, list: rankData, idKey: "dictValue", nameKey: "labelKey" });
idCardGetDateAndGender(values.userIdCard);
-
- console.log(idCardGetDateAndGender(values.userIdCard));
+ const { filePath } = await uploadFile({
+ single: true,
+ files: values.faceFile,
+ params: { type: UPLOAD_FILE_TYPE_ENUM["13"], foreignKey: userID },
+ });
+ values.userAvatarUrl = filePath;
values.mainCorpFlag = 0;
values.userType = 2;
if (queryParams["id"]) {
@@ -106,7 +138,7 @@ function Add(props) {
form={form}
onFinish={onSubmit}
labelCol={{ span: 6 }}
- loading={props.user.userLoading}
+ loading={uploadFileLoading || props.user.userLoading}
options={[
{ name: "roleId", label: "用户角色", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: rolesData, itemsField: { labelKey: "roleName", valueKey: "id" } },
{ name: "departmentId", label: "所属部门", render: },
@@ -158,6 +190,7 @@ function Add(props) {
render: (
@@ -168,6 +201,10 @@ function Add(props) {
* 人脸需双眼睁开、表情自然、露额，头发不要遮挡
)}
+ onRemove={() => {
+ form.setFieldValue("faceFile");
+ return false;
+ }}
/>
),
},
diff --git a/src/pages/Container/Enterprise/User/List/index.js b/src/pages/Container/Enterprise/User/List/index.js
index 25294d6..8bf9cc3 100644
--- a/src/pages/Container/Enterprise/User/List/index.js
+++ b/src/pages/Container/Enterprise/User/List/index.js
@@ -8,6 +8,8 @@ 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 useDownloadBlob from "zy-react-library/hooks/useDownloadBlob";
+import useImportFile from "zy-react-library/hooks/useImportFile";
import useTable from "zy-react-library/hooks/useTable";
import { NS_USER } from "~/enumerate/namespace";
@@ -17,6 +19,9 @@ function List(props) {
const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState("");
const [form] = Form.useForm();
+ const { downloadBlob } = useDownloadBlob();
+ const [selectedRowKeys, setSelectedRowKeys] = useState([]);
+ const { importFile } = useImportFile();
const { tableProps, getData } = useTable(props["userList"], {
form,
transform: (formData) => {
@@ -44,13 +49,14 @@ function List(props) {
title: "提示",
content: "确定要导出到excel吗？",
onOk: () => {
-
+ downloadBlob(`/basic-info/user/exportUserTable?ids=${selectedRowKeys.length !== 0 ? selectedRowKeys.join(",") : ""}`, { name: "用户" });
},
});
};
const onImportFileConfirm = (values) => {
console.log(values);
+ importFile("/basic-info/user/importUserTable", { files: values.file });
message.success("导入成功");
};
const onTreeChange = (selectedKeys) => {
@@ -73,6 +79,10 @@ function List(props) {
onFinish={getData}
/>