From 2f3b0dd5962bdcaf2fd37cfa7bcba8669cf41ace Mon Sep 17 00:00:00 2001 From: "853931625@qq.com" Date: Mon, 10 Nov 2025 18:19:30 +0800 Subject: [PATCH] no message --- src/pages/Container/BusinessLicense/index.js | 4 +- .../Enterprise/CorpInfo/Update/index.js | 60 +++++++------ .../Enterprise/OrganizationStructure/index.js | 84 ++++++++++++------- src/pages/Container/Enterprise/Post/index.js | 64 +++++++------- .../Container/Enterprise/User/Add/index.js | 4 +- .../Container/Enterprise/User/List/index.js | 2 +- .../Container/PersonnelCertificate/index.js | 6 +- .../Container/Stakeholder/CorpInfo/index.js | 37 ++++---- .../Container/Stakeholder/Department/index.js | 26 ++++-- .../SecurityPersonnelInfo/index.js | 3 +- .../SpecialOperationPersonnel/index.js | 3 +- .../Container/Stakeholder/User/Add/index.js | 30 ++++--- .../User/SecurityPersonnel/index.js | 24 ++++-- .../User/SpecialPersonnel/index.js | 32 +++++-- .../BranchCompany/AccountManage/List/index.js | 28 ++++++- .../EnterpriseMiddleground/UserList/index.js | 2 +- .../AccountManage/List/index.js | 23 +++-- .../CertificateList/index.js | 20 +++-- .../SpecialPersonnel/CertificateList/index.js | 36 ++++---- .../StakeholderUnit/User/UserList/index.js | 2 +- .../Supervision/Department/index.js | 20 ++++- .../Supervision/Supervision/Post/index.js | 35 ++++---- .../Supervision/Supervision/User/Add/index.js | 35 ++++---- .../Supervision/User/List/index.js | 2 +- 24 files changed, 355 insertions(+), 227 deletions(-) diff --git a/src/pages/Container/BusinessLicense/index.js b/src/pages/Container/BusinessLicense/index.js index 913af69..9f78dff 100644 --- a/src/pages/Container/BusinessLicense/index.js +++ b/src/pages/Container/BusinessLicense/index.js @@ -20,7 +20,7 @@ function Department(props) { transform: (formData) => { return { ...formData, - corpinfoIdString: CorpinfoId, + eqCorpinfoId: CorpinfoId, }; }, }); @@ -129,7 +129,7 @@ function AddModalComponent(props) { values.corpinfoId = CorpinfoId; values.startValidityTime = values.startValidity[0]; values.endValidityTime = values.startValidity[1]; - values.userIdString = "1985635856156274689"; + values.user = "1985635856156274689"; delete values.startValidity; if (props.currentId) { diff --git a/src/pages/Container/Enterprise/CorpInfo/Update/index.js b/src/pages/Container/Enterprise/CorpInfo/Update/index.js index e896016..99f5646 100644 --- a/src/pages/Container/Enterprise/CorpInfo/Update/index.js +++ b/src/pages/Container/Enterprise/CorpInfo/Update/index.js @@ -1,10 +1,11 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; -import { useEffect } from "react"; +import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import HeaderBack from "zy-react-library/components/HeaderBack"; import Map from "zy-react-library/components/Map"; import Area from "zy-react-library/components/SelectTree/Area"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; @@ -18,12 +19,7 @@ const ENTERPRISE_STATUS = [ { bianma: "filialstate04", name: "停产" }, { bianma: "filialstate05", name: "破产" }, ]; -const ECONOMY_TYPE = [ - { bianma: "economic_type19", name: "外资" }, - { bianma: "economic_type18", name: "中外合作" }, - { bianma: "economic_type17", name: "中外合资" }, -]; // const PRESENCE_OR_ABSENCE_ENUM = [ // { bianma: 1, name: "有" }, // { bianma: 0, name: "无" }, @@ -35,11 +31,13 @@ const WHETHER_ENUM = [ function Update(props) { const [form] = Form.useForm(); + const [scaleData, setScaleData] = useState([]); + const [ecoTypeData, setEcoTypeData] = useState([]); const onSubmit = async (values) => { values.id = "1985906265017954306"; - values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); - values.scaleName = getLabelName({ status: values.scale, list: [{ bianma: "1-10人", name: "1-10人" }] }); - values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS }); + values.ecoTypeName = getLabelName({ status: values.ecoType, list: ecoTypeData, idKey: "dictValue", nameKey: "dictLabel" }); + values.scaleName = getLabelName({ status: values.scale, list: scaleData, idKey: "dictValue", nameKey: "dictLabel" }); + values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS, idKey: "dictValue", nameKey: "dictLabel" }); values.licenseStart = values.license[0]; values.licenseEnd = values.license[1]; delete values.license; @@ -53,20 +51,20 @@ function Update(props) { const fetchData = async () => { const res = await props["corpInfoRemoveDetails"]({ id: "1985906265017954306" }); res.data.scaleType = res.data.scaleType ?? 0; - res.data.whetherHygieneFlag = res.data.whetherHygieneFlag ?? 0; - res.data.whetherHazardsFlag = res.data.whetherHazardsFlag ?? 0; - res.data.whetherScarceFlag = res.data.whetherScarceFlag ?? 0; - res.data.whetherChemicalsFlag = res.data.whetherChemicalsFlag ?? 0; - res.data.whetherSpecialequipmentFlag = res.data.whetherSpecialequipmentFlag ?? 0; - res.data.whetherSpecialpeopleFlag = res.data.whetherSpecialpeopleFlag ?? 0; - res.data.whetherCoalgasFlag = res.data.whetherCoalgasFlag ?? 0; - res.data.whetherFireFlag = res.data.whetherFireFlag ?? 0; - res.data.whetherConfinedFlag = res.data.whetherConfinedFlag ?? 0; - res.data.whetherPowderFlag = res.data.whetherPowderFlag ?? 0; - res.data.whetherLightningFlag = res.data.whetherLightningFlag ?? 0; - res.data.whetherActinogenFlag = res.data.whetherActinogenFlag ?? 0; - res.data.whetherLiquidammoniaFlag = res.data.whetherLiquidammoniaFlag ?? 0; - res.data.whetherPipeline = res.data.whetherPipeline ?? 0; + // res.data.whetherHygieneFlag = res.data.whetherHygieneFlag ?? 0; + // res.data.whetherHazardsFlag = res.data.whetherHazardsFlag ?? 0; + // res.data.whetherScarceFlag = res.data.whetherScarceFlag ?? 0; + // res.data.whetherChemicalsFlag = res.data.whetherChemicalsFlag ?? 0; + // res.data.whetherSpecialequipmentFlag = res.data.whetherSpecialequipmentFlag ?? 0; + // res.data.whetherSpecialpeopleFlag = res.data.whetherSpecialpeopleFlag ?? 0; + // res.data.whetherCoalgasFlag = res.data.whetherCoalgasFlag ?? 0; + // res.data.whetherFireFlag = res.data.whetherFireFlag ?? 0; + // res.data.whetherConfinedFlag = res.data.whetherConfinedFlag ?? 0; + // res.data.whetherPowderFlag = res.data.whetherPowderFlag ?? 0; + // res.data.whetherLightningFlag = res.data.whetherLightningFlag ?? 0; + // res.data.whetherActinogenFlag = res.data.whetherActinogenFlag ?? 0; + // res.data.whetherLiquidammoniaFlag = res.data.whetherLiquidammoniaFlag ?? 0; + // res.data.whetherPipeline = res.data.whetherPipeline ?? 0; res.data.license = [res.data.licenseStart, res.data.licenseEnd]; form.setFieldsValue(res.data); @@ -119,8 +117,12 @@ function Update(props) { label: "规模", name: "scale", required: false, - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ bianma: "1-10人", name: "1-10人" }], + render: ( + { setScaleData(data); }} + /> + ), }, { label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE }, { @@ -137,8 +139,12 @@ function Update(props) { { label: "经济类型", name: "ecoType", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: ECONOMY_TYPE, + render: ( + { setEcoTypeData(data); }} + /> + ), }, { label: "所属行业", diff --git a/src/pages/Container/Enterprise/OrganizationStructure/index.js b/src/pages/Container/Enterprise/OrganizationStructure/index.js index a4538fd..c898f63 100644 --- a/src/pages/Container/Enterprise/OrganizationStructure/index.js +++ b/src/pages/Container/Enterprise/OrganizationStructure/index.js @@ -5,18 +5,19 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import Search from "zy-react-library/components/Search"; +import SelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; 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 { getLabelName } from "zy-react-library/utils"; import { NS_DEPARTMENT } from "~/enumerate/namespace"; -const CorpinfoId = "1985906265017954306"; function OrganizationStructure(props) { const [addModalOpen, setAddModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); const [selectedNodeId, setSelectedNodeId] = useState(null); - + const [selectedNodeName, setSelectedNodeName] = useState(""); const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["departmentList"], { form, @@ -24,13 +25,13 @@ function OrganizationStructure(props) { return { ...formData, eqParentId: selectedNodeId, - eqCorpinfoId: CorpinfoId, }; }, }); - const onTreeChange = (selectedKeys) => { + const onTreeChange = (selectedKeys, event) => { const key = selectedKeys[0] || null; + setSelectedNodeName(event.node.name); setSelectedNodeId(key); getData(); }; @@ -55,12 +56,12 @@ function OrganizationStructure(props) { + ) }, ]} form={form} onFinish={getData} @@ -94,6 +95,7 @@ function OrganizationStructure(props) { {`${record.name}>`} ) }, + { title: "部门级别", dataIndex: "levelName" }, { title: "操作", width: 200, @@ -119,20 +121,24 @@ function OrganizationStructure(props) { /> - { - setAddModalOpen(false); - setCurrentId(""); - }} - getData={getData} - /> + {addModalOpen + && ( + { + setAddModalOpen(false); + setCurrentId(""); + }} + getData={getData} + /> + )} ); } @@ -140,6 +146,7 @@ function OrganizationStructure(props) { function AddModalComponent(props) { const [form] = Form.useForm(); const [parentName, setParentName] = useState(null); + const [levelData, setlevelData] = useState([]); useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { @@ -147,15 +154,21 @@ function AddModalComponent(props) { setParentName(res.data.parentName); }); } - }, [props.currentId]); + else { + console.log(props.selectedNodeName); + setParentName(props.selectedNodeName); + } + }, [props.currentId, props.selectedNodeName]); const onCancel = () => { form.resetFields(); props.onCancel(); }; const onSubmit = async (values) => { - values.levelName = getLabelName({ status: values.level, list: [{ bianma: "1", name: "一级部门" }] }); + values.levelName = getLabelName({ status: values.level, list: levelData, idKey: "dictValue", nameKey: "dictLabel" }); + values.level = 1; + values.levelName = "11"; values.parentId = props.parentId; - values.corpinfoId = CorpinfoId; + if (props.currentId) { values.parentId = props.parentId; values.id = props.currentId; @@ -178,6 +191,7 @@ function AddModalComponent(props) { > {parentName} }, { name: "name", label: "部门名称" }, - { name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, + { name: "level", label: "部门级别", render: ( + { setlevelData(data); }} + /> + ) }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "securityFlag", @@ -197,6 +216,15 @@ function AddModalComponent(props) { render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], }, + { + name: "superviseFlag", + label: "是否监管部门", + required: false, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + }, + { name: "departmentIdsList", label: "数据权限", required: false, render: , dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) }, + { name: "departmentFunction", label: "部门职能" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Enterprise/Post/index.js b/src/pages/Container/Enterprise/Post/index.js index de503ad..8b05576 100644 --- a/src/pages/Container/Enterprise/Post/index.js +++ b/src/pages/Container/Enterprise/Post/index.js @@ -4,12 +4,13 @@ import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; -import SelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; +// import SelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; 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 { NS_POST } from "~/enumerate/namespace"; + function Post(props) { const [addModalOpen, setAddModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); @@ -21,7 +22,7 @@ function Post(props) { transform: (formData) => { return { ...formData, - departmentIdString: selectedNodeId, + eqDepartmentId: selectedNodeId, corpFlag: 2, }; }, @@ -90,21 +91,24 @@ function Post(props) { /> - { - setAddModalOpen(false); - setCurrentId(""); - }} - getData={getData} - /> + {addModalOpen + && ( + { + setAddModalOpen(false); + setCurrentId(""); + }} + getData={getData} + /> + )} ); } @@ -115,11 +119,6 @@ function AddModalComponent(props) { useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { - const arr = []; - res.data.departmentList && res.data.departmentList.forEach((item) => { - arr.push(item.departmentId); - }); - res.data.departmentIdsString = arr; form.setFieldsValue(res.data); console.log(res.data); setParentName(res.data.departmentName); @@ -135,16 +134,17 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { - values.departmentIdString = props.parentId; + values.departmentId = props.parentId; values.corpFlag = 2; if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; props.requestEdit(values).then(() => { onCancel(); props.getData(); }); } else { + props.requestAdd(values).then(() => { onCancel(); props.getData(); @@ -172,14 +172,14 @@ function AddModalComponent(props) { options={[ { name: "parentName", required: false, label: "所属部门", render: {parentName } }, { name: "postName", label: "岗位名称" }, - { - name: "supervisionFlag", - label: "是否监管岗位", - required: false, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], - }, - { name: "departmentIdsString", label: "数据权限", required: false, render: , dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, + // { + // name: "supervisionFlag", + // label: "是否监管岗位", + // required: false, + // render: FORM_ITEM_RENDER_ENUM.RADIO, + // items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + // }, + // { name: "departmentIdsString", label: "数据权限", required: false, render: , dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, { name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Enterprise/User/Add/index.js b/src/pages/Container/Enterprise/User/Add/index.js index 630efb5..65c7c9f 100644 --- a/src/pages/Container/Enterprise/User/Add/index.js +++ b/src/pages/Container/Enterprise/User/Add/index.js @@ -57,7 +57,7 @@ function Add(props) { const onSubmit = async (values) => { values.nationName = getLabelName({ status: values.nation, list: nation }); - values.personnelTypeName = getLabelName({ status: values.personnelType, list: userTypeData, idKey: "dictValue", nameKey: "labelKey" }); + 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); @@ -88,7 +88,7 @@ function Add(props) { console.log(event); form.setFieldsValue({ postId: undefined }); // setDepartmentName(event[0].name) - props["postAll"]({ corpFlag: 1, departmentIdString: event[0].id }).then((res) => { + props["postAll"]({ corpFlag: 1, eqDepartmentId: event[0].id }).then((res) => { console.log(res); setPostData(res.data); }); diff --git a/src/pages/Container/Enterprise/User/List/index.js b/src/pages/Container/Enterprise/User/List/index.js index bc69692..25294d6 100644 --- a/src/pages/Container/Enterprise/User/List/index.js +++ b/src/pages/Container/Enterprise/User/List/index.js @@ -66,7 +66,7 @@ function List(props) {
{ return { ...formData, - corpinfoIdString: CorpinfoId, + eqCorpinfoId: CorpinfoId, }; }, }); @@ -132,13 +132,13 @@ function AddModalComponent(props) { values.corpinfoId = CorpinfoId; values.startValidityTime = values.startValidity[0]; values.endValidityTime = values.startValidity[1]; - values.userIdString = "1985635856156274689"; + values.userId = "1985635856156274689"; values.userQualificationinfoId = qualificationinfoId; console.log(values.startValidity); delete values.startValidity; if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; await props.requestEdit(values); } else { diff --git a/src/pages/Container/Stakeholder/CorpInfo/index.js b/src/pages/Container/Stakeholder/CorpInfo/index.js index 4604cc2..e7940b0 100644 --- a/src/pages/Container/Stakeholder/CorpInfo/index.js +++ b/src/pages/Container/Stakeholder/CorpInfo/index.js @@ -3,12 +3,12 @@ import { Button, Form, message, Modal, QRCode } from "antd"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import Map from "zy-react-library/components/Map"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { getLabelName } from "zy-react-library/utils"; import { NS_ENTERPRISE } from "~/enumerate/namespace"; -import Qualification from "./components/Qualification"; const ENTERPRISE_STATUS = [ { bianma: "filialstate01", name: "在产" }, @@ -17,12 +17,7 @@ const ENTERPRISE_STATUS = [ { bianma: "filialstate04", name: "停产" }, { bianma: "filialstate05", name: "破产" }, ]; -const ECONOMY_TYPE = [ - { bianma: "economic_type19", name: "外资" }, - { bianma: "economic_type18", name: "中外合作" }, - { bianma: "economic_type17", name: "中外合资" }, -]; const WHETHER_ENUM = [ { bianma: 1, name: "是" }, { bianma: 0, name: "否" }, @@ -37,6 +32,8 @@ const WHETHER_ENUM = [ function CorpInfo(props) { const [corpInfoQrCodeOpen, setCorpInfoQrCodeOpen] = useState(false); const [form] = Form.useForm(); + const [scaleData, setScaleData] = useState([]); + const [ecoTypeData, setEcoTypeData] = useState([]); useEffect(() => { const fetchData = async () => { const res = await props.corpInfoRemoveDetails({ id: "1985906265017954306" }); @@ -47,11 +44,9 @@ function CorpInfo(props) { }, []); const onSubmit = async (values) => { - console.log(values); - values.id = "1985906265017954306"; - values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); - values.scaleName = getLabelName({ status: values.scale, list: [{ bianma: "1-10人", name: "1-10人" }] }); - values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS }); + values.ecoTypeName = getLabelName({ status: values.ecoType, list: ecoTypeData, idKey: "dictValue", nameKey: "dictLabel" }); + values.scaleName = getLabelName({ status: values.scale, list: scaleData, idKey: "dictValue", nameKey: "dictLabel" }); + values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS, idKey: "dictValue", nameKey: "dictLabel" }); values.licenseStart = values.license[0]; values.licenseEnd = values.license[1]; delete values.license; @@ -84,8 +79,12 @@ function CorpInfo(props) { label: "规模", name: "scale", required: false, - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ bianma: "1-10人", name: "1-10人" }], + render: ( + { setScaleData(data); }} + /> + ), }, { label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE }, { @@ -102,8 +101,12 @@ function CorpInfo(props) { { label: "经济类型", name: "ecoType", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: ECONOMY_TYPE, + render: ( + { setEcoTypeData(data); }} + /> + ), }, { label: "所属行业", @@ -158,8 +161,8 @@ function CorpInfo(props) { 查看 ) }, - { label: "单位资质信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, - { name: "qualification", customizeRender: true, span: 24, render: }, + // { label: "单位资质信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, + // { name: "qualification", customizeRender: true, span: 24, render: }, ]} />
diff --git a/src/pages/Container/Stakeholder/Department/index.js b/src/pages/Container/Stakeholder/Department/index.js index a4dc38f..7f8a77e 100644 --- a/src/pages/Container/Stakeholder/Department/index.js +++ b/src/pages/Container/Stakeholder/Department/index.js @@ -5,13 +5,14 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import Search from "zy-react-library/components/Search"; +import SelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; 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 { getLabelName } from "zy-react-library/utils"; import { NS_DEPARTMENT } from "~/enumerate/namespace"; -const CorpinfoId = "1985906265017954306"; function Department(props) { const [addModalOpen, setAddModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); @@ -24,7 +25,7 @@ function Department(props) { return { ...formData, eqParentId: selectedNodeId, - eqCorpinfoId: CorpinfoId, + }; }, }); @@ -130,6 +131,7 @@ function Department(props) { function AddModalComponent(props) { const [form] = Form.useForm(); const [parentName, setParentName] = useState(null); + const [levelData, setlevelData] = useState([]); useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { @@ -143,9 +145,9 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { - values.levelName = getLabelName({ status: values.level, list: [{ bianma: "1", name: "一级部门" }] }); + values.levelName = getLabelName({ status: values.level, list: levelData, idKey: "dictValue", nameKey: "dictLabel" }); values.parentId = props.parentId; - values.corpinfoId = CorpinfoId; + if (props.currentId) { values.parentId = props.parentId; values.id = props.currentId; @@ -179,7 +181,12 @@ function AddModalComponent(props) { options={[ { name: "parentName", required: false, label: "上级部门", render: {parentName} }, { name: "name", label: "部门名称" }, - { name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, + { name: "level", label: "部门级别", render: ( + { setlevelData(data); }} + /> + ) }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "securityFlag", @@ -188,6 +195,15 @@ function AddModalComponent(props) { render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], }, + { + name: "superviseFlag", + label: "是否监管部门", + required: false, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + }, + { name: "departmentIdsList", label: "数据权限", required: false, render: , dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) }, + { name: "departmentFunction", label: "部门职能" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js b/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js index 0d51644..8f45c80 100644 --- a/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js +++ b/src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js @@ -16,8 +16,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 1, - corpinfoIdString: "1983773013086048256", - eqUserId: "1986628687154974721", + }; }, }); diff --git a/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js b/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js index 2a0a9a3..8ff956c 100644 --- a/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js +++ b/src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js @@ -16,8 +16,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 1, - corpinfoIdString: "1983773013086048256", - eqUserId: "1986628687154974721", + }; }, }); diff --git a/src/pages/Container/Stakeholder/User/Add/index.js b/src/pages/Container/Stakeholder/User/Add/index.js index 2857f5e..82addfe 100644 --- a/src/pages/Container/Stakeholder/User/Add/index.js +++ b/src/pages/Container/Stakeholder/User/Add/index.js @@ -4,6 +4,7 @@ import { useEffect, useState } from "react"; 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 DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -29,6 +30,8 @@ function Add(props) { const queryParams = useGetUrlQuery(); const [form] = Form.useForm(); const [userID, setUserID] = useState(null); + const [culturalLevelData, setCulturalLevelData] = useState([]); + const [politicalAffiliationData, setPoliticalAffiliationData] = useState([]); useEffect(() => { console.log(queryParams["id"]); @@ -47,8 +50,8 @@ function Add(props) { values.mainCorpFlag = 0; values.userType = 1; values.nationName = getLabelName({ status: values.nation, list: nation }); - values.politicalAffiliationName = getLabelName({ status: values.politicalAffiliation, list: [{ name: "党员", bianma: "1" }, { name: "群众", bianma: "2" }] }); - values.culturalLevelName = getLabelName({ status: values.culturalLevel, list: [{ name: "大学", bianma: "1" }] }); + values.politicalAffiliationName = getLabelName({ status: values.politicalAffiliation, list: politicalAffiliationData, idKey: "dictValue", nameKey: "dictLabel" }); + values.culturalLevelName = getLabelName({ status: values.culturalLevel, list: culturalLevelData, idKey: "dictValue", nameKey: "dictLabel" }); values.maritalStatusName = getLabelName({ status: values.maritalStatus, list: MARITAL_STATUS_ENUM }); if (queryParams["id"]) { values.id = queryParams["id"]; @@ -144,8 +147,12 @@ function Add(props) { { name: "culturalLevel", label: "文化程度", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ name: "大学", bianma: "1" }], + render: ( + { setCulturalLevelData(data); }} + /> + ), }, { name: "maritalStatus", @@ -156,13 +163,14 @@ function Add(props) { { name: "politicalAffiliation", label: "政治面貌", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: [{ name: "党员", bianma: "1" }, { name: "群众", bianma: "2" }], - componentProps: { - onChange: () => { - form.setFieldValue("politicalTime", undefined); - }, - }, + + render: ( + { setPoliticalAffiliationData(data); }} + /> + ), + }, // { name: "deputyLeaderFlag", label: "是否为分管领导", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM }, // { diff --git a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js index 0562355..c76f770 100644 --- a/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js +++ b/src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js @@ -6,14 +6,15 @@ import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Search from "zy-react-library/components/Search"; -import Dictionary from "zy-react-library/components/Select/Dictionary"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; -import useTable from "zy-react-library/hooks/useTable"; +import useTable from "zy-react-library/hooks/useTable"; +import { getLabelName } from "zy-react-library/utils"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace"; function Department(props) { @@ -28,7 +29,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 2, - corpinfoIdString: queryParams["corpinfoId"], + eqCorpinfoId: queryParams["corpinfoId"], eqUserId: queryParams["id"], }; }, @@ -130,6 +131,7 @@ function AddModalComponent(props) { const queryParams = useGetUrlQuery(); const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); + const [qualificationinfoData, setQualificationinfoData] = useState([]); useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { @@ -144,14 +146,13 @@ function AddModalComponent(props) { }; const onSubmit = async (values) => { values.corpinfoId = queryParams["corpinfoId"]; - values.userIdString = queryParams["id"]; - + values.userId = queryParams["id"]; + values.qualificationinfoCategoryName = getLabelName({ status: values.qualificationinfoCategory, list: qualificationinfoData, idKey: "dictValue", nameKey: "dictLabel" }); values.qualificationinfoType = 2; values.userQualificationinfoId = userQualificationinfoId; - values.qualificationinfoCategory = "qyzyfzr"; - values.qualificationinfoCategoryName = "企业主要负责人"; + if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; await props.requestEdit(values); } else { @@ -181,7 +182,12 @@ function AddModalComponent(props) { showActionButtons={false} options={[ { name: "qualificationName", label: "证书名称" }, - { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: }, + { name: "qualificationinfoCategory", label: "证书作业类别", render: ( + { setQualificationinfoData(data); }} + /> + ) }, { name: "certificateNo", label: "证书编号" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, diff --git a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js index fe609ce..b28fc52 100644 --- a/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js +++ b/src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js @@ -6,12 +6,14 @@ import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Search from "zy-react-library/components/Search"; +import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; +import { getLabelName } from "zy-react-library/utils"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace"; function Department(props) { @@ -26,7 +28,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 1, - corpinfoIdString: queryParams["corpinfoId"], + eqCorpinfoId: queryParams["corpinfoId"], eqUserId: queryParams["id"], }; }, @@ -130,6 +132,8 @@ function AddModalComponent(props) { const queryParams = useGetUrlQuery(); const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); + const [qualificationinfoData, setQualificationinfoData] = useState([]); + const [OperatingPrData, setOperatingPrData] = useState([]); useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { @@ -144,15 +148,13 @@ function AddModalComponent(props) { }; const onSubmit = async (values) => { values.corpinfoId = queryParams["corpinfoId"]; - values.userIdString = queryParams["id"]; - values.operatingProject = "DGZY_dgzy"; - values.operatingProjectName = "电工作业"; + values.userId = queryParams["id"]; values.qualificationinfoType = 1; values.userQualificationinfoId = userQualificationinfoId; - values.qualificationinfoCategory = "DYDGZY"; - values.qualificationinfoCategoryName = "低压电工作业"; + values.qualificationinfoCategoryName = getLabelName({ status: values.qualificationinfoCategory, list: qualificationinfoData, idKey: "dictValue", nameKey: "dictLabel" }); + values.operatingProjectName = getLabelName({ status: values.operatingProject, list: OperatingPrData, idKey: "dictValue", nameKey: "dictLabel" }); if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; await props.requestEdit(values); } else { @@ -182,8 +184,20 @@ function AddModalComponent(props) { showActionButtons={false} options={[ { name: "qualificationName", label: "证书名称" }, - { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, - { name: "operatingProject", required: false, label: "操作项目" }, + { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: ( + { setQualificationinfoData(data); }} + + /> + ) }, + { name: "operatingProject", required: false, label: "操作项目", render: ( + { setOperatingPrData(data); }} + /> + ) }, + { name: "certificateNo", label: "证书编号" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "name", required: false, label: "证书图片", render: }, diff --git a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js index fc3858d..311502d 100644 --- a/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js +++ b/src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js @@ -4,6 +4,7 @@ import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Search from "zy-react-library/components/Search"; +import DictionarySelect from "zy-react-library/components/Select/Dictionary"; 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"; @@ -86,7 +87,16 @@ function List(props) { { name: "likecorpName", label: "分公司名称" }, { name: "eqCorpState", label: "分公司状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_STATUS }, // { name: "createDate", label: "开户时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, - { name: "eqEcoType", label: "经济类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ECONOMY_TYPE }, + { name: "eqEcoType", label: "经济类型", render: ( + { + form.setFieldValue("ecoTypeName", label); + }} + /> + ) }, + { name: "ecoTypeName", label: "经济类型名称", onlyForLabel: true }, ]} form={form} onFinish={getData} @@ -182,7 +192,6 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { - values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS }); if (props.openType === "editName") { values.id = props.currentId; @@ -218,7 +227,20 @@ function AddModalComponent(props) { { name: "corpName", label: "分公司名称" }, { name: "code", label: "社会统一信用代码", rules: [{ pattern: UNIFIED_SOCIAL_CREDIT_CODE, message: "请输入正确的社会统一信用代码" }], hidden: (props.openType === "editName") }, { name: "type", label: "企业类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE, hidden: (props.openType === "editName") }, - { name: "ecoType", label: "经济类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ECONOMY_TYPE, hidden: (props.openType === "editName") }, + { name: "ecoType", label: "经济类型", render: ( + { + form.setFieldValue("ecoTypeName", label); + }} + /> + ), hidden: (props.openType === "editName") }, + + { + name: "ecoTypeName", + label: "经济类型名称", + onlyForLabel: true, + }, { name: "corpState", label: "分公司状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_STATUS, hidden: (props.openType === "editName") }, { name: "corpOrder", label: "列表排序", render: FORM_ITEM_RENDER_ENUM.NUMBER, hidden: (props.openType === "editName") }, ]} diff --git a/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js b/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js index 9ebe4a1..1c4c1ff 100644 --- a/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js +++ b/src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js @@ -45,7 +45,7 @@ function List(props) {
{ - values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); - if (props.currentId) { values.id = props.currentId; await props.requestEdit(values); @@ -174,9 +165,17 @@ function AddModalComponent(props) { options={[ { name: "corpName", label: "单位名称" }, { name: "code", label: "社会统一信用代码", rules: [{ pattern: UNIFIED_SOCIAL_CREDIT_CODE, message: "请输入正确的社会统一信用代码" }] }, - { name: "ecoType", label: "经济类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ECONOMY_TYPE }, - { name: "type", label: "相关方企业类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, + { name: "eqEcoType", label: "经济类型", render: ( + { + form.setFieldValue("ecoTypeName", label); + }} + /> + ) }, + { name: "ecoTypeName", label: "经济类型名称", onlyForLabel: true }, + { name: "type", label: "相关方企业类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, ]} /> diff --git a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js index 28d35f3..c313a21 100644 --- a/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js +++ b/src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js @@ -6,6 +6,7 @@ import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Search from "zy-react-library/components/Search"; +import DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import Upload from "zy-react-library/components/Upload"; @@ -13,6 +14,7 @@ import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace"; +import {getLabelName} from "zy-react-library/utils"; function Department(props) { const [addModalOpen, setAddModalOpen] = useState(false); @@ -26,7 +28,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 2, - corpinfoIdString: queryParams["id"], + eqCorpinfoId: queryParams["id"], }; }, }); @@ -128,6 +130,7 @@ function AddModalComponent(props) { const queryParams = useGetUrlQuery(); const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); + const [qualificationinfoData, setQualificationinfoData] = useState([]); useEffect(() => { // 证书作业类别 // props.dictData({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "zylb" }).then((res) => { @@ -147,14 +150,12 @@ function AddModalComponent(props) { }; const onSubmit = async (values) => { values.corpinfoId = queryParams["corpinfoId"]; - values.userIdString = queryParams["id"]; - + values.userId = queryParams["id"]; + values.qualificationinfoCategoryName = getLabelName({ status: values.qualificationinfoCategory, list: qualificationinfoData, idKey: "dictValue", nameKey: "dictLabel" }); values.qualificationinfoType = 2; values.userQualificationinfoId = userQualificationinfoId; - values.qualificationinfoCategory = "qyzyfzr"; - values.qualificationinfoCategoryName = "企业主要负责人"; if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; await props.requestEdit(values); } else { @@ -184,7 +185,12 @@ function AddModalComponent(props) { showActionButtons={false} options={[ { name: "qualificationName", label: "证书名称" }, - { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, + { name: "qualificationinfoCategory", label: "证书作业类别", render: ( + { setQualificationinfoData(data); }} + /> + ) }, { name: "certificateNo", label: "证书编号" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, diff --git a/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js b/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js index 21e678c..482544a 100644 --- a/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js +++ b/src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js @@ -6,12 +6,14 @@ import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Search from "zy-react-library/components/Search"; +import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; +import { getLabelName } from "zy-react-library/utils"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace"; function Department(props) { @@ -26,7 +28,7 @@ function Department(props) { return { ...formData, eqQualificationinfoType: 1, - corpinfoIdString: queryParams["id"], + eqCorpinfoId: queryParams["id"], }; }, }); @@ -129,12 +131,9 @@ function AddModalComponent(props) { const queryParams = useGetUrlQuery(); const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); + const [qualificationinfoData, setQualificationinfoData] = useState([]); + const [OperatingPrData, setOperatingPrData] = useState([]); useEffect(() => { - // 证书作业类别 - // props.dictData({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "zylb" }).then((res) => { - // setQualificationinfo(res.data); - // }); - if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { form.setFieldsValue(res.data); @@ -147,16 +146,15 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { + values.qualificationinfoCategoryName = getLabelName({ status: values.qualificationinfoCategory, list: qualificationinfoData, idKey: "dictValue", nameKey: "dictLabel" }); + values.operatingProjectName = getLabelName({ status: values.operatingProject, list: OperatingPrData, idKey: "dictValue", nameKey: "dictLabel" }); values.corpinfoId = queryParams["corpinfoId"]; - values.userIdString = queryParams["id"]; - values.operatingProject = "DGZY_dgzy"; - values.operatingProjectName = "电工作业"; + values.userId = queryParams["id"]; values.qualificationinfoType = 1; values.userQualificationinfoId = userQualificationinfoId; - values.qualificationinfoCategory = "DYDGZY"; - values.qualificationinfoCategoryName = "低压电工作业"; + if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; await props.requestEdit(values); } else { @@ -186,8 +184,18 @@ function AddModalComponent(props) { showActionButtons={false} options={[ { name: "qualificationName", label: "证书名称" }, - { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, - { name: "operatingProject", required: false, label: "操作项目" }, + { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: ( + { setQualificationinfoData(data); }} + /> + ) }, + { name: "operatingProject", required: false, label: "操作项目", render: ( + { setOperatingPrData(data); }} + /> + ) }, { name: "certificateNo", label: "证书编号" }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "name", required: false, label: "证书图片", render: }, diff --git a/src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js b/src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js index 3df1fc9..ffe737e 100644 --- a/src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js +++ b/src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js @@ -48,7 +48,7 @@ function List(props) {
{ if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { @@ -147,7 +150,7 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { - values.levelName = getLabelName({ status: values.level, list: [{ bianma: "1", name: "一级部门" }] }); + values.levelName = getLabelName({ status: values.level, list: levelData, idKey: "dictValue", nameKey: "dictLabel" }); values.parentId = props.parentId; if (props.currentId) { values.id = props.currentId; @@ -184,7 +187,12 @@ function AddModalComponent(props) { options={[ { name: "parentName", required: false, label: "上级部门", render: {parentName} }, { name: "name", label: "部门名称" }, - { name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, + { name: "level", label: "部门级别", render: ( + { setlevelData(data); }} + /> + ) }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "securityFlag", @@ -193,6 +201,14 @@ function AddModalComponent(props) { render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], }, + { + name: "superviseFlag", + label: "是否监管部门", + required: false, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + }, + { name: "departmentIdsList", label: "数据权限", required: false, render: , dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Supervision/Supervision/Post/index.js b/src/pages/Container/Supervision/Supervision/Post/index.js index c5f48ee..aa6968a 100644 --- a/src/pages/Container/Supervision/Supervision/Post/index.js +++ b/src/pages/Container/Supervision/Supervision/Post/index.js @@ -4,12 +4,12 @@ import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; -import SelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; 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 { NS_POST } from "~/enumerate/namespace"; +const CorpinfoId = "1983773013086048256"; function Post(props) { const [addModalOpen, setAddModalOpen] = useState(false); const [currentId, setCurrentId] = useState(""); @@ -21,7 +21,7 @@ function Post(props) { transform: (formData) => { return { ...formData, - departmentIdString: selectedNodeId, + eqDepartmentId: selectedNodeId, corpFlag: 1, }; }, @@ -115,17 +115,18 @@ function AddModalComponent(props) { useEffect(() => { if (props.currentId) { props.requestDetails({ id: props.currentId }).then((res) => { - const arr = []; - res.data.departmentList && res.data.departmentList.forEach((item) => { - arr.push(item.departmentId); - }); - res.data.departmentIdsString = arr; + // const arr = []; + // res.data.departmentList && res.data.departmentList.forEach((item) => { + // arr.push(item.departmentId); + // }); + // res.data.departmentIdsString = arr; form.setFieldsValue(res.data); console.log(res.data); setParentName(res.data.departmentName); }); } else { + values.corpinfoId = CorpinfoId; setParentName(props.selectedNodeName); } }, [props.currentId, props.selectedNodeName]); @@ -135,10 +136,10 @@ function AddModalComponent(props) { props.onCancel(); }; const onSubmit = async (values) => { - values.departmentIdString = props.parentId; + values.departmentId = props.parentId; values.corpFlag = 1; if (props.currentId) { - values.idString = props.currentId; + values.id = props.currentId; props.requestEdit(values).then(() => { onCancel(); props.getData(); @@ -172,14 +173,14 @@ function AddModalComponent(props) { options={[ { name: "parentName", required: false, label: "所属部门", render: {parentName } }, { name: "postName", label: "岗位名称" }, - { - name: "supervisionFlag", - label: "是否监管岗位", - required: false, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], - }, - { name: "departmentIdsString", label: "数据权限", required: false, render: , dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, + // { + // name: "supervisionFlag", + // label: "是否监管岗位", + // required: false, + // render: FORM_ITEM_RENDER_ENUM.RADIO, + // items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], + // }, + // { name: "departmentIdsString", label: "数据权限", required: false, render: , dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, { name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, ]} /> diff --git a/src/pages/Container/Supervision/Supervision/User/Add/index.js b/src/pages/Container/Supervision/Supervision/User/Add/index.js index a2507a2..8d1ca8f 100644 --- a/src/pages/Container/Supervision/Supervision/User/Add/index.js +++ b/src/pages/Container/Supervision/Supervision/User/Add/index.js @@ -4,6 +4,7 @@ import { useEffect, useState } from "react"; 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 DictionarySelect from "zy-react-library/components/SelectTree/Dictionary"; import Upload from "zy-react-library/components/Upload"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -43,26 +44,14 @@ function Add(props) { props["rolesAll"]().then((res) => { setRolesData(res.data); }); - - // 部门级别 - props["dictData"]({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "departmentLevel" }).then((res) => { - console.log(res); - getRankData(res.data); - }); - // 人员类型 - props["dictData"]({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "renyuanleixing" }).then((res) => { - console.log(res); - setUserTypeData(res.data); - }); }, []); const onSubmit = async (values) => { values.nationName = getLabelName({ status: values.nation, list: nation }); - values.personnelTypeName = getLabelName({ status: values.personnelType, list: userTypeData, idKey: "dictValue", nameKey: "labelKey" }); - values.rank_level_name = getLabelName({ status: values.rank_level, list: rankData, idKey: "dictValue", nameKey: "labelKey" }); + 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: "dictLabel" }); idCardGetDateAndGender(values.userIdCard); - console.log(idCardGetDateAndGender(values.userIdCard)); values.mainCorpFlag = 0; values.userType = 1; if (queryParams["id"]) { @@ -89,7 +78,7 @@ function Add(props) { console.log(event); form.setFieldsValue({ postId: undefined }); // setDepartmentName(event[0].name) - props["postAll"]({ corpFlag: 1, departmentIdString: event[0].id }).then((res) => { + props["postAll"]({ corpFlag: 1, departmentId: event[0].id }).then((res) => { console.log(res); setPostData(res.data); }); @@ -125,9 +114,12 @@ function Add(props) { { name: "personnelType", label: "人员类型", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: userTypeData, - itemsField: { labelKey: "dictLabel", valueKey: "dictValue" }, + render: ( + { setUserTypeData(data); }} + /> + ), }, { name: "userIdCard", @@ -175,7 +167,12 @@ function Add(props) { ), }, { name: "sort", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, - { name: "rank_level", label: "人员职级", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: rankData, itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, + { name: "rank_level", label: "职级", required: false, render: ( + { getRankData(data); }} + /> + ) }, { name: "email", label: "邮箱", required: false, rules: [{ type: "email", message: "请输入正确的邮箱" }] }, { name: "remarks", label: "备注", span: 24, required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "departmentLeaderFlag", label: "是否为部门负责人", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM }, diff --git a/src/pages/Container/Supervision/Supervision/User/List/index.js b/src/pages/Container/Supervision/Supervision/User/List/index.js index ad1cf25..b39a9f4 100644 --- a/src/pages/Container/Supervision/Supervision/User/List/index.js +++ b/src/pages/Container/Supervision/Supervision/User/List/index.js @@ -35,7 +35,7 @@ function List(props) { const fetchPostData = async () => { const deptId = selectedNodeId ?? "0"; try { - const res = await props["postAll"]({ corpFlag: 1, departmentIdString: deptId }); + const res = await props["postAll"]({ corpFlag: 1, departmentId: deptId }); setPostData(res?.data || []); } catch (err) {