From ebbbea564daef7c41017190d9bb1272b395d0be4 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Thu, 12 Feb 2026 14:04:43 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=E9=83=A8=E5=88=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E7=8A=B6=E6=80=81=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../ViewProjectReviewUserModal/index.js | 35 ++++++++++--------- src/enumerate/constant/index.js | 11 ++++-- .../ProjectFilingApplication/Add/index.js | 3 +- .../ProjectFilingInformation/List/index.js | 15 ++++---- .../Qualification/Apply/Add/index.js | 1 + .../Qualification/Apply/List/index.js | 1 + .../NoSubcontract/List/index.js | 18 +++++++--- .../ProjectApproval/Subcontract/List/index.js | 18 +++++++--- .../Subcontract/List/index.js | 18 +++++++--- .../ProjectFilingApplication/Add/index.js | 5 +-- .../ProjectFilingApplication/List/index.js | 4 +-- .../ProjectFilingApplication/ReView/index.js | 8 ++--- .../List/index.js | 2 +- .../List/index.js | 2 +- .../Qualification/Apply/List/index.js | 1 + .../ProjectFilingInformation/List/index.js | 8 ----- .../UserChange/index.js | 7 ++-- .../UserChangeRecord/index.js | 4 ++- 19 files changed, 102 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index c70777e..e0693c9 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.42" + "zy-react-library": "^1.1.46" }, "devDependencies": { "@antfu/eslint-config": "^5.4.1", diff --git a/src/components/ViewProjectReviewUserModal/index.js b/src/components/ViewProjectReviewUserModal/index.js index 2fc515f..343a242 100644 --- a/src/components/ViewProjectReviewUserModal/index.js +++ b/src/components/ViewProjectReviewUserModal/index.js @@ -13,17 +13,18 @@ import { getLabelName } from "zy-react-library/utils"; import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; const EMPLOYMENT_STATUS_ENUM = [ - { label: "离职", value: 0 }, - { label: "在职", value: 1 }, - { label: "信息变更中", value: 2 }, - { label: "未入职", value: 3 }, - { label: "实习生", value: 4 }, - { label: "实习结束", value: 5 }, - { label: "退休", value: 6 }, - { label: "劳务派遣", value: 7 }, - { label: "劳务派遣结束", value: 8 }, - { label: "入职待审核", value: 11 }, - { label: "离职待审核", value: 10 }, + // { bianma: "离职", name: 0 }, + { name: "离职", bianma: 0 }, + { name: "在职", bianma: 1 }, + { name: "信息变更中", bianma: 2 }, + { name: "未入职", bianma: 3 }, + { name: "实习生", bianma: 4 }, + { name: "实习结束", bianma: 5 }, + { name: "退休", bianma: 6 }, + { name: "劳务派遣", bianma: 7 }, + { name: "劳务派遣结束", bianma: 8 }, + { name: "入职待审核", bianma: 11 }, + { name: "离职待审核", bianma: 10 }, ]; const ViewProjectReviewUserModal = (props) => { const [form] = Form.useForm(); @@ -152,7 +153,7 @@ const ViewInfoModalComponent = (props) => { bordered styles={{ label: { width: 200 } }} items={[ - { label: "姓名", children: info.userName }, + { label: "姓名", children: info.name }, { label: "企业名称", children: info.corpinfoName }, { label: "部门名称", children: info.departmentName }, { label: "岗位名称", children: info.postName }, @@ -170,10 +171,10 @@ const ViewInfoModalComponent = (props) => { { label: "证书名称", children: info.certificateName }, { label: "证书编号", children: info.certificateCode }, { label: "发证机构", children: info.issuingAuthority }, - { label: "作业类别", children: info.industryCategoryName }, + { label: "行业类别", children: info.industryCategoryName }, { label: "操作项目", children: info.industryOperatingItemsName }, { label: "发证日期", children: info.dateIssue }, - { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` }, + { label: "有效期至", children: `${info.certificateDateStart} - ${info.certificateDateEnd}` }, { label: "复审日期", children: info.reviewDate }, { label: "证书照片", children: () }, ]} @@ -194,7 +195,7 @@ const ViewInfoModalComponent = (props) => { { label: "发证机构", children: info.issuingAuthority }, { label: "发证日期", children: info.dateIssue }, { label: "复审日期", children: info.reviewDate }, - { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` }, + { label: "有效期至", children: `${info.certificateDateStart} - ${info.certificateDateEnd}` }, { label: "证书照片", children: () }, ]} /> @@ -212,7 +213,7 @@ const ViewInfoModalComponent = (props) => { { label: "岗位名称", children: info.postName }, { label: "发证机构", children: info.issuingAuthority }, { label: "发证日期", children: info.dateIssue }, - { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` }, + { label: "有效期至", children: `${info.certificateDateStart} - ${info.certificateDateEnd}` }, { label: "证书照片", children: () }, ]} /> @@ -230,7 +231,7 @@ const ViewInfoModalComponent = (props) => { { label: "岗位名称", children: info.postName }, { label: "发证机构", children: info.issuingAuthority }, { label: "发证日期", children: info.dateIssue }, - { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` }, + { label: "有效期至", children: `${info.certificateDateStart} - ${info.certificateDateEnd}` }, { label: "证书照片", children: () }, ]} /> diff --git a/src/enumerate/constant/index.js b/src/enumerate/constant/index.js index cced1db..96fc6c8 100644 --- a/src/enumerate/constant/index.js +++ b/src/enumerate/constant/index.js @@ -13,10 +13,17 @@ export {}; // COMPANY_DEPARTMENT_AUDITING(200, "股份主管部门审核"), // COMPANY_SAFETY_AUDITING(300, "股份安监部门审核"); export const PROJECT_STATUS_MAP = [ - { name: "股份主管部门审核中", bianma: "1" }, + { name: "主管部门审核中", bianma: "1" }, + { name: "项目属地单位确认中", bianma: "2" }, + { name: "推荐属地公司审核中", bianma: "3" }, + { name: "集团单位审核中", bianma: "7" }, + { name: "已完成", bianma: "4" }, + { name: "已驳回", bianma: "6" }, +]; +export const PROJECT_ONELEVEL_STATUS_MAP = [ + { name: "主管部门审核中", bianma: "1" }, { name: "项目属地单位确认中", bianma: "2" }, { name: "推荐属地公司审核中", bianma: "3" }, { name: "已完成", bianma: "4" }, { name: "已驳回", bianma: "6" }, - { name: "集团单位审核中", bianma: "7" }, ]; diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingApplication/Add/index.js index 00c3d01..d83cd98 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingApplication/Add/index.js @@ -1,7 +1,8 @@ import AddView from "~/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add"; function Add(props) { - return (); + // 分公司，集团单位 必须是人资系统存在的人 + return (); }; export default Add; diff --git a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/List/index.js index 685cb4a..f2d405b 100644 --- a/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/List/index.js +++ b/src/pages/Container/BranchCompany/ProjectReview/ProjectFilingInformation/List/index.js @@ -17,6 +17,7 @@ function List(props) { form, params: { searchType: 2, + eqProjectStatus: 4, }, }); @@ -35,12 +36,12 @@ function List(props) { { bianma: "1", name: "是" }, { bianma: "0", name: "否" }, ] }, - { - name: "eqProjectStatus", - label: "项目审核状态", - render: FORM_ITEM_RENDER_ENUM.SELECT, - items: PROJECT_STATUS_MAP, - }, + // { + // name: "eqProjectStatus", + // label: "项目审核状态", + // render: FORM_ITEM_RENDER_ENUM.SELECT, + // items: PROJECT_STATUS_MAP, + // }, ]} form={form} onFinish={getData} @@ -75,7 +76,7 @@ function List(props) { 查看 )} - {props.permission("xmsh-jtgs-xmbagl-btn-xmrybg") && ( + {props.permission("xmsh-jtgs-xmbagl-btn-xmrybg") && record.projectStatus === 4 && ( + )} + {props.permission("xmsh-sdgs-ffbxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && ( + )} {(props.permission("xmsh-sdgs-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( 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 78987f6..c471c4a 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApproval/Subcontract/List/index.js @@ -18,7 +18,7 @@ function List(props) { params: { eqStakeholderLevel: "one-level", eqSubcontractFlag: 1, - eqProjectStatus: 3, + projectStatusArr: "1,3", }, }); const [rejectReasonModalOpen, setRejectReasonModalOpen] = useState(false); // 驳回原因弹窗 @@ -64,14 +64,24 @@ function List(props) { width: 150, render: (_, record) => ( - {props.permission("xmsh-sdgs-fbxmsh-btn-ck" || "xmsh-sdgs-fbxmsh-btn-sh") && ( + {props.permission("xmsh-sdgs-fbxmsh-btn-ck") && ( + )} + {props.permission("xmsh-sdgs-fbxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && ( + )} {(props.permission("xmsh-sdgs-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( 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 316b17d..855a3c4 100644 --- a/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js +++ b/src/pages/Container/Local/ProjectReview/ProjectApprovalTwo/Subcontract/List/index.js @@ -17,7 +17,7 @@ function List(props) { form, params: { eqStakeholderLevel: "two-level", - eqProjectStatus: 3, + projectStatusArr: "1,3", }, }); const [rejectReasonModalOpen, setRejectReasonModalOpen] = useState(false); // 驳回原因弹窗 @@ -64,14 +64,24 @@ function List(props) { width: 150, render: (_, record) => ( - {props.permission("xmsh-sdgs-ejxmsh-btn-ck" || "xmsh-sdgs-ejxmsh-btn-sh") && ( + {props.permission("xmsh-sdgs-ejxmsh-btn-ck") && ( + )} + {props.permission("xmsh-sdgs-ejxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && ( + )} {(props.permission("xmsh-sdgs-ejxmsh-btn-ckbhyy") && record.projectStatus === 6) && ( diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index 65d0934..0db8745 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -89,6 +89,7 @@ function Add(props) { {currentStep === 1 && ( { const [qualificationsTypeList, setQualificationsTypeList] = useState([]); // 获取项目执行属地公司数据 const getCorpInfoList = async () => { - const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, inType: [0] }); + const { data } = await props["corpInfoList"]({ pageIndex: 1, pageSize: 1000, inType: [0, 2] }); setCorpInfoList(data); }; // 获取资质类型数据 @@ -247,7 +248,7 @@ const StepOneComponent = (props) => { { form.setFieldValue("userName", label); diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js index cb7a31a..51d0b80 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js @@ -10,7 +10,7 @@ import Table from "zy-react-library/components/Table"; import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender"; import useTable from "zy-react-library/hooks/useTable"; import { getLabelName } from "zy-react-library/utils"; -import { PROJECT_STATUS_MAP } from "~/enumerate/constant"; +import {PROJECT_ONELEVEL_STATUS_MAP, PROJECT_STATUS_MAP} from "~/enumerate/constant"; import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace"; function List(props) { @@ -46,7 +46,7 @@ function List(props) { name: "eqProjectStatus", label: "项目审核状态", render: FORM_ITEM_RENDER_ENUM.SELECT, - items: PROJECT_STATUS_MAP, + items: PROJECT_ONELEVEL_STATUS_MAP, }, ]} form={form} diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js index b64ea8d..56a9c7f 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js @@ -59,7 +59,7 @@ function Review(props) { }); const qiyefile = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["6"], - eqForeignKey: projectData.corpinfoId, + eqForeignKey: corpInfoResult.data.corpinfoId, }); corpInfoResult.data.qiyefile = qiyefile; projectData.corpInfo = corpInfoResult.data; @@ -296,10 +296,10 @@ function Review(props) { styles={{ label: { width: 200 }, content: { width: 500 } }} items={[ { label: "公司名称", children: info.corpInfo?.corpName }, - { label: "企业状态", children: info.corpInfo?.corpStateName }, + { label: "企业状态", children: (info.corpInfo?.corpStateName) ? info.corpInfo?.corpStateName : "-" }, { label: "开户人", children: info.corpInfo?.accountContactName }, { label: "社会统一信号代码", children: info.corpInfo?.code }, - { label: "属地", children: info.corpInfo?.companyArea }, + { label: "属地", children: (info.corpInfo?.provinceName) ? `${info.corpInfo?.provinceName}/${info.corpInfo?.cityName}/${info.corpInfo?.countryName}` : "-" }, { label: "所属行业", children: [info.corpInfo?.corpType2Name, info.corpInfo?.corpType3Name, info.corpInfo?.corpType4Name, info.corpInfo?.corpTypeName].filter(Boolean).join("/") }, { label: "单位经营地址", children: info.corpInfo?.addressBusiness }, { label: "企业规模", children: info.corpInfo?.scaleName }, @@ -312,7 +312,7 @@ function Review(props) { { label: "资产总额（万元）", children: info.corpInfo?.totalAssets }, { label: "注册资金（万元）", children: info.corpInfo?.regcapital }, { label: "企业类型", children: getLabelName({ list: typeList, status: info.corpInfo?.type }) }, - { label: "营业执照", children: }, + { label: "营业执照", children: }, { label: "营业执照有效期", children: info.corpInfo?.licenseStart ? `${info.corpInfo?.licenseStart}-${info.corpInfo?.licenseEnd}` : "-" }, ]} /> diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js index 85b0ce6..af3ebf7 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js @@ -76,7 +76,7 @@ function List(props) { 查看 )} - {props.permission("xmsh-xgf-yjxmbagl-btn-xmrybg") && ( + {props.permission("xmsh-xgf-yjxmbagl-btn-xmrybg") && record.projectStatus === 4 && ( )} - {props.permission("xmsh-xgf-ejxmbagl-btn-xmrybg") && ( + {props.permission("xmsh-xgf-ejxmbagl-btn-xmrybg") && record.projectStatus === 4 && ( )} - {props.permission(props.rybgjlbtn || "xmsh-gfd-xmbaxx-btn-rybgjl") && (