diff --git a/jjb.config.js b/jjb.config.js index 87d7133..5f7f367 100644 --- a/jjb.config.js +++ b/jjb.config.js @@ -25,6 +25,7 @@ module.exports = { contextInject: { // 应用Key appKey: "", + // fileUrl: "https://jpfz.qhdscom/gbsFileTest/", fileUrl: "http://192.168.20.240:9787/mnt/", }, // public/index.html注入全局变量 diff --git a/src/api/qualificationStatistics/index.js b/src/api/qualificationStatistics/index.js index 01c7cb1..aff8c09 100644 --- a/src/api/qualificationStatistics/index.js +++ b/src/api/qualificationStatistics/index.js @@ -37,7 +37,7 @@ export const projectDetail = declareRequest( ); export const projectApprovalFlow = declareRequest( "qualificationStatisticsLoading", - `Get > /xgfManager/projectApprovalFlow/getRejectCause/`, + `Get > /xgfManager/projectApprovalFlow/getRejectCause/{id}`, ); export const deptListByType = declareRequest( "qualificationStatisticsLoading", diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js index d3a2658..486c3ab 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectApproval/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -62,15 +63,17 @@ function List(props) { width: 150, render: (_, record) => ( - - {record.projectStatus === 6 && ( + {props.permission("xmsh-jtgs-ejxmbash-btn-ck" || "xmsh-jtgs-ejxmbash-btn-sh") && ( + + )} + {(props.permission("xmsh-jtgs-ejxmbash-btn-ckbhyy") && record.projectStatus === 6) && ( - - + {props.permission("xmsh-jtgs-xmbagl-btn-ck") && ( + + )} + {props.permission("xmsh-jtgs-xmbagl-btn-xmrybg") && ( + + )} + {props.permission("xmsh-jtgs-xmbagl-btn-rybgjl") && ( + + )} ), }, @@ -97,4 +104,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/BranchCompany/Qualification/Apply/List/index.js b/src/pages/Container/BranchCompany/Qualification/Apply/List/index.js index 82dca0b..2aa0188 100644 --- a/src/pages/Container/BranchCompany/Qualification/Apply/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Apply/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -39,15 +40,17 @@ function List(props) { ( - + {props.permission("zrzz-jtgs-zrzzsq-btn-xz") && ( + + )} )} columns={[ @@ -69,32 +72,38 @@ function List(props) { width: 200, render: (_, record) => ( - - - + {props.permission("zrzz-jtgs-zrzzsq-btn-ck") && ( + + )} + {props.permission("zrzz-jtgs-zrzzsq-btn-xg") && ( + + )} + {props.permission("zrzz-jtgs-zrzzsq-btn-ckbhyy") && ( + + )} ), }, @@ -130,4 +139,4 @@ const RejectReason = (props) => { ); }; -export default Connect([NS_QUALIFICATION_APPLY], true)(List); +export default Connect([NS_QUALIFICATION_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js index 7f81e9c..3af93bf 100644 --- a/src/pages/Container/BranchCompany/Qualification/Records/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Records/List/index.js @@ -1,7 +1,8 @@ -import { Connect } from "@cqsjjb/jjb-dva-runtime"; -import { useState } from "react"; -import { Button, Form, Space, Tooltip } from "antd"; 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 { useState } from "react"; 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) { }, onSuccess: (data) => { setCurrentTenantId(data.extValues.currentTenantId); - } + }, }); return ( @@ -39,11 +40,14 @@ function List(props) { }, { name: "stakeholderLevel", label: "资质级别", render: () }, { - name: "auditStatus", label: "审核状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [ + name: "auditStatus", + label: "审核状态", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [ { bianma: "200-200", name: "主管部门审核中" }, { bianma: "200-300", name: "主管部门已驳回" }, { bianma: "400", name: "已完成" }, - ] + ], }, ]} form={form} @@ -58,36 +62,49 @@ function List(props) { { title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm ? "长期" : "短期" }, { title: "材料数", dataIndex: "materialNum" }, { - title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( + title: "资质状态", + dataIndex: "qualificationsStatus", + render: (_, record) => (
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 2 && ( - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 + record.expireList + ? ( +
+ {record.expireList.map((item, index) => ( +
+ {item.dataName} + {" "} + 已于 + {item.qualificationsTermEnd} + {" "} + 过期 +
+ ))}
- ))} -
- ) : "部分资料已过期" + ) + : "部分资料已过期" } > - - 存在异常 + + 存在异常 + {" "} +
)} {record.qualificationsStatus === 3 && "资质过期"}
- ) + ), }, { - title: "当前状态", dataIndex: "auditProcess", render: (_, record) => ( + title: "当前状态", + dataIndex: "auditProcess", + render: (_, record) => (
{record.auditProcess === "100" && "集团单位"} {record.status === 100 && "待审核"} @@ -95,7 +112,7 @@ function List(props) { {record.status === 300 && "已驳回"} {record.status === 400 && "已通过"}
- ) + ), }, { title: "操作", @@ -103,7 +120,7 @@ function List(props) { width: 200, render: (_, record) => ( - {record.status === 400 && record.corpId === currentTenantId && (record.qualificationsStatus === 1 || record.qualificationsStatus === 2) && ( + {(props.permission(props.cxtjbtn || "zrzz-jtgs-zrzzjl-btn-cxtj") && record.status === 400 && record.corpId === currentTenantId && (record.qualificationsStatus === 1 || record.qualificationsStatus === 2)) && ( )} - + {props.permission(props.ckbtn || "zrzz-jtgs-zrzzjl-btn-ck") && ( + + )} ), }, @@ -131,4 +150,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_RECORDS], true)(List); +export default Connect([NS_QUALIFICATION_RECORDS], true)(Permission(List)); diff --git a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js index 8dae59f..14e4cfe 100644 --- a/src/pages/Container/BranchCompany/Qualification/Review/List/index.js +++ b/src/pages/Container/BranchCompany/Qualification/Review/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import Search from "zy-react-library/components/Search"; @@ -36,33 +37,44 @@ function List(props) { { title: "资质级别", dataIndex: "stakeholderLevelName" }, { title: "材料数", dataIndex: "materialNum" }, { - title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( + title: "资质状态", + dataIndex: "qualificationsStatus", + render: (_, record) => (
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 2 && ( - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 + record.expireList + ? ( +
+ {record.expireList.map((item, index) => ( +
+ {item.dataName} + {" "} + 已于 + {item.qualificationsTermEnd} + {" "} + 过期 +
+ ))}
- ))} -
- ) : "部分资料已过期" + ) + : "部分资料已过期" } > - - 存在异常 + + 存在异常 + {" "} +
)} {record.qualificationsStatus === 3 && "资质过期"}
- ) + ), }, { title: "操作", @@ -70,14 +82,16 @@ function List(props) { width: 100, render: (_, record) => ( - + {props.permission("zrzz-jtgs-xgfzrzzsh-btn-sh") && ( + + )} ), }, @@ -88,4 +102,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_REVIEW], true)(List); +export default Connect([NS_QUALIFICATION_REVIEW], true)(Permission(List)); diff --git a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js index 8a3b26a..b4db738 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -62,15 +63,17 @@ function List(props) { width: 150, render: (_, record) => ( - - {record.projectStatus === 6 && ( + {props.permission("xmsh-sdgs-ffbxmsh-btn-ck" || "xmsh-sdgs-ffbxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-sdgs-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( + {props.permission("xmqr-sdgs-ffbxmqr-btn-ck") && ( + + )} ), }, @@ -70,4 +73,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +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 e4039d9..582783f 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -62,15 +63,17 @@ function List(props) { width: 150, render: (_, record) => ( - - {record.projectStatus === 6 && ( + {props.permission("xmsh-sdgs-fbxmsh-btn-ck" || "xmsh-sdgs-fbxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-sdgs-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( + {props.permission("xmqr-sdgs-fbxmqr-btn-ck") && ( + + )} ), }, @@ -71,4 +74,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); 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 a2c9511..3797d77 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -62,15 +63,17 @@ function List(props) { width: 150, render: (_, record) => ( - - {record.projectStatus === 6 && ( + {props.permission("xmsh-sdgs-ejxmsh-btn-ck" || "xmsh-sdgs-ejxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-sdgs-ejxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( + {props.permission("xmqr-sdgs-ejxmqr-btn-ck") && ( + + )} ), }, @@ -70,4 +73,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/Local/ProjectReview/ProjectFilingInformation/List/index.js index 7bee826..5553991 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 b83223c..8e40909 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/Local/Qualification/Review/List/index.js b/src/pages/Container/Local/Qualification/Review/List/index.js index 8dae59f..00fd4a5 100644 --- a/src/pages/Container/Local/Qualification/Review/List/index.js +++ b/src/pages/Container/Local/Qualification/Review/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import Search from "zy-react-library/components/Search"; @@ -36,33 +37,44 @@ function List(props) { { title: "资质级别", dataIndex: "stakeholderLevelName" }, { title: "材料数", dataIndex: "materialNum" }, { - title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( + title: "资质状态", + dataIndex: "qualificationsStatus", + render: (_, record) => (
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 2 && ( - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 + record.expireList + ? ( +
+ {record.expireList.map((item, index) => ( +
+ {item.dataName} + {" "} + 已于 + {item.qualificationsTermEnd} + {" "} + 过期 +
+ ))}
- ))} -
- ) : "部分资料已过期" + ) + : "部分资料已过期" } > - - 存在异常 + + 存在异常 + {" "} +
)} {record.qualificationsStatus === 3 && "资质过期"}
- ) + ), }, { title: "操作", @@ -70,14 +82,16 @@ function List(props) { width: 100, render: (_, record) => ( - + {props.permission("zrzz-sdgs-xgfzrzzsh-btn-sh") && ( + + )} ), }, @@ -88,4 +102,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_REVIEW], true)(List); +export default Connect([NS_QUALIFICATION_REVIEW], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index e918ac0..6084c69 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -178,7 +178,7 @@ const StepOneComponent = (props) => { useEffect(() => { getCorpInfoList(); getCropList(); - if (props.formValues.isLocalCompany) { + if (props.formValues.isLocalCompany === 0) { getDeptList(props.formValues.qualificationsTypeId); getUserList(props.formValues.manageDeptId); } @@ -265,11 +265,18 @@ const StepOneComponent = (props) => { form.setFieldValue("qualificationsTypeName", label)} - onChange={() => { - - }} + style={{ width: "100%" }} + onChange={() => {}} /> ) }, + { + span: 24, + render: ( +
+ 如果选择项目类别或等级没有您相应的选项时,请在"资质准入管理"中查看是否持有对应类比或等级的相关资质。 +
+ ), + }, { name: "qualificationsTypeName", label: "项目类别名称", onlyForLabel: true }, { name: "subcontractFlag", label: "是否存在分包项目", span: 24, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] }, { name: "isLocalCompany", label: "是否为属地公司推荐", span: 24, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], componentProps: { @@ -291,6 +298,14 @@ const StepOneComponent = (props) => { }); }, } }, + { + span: 24, + render: ( +
+ 本次项目是否属于港股分公司发包项目,如是,请选择"是" +
+ ), + }, ...(isLocalCompany === 1 ? [ { @@ -391,6 +406,14 @@ const StepOneComponent = (props) => { }, { name: "manageUserNames", label: "主管部门审核人名称", onlyForLabel: true }, ]), + { + render: ( +
+ 本信息涉及后续项目资料审核,请如实填写。 +
+ ), + span: 24, + }, { name: "approvalCorpId", label: "项目执行属地公司名称", diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js index 2b49328..17852a2 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -53,15 +54,17 @@ function List(props) {
( - + {props.permission("xmsh-xgf-yjxmbasq-btn-xz" || props.xzbtn) && ( + + )} )} columns={[ @@ -79,36 +82,42 @@ function List(props) { { title: "操作", fixed: "right", - width: 150, + width: 200, render: (_, record) => ( - + {props.permission("xmsh-xgf-yjxmbasq-btn-ck" || props.ckbtn) && ( + + )} {record.projectStatus === 6 && ( <> - - + {props.permission("xmsh-xgf-yjxmbasq-btn-xg" || props.xgbtn) && ( + + )} + {props.permission("xmsh-xgf-yjxmbasq-btn-ckbhyy" || props.ckbhyybtn) && ( + + )} )} @@ -138,11 +147,11 @@ const RejectReason = (props) => { column={1} styles={{ label: { width: 200 } }} items={[ - { label: "驳回原因", children: props.rejectReason }, + { label: "驳回原因", children: props.rejectReason.rejectReason }, ]} /> ); }; -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js index 44f34af..1ccbc0c 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js @@ -181,7 +181,7 @@ function Review(props) { const { success } = await props["projectAudit"]({ id: query.id, result, - rejectReason: values.rejectReason, // 添加拒绝原因 + rejectCause: values.rejectReason, // 添加拒绝原因 }); if (success) { message.success("审核驳回成功"); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js index f8e5a36..6646457 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import Search from "zy-react-library/components/Search"; @@ -64,30 +65,36 @@ function List(props) { width: 350, render: (_, record) => ( - - - + {props.permission("xmsh-xgf-yjxmbagl-btn-ck") && ( + + )} + {props.permission("xmsh-xgf-yjxmbagl-btn-xmrybg") && ( + + )} + {props.permission("xmsh-xgf-yjxmbagl-btn-rybgjl") && ( + + )} ), }, @@ -98,4 +105,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js index 1af10be..196c454 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -52,15 +53,17 @@ function List(props) {
( - + {props.permission("xmsh-xgf-ejxmbasq-btn-xz") && ( + + )} )} columns={[ @@ -78,36 +81,42 @@ function List(props) { { title: "操作", fixed: "right", - width: 150, + width: 200, render: (_, record) => ( - + {props.permission("xmsh-xgf-ejxmbasq-btn-ck") && ( + + )} {record.projectStatus === 6 && ( <> - - + {props.permission("xmsh-xgf-ejxmbasq-btn-xg") && ( + + )} + {props.permission("xmsh-xgf-ejxmbasq-btn-ckbhyy") && ( + + )} )} @@ -137,11 +146,11 @@ const RejectReason = (props) => { column={1} styles={{ label: { width: 200 } }} items={[ - { label: "驳回原因", children: props.rejectReason }, + { label: "驳回原因", children: props.rejectReason.rejectReason }, ]} /> ); }; -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwoManagement/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwoManagement/List/index.js index 85eb3b2..7054e8c 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwoManagement/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwoManagement/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import Search from "zy-react-library/components/Search"; @@ -52,30 +53,36 @@ function List(props) { width: 350, render: (_, record) => ( - - - + {props.permission("xmsh-xgf-ejxmbagl-btn-ck") && ( + + )} + {props.permission("xmsh-xgf-ejxmbagl-btn-xmrybg") && ( + + )} + {props.permission("xmsh-xgf-ejxmbagl-btn-rybgjl") && ( + + )} ), }, @@ -86,4 +93,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js b/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js index de3f037..1d1274b 100644 --- a/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js +++ b/src/pages/Container/Stakeholder/Qualification/Apply/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -39,15 +40,17 @@ function List(props) {
( - + {props.permission("zrzz-xgf-zrzzsq-btn-xz") && ( + + )} )} columns={[ @@ -70,32 +73,38 @@ function List(props) { width: 200, render: (_, record) => ( - - - + {props.permission("zrzz-xgf-zrzzsq-btn-ck") && ( + + )} + {props.permission("zrzz-xgf-zrzzsq-btn-xg") && ( + + )} + {props.permission("zrzz-xgf-zrzzsq-btn-ckbhyy") && ( + + )} ), }, @@ -131,4 +140,4 @@ const RejectReason = (props) => { ); }; -export default Connect([NS_QUALIFICATION_APPLY], true)(List); +export default Connect([NS_QUALIFICATION_APPLY], true)(Permission(List)); diff --git a/src/pages/Container/Stakeholder/Qualification/Records/List/index.js b/src/pages/Container/Stakeholder/Qualification/Records/List/index.js index 694d3e7..4d7bcff 100644 --- a/src/pages/Container/Stakeholder/Qualification/Records/List/index.js +++ b/src/pages/Container/Stakeholder/Qualification/Records/List/index.js @@ -1,7 +1,7 @@ import ListPage from "~/pages/Container/BranchCompany/Qualification/Records/List"; function List(props) { - return (); + return (); } export default List; diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/NoSubcontract/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/NoSubcontract/List/index.js index 63963a6..daf06b5 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectApproval/NoSubcontract/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectApproval/NoSubcontract/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -62,15 +63,17 @@ function List(props) { width: 150, render: (_, record) => ( - - {record.projectStatus === 6 && ( + {props.permission("xmsh-gfd-ffbxmsh-btn-ck" || "xmsh-gfd-ffbxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-gfd-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( - {record.projectStatus === 6 && ( + {props.permission("xmsh-gfd-fbxmsh-btn-ck" || "xmsh-gfd-fbxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-gfd-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( - {record.projectStatus === 6 && ( + {props.permission("xmsh-gfd-ejxmsh-btn-ck" || "xmsh-gfd-ejxmsh-btn-sh") && ( + + )} + {(props.permission("xmsh-gfd-ejxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( + {props.permission("xmsh-gfd-xmbaxx-btn-ck" || props.ckbtn) && ( + + )} - + {props.permission("xmsh-gfd-xmbaxx-btn-rybgjl" || props.rybgjlbtn) && ( + + )} ), }, @@ -88,4 +93,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_STATISTICS], true)(List); +export default Connect([NS_QUALIFICATION_STATISTICS], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js index 74c5b7c..126d87d 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/List/index.js @@ -1,3 +1,4 @@ +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"; @@ -43,15 +44,17 @@ function List(props) {
( - + {props.permission("zrzz-jgd-zrzzwh-btn-xz") && ( + + )} )} columns={[ @@ -59,37 +62,43 @@ function List(props) { { title: "资质类别", dataIndex: "qualificationsTypeName" }, { title: "资质级别", dataIndex: "stakeholderLevelName" }, { title: "主管部门", dataIndex: "managerDeptName" }, - { title: "材料数量", dataIndex: "materialNum",render:(_,record) => record.details?.length || 0 }, - { title: "状态", dataIndex: "status",render:(_,record) => record.status === 0 ? "启用" : "禁用" }, + { title: "材料数量", dataIndex: "materialNum", render: (_, record) => record.details?.length || 0 }, + { title: "状态", dataIndex: "status", render: (_, record) => record.status === 0 ? "启用" : "禁用" }, { title: "操作", fixed: "right", width: 200, render: (_, record) => ( - - - + {props.permission("zrzz-jgd-zrzzwh-btn-xg") && ( + + )} + {props.permission("zrzz-jgd-zrzzwh-btn-qyjy") && ( + + )} + {props.permission("zrzz-jgd-zrzzwh-btn-bgjl") && ( + + )} ), }, @@ -100,4 +109,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_MAINTENANCE], true)(List); +export default Connect([NS_QUALIFICATION_MAINTENANCE], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/Qualification/Records/List/index.js b/src/pages/Container/Supervision/Qualification/Records/List/index.js index 0395e7b..0954173 100644 --- a/src/pages/Container/Supervision/Qualification/Records/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Records/List/index.js @@ -1,6 +1,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 { WarningOutlined } from "@ant-design/icons"; 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"; @@ -34,11 +35,14 @@ function List(props) { }, { name: "stakeholderLevel", label: "资质级别", render: () }, { - name: "auditStatus", label: "审核状态", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [ + name: "auditStatus", + label: "审核状态", + render: FORM_ITEM_RENDER_ENUM.SELECT, + items: [ { bianma: "200-200", name: "主管部门审核中" }, { bianma: "200-300", name: "主管部门已驳回" }, { bianma: "400", name: "已完成" }, - ] + ], }, ]} form={form} @@ -53,36 +57,49 @@ function List(props) { { title: "时效属性", dataIndex: "isLongTerm", render: (_, record) => record.isLongTerm ? "长期" : "短期" }, { title: "材料数", dataIndex: "materialNum" }, { - title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( + title: "资质状态", + dataIndex: "qualificationsStatus", + render: (_, record) => (
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 2 && ( - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 + record.expireList + ? ( +
+ {record.expireList.map((item, index) => ( +
+ {item.dataName} + {" "} + 已于 + {item.qualificationsTermEnd} + {" "} + 过期 +
+ ))}
- ))} -
- ) : "部分资料已过期" + ) + : "部分资料已过期" } > - - 存在异常 + + 存在异常 + {" "} +
)} {record.qualificationsStatus === 3 && "资质过期"}
- ) + ), }, { - title: "审核状态", dataIndex: "auditProcess", render: (_, record) => ( + title: "审核状态", + dataIndex: "auditProcess", + render: (_, record) => (
{record.auditProcess === "100" && "集团单位"} {record.status === 100 && "待审核"} @@ -90,23 +107,25 @@ function List(props) { {record.status === 300 && "已驳回"} {record.status === 400 && "已通过"}
- ) + ), }, - { title:"时效性", dataIndex:"qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-",}, + { title: "时效性", dataIndex: "qualificationsTermStart", render: (_, record) => record.qualificationsTermStart ? `${record.qualificationsTermStart}至${record.qualificationsTermEnd}` : "-" }, { title: "操作", fixed: "right", width: 130, render: (_, record) => ( - + {props.permission("zrzz-jgd-zrzzjl-btn-ck") && ( + + )} ), }, @@ -117,4 +136,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_RECORDS], true)(List); +export default Connect([NS_QUALIFICATION_RECORDS], true)(Permission(List)); diff --git a/src/pages/Container/Supervision/Qualification/Review/List/index.js b/src/pages/Container/Supervision/Qualification/Review/List/index.js index 274fb1c..97d476d 100644 --- a/src/pages/Container/Supervision/Qualification/Review/List/index.js +++ b/src/pages/Container/Supervision/Qualification/Review/List/index.js @@ -1,3 +1,4 @@ +import { Permission } from "@cqsjjb/jjb-common-decorator/permission"; import { Connect } from "@cqsjjb/jjb-dva-runtime"; import { Button, Form, Space } from "antd"; import Search from "zy-react-library/components/Search"; @@ -41,33 +42,44 @@ function List(props) { { title: "资质级别", dataIndex: "stakeholderLevelName" }, { title: "材料数", dataIndex: "materialNum" }, { - title: "资质状态", dataIndex: "qualificationsStatus", render: (_, record) => ( + title: "资质状态", + dataIndex: "qualificationsStatus", + render: (_, record) => (
{record.qualificationsStatus === 0 && "正常"} {record.qualificationsStatus === 1 && "待完善"} {record.qualificationsStatus === 2 && ( - {record.expireList.map((item, index) => ( -
- {item.dataName} 已于 {item.qualificationsTermEnd} 过期 + record.expireList + ? ( +
+ {record.expireList.map((item, index) => ( +
+ {item.dataName} + {" "} + 已于 + {item.qualificationsTermEnd} + {" "} + 过期 +
+ ))}
- ))} -
- ) : "部分资料已过期" + ) + : "部分资料已过期" } > - - 存在异常 + + 存在异常 + {" "} +
)} {record.qualificationsStatus === 3 && "资质过期"}
- ) + ), }, { title: "操作", @@ -75,14 +87,16 @@ function List(props) { width: 100, render: (_, record) => ( - + {props.permission("zrzz-jgd-xgfzrzzsh-btn-sh") && ( + + )} ), }, @@ -93,4 +107,4 @@ function List(props) { ); } -export default Connect([NS_QUALIFICATION_REVIEW], true)(List); +export default Connect([NS_QUALIFICATION_REVIEW], true)(Permission(List));