zcloud_gbs
/
zcloud_gbs_basic_info_gwj-react
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

dev
853931625@qq.com 2025-11-10 18:19:30 +08:00
parent 80dd9b0de0
commit 2f3b0dd596
24 changed files with 355 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/Container/BusinessLicense/index.js
View File

@ -20,7 +20,7 @@ function Department(props) {
transform: (formData) => { transform: (formData) => {
return { return {
...formData, ...formData,
corpinfoIdString: CorpinfoId, eqCorpinfoId: CorpinfoId,
}; };
}, },
}); });
@ -129,7 +129,7 @@ function AddModalComponent(props) {
values.corpinfoId = CorpinfoId; values.corpinfoId = CorpinfoId;
values.startValidityTime = values.startValidity[0]; values.startValidityTime = values.startValidity[0];
values.endValidityTime = values.startValidity[1]; values.endValidityTime = values.startValidity[1];
values.userIdString = "1985635856156274689"; values.user = "1985635856156274689";
delete values.startValidity; delete values.startValidity;
if (props.currentId) { if (props.currentId) {

60
src/pages/Container/Enterprise/CorpInfo/Update/index.js
View File

@ -1,10 +1,11 @@
import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Connect } from "@cqsjjb/jjb-dva-runtime";
import { Form, message } from "antd"; import { Form, message } from "antd";
import { useEffect } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import HeaderBack from "zy-react-library/components/HeaderBack";
import Map from "zy-react-library/components/Map"; import Map from "zy-react-library/components/Map";
import Area from "zy-react-library/components/SelectTree/Area"; 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 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 { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
@ -18,12 +19,7 @@ const ENTERPRISE_STATUS = [
{ bianma: "filialstate04", name: "停产" }, { bianma: "filialstate04", name: "停产" },
{ bianma: "filialstate05", name: "破产" }, { bianma: "filialstate05", name: "破产" },
]; ];
const ECONOMY_TYPE = [
{ bianma: "economic_type19", name: "外资" },
{ bianma: "economic_type18", name: "中外合作" },
{ bianma: "economic_type17", name: "中外合资" },
];
// const PRESENCE_OR_ABSENCE_ENUM = [ // const PRESENCE_OR_ABSENCE_ENUM = [
// { bianma: 1, name: "有" }, // { bianma: 1, name: "有" },
// { bianma: 0, name: "无" }, // { bianma: 0, name: "无" },
@ -35,11 +31,13 @@ const WHETHER_ENUM = [
function Update(props) { function Update(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [scaleData, setScaleData] = useState([]);
const [ecoTypeData, setEcoTypeData] = useState([]);
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.id = "1985906265017954306"; values.id = "1985906265017954306";
values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); values.ecoTypeName = getLabelName({ status: values.ecoType, list: ecoTypeData, idKey: "dictValue", nameKey: "dictLabel" });
values.scaleName = getLabelName({ status: values.scale, list: [{ bianma: "1-10人", name: "1-10人" }] }); values.scaleName = getLabelName({ status: values.scale, list: scaleData, idKey: "dictValue", nameKey: "dictLabel" });
values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS }); values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS, idKey: "dictValue", nameKey: "dictLabel" });
values.licenseStart = values.license[0]; values.licenseStart = values.license[0];
values.licenseEnd = values.license[1]; values.licenseEnd = values.license[1];
delete values.license; delete values.license;
@ -53,20 +51,20 @@ function Update(props) {
const fetchData = async () => { const fetchData = async () => {
const res = await props["corpInfoRemoveDetails"]({ id: "1985906265017954306" }); const res = await props["corpInfoRemoveDetails"]({ id: "1985906265017954306" });
res.data.scaleType = res.data.scaleType ?? 0; res.data.scaleType = res.data.scaleType ?? 0;
res.data.whetherHygieneFlag = res.data.whetherHygieneFlag ?? 0; // res.data.whetherHygieneFlag = res.data.whetherHygieneFlag ?? 0;
res.data.whetherHazardsFlag = res.data.whetherHazardsFlag ?? 0; // res.data.whetherHazardsFlag = res.data.whetherHazardsFlag ?? 0;
res.data.whetherScarceFlag = res.data.whetherScarceFlag ?? 0; // res.data.whetherScarceFlag = res.data.whetherScarceFlag ?? 0;
res.data.whetherChemicalsFlag = res.data.whetherChemicalsFlag ?? 0; // res.data.whetherChemicalsFlag = res.data.whetherChemicalsFlag ?? 0;
res.data.whetherSpecialequipmentFlag = res.data.whetherSpecialequipmentFlag ?? 0; // res.data.whetherSpecialequipmentFlag = res.data.whetherSpecialequipmentFlag ?? 0;
res.data.whetherSpecialpeopleFlag = res.data.whetherSpecialpeopleFlag ?? 0; // res.data.whetherSpecialpeopleFlag = res.data.whetherSpecialpeopleFlag ?? 0;
res.data.whetherCoalgasFlag = res.data.whetherCoalgasFlag ?? 0; // res.data.whetherCoalgasFlag = res.data.whetherCoalgasFlag ?? 0;
res.data.whetherFireFlag = res.data.whetherFireFlag ?? 0; // res.data.whetherFireFlag = res.data.whetherFireFlag ?? 0;
res.data.whetherConfinedFlag = res.data.whetherConfinedFlag ?? 0; // res.data.whetherConfinedFlag = res.data.whetherConfinedFlag ?? 0;
res.data.whetherPowderFlag = res.data.whetherPowderFlag ?? 0; // res.data.whetherPowderFlag = res.data.whetherPowderFlag ?? 0;
res.data.whetherLightningFlag = res.data.whetherLightningFlag ?? 0; // res.data.whetherLightningFlag = res.data.whetherLightningFlag ?? 0;
res.data.whetherActinogenFlag = res.data.whetherActinogenFlag ?? 0; // res.data.whetherActinogenFlag = res.data.whetherActinogenFlag ?? 0;
res.data.whetherLiquidammoniaFlag = res.data.whetherLiquidammoniaFlag ?? 0; // res.data.whetherLiquidammoniaFlag = res.data.whetherLiquidammoniaFlag ?? 0;
res.data.whetherPipeline = res.data.whetherPipeline ?? 0; // res.data.whetherPipeline = res.data.whetherPipeline ?? 0;
res.data.license = [res.data.licenseStart, res.data.licenseEnd]; res.data.license = [res.data.licenseStart, res.data.licenseEnd];
form.setFieldsValue(res.data); form.setFieldsValue(res.data);
@ -119,8 +117,12 @@ function Update(props) {
label: "规模", label: "规模",
name: "scale", name: "scale",
required: false, required: false,
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: [{ bianma: "1-10人", name: "1-10人" }], <DictionarySelect
dictValue="scale"
onGetData={(data) => { setScaleData(data); }}
/>
),
}, },
{ label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE }, { label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE },
{ {
@ -137,8 +139,12 @@ function Update(props) {
{ {
label: "经济类型", label: "经济类型",
name: "ecoType", name: "ecoType",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: ECONOMY_TYPE, <DictionarySelect
dictValue="ECO_TYPE"
onGetData={(data) => { setEcoTypeData(data); }}
/>
),
}, },
{ {
label: "所属行业", label: "所属行业",

84
src/pages/Container/Enterprise/OrganizationStructure/index.js
View File

@ -5,18 +5,19 @@ import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
import { NS_DEPARTMENT } from "~/enumerate/namespace"; import { NS_DEPARTMENT } from "~/enumerate/namespace";
const CorpinfoId = "1985906265017954306";
function OrganizationStructure(props) { function OrganizationStructure(props) {
const [addModalOpen, setAddModalOpen] = useState(false); const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState(""); const [currentId, setCurrentId] = useState("");
const [selectedNodeId, setSelectedNodeId] = useState(null); const [selectedNodeId, setSelectedNodeId] = useState(null);
const [selectedNodeName, setSelectedNodeName] = useState("");
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["departmentList"], { const { tableProps, getData } = useTable(props["departmentList"], {
form, form,
@ -24,13 +25,13 @@ function OrganizationStructure(props) {
return { return {
...formData, ...formData,
eqParentId: selectedNodeId, eqParentId: selectedNodeId,
eqCorpinfoId: CorpinfoId,
}; };
}, },
}); });
const onTreeChange = (selectedKeys) => { const onTreeChange = (selectedKeys, event) => {
const key = selectedKeys[0] || null; const key = selectedKeys[0] || null;
setSelectedNodeName(event.node.name);
setSelectedNodeId(key); setSelectedNodeId(key);
getData(); getData();
}; };
@ -55,12 +56,12 @@ function OrganizationStructure(props) {
<Search <Search
options={[ options={[
{ name: "likeName", label: "部门名称" }, { name: "likeName", label: "部门名称" },
{
name: "eqLevel", { name: "level", label: "部门级别", render: (
label: "部门级别", <DictionarySelect
render: FORM_ITEM_RENDER_ENUM.SELECT, dictValue="companyDepartmentLevel0000"
items: [{ name: "一级部门", bianma: "1" }], />
}, ) },
]} ]}
form={form} form={form}
onFinish={getData} onFinish={getData}
@ -94,6 +95,7 @@ function OrganizationStructure(props) {
{`${record.name}>`} {`${record.name}>`}
</Button> </Button>
) }, ) },
{ title: "部门级别", dataIndex: "levelName" },
{ {
title: "操作", title: "操作",
width: 200, width: 200,
@ -119,20 +121,24 @@ function OrganizationStructure(props) {
/> />
</div> </div>
</div> </div>
<AddModal {addModalOpen
currentId={currentId} && (
requestAdd={props["departmentAdd"]} <AddModal
requestEdit={props["departmentEdit"]} currentId={currentId}
requestDetails={props["departmentDetails"]} requestAdd={props["departmentAdd"]}
loading={props.department.departmentLoading} requestEdit={props["departmentEdit"]}
open={addModalOpen} requestDetails={props["departmentDetails"]}
parentId={selectedNodeId} loading={props.department.departmentLoading}
onCancel={() => { open={addModalOpen}
setAddModalOpen(false); parentId={selectedNodeId}
setCurrentId(""); selectedNodeName={selectedNodeName}
}} onCancel={() => {
getData={getData} setAddModalOpen(false);
/> setCurrentId("");
}}
getData={getData}
/>
)}
</div> </div>
); );
} }
@ -140,6 +146,7 @@ function OrganizationStructure(props) {
function AddModalComponent(props) { function AddModalComponent(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [parentName, setParentName] = useState(null); const [parentName, setParentName] = useState(null);
const [levelData, setlevelData] = useState([]);
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
@ -147,15 +154,21 @@ function AddModalComponent(props) {
setParentName(res.data.parentName); setParentName(res.data.parentName);
}); });
} }
}, [props.currentId]); else {
console.log(props.selectedNodeName);
setParentName(props.selectedNodeName);
}
}, [props.currentId, props.selectedNodeName]);
const onCancel = () => { const onCancel = () => {
form.resetFields(); form.resetFields();
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { 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.parentId = props.parentId;
values.corpinfoId = CorpinfoId;
if (props.currentId) { if (props.currentId) {
values.parentId = props.parentId; values.parentId = props.parentId;
values.id = props.currentId; values.id = props.currentId;
@ -178,6 +191,7 @@ function AddModalComponent(props) {
> >
<FormBuilder <FormBuilder
values={{ values={{
superviseFlag: 0,
securityFlag: 0, securityFlag: 0,
}} }}
form={form} form={form}
@ -188,7 +202,12 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> }, { name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> },
{ name: "name", label: "部门名称" }, { name: "name", label: "部门名称" },
{ name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, { name: "level", label: "部门级别", render: (
<DictionarySelect
dictValue="companyDepartmentLevel0000"
onGetData={(data) => { setlevelData(data); }}
/>
) },
{ name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
{ {
name: "securityFlag", name: "securityFlag",
@ -197,6 +216,15 @@ function AddModalComponent(props) {
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], 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: <SelectTree multiple />, dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) },
{ name: "departmentFunction", label: "部门职能" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />

64
src/pages/Container/Enterprise/Post/index.js
View File

@ -4,12 +4,13 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { NS_POST } from "~/enumerate/namespace"; import { NS_POST } from "~/enumerate/namespace";
function Post(props) { function Post(props) {
const [addModalOpen, setAddModalOpen] = useState(false); const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState(""); const [currentId, setCurrentId] = useState("");
@ -21,7 +22,7 @@ function Post(props) {
transform: (formData) => { transform: (formData) => {
return { return {
...formData, ...formData,
departmentIdString: selectedNodeId, eqDepartmentId: selectedNodeId,
corpFlag: 2, corpFlag: 2,
}; };
}, },
@ -90,21 +91,24 @@ function Post(props) {
/> />
</div> </div>
</div> </div>
<AddModal {addModalOpen
currentId={currentId} && (
open={addModalOpen} <AddModal
requestAdd={props["postAdd"]} currentId={currentId}
requestEdit={props["postEdit"]} open={addModalOpen}
requestDetails={props["postDetails"]} requestAdd={props["postAdd"]}
selectedNodeName={selectedNodeName} requestEdit={props["postEdit"]}
parentId={selectedNodeId} requestDetails={props["postDetails"]}
loding={props.post.postLoading} selectedNodeName={selectedNodeName}
onCancel={() => { parentId={selectedNodeId}
setAddModalOpen(false); loding={props.post.postLoading}
setCurrentId(""); onCancel={() => {
}} setAddModalOpen(false);
getData={getData} setCurrentId("");
/> }}
getData={getData}
/>
)}
</div> </div>
); );
} }
@ -115,11 +119,6 @@ function AddModalComponent(props) {
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { 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); form.setFieldsValue(res.data);
console.log(res.data); console.log(res.data);
setParentName(res.data.departmentName); setParentName(res.data.departmentName);
@ -135,16 +134,17 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.departmentIdString = props.parentId; values.departmentId = props.parentId;
values.corpFlag = 2; values.corpFlag = 2;
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
props.requestEdit(values).then(() => { props.requestEdit(values).then(() => {
onCancel(); onCancel();
props.getData(); props.getData();
}); });
} }
else { else {
props.requestAdd(values).then(() => { props.requestAdd(values).then(() => {
onCancel(); onCancel();
props.getData(); props.getData();
@ -172,14 +172,14 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "parentName", required: false, label: "所属部门", render: <Tag color="processing">{parentName }</Tag> }, { name: "parentName", required: false, label: "所属部门", render: <Tag color="processing">{parentName }</Tag> },
{ name: "postName", label: "岗位名称" }, { name: "postName", label: "岗位名称" },
{ // {
name: "supervisionFlag", // name: "supervisionFlag",
label: "是否监管岗位", // label: "是否监管岗位",
required: false, // required: false,
render: FORM_ITEM_RENDER_ENUM.RADIO, // render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], // items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }],
}, // },
{ name: "departmentIdsString", label: "数据权限", required: false, render: <SelectTree multiple />, dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, // { name: "departmentIdsString", label: "数据权限", required: false, render: <SelectTree multiple />, dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) },
{ name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />

4
src/pages/Container/Enterprise/User/Add/index.js
View File

@ -57,7 +57,7 @@ function Add(props) {
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.nationName = getLabelName({ status: values.nation, list: nation }); 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" }); // values.rank_level_name = getLabelName({ status: values.rank_level, list: rankData, idKey: "dictValue", nameKey: "labelKey" });
idCardGetDateAndGender(values.userIdCard); idCardGetDateAndGender(values.userIdCard);
@ -88,7 +88,7 @@ function Add(props) {
console.log(event); console.log(event);
form.setFieldsValue({ postId: undefined }); form.setFieldsValue({ postId: undefined });
// setDepartmentName(event[0].name) // 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); console.log(res);
setPostData(res.data); setPostData(res.data);
}); });

2
src/pages/Container/Enterprise/User/List/index.js
View File

@ -66,7 +66,7 @@ function List(props) {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search <Search
options={[ options={[
{ name: "name", label: "关键字", tip: "用户名/姓名" }, { name: "username", label: "用户名" },
]} ]}
form={form} form={form}

6
src/pages/Container/PersonnelCertificate/index.js
View File

@ -21,7 +21,7 @@ function Department(props) {
transform: (formData) => { transform: (formData) => {
return { return {
...formData, ...formData,
corpinfoIdString: CorpinfoId, eqCorpinfoId: CorpinfoId,
}; };
}, },
}); });
@ -132,13 +132,13 @@ function AddModalComponent(props) {
values.corpinfoId = CorpinfoId; values.corpinfoId = CorpinfoId;
values.startValidityTime = values.startValidity[0]; values.startValidityTime = values.startValidity[0];
values.endValidityTime = values.startValidity[1]; values.endValidityTime = values.startValidity[1];
values.userIdString = "1985635856156274689"; values.userId = "1985635856156274689";
values.userQualificationinfoId = qualificationinfoId; values.userQualificationinfoId = qualificationinfoId;
console.log(values.startValidity); console.log(values.startValidity);
delete values.startValidity; delete values.startValidity;
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
} }
else { else {

37
src/pages/Container/Stakeholder/CorpInfo/index.js
View File

@ -3,12 +3,12 @@ import { Button, Form, message, Modal, QRCode } from "antd";
import { useEffect, useState } from "react"; import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import Map from "zy-react-library/components/Map"; 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 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 { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { PHONE, POSTAL_CODE, UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
import Qualification from "./components/Qualification";
const ENTERPRISE_STATUS = [ const ENTERPRISE_STATUS = [
{ bianma: "filialstate01", name: "在产" }, { bianma: "filialstate01", name: "在产" },
@ -17,12 +17,7 @@ const ENTERPRISE_STATUS = [
{ bianma: "filialstate04", name: "停产" }, { bianma: "filialstate04", name: "停产" },
{ bianma: "filialstate05", name: "破产" }, { bianma: "filialstate05", name: "破产" },
]; ];
const ECONOMY_TYPE = [
{ bianma: "economic_type19", name: "外资" },
{ bianma: "economic_type18", name: "中外合作" },
{ bianma: "economic_type17", name: "中外合资" },
];
const WHETHER_ENUM = [ const WHETHER_ENUM = [
{ bianma: 1, name: "是" }, { bianma: 1, name: "是" },
{ bianma: 0, name: "否" }, { bianma: 0, name: "否" },
@ -37,6 +32,8 @@ const WHETHER_ENUM = [
function CorpInfo(props) { function CorpInfo(props) {
const [corpInfoQrCodeOpen, setCorpInfoQrCodeOpen] = useState(false); const [corpInfoQrCodeOpen, setCorpInfoQrCodeOpen] = useState(false);
const [form] = Form.useForm(); const [form] = Form.useForm();
const [scaleData, setScaleData] = useState([]);
const [ecoTypeData, setEcoTypeData] = useState([]);
useEffect(() => { useEffect(() => {
const fetchData = async () => { const fetchData = async () => {
const res = await props.corpInfoRemoveDetails({ id: "1985906265017954306" }); const res = await props.corpInfoRemoveDetails({ id: "1985906265017954306" });
@ -47,11 +44,9 @@ function CorpInfo(props) {
}, []); }, []);
const onSubmit = async (values) => { const onSubmit = async (values) => {
console.log(values); values.ecoTypeName = getLabelName({ status: values.ecoType, list: ecoTypeData, idKey: "dictValue", nameKey: "dictLabel" });
values.id = "1985906265017954306"; values.scaleName = getLabelName({ status: values.scale, list: scaleData, idKey: "dictValue", nameKey: "dictLabel" });
values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE }); values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS, idKey: "dictValue", nameKey: "dictLabel" });
values.scaleName = getLabelName({ status: values.scale, list: [{ bianma: "1-10人", name: "1-10人" }] });
values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS });
values.licenseStart = values.license[0]; values.licenseStart = values.license[0];
values.licenseEnd = values.license[1]; values.licenseEnd = values.license[1];
delete values.license; delete values.license;
@ -84,8 +79,12 @@ function CorpInfo(props) {
label: "规模", label: "规模",
name: "scale", name: "scale",
required: false, required: false,
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: [{ bianma: "1-10人", name: "1-10人" }], <DictionarySelect
dictValue="scale"
onGetData={(data) => { setScaleData(data); }}
/>
),
}, },
{ label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE }, { label: "成立时间", name: "createDate", required: false, render: FORM_ITEM_RENDER_ENUM.DATE },
{ {
@ -102,8 +101,12 @@ function CorpInfo(props) {
{ {
label: "经济类型", label: "经济类型",
name: "ecoType", name: "ecoType",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: ECONOMY_TYPE, <DictionarySelect
dictValue="ECO_TYPE"
onGetData={(data) => { setEcoTypeData(data); }}
/>
),
}, },
{ {
label: "所属行业", label: "所属行业",
@ -158,8 +161,8 @@ function CorpInfo(props) {
查看 查看
</Button> </Button>
) }, ) },
{ label: "单位资质信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, // { label: "单位资质信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
{ name: "qualification", customizeRender: true, span: 24, render: <Qualification /> }, // { name: "qualification", customizeRender: true, span: 24, render: <Qualification /> },
]} ]}
/> />
</div> </div>

26
src/pages/Container/Stakeholder/Department/index.js
View File

@ -5,13 +5,14 @@ import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { getLabelName } from "zy-react-library/utils"; import { getLabelName } from "zy-react-library/utils";
import { NS_DEPARTMENT } from "~/enumerate/namespace"; import { NS_DEPARTMENT } from "~/enumerate/namespace";
const CorpinfoId = "1985906265017954306";
function Department(props) { function Department(props) {
const [addModalOpen, setAddModalOpen] = useState(false); const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState(""); const [currentId, setCurrentId] = useState("");
@ -24,7 +25,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqParentId: selectedNodeId, eqParentId: selectedNodeId,
eqCorpinfoId: CorpinfoId,
}; };
}, },
}); });
@ -130,6 +131,7 @@ function Department(props) {
function AddModalComponent(props) { function AddModalComponent(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [parentName, setParentName] = useState(null); const [parentName, setParentName] = useState(null);
const [levelData, setlevelData] = useState([]);
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
@ -143,9 +145,9 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { 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.parentId = props.parentId;
values.corpinfoId = CorpinfoId;
if (props.currentId) { if (props.currentId) {
values.parentId = props.parentId; values.parentId = props.parentId;
values.id = props.currentId; values.id = props.currentId;
@ -179,7 +181,12 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> }, { name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> },
{ name: "name", label: "部门名称" }, { name: "name", label: "部门名称" },
{ name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, { name: "level", label: "部门级别", render: (
<DictionarySelect
dictValue="companyDepartmentLevel0000"
onGetData={(data) => { setlevelData(data); }}
/>
) },
{ name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
{ {
name: "securityFlag", name: "securityFlag",
@ -188,6 +195,15 @@ function AddModalComponent(props) {
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], 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: <SelectTree multiple />, dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) },
{ name: "departmentFunction", label: "部门职能" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />

3
src/pages/Container/Stakeholder/SecurityPersonnelInfo/index.js
View File

@ -16,8 +16,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 1, eqQualificationinfoType: 1,
corpinfoIdString: "1983773013086048256",
eqUserId: "1986628687154974721",
}; };
}, },
}); });

3
src/pages/Container/Stakeholder/SpecialOperationPersonnel/index.js
View File

@ -16,8 +16,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 1, eqQualificationinfoType: 1,
corpinfoIdString: "1983773013086048256",
eqUserId: "1986628687154974721",
}; };
}, },
}); });

