修复bug：14354、14353、14345、14344、14338、14337、14331、14324、14315、14289、13543、13499、13489

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.32"
+    "zy-react-library": "^1.1.42"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^5.4.1",

src/api/qualificationStatistics/index.js

@@ -28,9 +28,12 @@ export const projectUpdate = declareRequest(
   "qualificationStatisticsLoading",
   `Put > @/xgfManager/project/edit`,
 );
-export const userQualificationInfo = declareRequest(
+export const userQualificationList = declareRequest(
   `Post > @/certificate/userCertificate/listPage`,
 );
+export const userQualificationInfo = declareRequest(
+  `Get > /certificate/userCertificate/getInfoById/{id}`,
+);
 export const projectDetail = declareRequest(
   "qualificationStatisticsLoading",
   `Get > /xgfManager/project/{id}`,

src/components/ViewProjectReviewUserModal/index.js

@@ -1,72 +1,139 @@
 import { Connect } from "@cqsjjb/jjb-dva-runtime";
-import { Button, Form, Modal } from "antd";
+import { Button, Descriptions, Divider, Form, Modal } from "antd";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useEffect, useState } from "react";
+import PreviewImg from "zy-react-library/components/PreviewImg";
+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";
 import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useTable from "zy-react-library/hooks/useTable";
+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 },
+];
 const ViewProjectReviewUserModal = (props) => {
   const [form] = Form.useForm();
   const [realData, setRealData] = useState([]);
+  const [viewInfoModalVisible, setViewInfoModalVisible] = useState(false);
+  const [currentId, setCurrentId] = useState("");
 
   const { loading: getFileLoading, getFile } = useGetFile();
-  const { tableProps } = useTable(props["userQualificationInfo"], {
+  const { tableProps, getData } = useTable(props["userQualificationList"], {
     form,
     params: {
       eqUserId: props.data.userRealId ? props.data.userRealId : props.data.id,
     },
     useStorageQueryCriteria: false,
     onSuccess: async (data) => {
-      const list = data.list;
+      const list = await getFile({
-      for (let i = 0; i < list.length; i++) {
+        single: false,
-        const fileItems = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["159"], eqForeignKey: list[i].userCertificateId });
+        dataSource: data.list,
-        list[i].files = fileItems;
+        foreignKey: "userCertificateId",
-      }
+        eqType: UPLOAD_FILE_TYPE_ENUM["159"],
+      });
       setRealData(list);
     },
   });
-  const [tableData, setTableData] = useState([]);
-  const hasFetchedRef = useRef(false);
-  useEffect(() => {
-    // 只在第一次获取数据时执行，或者数据真正变化时
-    if (tableProps.dataSource
-      && tableProps.dataSource.length > 0
-      && !getFileLoading
-      && !hasFetchedRef.current) {
-      hasFetchedRef.current = true;
 
-      const fetchFiles = async () => {
+  return (
-        const dataWithFiles = await Promise.all(
+    <div>
-          tableProps.dataSource.map(async (item) => {
+      <Modal
-            try {
+        title="特种证书"
-              const files = await getFile({
+        width={1200}
-                eqType: UPLOAD_FILE_TYPE_ENUM["6"],
+        open
-                eqForeignKey: item.userId,
+        maskClosable={false}
-              });
+        onCancel={props.onCancel}
-              return { ...item, files: files || [] };
+        footer={[
-            }
+          <Button key="cancel" onClick={props.onCancel}>取消</Button>,
-            catch (error) {
+        ]}
-              console.error("获取文件失败:", error);
+      >
-              return { ...item, files: [] };
+        <Search
-            }
+          labelCol={{ span: 8 }}
-          }),
+          options={[
+            { name: "likeUserName", label: "姓名" },
+            { name: "eqType", label: "证书类型", render: (<DictionarySelect dictValue="zslx" />) },
+          ]}
+          form={form}
+          onFinish={getData}
+        />
+        <Table
+          options={false}
+          disabledResizer={true}
+          columns={[
+            { title: "姓名", dataIndex: "name" },
+            { title: "证书类型", dataIndex: "typeName" },
+            { title: "证书名称", dataIndex: "certificateName" },
+            { title: "证书编号", dataIndex: "certificateCode" },
+            {
+              title: "有效期",
+              dataIndex: "certificateDateStart",
+              render: (_, record) => `${record.certificateDateStart}至${record.certificateDateEnd}`,
+            },
+            { title: "图片", dataIndex: "files", render: (_, record) => (<TooltipPreviewImg files={record.files} />) },
+            {
+              title: "操作",
+              width: 100,
+              fixed: "right",
+              render: (_, record) => (
+                <Button
+                  type="link"
+                  onClick={() => {
+                    setViewInfoModalVisible(true);
+                    setCurrentId(record.id);
+                  }}
+                >
+                  查看
+                </Button>
+              ),
+            },
+          ]}
+          {...tableProps}
+          dataSource={realData}
+          loading={getFileLoading || tableProps.loading}
+        />
+      </Modal>
+      {viewInfoModalVisible && (
+        <ViewInfoModal
+          id={currentId}
+          onCancel={() => {
+            setViewInfoModalVisible(false);
+            setCurrentId("");
+          }}
+        />
+      )}
+    </div>
   );
-
-        setTableData(dataWithFiles);
 };
 
-      fetchFiles();
+const ViewInfoModalComponent = (props) => {
-    }
+  const [info, setInfo] = useState({});
-  }, [tableProps.dataSource, getFileLoading, getFile]);
 
-  // 使用 useMemo 避免重复计算
+  const { getFile } = useGetFile();
-  const enhancedTableProps = useMemo(() => ({
+
-    ...tableProps,
+  const getData = async () => {
-    dataSource: tableData.length > 0 ? tableData : tableProps.dataSource || [],
+    const { data } = await props["userQualificationInfo"]({ id: props.id });
-  }), [tableProps, tableData]);
+    const fileItems = await getFile({ eqType: UPLOAD_FILE_TYPE_ENUM["159"], eqForeignKey: data.userCertificateId });
+    console.log(fileItems);
+    setInfo({ ...data, files: fileItems });
+  };
+
+  useEffect(() => {
+    getData();
+  }, []);
 
   return (
     <Modal
@@ -79,23 +146,100 @@ const ViewProjectReviewUserModal = (props) => {
         <Button key="cancel" onClick={props.onCancel}>取消</Button>,
       ]}
     >
-      <Table
+      <Divider orientation="left">人员信息</Divider>
-        options={false}
+      <Descriptions
-        disabledResizer={true}
+        column={1}
-        columns={[
+        bordered
-          { title: "姓名", dataIndex: "name" },
+        styles={{ label: { width: 200 } }}
-          { title: "证书名称", dataIndex: "certificateName" },
+        items={[
-          { title: "行业类别", dataIndex: "industryCategoryName" },
+          { label: "姓名", children: info.userName },
-          { title: "操作项目", dataIndex: "industryOperatingItemsName" },
+          { label: "企业名称", children: info.corpinfoName },
-          { title: "证书编号", dataIndex: "certificateCode" },
+          { label: "部门名称", children: info.departmentName },
-          { title: "图片", dataIndex: "files", render: (_, record) => (<TooltipPreviewImg files={record.files} />) },
+          { label: "岗位名称", children: info.postName },
-
+          { label: "就职状态", children: getLabelName({ list: EMPLOYMENT_STATUS_ENUM, status: info.employmentStatus }) },
         ]}
-        {...enhancedTableProps}
-        dataSource={realData}
       />
+      <Divider orientation="left">证书信息</Divider>
+      {
+        info.type === "tezhongzuoye" && (
+          <Descriptions
+            column={1}
+            bordered
+            styles={{ label: { width: 200 } }}
+            items={[
+              { label: "证书名称", children: info.certificateName },
+              { label: "证书编号", children: info.certificateCode },
+              { label: "发证机构", children: info.issuingAuthority },
+              { label: "作业类别", children: info.industryCategoryName },
+              { label: "操作项目", children: info.industryOperatingItemsName },
+              { label: "发证日期", children: info.dateIssue },
+              { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` },
+              { label: "复审日期", children: info.reviewDate },
+              { label: "证书照片", children: (<PreviewImg files={info.files} />) },
+            ]}
+          />
+        )
+      }
+      {
+        info.type === "tzsbczry" && (
+          <Descriptions
+            column={1}
+            bordered
+            styles={{ label: { width: 200 } }}
+            items={[
+              { label: "证书名称", children: info.certificateName },
+              { label: "证书编号", children: info.certificateCode },
+              { label: "操作类别", children: info.assignmentCategoryName },
+              { label: "作业项目", children: info.assignmentOperatingItemsName },
+              { label: "发证机构", children: info.issuingAuthority },
+              { label: "发证日期", children: info.dateIssue },
+              { label: "复审日期", children: info.reviewDate },
+              { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` },
+              { label: "证书照片", children: (<PreviewImg files={info.files} />) },
+            ]}
+          />
+        )
+      }
+      {
+        info.type === "zyfzr" && (
+          <Descriptions
+            column={1}
+            bordered
+            styles={{ label: { width: 200 } }}
+            items={[
+              { label: "证书名称", children: info.certificateName },
+              { label: "证书编号", children: info.certificateCode },
+              { label: "岗位名称", children: info.postName },
+              { label: "发证机构", children: info.issuingAuthority },
+              { label: "发证日期", children: info.dateIssue },
+              { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` },
+              { label: "证书照片", children: (<PreviewImg files={info.files} />) },
+            ]}
+          />
+        )
+      }
+      {
+        info.type === "aqscglry" && (
+          <Descriptions
+            column={1}
+            bordered
+            styles={{ label: { width: 200 } }}
+            items={[
+              { label: "证书名称", children: info.certificateName },
+              { label: "证书编号", children: info.certificateCode },
+              { label: "岗位名称", children: info.postName },
+              { label: "发证机构", children: info.issuingAuthority },
+              { label: "发证日期", children: info.dateIssue },
+              { label: "有效日期", children: `${info.certificateDateStart}至${info.certificateDateEnd}` },
+              { label: "证书照片", children: (<PreviewImg files={info.files} />) },
+            ]}
+          />
+        )
+      }
     </Modal>
   );
 };
 
+const ViewInfoModal = Connect([NS_QUALIFICATION_STATISTICS], true)(ViewInfoModalComponent);
+
 export default Connect([NS_QUALIFICATION_STATISTICS], true)(ViewProjectReviewUserModal);

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js

@@ -29,6 +29,7 @@ function Add(props) {
   const query = useGetUrlQuery();
   const [form] = Form.useForm();
   const [userInfo, setUserInfo] = useState({});
+  // const [currentStep, setCurrentStep] = useState(1);
   const [currentStep, setCurrentStep] = useState(1);
   const [formValues, setFormValues] = useState({});
   const [projectFileAddCmdList, setProjectFileAddCmdList] = useState([]); // 项目资料
@@ -83,7 +84,7 @@ function Add(props) {
   }, []);
 
   return (
-    <Page headerTitle={query.id ? "编辑" : "新增"} isShowFooter={false}>
+    <Page headerTitle={query.id ? "编辑" : "项目备案申请"} isShowFooter={false}>
       <>
         {currentStep === 1
           && (
@@ -226,7 +227,7 @@ const StepOneComponent = (props) => {
   }, [props.formValues]);
   return (
     <FormBuilder
-      labelCol={{ span: 5 }}
+      labelCol={{ span: 6 }}
       form={form}
       span={8}
       loading={props.qualificationStatistics.qualificationStatisticsLoading}
@@ -285,7 +286,7 @@ const StepOneComponent = (props) => {
         { name: "chooseForm", label: "项目选取形式", render: <DictionarySelect dictValue="project_choose_form" onGetLabel={label => form.setFieldValue("chooseFormName", label)} /> },
         { name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true },
         { name: "fourNewFlag", label: "是否涉及四新工作内容", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
-        { name: "threePeopleFlag", label: "是否涉及三人及以上工作内容", labelCol: { span: 9 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
+        { name: "threePeopleFlag", label: "是否涉及三人及以上工作内容", labelCol: { span: 10 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
         { name: "nightWorkFlag", label: "是否涉及夜间作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
         { name: "specialFlag", label: "是否包含特殊作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
         { label: "项目审核信息", render: FORM_ITEM_RENDER_ENUM.DIVIDER },
@@ -430,7 +431,6 @@ const StepOneComponent = (props) => {
           : [
               {
                 name: "manageDeptId",
-                labelCol: { span: 5 },
                 label: "选择主管部门",
                 render: FORM_ITEM_RENDER_ENUM.SELECT,
                 items: deptList,
@@ -479,8 +479,7 @@ const StepOneComponent = (props) => {
         },
         {
           name: "approvalCorpId",
-          label: "项目执行属地公司名称",
+          label: "项目属地单位",
-          labelCol: { span: 7 },
           items: corpInfoList,
           render: FORM_ITEM_RENDER_ENUM.SELECT,
           itemsField: { valueKey: "id", labelKey: "corpName" },
@@ -497,11 +496,10 @@ const StepOneComponent = (props) => {
             },
           },
         },
-        { name: "approvalCorpName", label: "项目执行属地公司名称", onlyForLabel: true },
+        { name: "approvalCorpName", label: "项目属地单位名称", onlyForLabel: true },
         {
           name: "approvalDeptId",
-          labelCol: { span: 7 },
+          label: "项目属地单位部门",
-          label: "项目执行属地公司部门",
           render: (
             <DepartmentSelectTree
               params={{ eqCorpinfoId: approvalCorpId }}
@@ -516,11 +514,10 @@ const StepOneComponent = (props) => {
             />
           ),
         },
-        { name: "approvalDeptName", label: "项目执行属地公司部门名称", onlyForLabel: true },
+        { name: "approvalDeptName", label: "项目属地单位部门名称", onlyForLabel: true },
         {
           name: "approvalUserIds",
-          label: "项目执行属地公司人员",
+          label: "项目属地单位人员",
-          labelCol: { span: 7 },
           render: (
             <PersonnelSelect
               params={{ departmentId: approvalDeptId }}
@@ -529,11 +526,12 @@ const StepOneComponent = (props) => {
             />
           ),
         },
-        { name: "approvalUserNames", label: "项目执行属地公司人员名称", onlyForLabel: true },
+        { name: "approvalUserNames", label: "项目属地单位人员名称", onlyForLabel: true },
         {
           name: "projectFiles",
           label: "安全管理协议",
           span: 24,
+          labelCol: { span: 2 },
           render: (
             <Upload
               fileType="image"
@@ -768,7 +766,7 @@ const StepTwoComponent = (props) => {
             pagination={false}
             options={false}
             disabledResizer={true}
-            rowKey={record => record.id || record.dataName}
+            rowKey={record => record.id || record.detailId}
             columns={[
               { title: "材料名称", key: "dataName", dataIndex: "dataName" },
               { title: "上传时间", key: "createTime", dataIndex: "createTime", render: (_, record) => record.createTime || "-" },

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js

@@ -43,7 +43,7 @@ function List(props) {
           },
           { name: "eqSubcontractFlag", label: "是否存在分包", render: FORM_ITEM_RENDER_ENUM.SELECT, items: [{ name: "是", bianma: "1" }, { name: "否", bianma: "0" }] },
           {
-            name: "",
+            name: "eqProjectStatus",
             label: "项目审核状态",
             render: FORM_ITEM_RENDER_ENUM.SELECT,
             items: PROJECT_STATUS_MAP,

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js

@@ -3,8 +3,8 @@ import { Button, Descriptions, Divider, Form, Input, message, Modal, Space } fro
 import { useEffect, useState } from "react";
 import FormBuilder from "zy-react-library/components/FormBuilder";
 import Page from "zy-react-library/components/Page";
+import PreviewImg from "zy-react-library/components/PreviewImg";
 import Table from "zy-react-library/components/Table";
-import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
 import { FORM_ITEM_RENDER_ENUM } from "zy-react-library/enum/formItemRender";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetFile from "zy-react-library/hooks/useGetFile";
@@ -269,7 +269,8 @@ function Review(props) {
           <Divider orientation="left">项目基础信息</Divider>
           <Descriptions
             bordered
-            column={4}
+            column={2}
+            styles={{ label: { width: 200 }, content: { width: 500 } }}
             items={[
               { label: "项目名称", children: info.projectName },
               { label: "项目负责人", children: info.userName },
@@ -283,7 +284,7 @@ function Review(props) {
               { label: "项目类别", children: info.qualificationsTypeName },
               { label: "是否存在分包项目", children: info.subcontractFlag === 1 ? "是" : "否" },
               { label: "是否为属地公司推荐", children: info.isLocalCompany === 1 ? "是" : "否" },
-              { label: "安全管理协议", children: <TooltipPreviewImg files={info.files} /> },
+              { label: "安全管理协议", children: <PreviewImg files={info.files} /> },
             ]}
           />
         </div>
@@ -291,7 +292,8 @@ function Review(props) {
           <Divider orientation="left">企业基础信息</Divider>
           <Descriptions
             bordered
-            column={4}
+            column={2}
+            styles={{ label: { width: 200 }, content: { width: 500 } }}
             items={[
               { label: "公司名称", children: info.corpInfo?.corpName },
               { label: "企业状态", children: info.corpInfo?.corpStateName },
@@ -310,9 +312,8 @@ function Review(props) {
               { label: "资产总额（万元）", children: info.corpInfo?.totalAssets },
               { label: "注册资金（万元）", children: info.corpInfo?.regcapital },
               { label: "企业类型", children: getLabelName({ list: typeList, status: info.corpInfo?.type }) },
-              { label: "营业执照", children: <TooltipPreviewImg files={info.corpInfo?.files || []} /> },
+              { label: "营业执照", children: <PreviewImg files={info.corpInfo?.files || []} /> },
               { label: "营业执照有效期", children: info.corpInfo?.licenseStart ? `${info.corpInfo?.licenseStart}-${info.corpInfo?.licenseEnd}` : "-" },
-              { label: "", children: "" },
             ]}
           />
         </div>
@@ -422,7 +423,18 @@ function Review(props) {
               { title: "部门", dataIndex: "departmentName" },
               { title: "姓名", dataIndex: "userName" },
               { title: "时间", dataIndex: "approvalTime" },
-              { title: "审核结果", dataIndex: "approvalStatus", render: (_, record) => getLabelName({ list: [{ name: record.auditType === 2 ? "确认中" : "审核中", bianma: "1" }, { name: record.auditType === 2 ? "已确认" : "已通过", bianma: "2" }, { name: "已驳回", bianma: "3" }], status: record.approvalStatus }) },
+              {
+                title: "审核结果",
+                dataIndex: "approvalStatus",
+                render: (_, record) => getLabelName({
+                  list: [
+                    { name: record.auditType === 2 ? "确认中" : "审核中", bianma: "1" },
+                    { name: record.auditType === 2 ? "已确认" : "已通过", bianma: "2" },
+                    { name: "已驳回", bianma: "3" },
+                  ],
+                  status: record.approvalStatus,
+                }),
+              },
             ]}
           />
         </div>

src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationTwo/List/index.js

@@ -42,7 +42,7 @@ function List(props) {
             render: (<DictionarySelect dictValue="qualificationsType" />),
           },
           {
-            name: "",
+            name: "eqProjectStatus",
             label: "项目审核状态",
             render: FORM_ITEM_RENDER_ENUM.SELECT,
             items: PROJECT_STATUS_MAP,

src/pages/Container/Supervision/ProjectReview/ProjectApproval/Subcontract/List/index.js

@@ -52,6 +52,7 @@ function List(props) {
           { title: "项目名称", dataIndex: "projectName" },
           { title: "股份主管部门", dataIndex: "manageDeptName" },
           { title: "项目类别", dataIndex: "qualificationsTypeName" },
+          { title: "是否存在分包", dataIndex: "subcontractFlag", render: (_, record) => record.subcontractFlag === 1 ? "是" : "否" },
           { title: "项目属地单位", dataIndex: "companyName" },
           {
             title: "项目备案审核状态",

src/pages/Container/Supervision/Qualification/ViewInfo/index.js

@@ -2,8 +2,8 @@ import { Connect } from "@cqsjjb/jjb-dva-runtime";
 import { Button, Descriptions, Divider, Spin } from "antd";
 import { Fragment, useEffect, useState } from "react";
 import Page from "zy-react-library/components/Page";
+import PreviewImg from "zy-react-library/components/PreviewImg";
 import Table from "zy-react-library/components/Table";
-import TooltipPreviewImg from "zy-react-library/components/TooltipPreviewImg";
 import { UPLOAD_FILE_TYPE_ENUM } from "zy-react-library/enum/uploadFile/gwj";
 import useGetFile from "zy-react-library/hooks/useGetFile";
 import useGetUrlQuery from "zy-react-library/hooks/useGetUrlQuery";
@@ -162,7 +162,7 @@ function ViewInfo(props) {
                   label: "企业类型",
                   children: getLabelName({ status: corpInfoData.type, list: ENTERPRISE_TYPE }),
                 },
-                { label: "营业执照", children: <TooltipPreviewImg files={corpInfoData.licenseFile} /> },
+                { label: "营业执照", children: <PreviewImg files={corpInfoData.licenseFile} /> },
                 { label: "营业执照有效期", children: corpInfoData.licenseStart ? `${corpInfoData.licenseStart} 至 ${corpInfoData.licenseEnd}` : "" },
               ]}
             />