diff --git a/src/components/ViewProjectReviewUserModal/index.js b/src/components/ViewProjectReviewUserModal/index.js index 5e8a71f..0bf1681 100644 --- a/src/components/ViewProjectReviewUserModal/index.js +++ b/src/components/ViewProjectReviewUserModal/index.js @@ -40,13 +40,21 @@ const ViewProjectReviewUserModal = (props) => { }, useStorageQueryCriteria: false, onSuccess: async (data) => { - const list = await getFile({ - single: false, - dataSource: data.list, - foreignKey: "userCertificateId", - eqType: UPLOAD_FILE_TYPE_ENUM["159"], - }); - setRealData(list); + for (let i = 0; i < data.list.length; i++) { + const item = data.list[i]; + let getFileType = ""; + if (item.type === "aqscglry") + getFileType = UPLOAD_FILE_TYPE_ENUM["162"]; + else if (item.type === "tezhongzuoye") + getFileType = UPLOAD_FILE_TYPE_ENUM["159"]; + else if (item.type === "tzsbczry") + getFileType = UPLOAD_FILE_TYPE_ENUM["160"]; + else if (item.type === "zyfzr") + getFileType = UPLOAD_FILE_TYPE_ENUM["161"]; + const fileItems = await getFile({ eqType: getFileType, eqForeignKey: item.userCertificateId }); + item.files = fileItems; + } + setRealData(data.list); }, }); @@ -84,7 +92,7 @@ const ViewProjectReviewUserModal = (props) => { dataIndex: "certificateDateStart", render: (_, record) => `${record.certificateDateStart}至${record.certificateDateEnd}`, }, - { title: "图片", dataIndex: "files", render: (_, record) => () }, + { title: "图片", dataIndex: "files", width: 100, render: (_, record) => () }, { title: "操作", width: 100, @@ -127,8 +135,17 @@ const ViewInfoModalComponent = (props) => { const getData = async () => { const { data } = await props["userQualificationInfo"]({ id: props.id }); - const fileItems = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["159"], eqForeignKey: data.userCertificateId }); - console.log(fileItems); + let getFileType = ""; + if (data.type === "aqscglry") + getFileType = UPLOAD_FILE_TYPE_ENUM["162"]; + else if (data.type === "tezhongzuoye") + getFileType = UPLOAD_FILE_TYPE_ENUM["159"]; + else if (data.type === "tzsbczry") + getFileType = UPLOAD_FILE_TYPE_ENUM["160"]; + else if (data.type === "zyfzr") + getFileType = UPLOAD_FILE_TYPE_ENUM["161"]; + + const fileItems = await getFile({ eqType: getFileType, eqForeignKey: data.userCertificateId }); setInfo({ ...data, files: fileItems }); }; @@ -156,7 +173,7 @@ const ViewInfoModalComponent = (props) => { { label: "姓名", children: info.name }, { label: "企业名称", children: info.corpinfoName }, { label: "部门名称", children: info.departmentName }, - { label: "岗位名称", children: info.postName }, + { label: "岗位名称", children: info.userPostName }, { label: "就职状态", children: getLabelName({ list: EMPLOYMENT_STATUS_ENUM, status: info.employmentStatus }) }, ]} /> @@ -190,8 +207,8 @@ const ViewInfoModalComponent = (props) => { items={[ { label: "证书名称", children: info.certificateName }, { label: "证书编号", children: info.certificateCode }, - { label: "操作类别", children: info.assignmentCategoryName }, - { label: "作业项目", children: info.assignmentOperatingItemsName }, + { label: "操作项目", children: info.assignmentCategoryName }, + { label: "作业类别", children: info.assignmentOperatingItemsName }, { label: "发证机构", children: info.issuingAuthority }, { label: "发证日期", children: info.dateIssue }, { label: "复审日期", children: info.reviewDate }, diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js index 8c8b240..71fae94 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js @@ -69,7 +69,7 @@ function List(props) { )} columns={[ - { title: "集团单位名称", dataIndex: "corpinfoName" }, + { title: "集团单位名称", dataIndex: "groupCompanyName" }, { title: "集团单位审核部门", dataIndex: "groupCompanyDeptName" }, { title: "一级项目名称", dataIndex: "relatedProjectName" }, { title: "二级项目名称", dataIndex: "projectName" }, diff --git a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js index c62230b..9deada3 100644 --- a/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js +++ b/src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js @@ -24,7 +24,6 @@ function List(props) { return (