30
src/pages/Container/Stakeholder/User/Add/index.js
View File

@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import HeaderBack from "zy-react-library/components/HeaderBack";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; 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 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -29,6 +30,8 @@ function Add(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const [form] = Form.useForm(); const [form] = Form.useForm();
const [userID, setUserID] = useState(null); const [userID, setUserID] = useState(null);
const [culturalLevelData, setCulturalLevelData] = useState([]);
const [politicalAffiliationData, setPoliticalAffiliationData] = useState([]);
useEffect(() => { useEffect(() => {
console.log(queryParams["id"]); console.log(queryParams["id"]);
@ -47,8 +50,8 @@ function Add(props) {
values.mainCorpFlag = 0; values.mainCorpFlag = 0;
values.userType = 1; values.userType = 1;
values.nationName = getLabelName({ status: values.nation, list: nation }); values.nationName = getLabelName({ status: values.nation, list: nation });
values.politicalAffiliationName = getLabelName({ status: values.politicalAffiliation, list: [{ name: "党员", bianma: "1" }, { name: "群众", bianma: "2" }] }); values.politicalAffiliationName = getLabelName({ status: values.politicalAffiliation, list: politicalAffiliationData, idKey: "dictValue", nameKey: "dictLabel" });
values.culturalLevelName = getLabelName({ status: values.culturalLevel, list: [{ name: "大学", bianma: "1" }] }); values.culturalLevelName = getLabelName({ status: values.culturalLevel, list: culturalLevelData, idKey: "dictValue", nameKey: "dictLabel" });
values.maritalStatusName = getLabelName({ status: values.maritalStatus, list: MARITAL_STATUS_ENUM }); values.maritalStatusName = getLabelName({ status: values.maritalStatus, list: MARITAL_STATUS_ENUM });
if (queryParams["id"]) { if (queryParams["id"]) {
values.id = queryParams["id"]; values.id = queryParams["id"];
@ -144,8 +147,12 @@ function Add(props) {
{ {
name: "culturalLevel", name: "culturalLevel",
label: "文化程度", label: "文化程度",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: [{ name: "大学", bianma: "1" }], <DictionarySelect
dictValue="wenhuachengdu"
onGetData={(data) => { setCulturalLevelData(data); }}
/>
),
}, },
{ {
name: "maritalStatus", name: "maritalStatus",
@ -156,13 +163,14 @@ function Add(props) {
{ {
name: "politicalAffiliation", name: "politicalAffiliation",
label: "政治面貌", label: "政治面貌",
render: FORM_ITEM_RENDER_ENUM.SELECT,
items: [{ name: "党员", bianma: "1" }, { name: "群众", bianma: "2" }], render: (
componentProps: { <DictionarySelect
onChange: () => { dictValue="zhengzhimianmao"
form.setFieldValue("politicalTime", undefined); onGetData={(data) => { setPoliticalAffiliationData(data); }}
}, />
}, ),
}, },
// { name: "deputyLeaderFlag", label: "是否为分管领导", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM }, // { name: "deputyLeaderFlag", label: "是否为分管领导", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM },
// { // {

24
src/pages/Container/Stakeholder/User/SecurityPersonnel/index.js
View File

@ -6,14 +6,15 @@ import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import Upload from "zy-react-library/components/Upload"; 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; 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"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace";
function Department(props) { function Department(props) {
@ -28,7 +29,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 2, eqQualificationinfoType: 2,
corpinfoIdString: queryParams["corpinfoId"], eqCorpinfoId: queryParams["corpinfoId"],
eqUserId: queryParams["id"], eqUserId: queryParams["id"],
}; };
}, },
@ -130,6 +131,7 @@ function AddModalComponent(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); const [userQualificationinfoId, setUserQualificationinfoId] = useState("");
const [qualificationinfoData, setQualificationinfoData] = useState([]);
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
@ -144,14 +146,13 @@ function AddModalComponent(props) {
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.corpinfoId = queryParams["corpinfoId"]; 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.qualificationinfoType = 2;
values.userQualificationinfoId = userQualificationinfoId; values.userQualificationinfoId = userQualificationinfoId;
values.qualificationinfoCategory = "qyzyfzr";
values.qualificationinfoCategoryName = "企业主要负责人";
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
} }
else { else {
@ -181,7 +182,12 @@ function AddModalComponent(props) {
showActionButtons={false} showActionButtons={false}
options={[ options={[
{ name: "qualificationName", label: "证书名称" }, { name: "qualificationName", label: "证书名称" },
{ name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: <Dictionary dictValue="zslx" /> }, { name: "qualificationinfoCategory", label: "证书作业类别", render: (
<DictionarySelect
dictValue="zslx"
onGetData={(data) => { setQualificationinfoData(data); }}
/>
) },
{ name: "certificateNo", label: "证书编号" }, { name: "certificateNo", label: "证书编号" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },

32
src/pages/Container/Stakeholder/User/SpecialPersonnel/index.js
View File

@ -6,12 +6,14 @@ import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import Upload from "zy-react-library/components/Upload"; 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; 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"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace";
function Department(props) { function Department(props) {
@ -26,7 +28,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 1, eqQualificationinfoType: 1,
corpinfoIdString: queryParams["corpinfoId"], eqCorpinfoId: queryParams["corpinfoId"],
eqUserId: queryParams["id"], eqUserId: queryParams["id"],
}; };
}, },
@ -130,6 +132,8 @@ function AddModalComponent(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); const [userQualificationinfoId, setUserQualificationinfoId] = useState("");
const [qualificationinfoData, setQualificationinfoData] = useState([]);
const [OperatingPrData, setOperatingPrData] = useState([]);
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
@ -144,15 +148,13 @@ function AddModalComponent(props) {
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.corpinfoId = queryParams["corpinfoId"]; values.corpinfoId = queryParams["corpinfoId"];
values.userIdString = queryParams["id"]; values.userId = queryParams["id"];
values.operatingProject = "DGZY_dgzy";
values.operatingProjectName = "电工作业";
values.qualificationinfoType = 1; values.qualificationinfoType = 1;
values.userQualificationinfoId = userQualificationinfoId; values.userQualificationinfoId = userQualificationinfoId;
values.qualificationinfoCategory = "DYDGZY"; values.qualificationinfoCategoryName = getLabelName({ status: values.qualificationinfoCategory, list: qualificationinfoData, idKey: "dictValue", nameKey: "dictLabel" });
values.qualificationinfoCategoryName = "低压电工作业"; values.operatingProjectName = getLabelName({ status: values.operatingProject, list: OperatingPrData, idKey: "dictValue", nameKey: "dictLabel" });
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
} }
else { else {
@ -182,8 +184,20 @@ function AddModalComponent(props) {
showActionButtons={false} showActionButtons={false}
options={[ options={[
{ name: "qualificationName", label: "证书名称" }, { name: "qualificationName", label: "证书名称" },
{ name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: (
{ name: "operatingProject", required: false, label: "操作项目" }, <DictionarySelect
dictValue="zylb"
onGetData={(data) => { setQualificationinfoData(data); }}
/>
) },
{ name: "operatingProject", required: false, label: "操作项目", render: (
<DictionarySelect
dictValue="DGZY_dgzy"
onGetData={(data) => { setOperatingPrData(data); }}
/>
) },
{ name: "certificateNo", label: "证书编号" }, { name: "certificateNo", label: "证书编号" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "name", required: false, label: "证书图片", render: <Upload size={10} fileType="image" /> }, { name: "name", required: false, label: "证书图片", render: <Upload size={10} fileType="image" /> },

28
src/pages/Container/Supervision/BranchCompany/AccountManage/List/index.js
View File

@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -86,7 +87,16 @@ function List(props) {
{ name: "likecorpName", label: "分公司名称" }, { name: "likecorpName", label: "分公司名称" },
{ name: "eqCorpState", label: "分公司状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_STATUS }, { name: "eqCorpState", label: "分公司状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_STATUS },
// { name: "createDate", label: "开户时间", render: FORM_ITEM_RENDER_ENUM.DATE_RANGE }, // { 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: (
<DictionarySelect
dictValue="ECO_TYPE"
onGetLabel={(label) => {
form.setFieldValue("ecoTypeName", label);
}}
/>
) },
{ name: "ecoTypeName", label: "经济类型名称", onlyForLabel: true },
]} ]}
form={form} form={form}
onFinish={getData} onFinish={getData}
@ -182,7 +192,6 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE });
values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS }); values.corpStateName = getLabelName({ status: values.corpState, list: ENTERPRISE_STATUS });
if (props.openType === "editName") { if (props.openType === "editName") {
values.id = props.currentId; values.id = props.currentId;
@ -218,7 +227,20 @@ function AddModalComponent(props) {
{ name: "corpName", label: "分公司名称" }, { name: "corpName", label: "分公司名称" },
{ name: "code", label: "社会统一信用代码", rules: [{ pattern: UNIFIED_SOCIAL_CREDIT_CODE, message: "请输入正确的社会统一信用代码" }], hidden: (props.openType === "editName") }, { 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: "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: (
<DictionarySelect
dictValue="ECO_TYPE"
onGetLabel={(label) => {
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: "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") }, { name: "corpOrder", label: "列表排序", render: FORM_ITEM_RENDER_ENUM.NUMBER, hidden: (props.openType === "editName") },
]} ]}

2
src/pages/Container/Supervision/EnterpriseMiddleground/UserList/index.js
View File

@ -45,7 +45,7 @@ function List(props) {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search <Search
options={[ options={[
{ name: "name", label: "关键字", tip: "用户名/姓名" }, { name: "name", label: "姓名" },
{ name: "eqtype", label: "人员状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: USER_TYPE }, { name: "eqtype", label: "人员状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: USER_TYPE },
]} ]}
form={form} form={form}

23
src/pages/Container/Supervision/StakeholderUnit/AccountManage/List/index.js
View File

@ -4,11 +4,11 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular"; import { UNIFIED_SOCIAL_CREDIT_CODE } from "zy-react-library/regular";
import { getLabelName } from "zy-react-library/utils";
import { NS_ENTERPRISE } from "~/enumerate/namespace"; import { NS_ENTERPRISE } from "~/enumerate/namespace";
const ENTERPRISE_TYPE = [ const ENTERPRISE_TYPE = [
@ -17,13 +17,6 @@ const ENTERPRISE_TYPE = [
{ bianma: 5, name: "驻港单位" }, { bianma: 5, name: "驻港单位" },
]; ];
const ECONOMY_TYPE = [
{ bianma: "economic_type19", name: "外资" },
{ bianma: "economic_type18", name: "中外合作" },
{ bianma: "economic_type17", name: "中外合资" },
];
function List(props) { function List(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const { tableProps, getData } = useTable(props["corpInfoList"], { const { tableProps, getData } = useTable(props["corpInfoList"], {
@ -144,8 +137,6 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.ecoTypeName = getLabelName({ status: values.ecoType, list: ECONOMY_TYPE });
if (props.currentId) { if (props.currentId) {
values.id = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
@ -174,9 +165,17 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "corpName", label: "单位名称" }, { name: "corpName", label: "单位名称" },
{ name: "code", label: "社会统一信用代码", rules: [{ pattern: UNIFIED_SOCIAL_CREDIT_CODE, message: "请输入正确的社会统一信用代码" }] }, { name: "code", label: "社会统一信用代码", rules: [{ pattern: UNIFIED_SOCIAL_CREDIT_CODE, message: "请输入正确的社会统一信用代码" }] },
{ name: "ecoType", label: "经济类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ECONOMY_TYPE }, { name: "eqEcoType", label: "经济类型", render: (
{ name: "type", label: "相关方企业类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE }, <DictionarySelect
dictValue="ECO_TYPE"
onGetLabel={(label) => {
form.setFieldValue("ecoTypeName", label);
}}
/>
) },
{ name: "ecoTypeName", label: "经济类型名称", onlyForLabel: true },
{ name: "type", label: "相关方企业类型", render: FORM_ITEM_RENDER_ENUM.SELECT, items: ENTERPRISE_TYPE },
]} ]}
/> />

20
src/pages/Container/Supervision/StakeholderUnit/SecurityPersonnel/CertificateList/index.js
View File

@ -6,6 +6,7 @@ import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import Upload from "zy-react-library/components/Upload"; 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace";
import {getLabelName} from "zy-react-library/utils";
function Department(props) { function Department(props) {
const [addModalOpen, setAddModalOpen] = useState(false); const [addModalOpen, setAddModalOpen] = useState(false);
@ -26,7 +28,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 2, eqQualificationinfoType: 2,
corpinfoIdString: queryParams["id"], eqCorpinfoId: queryParams["id"],
}; };
}, },
}); });
@ -128,6 +130,7 @@ function AddModalComponent(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); const [userQualificationinfoId, setUserQualificationinfoId] = useState("");
const [qualificationinfoData, setQualificationinfoData] = useState([]);
useEffect(() => { useEffect(() => {
// 证书作业类别 // 证书作业类别
// props.dictData({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "zylb" }).then((res) => { // props.dictData({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "zylb" }).then((res) => {
@ -147,14 +150,12 @@ function AddModalComponent(props) {
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.corpinfoId = queryParams["corpinfoId"]; 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.qualificationinfoType = 2;
values.userQualificationinfoId = userQualificationinfoId; values.userQualificationinfoId = userQualificationinfoId;
values.qualificationinfoCategory = "qyzyfzr";
values.qualificationinfoCategoryName = "企业主要负责人";
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
} }
else { else {
@ -184,7 +185,12 @@ function AddModalComponent(props) {
showActionButtons={false} showActionButtons={false}
options={[ options={[
{ name: "qualificationName", label: "证书名称" }, { name: "qualificationName", label: "证书名称" },
{ name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, { name: "qualificationinfoCategory", label: "证书作业类别", render: (
<DictionarySelect
dictValue="zslx"
onGetData={(data) => { setQualificationinfoData(data); }}
/>
) },
{ name: "certificateNo", label: "证书编号" }, { name: "certificateNo", label: "证书编号" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },

36
src/pages/Container/Supervision/StakeholderUnit/SpecialPersonnel/CertificateList/index.js
View File

@ -6,12 +6,14 @@ import HeaderBack from "zy-react-library/components/HeaderBack";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
import Upload from "zy-react-library/components/Upload"; 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; 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"; import { NS_PERSNONEL_CERTFICATE } from "~/enumerate/namespace";
function Department(props) { function Department(props) {
@ -26,7 +28,7 @@ function Department(props) {
return { return {
...formData, ...formData,
eqQualificationinfoType: 1, eqQualificationinfoType: 1,
corpinfoIdString: queryParams["id"], eqCorpinfoId: queryParams["id"],
}; };
}, },
}); });
@ -129,12 +131,9 @@ function AddModalComponent(props) {
const queryParams = useGetUrlQuery(); const queryParams = useGetUrlQuery();
const [userQualificationinfoId, setUserQualificationinfoId] = useState(""); const [userQualificationinfoId, setUserQualificationinfoId] = useState("");
const [qualificationinfoData, setQualificationinfoData] = useState([]);
const [OperatingPrData, setOperatingPrData] = useState([]);
useEffect(() => { useEffect(() => {
// 证书作业类别
// props.dictData({ appKey: "0bb989ecada5470c87635018ece9f327", dictValue: "zylb" }).then((res) => {
// setQualificationinfo(res.data);
// });
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
form.setFieldsValue(res.data); form.setFieldsValue(res.data);
@ -147,16 +146,15 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { 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.corpinfoId = queryParams["corpinfoId"];
values.userIdString = queryParams["id"]; values.userId = queryParams["id"];
values.operatingProject = "DGZY_dgzy";
values.operatingProjectName = "电工作业";
values.qualificationinfoType = 1; values.qualificationinfoType = 1;
values.userQualificationinfoId = userQualificationinfoId; values.userQualificationinfoId = userQualificationinfoId;
values.qualificationinfoCategory = "DYDGZY";
values.qualificationinfoCategoryName = "低压电工作业";
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
await props.requestEdit(values); await props.requestEdit(values);
} }
else { else {
@ -186,8 +184,18 @@ function AddModalComponent(props) {
showActionButtons={false} showActionButtons={false}
options={[ options={[
{ name: "qualificationName", label: "证书名称" }, { name: "qualificationName", label: "证书名称" },
{ name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [], itemsField: { labelKey: "dictLabel", valueKey: "dictValue" } }, { name: "qualificationinfoCategory", required: false, label: "证书作业类别", render: (
{ name: "operatingProject", required: false, label: "操作项目" }, <DictionarySelect
dictValue="zylb"
onGetData={(data) => { setQualificationinfoData(data); }}
/>
) },
{ name: "operatingProject", required: false, label: "操作项目", render: (
<DictionarySelect
dictValue="DGZY_dgzy"
onGetData={(data) => { setOperatingPrData(data); }}
/>
) },
{ name: "certificateNo", label: "证书编号" }, { name: "certificateNo", label: "证书编号" },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
{ name: "name", required: false, label: "证书图片", render: <Upload size={10} fileType="image" /> }, { name: "name", required: false, label: "证书图片", render: <Upload size={10} fileType="image" /> },

2
src/pages/Container/Supervision/StakeholderUnit/User/UserList/index.js
View File

@ -48,7 +48,7 @@ function List(props) {
<div style={{ flex: 1 }}> <div style={{ flex: 1 }}>
<Search <Search
options={[ options={[
{ name: "name", label: "关键字", tip: "用户名/姓名" }, { name: "username", label: "用户名" },
]} ]}
form={form} form={form}

20
src/pages/Container/Supervision/Supervision/Department/index.js
View File

@ -5,6 +5,8 @@ import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index";
import Search from "zy-react-library/components/Search"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
@ -134,6 +136,7 @@ function Department(props) {
function AddModalComponent(props) { function AddModalComponent(props) {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [parentName, setParentName] = useState(null); const [parentName, setParentName] = useState(null);
const [levelData, setlevelData] = useState([]);
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
@ -147,7 +150,7 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { 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.parentId = props.parentId;
if (props.currentId) { if (props.currentId) {
values.id = props.currentId; values.id = props.currentId;
@ -184,7 +187,12 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> }, { name: "parentName", required: false, label: "上级部门", render: <Tag color="processing">{parentName}</Tag> },
{ name: "name", label: "部门名称" }, { name: "name", label: "部门名称" },
{ name: "level", label: "部门级别", required: false, render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ bianma: "1", name: "一级部门" }] }, { name: "level", label: "部门级别", render: (
<DictionarySelect
dictValue="companyDepartmentLevel0000"
onGetData={(data) => { setlevelData(data); }}
/>
) },
{ name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { name: "depOrder", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER },
{ {
name: "securityFlag", name: "securityFlag",
@ -193,6 +201,14 @@ function AddModalComponent(props) {
render: FORM_ITEM_RENDER_ENUM.RADIO, render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], 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: <SelectTree multiple />, dependencies: ["superviseFlag"], hidden: formValues => (formValues.superviseFlag === 0) },
{ name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "备注", required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />

35
src/pages/Container/Supervision/Supervision/Post/index.js
View File

@ -4,12 +4,12 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import AddIcon from "zy-react-library/components/Icon/AddIcon"; import AddIcon from "zy-react-library/components/Icon/AddIcon";
import LeftTree from "zy-react-library/components/LeftTree/Department/Gwj/index"; 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 Table from "zy-react-library/components/Table";
import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
import useTable from "zy-react-library/hooks/useTable"; import useTable from "zy-react-library/hooks/useTable";
import { NS_POST } from "~/enumerate/namespace"; import { NS_POST } from "~/enumerate/namespace";
const CorpinfoId = "1983773013086048256";
function Post(props) { function Post(props) {
const [addModalOpen, setAddModalOpen] = useState(false); const [addModalOpen, setAddModalOpen] = useState(false);
const [currentId, setCurrentId] = useState(""); const [currentId, setCurrentId] = useState("");
@ -21,7 +21,7 @@ function Post(props) {
transform: (formData) => { transform: (formData) => {
return { return {
...formData, ...formData,
departmentIdString: selectedNodeId, eqDepartmentId: selectedNodeId,
corpFlag: 1, corpFlag: 1,
}; };
}, },
@ -115,17 +115,18 @@ function AddModalComponent(props) {
useEffect(() => { useEffect(() => {
if (props.currentId) { if (props.currentId) {
props.requestDetails({ id: props.currentId }).then((res) => { props.requestDetails({ id: props.currentId }).then((res) => {
const arr = []; // const arr = [];
res.data.departmentList && res.data.departmentList.forEach((item) => { // res.data.departmentList && res.data.departmentList.forEach((item) => {
arr.push(item.departmentId); // arr.push(item.departmentId);
}); // });
res.data.departmentIdsString = arr; // res.data.departmentIdsString = arr;
form.setFieldsValue(res.data); form.setFieldsValue(res.data);
console.log(res.data); console.log(res.data);
setParentName(res.data.departmentName); setParentName(res.data.departmentName);
}); });
} }
else { else {
values.corpinfoId = CorpinfoId;
setParentName(props.selectedNodeName); setParentName(props.selectedNodeName);
} }
}, [props.currentId, props.selectedNodeName]); }, [props.currentId, props.selectedNodeName]);
@ -135,10 +136,10 @@ function AddModalComponent(props) {
props.onCancel(); props.onCancel();
}; };
const onSubmit = async (values) => { const onSubmit = async (values) => {
values.departmentIdString = props.parentId; values.departmentId = props.parentId;
values.corpFlag = 1; values.corpFlag = 1;
if (props.currentId) { if (props.currentId) {
values.idString = props.currentId; values.id = props.currentId;
props.requestEdit(values).then(() => { props.requestEdit(values).then(() => {
onCancel(); onCancel();
props.getData(); props.getData();
@ -172,14 +173,14 @@ function AddModalComponent(props) {
options={[ options={[
{ name: "parentName", required: false, label: "所属部门", render: <Tag color="processing">{parentName }</Tag> }, { name: "parentName", required: false, label: "所属部门", render: <Tag color="processing">{parentName }</Tag> },
{ name: "postName", label: "岗位名称" }, { name: "postName", label: "岗位名称" },
{ // {
name: "supervisionFlag", // name: "supervisionFlag",
label: "是否监管岗位", // label: "是否监管岗位",
required: false, // required: false,
render: FORM_ITEM_RENDER_ENUM.RADIO, // render: FORM_ITEM_RENDER_ENUM.RADIO,
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], // items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }],
}, // },
{ name: "departmentIdsString", label: "数据权限", required: false, render: <SelectTree multiple />, dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) }, // { name: "departmentIdsString", label: "数据权限", required: false, render: <SelectTree multiple />, dependencies: ["supervisionFlag"], hidden: formValues => (formValues.supervisionFlag === 0) },
{ name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { name: "remarks", label: "岗位职责", render: FORM_ITEM_RENDER_ENUM.TEXTAREA },
]} ]}
/> />

35
src/pages/Container/Supervision/Supervision/User/Add/index.js
View File

@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
import FormBuilder from "zy-react-library/components/FormBuilder"; import FormBuilder from "zy-react-library/components/FormBuilder";
import HeaderBack from "zy-react-library/components/HeaderBack"; import HeaderBack from "zy-react-library/components/HeaderBack";
import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; 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 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 useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@ -43,26 +44,14 @@ function Add(props) {
props["rolesAll"]().then((res) => { props["rolesAll"]().then((res) => {
setRolesData(res.data); 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) => { const onSubmit = async (values) => {
values.nationName = getLabelName({ status: values.nation, list: nation }); 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" }); values.rank_level_name = getLabelName({ status: values.rank_level, list: rankData, idKey: "dictValue", nameKey: "dictLabel" });
idCardGetDateAndGender(values.userIdCard); idCardGetDateAndGender(values.userIdCard);
console.log(idCardGetDateAndGender(values.userIdCard));
values.mainCorpFlag = 0; values.mainCorpFlag = 0;
values.userType = 1; values.userType = 1;
if (queryParams["id"]) { if (queryParams["id"]) {
@ -89,7 +78,7 @@ function Add(props) {
console.log(event); console.log(event);
form.setFieldsValue({ postId: undefined }); form.setFieldsValue({ postId: undefined });
// setDepartmentName(event[0].name) // 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); console.log(res);
setPostData(res.data); setPostData(res.data);
}); });
@ -125,9 +114,12 @@ function Add(props) {
{ {
name: "personnelType", name: "personnelType",
label: "人员类型", label: "人员类型",
render: FORM_ITEM_RENDER_ENUM.SELECT, render: (
items: userTypeData, <DictionarySelect
itemsField: { labelKey: "dictLabel", valueKey: "dictValue" }, dictValue="renyuanleixing"
onGetData={(data) => { setUserTypeData(data); }}
/>
),
}, },
{ {
name: "userIdCard", name: "userIdCard",
@ -175,7 +167,12 @@ function Add(props) {
), ),
}, },
{ name: "sort", label: "部门排序", render: FORM_ITEM_RENDER_ENUM.NUMBER }, { 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: (
<DictionarySelect
dictValue="Rankorpositionlevel000"
onGetData={(data) => { getRankData(data); }}
/>
) },
{ name: "email", label: "邮箱", required: false, rules: [{ type: "email", message: "请输入正确的邮箱" }] }, { name: "email", label: "邮箱", required: false, rules: [{ type: "email", message: "请输入正确的邮箱" }] },
{ name: "remarks", label: "备注", span: 24, required: false, render: FORM_ITEM_RENDER_ENUM.TEXTAREA }, { 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 }, { name: "departmentLeaderFlag", label: "是否为部门负责人", required: false, render: FORM_ITEM_RENDER_ENUM.RADIO, items: WHETHER_ENUM },

2
src/pages/Container/Supervision/Supervision/User/List/index.js
View File

@ -35,7 +35,7 @@ function List(props) {
const fetchPostData = async () => { const fetchPostData = async () => {
const deptId = selectedNodeId ?? "0"; const deptId = selectedNodeId ?? "0";
try { try {
const res = await props["postAll"]({ corpFlag: 1, departmentIdString: deptId }); const res = await props["postAll"]({ corpFlag: 1, departmentId: deptId });
setPostData(res?.data || []); setPostData(res?.data || []);
} }
catch (err) { catch (err) {