diff --git a/package.json b/package.json index dd7403a..3458270 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "lodash-es": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "zy-react-library": "^1.1.51" + "zy-react-library": "^1.2.0" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js index 27489c6..e3b76a0 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Submit/List/index.js @@ -42,7 +42,7 @@ function List(props) { { title: "项目名称", dataIndex: "projectName" }, { title: "股份主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, - { title: "二级项目数", dataIndex: "secondLevelTotal" }, + // { title: "二级项目数", dataIndex: "secondLevelTotal" }, { title: "项目属地单位", dataIndex: "companyName" }, { title: "项目备案审核状态", diff --git a/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js index 86b5ea3..d2139d8 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js @@ -1,7 +1,7 @@ import ListView from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/list"; function List(props) { - return (); + return (); } export default List; diff --git a/src/pages/Container/Local/ProjectReview/ProjectFilingInformationSub/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectFilingInformationSub/List/index.js index 8e40909..9b9e4b9 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectFilingInformationSub/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectFilingInformationSub/List/index.js @@ -1,7 +1,7 @@ import ListView from "~/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/list"; function List(props) { - return (); + return (); }; export default List; diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js index eb0317b..057e28d 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -52,7 +52,7 @@ function List(props) { { title: "项目名称", dataIndex: "projectName" }, { title: "股份主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, - { title: "二级项目数", dataIndex: "secondLevelTotal", render: (_, record) => record.secondLevelTotal || 0 }, + // { title: "二级项目数", dataIndex: "secondLevelTotal", render: (_, record) => record.secondLevelTotal || 0 }, { title: "是否存在分包", dataIndex: "subcontractFlag", render: (_, record) => record.subcontractFlag === 1 ? "是" : "否" }, { title: "项目属地单位", dataIndex: "companyName" }, { diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js index 9deada3..185363b 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js @@ -11,11 +11,19 @@ import { PROJECT_STATUS_MAP } from "~/enumerate/constant"; import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; function List(props) { + let onlyAuditLog = props.onlyAuditLog; + const onlyConfirmLog = props.onlyConfirmLog; + if (!onlyAuditLog && !onlyConfirmLog) { + onlyAuditLog = 1; + } const [form] = Form.useForm(); const { tableProps, getData } = useTable(props["projectPage"], { form, params: { searchType: props.searchType || 1, + // 这个是主页面,主页面props.onlyAuditLog,与props.onlyConfirmLog 都是空 + onlyAuditLog: onlyAuditLog || 2, + onlyConfirmLog: onlyConfirmLog || 2, // eqStakeholderLevel: props.eqStakeholderLevel || "", eqProjectStatus: 4, }, @@ -32,6 +40,7 @@ function List(props) { label: "项目类别", render: (), }, + { name: "stakeholderLevel", label: "资质等级", render: () }, ]} form={form} onFinish={getData} @@ -42,8 +51,9 @@ function List(props) { { title: "项目名称", dataIndex: "projectName" }, { title: "股份主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, + { title: "项目等级", dataIndex: "stakeholderLevelName" }, { title: "是否存在分包", dataIndex: "subcontractFlag", render: (_, record) => record.subcontractFlag ? "是" : "否" }, - { title: "二级项目数", dataIndex: "secondLevelTotal" }, + // { title: "二级项目数", dataIndex: "secondLevelTotal" }, { title: "项目属地单位", dataIndex: "companyName" }, { title: "项目备案审核状态",