diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js index 486c3ab..408678e 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useState } from "react"; +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"; @@ -29,7 +30,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } const RejectReason = (props) => { return ( + - + ); } diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js index f2706fe..dc27189 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js @@ -4,7 +4,7 @@ import dayjs from "dayjs"; import { cloneDeep } from "lodash-es"; import { useEffect, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +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 DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; @@ -42,24 +42,20 @@ function Add(props) { }, []); return ( -
- -
- {currentStep === 1 - && - } - {currentStep === 2 - && ( - - )} -
-
+ + {currentStep === 1 + && } + {currentStep === 2 + && ( + + )} + ); } @@ -225,38 +221,6 @@ const StepTwoComponent = (props) => { const { loading: deleteFileLoading, deleteFile } = useDeleteFile(); const { loading: getFileLoading, getFile } = useGetFile(); - const getData = async () => { - if (!props.formValues.qualificationsId) - return; - if (specialList.length === 0) { - const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId }); - await getTypeGroup(data.details) - setSpecialList(data.details || []); - } else { - const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId }); - const newSpecialList = data.details.map(item => { - const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id); - if (existsItem) { - return { ...item, ...existsItem }; - } - return item; - }) - - await getTypeGroup(newSpecialList) - for (let i = 0; i < newSpecialList.length; i++) { - if (newSpecialList[i].applyDetailId) { - newSpecialList[i].files = await getFile({ - eqType: UPLOAD_FILE_TYPE_ENUM["148"], - eqForeignKey: newSpecialList[i].applyDetailId - }); - } - } - - setSpecialList(newSpecialList); - } - - }; - const getTypeGroup = async (details) => { const typeMap = new Map(); for (let i = 0; i < details.length; i++) { @@ -266,7 +230,38 @@ const StepTwoComponent = (props) => { } } setTypeGroup(Array.from(typeMap.values())); - } + }; + const getData = async () => { + if (!props.formValues.qualificationsId) + return; + if (specialList.length === 0) { + const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId }); + await getTypeGroup(data.details); + setSpecialList(data.details || []); + } + else { + const { data } = await props["qualificationMaintenanceInfo"]({ id: props.formValues.qualificationsId }); + const newSpecialList = data.details.map((item) => { + const existsItem = specialList.find(specialItem => specialItem.qualificationsDetailId === item.id); + if (existsItem) { + return { ...item, ...existsItem }; + } + return item; + }); + + await getTypeGroup(newSpecialList); + for (let i = 0; i < newSpecialList.length; i++) { + if (newSpecialList[i].applyDetailId) { + newSpecialList[i].files = await getFile({ + eqType: UPLOAD_FILE_TYPE_ENUM["148"], + eqForeignKey: newSpecialList[i].applyDetailId, + }); + } + } + + setSpecialList(newSpecialList); + } + }; useEffect(() => { getData(); @@ -337,11 +332,11 @@ const StepTwoComponent = (props) => { - {typeGroup.map((item) => ( + {typeGroup.map(item => (
{item.dataTypeName} record.dataType === item.dataType)} + dataSource={specialList.filter(record => record.dataType === item.dataType)} pagination={false} options={false} disabledResizer={true} @@ -362,25 +357,25 @@ const StepTwoComponent = (props) => { { record.files?.length > 0 ? ( - - ) + + ) : ( - - ) + + ) } ), @@ -388,8 +383,7 @@ const StepTwoComponent = (props) => { ]} /> - )) - } + ))}
detail.dataType === item.dataType)} + pagination={false} + options={false} + disabledResizer={true} + columns={[ + { title: "材料名称", dataIndex: "dataName" }, + { title: "上传时间", dataIndex: "uploadedTime", render: (_, record) => record.uploadedTime || "-" }, + { + title: "时效性", + dataIndex: "qualificationsTermStart", + render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-", + }, + { + title: "操作", + width: 80, + render: (_, record) => ( + + ), + }, ]} /> - {typeGroup.map((item) => ( -
- {item.dataTypeName} -
detail.dataType === item.dataType)} - pagination={false} - options={false} - disabledResizer={true} - columns={[ - { title: "材料名称", dataIndex: "dataName" }, - { title: "上传时间", dataIndex: "uploadedTime", render: (_, record) => record.uploadedTime || "-" }, - { - title: "时效性", - dataIndex: "qualificationsTermStart", - render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-", - }, - { - title: "操作", - width: 80, - render: (_, record) => ( - - ), - }, - ]} - /> - - )) - } - - {viewQualificationDetailsModalOpen - && setViewQualificationDetailsModalOpen(false)} data={viewQualificationDetailsModalData} />} - - + ))} + + {viewQualificationDetailsModalOpen + && setViewQualificationDetailsModalOpen(false)} data={viewQualificationDetailsModalData} />} + ); } diff --git a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js index 3af93bf..18c92ab 100644 --- a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js @@ -3,6 +3,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space, Tooltip } from "antd"; import { useState } from "react"; +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"; @@ -28,7 +29,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js index 14e4cfe..9aaeddb 100644 --- a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +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"; @@ -14,7 +15,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js b/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js index 04d2930..c9c469b 100644 --- a/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Review/Review/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Modal, Space } from "antd"; +import { Button, Form, message, Modal } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -11,7 +11,6 @@ function Review(props) { const query = useGetUrlQuery(); const [rejectModalOpen, setRejectModalOpen] = useState(false); - const [passModalOpen, setPassModalOpen] = useState(false); const onSubmit = async () => { const { success } = await props["qualificationReviewSubmit"]({ id: query.id, status: "400" }); @@ -24,9 +23,10 @@ function Review(props) { return (
- -
- + - -
-
+ + )} + /> {rejectModalOpen && setRejectModalOpen(false)} id={query.id} />} - {passModalOpen && setPassModalOpen(false)} id={query.id} />}
); } @@ -65,18 +64,20 @@ const RejectModalComponent = (props) => { return ( + {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} - + ); } const RejectReason = (props) => { return ( + - + ); } export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js index 582783f..5deadf9 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useState } from "react"; +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"; @@ -30,7 +31,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } const RejectReason = (props) => { return ( + - + ); } diff --git a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js index 3797d77..80056a8 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { useState } from "react"; +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"; @@ -29,7 +30,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } const RejectReason = (props) => { return ( + - + ); } diff --git a/src/pages/Container/Local/Qualification/Review/List/index.js b/src/pages/Container/Local/Qualification/Review/List/index.js index 00fd4a5..1dc67e2 100644 --- a/src/pages/Container/Local/Qualification/Review/List/index.js +++ b/src/pages/Container/Local/Qualification/Review/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +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"; @@ -14,7 +15,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Local/Qualification/Review/Review/index.js b/src/pages/Container/Local/Qualification/Review/Review/index.js index 636c1ce..68d26e0 100644 --- a/src/pages/Container/Local/Qualification/Review/Review/index.js +++ b/src/pages/Container/Local/Qualification/Review/Review/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Modal, Space } from "antd"; +import { Button, Form, message, Modal } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; @@ -17,9 +17,10 @@ function Review() { return (
- -
- + - -
-
+ + )} + /> {rejectModalOpen && setRejectModalOpen(false)} id={query.id} />} {passModalOpen && setPassModalOpen(false)} id={query.id} />}
@@ -60,18 +61,20 @@ const RejectModalComponent = (props) => { return ( { return ( - -
+ + <> {currentStep === 1 && ( )} -
- + + ); } @@ -626,7 +625,6 @@ const StepTwoComponent = (props) => { }); projectFileList[i].projectFileId = id; } - console.log("usercontentList", usercontentList); const userList = usercontentList.map(item => ({ userId: item.id, userName: item.name, @@ -636,7 +634,6 @@ const StepTwoComponent = (props) => { userPostName: item.postName, projectLeader: item.projectLeader, })); - console.log("userList", userList); const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId }; const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({ ...data, @@ -719,6 +716,7 @@ const StepTwoComponent = (props) => {
{ ); }; // 选择项目人员的组件 -const UsercontentComponent = (props) => { +const UserSelectComponent = (props) => { const [form] = Form.useForm(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键 const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据 @@ -909,6 +910,7 @@ const UsercontentComponent = (props) => { inDepartmentId, eqEmploymentFlag: 1, // 在职 }, + useStorageQueryCriteria: false, }); const projectLeader = useMemo(() => { if (props.data && Array.isArray(props.data)) { @@ -969,19 +971,9 @@ const UsercontentComponent = (props) => { open maskClosable={false} onCancel={props.onCancel} - footer={null} + okText="确认添加" + onOk={handleConfirmAdd} > - { - getData(values); - }} - />
{ />
+
{ disabled: projectLeader && record.id === projectLeader.id, }), }} - rowKey="id" - toolBarRender={() => ( - <> - - - )} columns={[ { title: "手机号", dataIndex: "phone" }, { title: "姓名", dataIndex: "name" }, @@ -1096,7 +1088,7 @@ const FileUpload = (props) => { const StepOne = Connect([NS_QUALIFICATION_STATISTICS], true)(StepOneComponent); const StepTwo = Connect([NS_QUALIFICATION_STATISTICS], true)(StepTwoComponent); -const Usercontent = Connect([NS_QUALIFICATION_STATISTICS], true)(UsercontentComponent); +const UserSelect = Connect([NS_QUALIFICATION_STATISTICS], true)(UserSelectComponent); const ChooseFilsList = Connect([NS_QUALIFICATION_STATISTICS], true)(ChooseFilsComponent); export default Connect([NS_QUALIFICATION_STATISTICS], true)(Add); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js index a5b59b9..2d89f3d 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js @@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { 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"; @@ -30,7 +31,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } const RejectReason = (props) => { return ( - -
+ + {(query.projectStatusLast === "1" || query.projectStatusLast === "3" || query.projectStatusLast === "7") + && ( + <> + + + + )} + {query.projectStatusLast === "2" + && ( + + )} + + )} + > +
{info.relatedProjectId && (
一级项目信息 @@ -234,58 +257,54 @@ function Review(props) { )}
项目基础信息 - - }, - ]} - /> - + }, + ]} + />
企业基础信息 - - }, - { label: "营业执照有效期", children: `${info.corpInfo?.licenseStart}-${info.corpInfo?.licenseEnd}` }, - { label: "", children: "" }, - ]} - /> - + }, + { label: "营业执照有效期", children: `${info.corpInfo?.licenseStart}-${info.corpInfo?.licenseEnd}` }, + { label: "", children: "" }, + ]} + />
项目资料信息 @@ -355,86 +374,48 @@ function Review(props) { {info.subcontractFlag === 1 && (
分包项目信息详情 - -
getLabelName({ list: PROJECT_STATUS_MAP, status: record.projectStatus }) }, - { - title: "操作", - render: (_, record) => ( - - ), - }, - ]} - /> - - - )} -
- {info.stakeholderLevel === "one-level" ? "一级项目审核信息" : "审核记录"} -
getLabelName({ list: [{ name: "审核中", bianma: "1" }, { name: "已通过", bianma: "2" }, { name: "已驳回", bianma: "3" }], status: record.approvalStatus }) }, + { title: "相关方名称", dataIndex: "corpinfoName" }, + { title: "项目名称", dataIndex: "projectName" }, + { title: "审核状态", dataIndex: "projectStatus", render: (_, record) => getLabelName({ list: PROJECT_STATUS_MAP, status: record.projectStatus }) }, + { + title: "操作", + render: (_, record) => ( + + ), + }, ]} /> - + + )} +
+ {info.stakeholderLevel === "one-level" ? "一级项目审核信息" : "审核记录"} +
getLabelName({ list: [{ name: "审核中", bianma: "1" }, { name: "已通过", bianma: "2" }, { name: "已驳回", bianma: "3" }], status: record.approvalStatus }) }, + ]} + /> - {(query.projectStatusLast === "1" || query.projectStatusLast === "3" || query.projectStatusLast === "7") - && ( -
- - -
- )} - {query.projectStatusLast === "2" - && ( -
- - -
- )} {viewProjectReviewUserModalOpen && setViewProjectReviewUserModalOpen(false)} data={viewProjectReviewUserModalData} />} {viewProjectReviewDetailsModalOpen @@ -447,7 +428,7 @@ function Review(props) { {props.children} - + ); } diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.less b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.less index ce8fde6..61f1887 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.less +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.less @@ -47,11 +47,4 @@ } } } - - -} -.btn_bottom{ - text-align: center; - margin-top: 20px; - } diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js index 6646457..ea88634 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +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"; @@ -21,7 +22,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js index cf5cfae..a2512dd 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/Add/index.js @@ -3,9 +3,9 @@ import { Button, Divider, Form, message, Modal, Space, Spin } from "antd"; import dayjs from "dayjs"; import { useEffect, useMemo, useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; +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 PersonnelSelect from "zy-react-library/components/Select/Personnel/Gwj"; @@ -73,38 +73,35 @@ function Add(props) { }, []); return ( -
- -
- {currentStep === 1 - && ( - - )} - {currentStep === 2 - && ( - - )} -
-
+ + {currentStep === 1 + && ( + + )} + {currentStep === 2 + && ( + + )} + ); } @@ -457,7 +454,6 @@ const StepTwoComponent = (props) => { }); projectFileList[i].projectFileId = id; } - console.log("usercontentList", usercontentList); const userList = usercontentList.map(item => ({ userId: item.id, userName: item.name, @@ -467,7 +463,6 @@ const StepTwoComponent = (props) => { userPostName: item.postName, projectLeader: item.projectLeader, })); - console.log("userList", userList); const data = { ...props.formValues, projectUserAddCmdList: [...userList], projectFileAddCmdList: [...projectFileList], projectLocalCompanyAddCmdList: [...projectLocalCompanyAddCmdList], projectApprovalUserAddCmdList: [...projectApprovalUserAddCmdList], projectApprovalFlowAddCmdList: [...projectApprovalFlowAddCmdList], corpinfoId }; const { success } = await props[!query.id ? "projectAdd" : "projectUpdate"]({ ...data, @@ -675,6 +670,7 @@ const ChooseFilsComponent = (props) => { params: { qualificationsTypeId: "", }, + useStorageQueryCriteria: false, }); const submit = () => { if (props.onSubmit) { @@ -704,6 +700,8 @@ const ChooseFilsComponent = (props) => { onOk={submit} >
{ inDepartmentId, eqEmploymentFlag: 1, // 在职 }, + useStorageQueryCriteria: false, }); const projectLeader = useMemo(() => { if (props.data && Array.isArray(props.data)) { @@ -799,19 +798,9 @@ const UsercontentComponent = (props) => { open maskClosable={false} onCancel={props.onCancel} - footer={null} + okText="确认添加" + onOk={handleConfirmAdd} > - { - getData(values); - }} - />
{ />
+ { + getData(values); + }} + />
{ disabled: projectLeader && record.id === projectLeader.id, }), }} - rowKey="id" - toolBarRender={() => ( - <> - - - )} columns={[ { title: "手机号", dataIndex: "phone" }, { title: "姓名", dataIndex: "name" }, diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js index 196c454..a6a538a 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js @@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { 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"; @@ -30,7 +31,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } const RejectReason = (props) => { return ( + - + ); } diff --git a/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js b/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js index 1d1274b..664f9e1 100644 --- a/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js +++ b/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js @@ -3,6 +3,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Form, Modal, Space } from "antd"; import { 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"; @@ -26,7 +27,7 @@ function List(props) { }; return ( -
+ {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} -
+ ); } @@ -120,7 +121,7 @@ const RejectReason = (props) => { return ( + {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} - + ); } const RejectReason = (props) => { return ( + {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} - + ); } const RejectReason = (props) => { return ( + {rejectReasonModalOpen && setRejectReasonModalOpen(false)} />} - + ); } const RejectReason = (props) => { return ( + - + ); } diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js index a32a308..2bce0db 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js @@ -1,9 +1,9 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space } from "antd"; import { useEffect, useMemo, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; import AddIcon from "zy-react-library/components/Icon/AddIcon"; import DepartmentLeftTree from "zy-react-library/components/LeftTree/Department/Gwj"; +import Page from "zy-react-library/components/Page"; import Search from "zy-react-library/components/Search"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -71,62 +71,59 @@ function UserChange(props) { }; return ( -
- -
-
( - - - - )} - columns={[ - { title: "姓名", dataIndex: "userName" }, - { title: "部门", dataIndex: "deptName" }, - { - title: "是否为项目负责人", - dataIndex: "projectLeader", - render: (_, record) => record.projectLeader === 1 ? "是" : "否", - }, - { - title: "操作", - fixed: "right", - render: (_, record) => ( - + +
( + + + + )} + columns={[ + { title: "姓名", dataIndex: "userName" }, + { title: "部门", dataIndex: "deptName" }, + { + title: "是否为项目负责人", + dataIndex: "projectLeader", + render: (_, record) => record.projectLeader === 1 ? "是" : "否", + }, + { + title: "操作", + fixed: "right", + render: (_, record) => ( + + + {record.projectLeader === 0 && ( - {record.projectLeader === 0 && ( - - )} - - ), - }, - ]} - {...tableProps} - /> - + )} + + ), + }, + ]} + {...tableProps} + /> {usercontentOpen && ( - { @@ -135,12 +132,12 @@ function UserChange(props) { onConfirm={handleConfirmAdd} /> )} - + ); } // 选择项目人员的组件 -const UsercontentComponent = (props) => { +const UserSelectComponent = (props) => { const [form] = Form.useForm(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); // 存储选中的行键 const [selectedRows, setSelectedRows] = useState([]); // 存储选中行的完整数据 @@ -155,6 +152,7 @@ const UsercontentComponent = (props) => { inDepartmentId, eqEmploymentFlag: 1, // 在职 }, + useStorageQueryCriteria: false, }); // 合并表格数据:接口返回的数据 + 已存在但可能不在接口数据中的人员 @@ -268,19 +266,9 @@ const UsercontentComponent = (props) => { open maskClosable={false} onCancel={props.onCancel} - footer={null} + okText="确认添加" + onOk={handleConfirmAdd} > - { - getData(values); - }} - />
{ />
+
{ disabled: projectLeader && record.id === projectLeader.id, }), }} - rowKey="id" - toolBarRender={() => ( - <> - - - )} columns={[ { title: "手机号", dataIndex: "phone" }, { @@ -331,9 +319,8 @@ const UsercontentComponent = (props) => { { title: "所属岗位", dataIndex: "postName" }, { title: "是否存在人资系统", dataIndex: "rzFlag", render: (_, record) => record.rzFlag === 1 ? "是" : "否" }, ]} + {...tableProps} dataSource={tableDataSource} - pagination={tableProps.pagination} - loading={tableProps.loading} /> @@ -341,5 +328,5 @@ const UsercontentComponent = (props) => { ); }; -const Usercontent = Connect([NS_QUALIFICATION_STATISTICS], true)(UsercontentComponent); +const UserSelect = Connect([NS_QUALIFICATION_STATISTICS], true)(UserSelectComponent); export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange); diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChangeRecord/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChangeRecord/index.js index 49b7e69..3fa5dfc 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChangeRecord/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChangeRecord/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -10,20 +10,17 @@ function UserChange(props) { const { tableProps } = useTable(props["projectUserChangeRecordList"], { params: { eqProjectId: query.id } }); return ( -
- -
-
{ return text === 1 ? "删除" : "新增"; } }, - { title: "记录时间", dataIndex: "createTime" }, - ]} - {...tableProps} - /> - - + +
{ return text === 1 ? "删除" : "新增"; } }, + { title: "记录时间", dataIndex: "createTime" }, + ]} + {...tableProps} + /> + ); } export default Connect([NS_QUALIFICATION_STATISTICS], true)(UserChange); diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js index ae30b7d..a687519 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +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 DepartmentSelectTree from "zy-react-library/components/SelectTree/Department/Gwj"; @@ -14,7 +14,6 @@ function Add(props) { const query = useGetUrlQuery(); const [form] = Form.useForm(); const managerDept = Form.useWatch("managerDept", form); - const supervisionDept = Form.useWatch("supervisionDept", form); const getData = async () => { const { data } = await props["qualificationMaintenanceInfo"]({ id: query.id }); @@ -43,129 +42,126 @@ function Add(props) { }; return ( -
- -
- { - form.setFieldValue("qualificationsTypeName", label); - }} - /> - ), - }, - { name: "qualificationsTypeName", label: "资质类别", onlyForLabel: true }, - { - name: "stakeholderLevel", - label: "资质级别", - render: ( - { - form.setFieldValue("stakeholderLevelName", label); - }} - /> - ), - }, - { name: "stakeholderLevelName", label: "资质级别", onlyForLabel: true }, - { - name: "managerDept", - label: "主管部门", - render: ( - { - form.setFieldValue("managerDeptName", label); - }} - onChange={(_, __, extra) => { - form.setFieldValue("managerUser", []); - form.setFieldValue("managerUserName", []); - form.setFieldValue("corpId", extra.triggerNode.props.corpinfoId); - }} - /> - ), - }, - { name: "managerDeptName", label: "主管部门名称", onlyForLabel: true }, - { name: "corpId", label: "主管部门所属公司", onlyForLabel: true }, - { - name: "managerUser", - label: "主管人员", - render: ( - { - form.setFieldValue("managerUserName", label); - }} - /> - ), - }, - { name: "managerUserName", label: "主管人员名称", onlyForLabel: true }, - { - name: "status", - label: "是否启用", - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ name: "是", bianma: 0 }, { name: "否", bianma: 1 }], - }, + + { + form.setFieldValue("qualificationsTypeName", label); + }} + /> + ), + }, + { name: "qualificationsTypeName", label: "资质类别", onlyForLabel: true }, + { + name: "stakeholderLevel", + label: "资质级别", + render: ( + { + form.setFieldValue("stakeholderLevelName", label); + }} + /> + ), + }, + { name: "stakeholderLevelName", label: "资质级别", onlyForLabel: true }, + { + name: "managerDept", + label: "主管部门", + render: ( + { + form.setFieldValue("managerDeptName", label); + }} + onChange={(_, __, extra) => { + form.setFieldValue("managerUser", []); + form.setFieldValue("managerUserName", []); + form.setFieldValue("corpId", extra.triggerNode.props.corpinfoId); + }} + /> + ), + }, + { name: "managerDeptName", label: "主管部门名称", onlyForLabel: true }, + { name: "corpId", label: "主管部门所属公司", onlyForLabel: true }, + { + name: "managerUser", + label: "主管人员", + render: ( + { + form.setFieldValue("managerUserName", label); + }} + /> + ), + }, + { name: "managerUserName", label: "主管人员名称", onlyForLabel: true }, + { + name: "status", + label: "是否启用", + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ name: "是", bianma: 0 }, { name: "否", bianma: 1 }], + }, - { key: "divider-detail", label: "资料信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, - { - name: "details", - span: 24, - render: FORM_ITEM_RENDER_ENUM.FORM_LIST, - formListUniqueProps: { - options: field => ( - [ - { - label: "资料属性", - name: [field.name, "dataType"], - span: 8, - render: ( - { - form.setFieldValue(["details", field.name, "dataTypeName"], label); - }} - /> - ), - }, - { label: "资料属性名称", name: [field.name, "dataTypeName"], span: 8, onlyForLabel: true }, - { label: "资料名称", name: [field.name, "dataName"], span: 8 }, - { - label: "是否涉及有效时间", - name: [field.name, "isValidity"], - span: 8, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 0, name: "是" }, { bianma: 1, name: "否" }], - labelCol: { span: 6 }, - }, - ] - ), - }, + { key: "divider-detail", label: "资料信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER }, + { + name: "details", + span: 24, + render: FORM_ITEM_RENDER_ENUM.FORM_LIST, + formListUniqueProps: { + options: field => ( + [ + { + label: "资料属性", + name: [field.name, "dataType"], + span: 8, + render: ( + { + form.setFieldValue(["details", field.name, "dataTypeName"], label); + }} + /> + ), + }, + { label: "资料属性名称", name: [field.name, "dataTypeName"], span: 8, onlyForLabel: true }, + { label: "资料名称", name: [field.name, "dataName"], span: 8 }, + { + label: "是否涉及有效时间", + name: [field.name, "isValidity"], + span: 8, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 0, name: "是" }, { bianma: 1, name: "否" }], + labelCol: { span: 6 }, + }, + ] + ), }, - ]} - /> -
-
+ }, + ]} + /> + ); } diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/AddQualifications/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/AddQualifications/index.js index 1589403..40ed1bd 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/AddQualifications/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/AddQualifications/index.js @@ -2,7 +2,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Form, message } from "antd"; import { useEffect } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import DictionarySelect from "zy-react-library/components/Select/Dictionary"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; @@ -29,61 +29,58 @@ function AddQualifications(props) { }; return ( -
- -
- ( - [ - { - label: "资料属性", - name: [field.name, "dataType"], - span: 8, - render: ( - { - form.setFieldValue(["qualificationsDetailAddCmdList", field.name, "dataTypeName"], label); - }} - /> - ), - }, - { label: "资料属性名称", name: [field.name, "dataTypeName"], span: 8, onlyForLabel: true }, - { label: "资料名称", name: [field.name, "dataName"], span: 8 }, - { - label: "是否涉及有效时间", - name: [field.name, "isValidity"], - span: 8, - render: FORM_ITEM_RENDER_ENUM.RADIO, - items: [{ bianma: 0, name: "是" }, { bianma: 1, name: "否" }], - }, - ] - ), - }, + + ( + [ + { + label: "资料属性", + name: [field.name, "dataType"], + span: 8, + render: ( + { + form.setFieldValue(["qualificationsDetailAddCmdList", field.name, "dataTypeName"], label); + }} + /> + ), + }, + { label: "资料属性名称", name: [field.name, "dataTypeName"], span: 8, onlyForLabel: true }, + { label: "资料名称", name: [field.name, "dataName"], span: 8 }, + { + label: "是否涉及有效时间", + name: [field.name, "isValidity"], + span: 8, + render: FORM_ITEM_RENDER_ENUM.RADIO, + items: [{ bianma: 0, name: "是" }, { bianma: 1, name: "否" }], + }, + ] + ), }, - ]} - /> -
-
+ }, + ]} + /> + ); } diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogList/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogList/index.js index 30d09f7..cde82f3 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogList/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogList/index.js @@ -1,7 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button } from "antd"; import { useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -17,39 +17,37 @@ function ChangeLogList(props) { }); return ( -
- -
-
{ - if (selectedRowKeys.length <= 2) - setSelectedRowKeys(selectedRowKeys); - }, - getCheckboxProps: record => ({ disabled: selectedRowKeys.length >= 2 && !selectedRowKeys.includes(record.id) }), - hideSelectAll: true, - }} - toolBarRender={() => ( - - )} - columns={[ - { title: "操作时间", dataIndex: "createTime" }, - { title: "操作人", dataIndex: "createName" }, - ]} - {...tableProps} - /> - - + +
{ + if (selectedRowKeys.length <= 2) + setSelectedRowKeys(selectedRowKeys); + }, + getCheckboxProps: record => ({ disabled: selectedRowKeys.length >= 2 && !selectedRowKeys.includes(record.id) }), + hideSelectAll: true, + }} + toolBarRender={() => ( + + )} + columns={[ + { title: "操作时间", dataIndex: "createTime" }, + { title: "操作人", dataIndex: "createName" }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogView/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogView/index.js index 3f2da85..66161ba 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogView/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/ChangeLogView/index.js @@ -1,7 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Descriptions, Divider } from "antd"; import { useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import { getLabelName } from "zy-react-library/utils"; @@ -12,7 +12,6 @@ function ChangeLogView(props) { const { ids } = useGetUrlQuery(); const getData = async () => { const { data } = await props["getQualificationMaintenanceChangeLogByIds"]({ ids }); - console.log(data); setInfo(data); }; @@ -21,67 +20,64 @@ function ChangeLogView(props) { }, []); return ( -
- -
-
- { - info.map((item, index) => ( -
- 基础信息 - - 资料信息 -
getLabelName({ - list: [{ name: "是", bianma: 0 }, { name: "否", bianma: 1 }], - status: record.isValidity, - }), - }, - ]} - /> - - )) - } - + +
+ { + info.map((item, index) => ( +
+ 基础信息 + + 资料信息 +
getLabelName({ + list: [{ name: "是", bianma: 0 }, { name: "否", bianma: 1 }], + status: record.isValidity, + }), + }, + ]} + /> + + )) + } - + ); } diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js index 126d87d..c304e93 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js @@ -2,6 +2,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, message, Modal, Space } from "antd"; 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"; @@ -30,7 +31,7 @@ function List(props) { }; return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Qualification/Records/History/index.js b/src/pages/Container/Supervision/Qualification/Records/History/index.js index d2984d6..a908d70 100644 --- a/src/pages/Container/Supervision/Qualification/Records/History/index.js +++ b/src/pages/Container/Supervision/Qualification/Records/History/index.js @@ -1,6 +1,6 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Space } from "antd"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import { Button, Space, Tooltip } from "antd"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery"; import useTable from "zy-react-library/hooks/useTable"; @@ -11,77 +11,85 @@ function History(props) { const { tableProps } = useTable(props["qualificationRecordsHistoryList"], { params: { id: query.id } }); return ( -
- -
-
( -
- {record.qualificationsStatus === 0 && "正常"} - {record.qualificationsStatus === 1 && "待完善"} - {record.qualificationsStatus === 2 && ( - - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 -
- ))} -
- ) : "部分资料已过期" - } - > - - 存在异常 - - - )} - {record.qualificationsStatus === 3 && "资质过期"} - - ) - }, - { title: "当前状态", dataIndex: "auditProcess", render: (_, record) => ( + +
(
- {record.auditProcess === "100" && "集团单位"} - {record.status === 100 && "待审核"} - {record.status === 200 && "审核中"} - {record.status === 300 && "已驳回"} - {record.status === 400 && "已通过"} -
- ) }, - { title: "审核时间", dataIndex: "auditTime" }, - { - title: "操作", - fixed: "right", - width: 100, - render: (_, record) => ( - - - - ), - }, - ]} - {...tableProps} - /> - - + + 存在异常 + {" "} + + + + )} + {record.qualificationsStatus === 3 && "资质过期"} + + ), + }, + { title: "当前状态", dataIndex: "auditProcess", render: (_, record) => ( +
+ {record.auditProcess === "100" && "集团单位"} + {record.status === 100 && "待审核"} + {record.status === 200 && "审核中"} + {record.status === 300 && "已驳回"} + {record.status === 400 && "已通过"} +
+ ) }, + { title: "审核时间", dataIndex: "auditTime" }, + { + title: "操作", + fixed: "right", + width: 100, + render: (_, record) => ( + + + + ), + }, + ]} + {...tableProps} + /> + ); } diff --git a/src/pages/Container/Supervision/Qualification/Records/List/index.js b/src/pages/Container/Supervision/Qualification/Records/List/index.js index 0954173..0e40642 100644 --- a/src/pages/Container/Supervision/Qualification/Records/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Records/List/index.js @@ -2,6 +2,7 @@ import { WarningOutlined } from "@ant-design/icons"; import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space, Tooltip } from "antd"; +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"; @@ -23,7 +24,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Qualification/Review/List/index.js b/src/pages/Container/Supervision/Qualification/Review/List/index.js index 97d476d..23a1029 100644 --- a/src/pages/Container/Supervision/Qualification/Review/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/List/index.js @@ -1,6 +1,7 @@ import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; +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"; @@ -14,7 +15,7 @@ function List(props) { }); return ( -
+ -
+ ); } diff --git a/src/pages/Container/Supervision/Qualification/Review/Review/index.js b/src/pages/Container/Supervision/Qualification/Review/Review/index.js index af88352..f3dff4d 100644 --- a/src/pages/Container/Supervision/Qualification/Review/Review/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/Review/index.js @@ -1,5 +1,5 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { Button, Form, message, Modal, Space } from "antd"; +import { Button, Form, message, Modal } from "antd"; import { useState } from "react"; import FormBuilder from "zy-react-library/components/FormBuilder"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; @@ -25,9 +25,11 @@ function Review(props) { return (
- setInfo(info)} title="审核"> -
- + setInfo(info)} + title="审核" + extraActionButtons={( + <> - -
-
+ + )} + /> {rejectModalOpen && setRejectModalOpen(false)} id={query.id} />} {passModalOpen && setPassModalOpen(false)} id={query.id} />}
@@ -73,18 +75,20 @@ const RejectModalComponent = (props) => { return ( { return ( + - + ); } diff --git a/src/pages/Container/Supervision/Qualification/ViewInfo/index.js b/src/pages/Container/Supervision/Qualification/ViewInfo/index.js index 12deeb1..4632f29 100644 --- a/src/pages/Container/Supervision/Qualification/ViewInfo/index.js +++ b/src/pages/Container/Supervision/Qualification/ViewInfo/index.js @@ -1,7 +1,7 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Descriptions, Divider, Spin } from "antd"; import { Fragment, useEffect, useState } from "react"; -import HeaderBack from "zy-react-library/components/HeaderBack"; +import Page from "zy-react-library/components/Page"; import Table from "zy-react-library/components/Table"; import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg"; import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj"; @@ -34,7 +34,16 @@ function ViewInfo(props) { const [viewQualificationDetailsModalOpen, setViewQualificationDetailsModalOpen] = useState(false); const [viewQualificationDetailsModalData, setViewQualificationDetailsModalData] = useState({}); - + const getTypeGroup = async (data) => { + const typeMap = new Map(); + for (let i = 0; i < data.specialList.length; i++) { + const { dataType, dataTypeName } = data.specialList[i]; + if (dataType && dataTypeName) { + typeMap.set(dataType, { dataType, dataTypeName }); + } + } + setTypeGroup(Array.from(typeMap.values())); + }; const getData = async () => { if (!query.id) return; @@ -61,165 +70,152 @@ function ViewInfo(props) { corpInfoData.licenseFile = licenseFile; setCorpInfoData(corpInfoData); }; - const getTypeGroup = async (data) => { - const typeMap = new Map(); - for (let i = 0; i < data.specialList.length; i++) { - const { dataType, dataTypeName } = data.specialList[i]; - if (dataType && dataTypeName) { - typeMap.set(dataType, { dataType, dataTypeName }); - } - } - setTypeGroup(Array.from(typeMap.values())); - } useEffect(() => { getData(); }, []); return ( - <> - -
-
-
- 流程信息 -
-
- { - info.processFlow.map((item, index) => ( - -
-
- {item.auditStatus === 400 && "通过"} - {item.auditStatus === 200 && "审核中"} - {item.auditStatus === 100 && "待审核"} - {item.auditStatus === 300 && "已驳回"} -
-
{item.auditUserName}
-
{item.auditCorpDeptName}
-
{item.auditCorpName}
- { - item.auditRemarks && ( -
- 驳回原因: - {item.auditRemarks} -
- ) - } + +
+
+ 流程信息 +
+
+ { + info.processFlow.map((item, index) => ( + +
+
+ {item.auditStatus === 400 && "通过"} + {item.auditStatus === 200 && "审核中"} + {item.auditStatus === 100 && "待审核"} + {item.auditStatus === 300 && "已驳回"}
- {index !== info.processFlow.length - 1 &&
} - - )) - } -
+
{item.auditUserName}
+
{item.auditCorpDeptName}
+
{item.auditCorpName}
+ { + item.auditRemarks && ( +
+ 驳回原因: + {item.auditRemarks} +
+ ) + } +
+ {index !== info.processFlow.length - 1 &&
} + + )) + }
-
- 审核信息 - - - - -
-
- 基础信息 - - }, - { label: "营业执照有效期", children: `${corpInfoData.licenseStart} 至 ${corpInfoData.licenseEnd}` }, - ]} - /> - -
- {typeGroup.map((item) => ( -
- {item.dataTypeName} - -
i.dataType === item.dataType) || []} - columns={[ - { title: "材料名称", dataIndex: "dataName" }, - { title: "上传时间", dataIndex: "uploadedTime" }, - { - title: "时效性", - dataIndex: "qualificationsTermStart", - render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-", - }, - { - title: "操作", - render: (_, record) => ( - - ), - }, - ]} - /> - - - ))} - {viewQualificationDetailsModalOpen - && ( - setViewQualificationDetailsModalOpen(false)} - data={viewQualificationDetailsModalData} +
+ 审核信息 + + - )} - {props.children} + + +
+
+ 基础信息 + + }, + { label: "营业执照有效期", children: `${corpInfoData.licenseStart} 至 ${corpInfoData.licenseEnd}` }, + ]} + /> + +
+ {typeGroup.map(item => ( +
+ {item.dataTypeName} + +
i.dataType === item.dataType) || []} + columns={[ + { title: "材料名称", dataIndex: "dataName" }, + { title: "上传时间", dataIndex: "uploadedTime" }, + { + title: "时效性", + dataIndex: "qualificationsTermStart", + render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-", + }, + { + title: "操作", + render: (_, record) => ( + + ), + }, + ]} + /> + + + ))} - + {viewQualificationDetailsModalOpen + && ( + setViewQualificationDetailsModalOpen(false)} + data={viewQualificationDetailsModalData} + /> + )} + {props.children} + ); }