diff --git a/src/api/qualificationMaintenance/index.js b/src/api/qualificationMaintenance/index.js index 8e8840f..99f2dee 100644 --- a/src/api/qualificationMaintenance/index.js +++ b/src/api/qualificationMaintenance/index.js @@ -41,3 +41,7 @@ export const getQualificationMaintenanceChangeLogByIds = declareRequest( "qualificationMaintenanceLoading", `Get > /xgfManager/qualificationsChangeLog/listByIds?ids={ids}`, ); +export const getDepartmentList = declareRequest( + "qualificationMaintenanceLoading", + `Post > @/basicInfo/department/listAllTreeByCorpTypeAndCorpIds`, +); diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/Add/index.js new file mode 100644 index 0000000..25b9f6b --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/Add/index.js @@ -0,0 +1,9 @@ +import AddPage from "~/pages/Container/Supervision/Qualification/Maintenance/Add"; + +function Add(props) { + return ( + + ); +} + +export default Add; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/AddQualifications/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/AddQualifications/index.js new file mode 100644 index 0000000..e3e9de9 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/AddQualifications/index.js @@ -0,0 +1,9 @@ +import AddQualificationsPage from "~/pages/Container/Supervision/Qualification/Maintenance/AddQualifications"; + +function AddQualifications(props) { + return ( + + ); +} + +export default AddQualifications; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogList/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogList/index.js new file mode 100644 index 0000000..9a6136c --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogList/index.js @@ -0,0 +1,9 @@ +import ChangeLogListPage from "~/pages/Container/Supervision/Qualification/Maintenance/ChangeLogList"; + +function ChangeLogList(props) { + return ( + + ); +} + +export default ChangeLogList; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogView/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogView/index.js new file mode 100644 index 0000000..c571203 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/ChangeLogView/index.js @@ -0,0 +1,9 @@ +import ChangeLogViewPage from "~/pages/Container/Supervision/Qualification/Maintenance/ChangeLogView"; + +function ChangeLogView(props) { + return ( + + ); +} + +export default ChangeLogView; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/List/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/List/index.js new file mode 100644 index 0000000..75fe88a --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/List/index.js @@ -0,0 +1,16 @@ +import ListPage from "~/pages/Container/Supervision/Qualification/Maintenance/List"; + +function List(props) { + return ( + + ); +} + +export default List; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/index.js new file mode 100644 index 0000000..b04cff6 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Maintenance/index.js @@ -0,0 +1,5 @@ +function Maintenance(props) { + return (
{props.children}
); +} + +export default Maintenance; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Review/List/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Review/List/index.js new file mode 100644 index 0000000..f878490 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Review/List/index.js @@ -0,0 +1,14 @@ +import ListPage from "~/pages/Container/Supervision/Qualification/Review/List"; + +function List(props) { + return ( + + ); +} + +export default List; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Review/Review/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Review/Review/index.js new file mode 100644 index 0000000..34deb29 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Review/Review/index.js @@ -0,0 +1,9 @@ +import ReviewPage from "~/pages/Container/Supervision/Qualification/Review/Review"; + +function Review(props) { + return ( + + ); +} + +export default Review; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/Review/index.js b/src/pages/Container/BranchCompany/Qualification/Access/Review/index.js new file mode 100644 index 0000000..816c1aa --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/Review/index.js @@ -0,0 +1,5 @@ +function Review(props) { + return (
{props.children}
); +} + +export default Review; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/ViewInfo/index.js b/src/pages/Container/BranchCompany/Qualification/Access/ViewInfo/index.js new file mode 100644 index 0000000..55f9948 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/ViewInfo/index.js @@ -0,0 +1,9 @@ +import InfoPage from "../../../../Supervision/Qualification/ViewInfo"; + +function ViewInfo() { + return ( + + ); +} + +export default ViewInfo; diff --git a/src/pages/Container/BranchCompany/Qualification/Access/index.js b/src/pages/Container/BranchCompany/Qualification/Access/index.js new file mode 100644 index 0000000..bcf5526 --- /dev/null +++ b/src/pages/Container/BranchCompany/Qualification/Access/index.js @@ -0,0 +1,5 @@ +function Access(props) { + return (
{props.children}
); +} + +export default Access; diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js index ef56851..eefea0a 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js @@ -5,6 +5,7 @@ import FormBuilder from "zy-react-library/components/FormBuilder"; import Page from "zy-react-library/components/Page"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; +import BasicSelectTree from "zy-react-library/components/SelectTree/Basic"; import DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -13,7 +14,8 @@ import { NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace"; function Add(props) { const query = useGetUrlQuery(); const [form] = Form.useForm(); - const [corpTypeList, setCorpTypeList] = useState([2]); + const [corpTypeList, setCorpTypeList] = useState([]); + const [departmentList, setDepartmentList] = useState([]); const managerDept = Form.useWatch("managerDept", form); const shareDeptId = Form.useWatch("shareDeptId", form); @@ -24,7 +26,6 @@ function Add(props) { } if (data?.details?.length) { data?.details?.forEach((item) => { - item.isRequired = item.isRequired ?? 1; }); } @@ -41,6 +42,16 @@ function Add(props) { useEffect(() => { query.id && getData(); }, []); + + const getDepartmentList = async () => { + const { data } = await props.getDepartmentList({ inType: corpTypeList }); + setDepartmentList(data); + }; + + useEffect(() => { + getDepartmentList(); + }, [JSON.stringify(corpTypeList)]); + const onSubmit = async (values) => { const { success } = await props[!query.id ? "qualificationMaintenanceAdd" : "qualificationMaintenanceUpdate"]({ ...values, @@ -67,7 +78,7 @@ function Add(props) { dataTypeName: undefined, dataName: undefined, isValidity: undefined, - isRequired:1 + isRequired: 1, }], }} loading={props.qualificationMaintenance.qualificationMaintenanceLoading} @@ -108,7 +119,7 @@ function Add(props) { setCorpTypeList([2, 6]); } else { - setCorpTypeList([2]); + setCorpTypeList([]); } form.setFieldValue("managerDept", ""); form.setFieldValue("managerDeptName", ""); @@ -141,10 +152,10 @@ function Add(props) { name: "managerDept", label: "审核部门", render: ( - { form.setFieldValue("managerDeptName", label); }} @@ -182,8 +193,6 @@ function Add(props) { }, { name: "managerUserName", label: "审核人名称", onlyForLabel: true }, - - { name: "shareDeptId", label: "股份主管部门", @@ -253,7 +262,7 @@ function Add(props) { ), }, - { label: "资料名称", name: [field.name, "dataName"], span: 6 , labelCol: { span: 6 },}, + { label: "资料名称", name: [field.name, "dataName"], span: 6, labelCol: { span: 6 } }, { label: "是否涉及有效时间", name: [field.name, "isValidity"], diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js index 3dbad9c..50036d8 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js @@ -1,19 +1,36 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space } from "antd"; +import { useEffect, useState } from "react"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import Page from "zy-react-library/components/Page"; 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 useGetUserInfo from "zy-react-library/hooks/useGetUserInfo"; import useTable from "zy-react-library/hooks/useTable"; import { NS_QUALIFICATION_MAINTENANCE } from "~/enumerate/namespace"; +const authorizedEnterprises = ["1746864895590143510", "2076831356482732032", "2008712261453131776"]; function List(props) { + const [currentCorpId, setCurrentCorpId] = useState(""); + const { getUserInfo } = useGetUserInfo(); const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["qualificationMaintenanceList"], { form, }); + // 监管端仅校验按钮权限，分公司端还需限制为指定企业。 + const isAuthorizedEntrance = props.entrance !== "branchCompany" || authorizedEnterprises.includes(currentCorpId); + + useEffect(() => { + (async () => { + if (props.entrance !== "branchCompany") + return; + + const userInfo = await getUserInfo(); + setCurrentCorpId(userInfo.corpinfoId); + })(); + }, []); const onDelete = (id, status) => { const msg = status === 0 ? "启用" : "禁用"; @@ -45,7 +62,7 @@ function List(props) { ( - {props.permission("zrzz-jgd-zrzzwh-btn-xz") && ( + {(isAuthorizedEntrance && props.permission(props.addBtn || "zrzz-jgd-zrzzwh-btn-xz")) && ( )} - {props.permission("zrzz-jgd-zrzzwh-btn-qyjy") && ( + {(isAuthorizedEntrance && props.permission(props.qyjyBtn || "zrzz-jgd-zrzzwh-btn-qyjy")) && ( { - (record.entrustAudit === 200 && props.permission("gfd-zrzzsh-wt")) && - + (record.entrustAudit === 200 && isAuthorizedEntrance && props.permission(props.wtBtn || "gfd-zrzzsh-wt")) + && ( + + ) } - {props.permission("zrzz-jgd-xgfzrzzsh-btn-sh") && ( + {(isAuthorizedEntrance && props.permission(props.shBtn || "zrzz-jgd-xgfzrzzsh-btn-sh")) && (