bug:14884、14883、14882、14881、14880

master
LiuJiaNan 2026-02-26 14:36:48 +08:00
parent 4554f5f8b1
commit 7222ac570f
3 changed files with 31 additions and 15 deletions

View File

@ -40,13 +40,21 @@ const ViewProjectReviewUserModal = (props) => {
}, },
useStorageQueryCriteria: false, useStorageQueryCriteria: false,
onSuccess: async (data) => { onSuccess: async (data) => {
const list = await getFile({ for (let i = 0; i < data.list.length; i++) {
single: false, const item = data.list[i];
dataSource: data.list, let getFileType = "";
foreignKey: "userCertificateId", if (item.type === "aqscglry")
eqType: UPLOAD_FILE_TYPE_ENUM["159"], getFileType = UPLOAD_FILE_TYPE_ENUM["162"];
}); else if (item.type === "tezhongzuoye")
setRealData(list); 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", dataIndex: "certificateDateStart",
render: (_, record) => `${record.certificateDateStart}${record.certificateDateEnd}`, render: (_, record) => `${record.certificateDateStart}${record.certificateDateEnd}`,
}, },
{ title: "图片", dataIndex: "files", render: (_, record) => (<TooltipPreviewImg files={record.files} />) }, { title: "图片", dataIndex: "files", width: 100, render: (_, record) => (<TooltipPreviewImg files={record.files} />) },
{ {
title: "操作", title: "操作",
width: 100, width: 100,
@ -127,8 +135,17 @@ const ViewInfoModalComponent = (props) => {
const getData = async () => { const getData = async () => {
const { data } = await props["userQualificationInfo"]({ id: props.id }); const { data } = await props["userQualificationInfo"]({ id: props.id });
const fileItems = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["159"], eqForeignKey: data.userCertificateId }); let getFileType = "";
console.log(fileItems); 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 }); setInfo({ ...data, files: fileItems });
}; };
@ -156,7 +173,7 @@ const ViewInfoModalComponent = (props) => {
{ label: "姓名", children: info.name }, { label: "姓名", children: info.name },
{ label: "企业名称", children: info.corpinfoName }, { label: "企业名称", children: info.corpinfoName },
{ label: "部门名称", children: info.departmentName }, { label: "部门名称", children: info.departmentName },
{ label: "岗位名称", children: info.postName }, { label: "岗位名称", children: info.userPostName },
{ label: "就职状态", children: getLabelName({ list: EMPLOYMENT_STATUS_ENUM, status: info.employmentStatus }) }, { label: "就职状态", children: getLabelName({ list: EMPLOYMENT_STATUS_ENUM, status: info.employmentStatus }) },
]} ]}
/> />
@ -190,8 +207,8 @@ const ViewInfoModalComponent = (props) => {
items={[ items={[
{ label: "证书名称", children: info.certificateName }, { label: "证书名称", children: info.certificateName },
{ label: "证书编号", children: info.certificateCode }, { label: "证书编号", children: info.certificateCode },
{ label: "操作类别", children: info.assignmentCategoryName }, { label: "操作项目", children: info.assignmentCategoryName },
{ label: "作业项目", children: info.assignmentOperatingItemsName }, { label: "作业类别", children: info.assignmentOperatingItemsName },
{ label: "发证机构", children: info.issuingAuthority }, { label: "发证机构", children: info.issuingAuthority },
{ label: "发证日期", children: info.dateIssue }, { label: "发证日期", children: info.dateIssue },
{ label: "复审日期", children: info.reviewDate }, { label: "复审日期", children: info.reviewDate },

View File

@ -69,7 +69,7 @@ function List(props) {
</Space> </Space>
)} )}
columns={[ columns={[
{ title: "集团单位名称", dataIndex: "corpinfoName" }, { title: "集团单位名称", dataIndex: "groupCompanyName" },
{ title: "集团单位审核部门", dataIndex: "groupCompanyDeptName" }, { title: "集团单位审核部门", dataIndex: "groupCompanyDeptName" },
{ title: "一级项目名称", dataIndex: "relatedProjectName" }, { title: "一级项目名称", dataIndex: "relatedProjectName" },
{ title: "二级项目名称", dataIndex: "projectName" }, { title: "二级项目名称", dataIndex: "projectName" },

View File

@ -24,7 +24,6 @@ function List(props) {
return ( return (
<Page isShowAllAction={false}> <Page isShowAllAction={false}>
<Search <Search
labelCol={{ span: 8 }}
options={[ options={[
{ name: "likeProjectName", label: "项目名称" }, { name: "likeProjectName", label: "项目名称" },
{ name: "likeCorpInfoName", label: "相关方名称" }, { name: "likeCorpInfoName", label: "相关方名称" },