fixed:部分项目审核状态变更

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",

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 },
+  // { bianma: "离职", name: 0 },
-  { label: "在职", value: 1 },
+  { name: "离职", bianma: 0 },
-  { label: "信息变更中", value: 2 },
+  { name: "在职", bianma: 1 },
-  { label: "未入职", value: 3 },
+  { name: "信息变更中", bianma: 2 },
-  { label: "实习生", value: 4 },
+  { name: "未入职", bianma: 3 },
-  { label: "实习结束", value: 5 },
+  { name: "实习生", bianma: 4 },
-  { label: "退休", value: 6 },
+  { name: "实习结束", bianma: 5 },
-  { label: "劳务派遣", value: 7 },
+  { name: "退休", bianma: 6 },
-  { label: "劳务派遣结束", value: 8 },
+  { name: "劳务派遣", bianma: 7 },
-  { label: "入职待审核", value: 11 },
+  { name: "劳务派遣结束", bianma: 8 },
-  { label: "离职待审核", value: 10 },
+  { 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: (<PreviewImg files={info.files} />) },
             ]}
@@ -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: (<PreviewImg files={info.files} />) },
             ]}
           />
@@ -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: (<PreviewImg files={info.files} />) },
             ]}
           />
@@ -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: (<PreviewImg files={info.files} />) },
             ]}
           />

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" },
 ];

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 (<AddView {...props} />);
+  // 分公司，集团单位 必须是人资系统存在的人
+  return (<AddView useRz={1} {...props} />);
 };
 
 export default Add;

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",
+          //   name: "eqProjectStatus",
-            label: "项目审核状态",
+          //   label: "项目审核状态",
-            render: FORM_ITEM_RENDER_ENUM.SELECT,
+          //   render: FORM_ITEM_RENDER_ENUM.SELECT,
-            items: PROJECT_STATUS_MAP,
+          //   items: PROJECT_STATUS_MAP,
-          },
+          // },
         ]}
         form={form}
         onFinish={getData}
@@ -75,7 +76,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                {props.permission("xmsh-jtgs-xmbagl-btn-xmrybg") && (
+                {props.permission("xmsh-jtgs-xmbagl-btn-xmrybg") && record.projectStatus === 4 && (
                   <Button
                     type="link"
                     onClick={() => {

src/pages/Container/BranchCompany/Qualification/Apply/Add/index.js

@@ -140,6 +140,7 @@ const StepOneComponent = (props) => {
               onGetLabel={label => form.setFieldValue("stakeholderLevelName", label)}
               onChange={() => {
                 form.setFieldValue("groupUnitName", "");
+                form.setFieldValue("groupUnitId", "");
                 form.setFieldValue("groupUnitDeptName", "");
                 form.setFieldValue("groupUnitUserName", "");
                 form.setFieldValue("qualificationsId", "");

src/pages/Container/BranchCompany/Qualification/Apply/List/index.js

@@ -100,6 +100,7 @@ function List(props) {
                 {props.permission("zrzz-jtgs-zrzzsq-btn-ckbhyy") && (
                   <Button
                     type="link"
+                    danger
                     disabled={record.status !== 300}
                     onClick={() => {
                       onViewRejectReason(record.id);

src/pages/Container/Local/ProjectReview/ProjectApproval/NoSubcontract/List/index.js

@@ -18,7 +18,7 @@ function List(props) {
     params: {
       eqStakeholderLevel: "one-level",
       eqSubcontractFlag: 0,
-      eqProjectStatus: 3,
+      projectStatusArr: "1,3",
     },
   });
   const [rejectReasonModalOpen, setRejectReasonModalOpen] = useState(false); // 驳回原因弹窗
@@ -64,14 +64,24 @@ function List(props) {
             width: 150,
             render: (_, record) => (
               <Space>
-                {props.permission("xmsh-sdgs-ffbxmsh-btn-ck" || "xmsh-sdgs-ffbxmsh-btn-sh") && (
+                {props.permission("xmsh-sdgs-ffbxmsh-btn-ck") && (
                   <Button
                     type="link"
                     onClick={() => {
-                      props.history.push(`./reView?id=${record.id}&projectStatusLast=3`);
+                      props.history.push(`./reView?id=${record.id}`);
                     }}
                   >
-                    {record.projectStatus === 3 ? "审核" : "查看"}
+                    查看
+                  </Button>
+                )}
+                {props.permission("xmsh-sdgs-ffbxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`);
+                    }}
+                  >
+                    审核
                   </Button>
                 )}
                 {(props.permission("xmsh-sdgs-ffbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (

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) => (
               <Space>
-                {props.permission("xmsh-sdgs-fbxmsh-btn-ck" || "xmsh-sdgs-fbxmsh-btn-sh") && (
+                {props.permission("xmsh-sdgs-fbxmsh-btn-ck") && (
                   <Button
                     type="link"
                     onClick={() => {
-                      props.history.push(`./reView?id=${record.id}&projectStatusLast=3`);
+                      props.history.push(`./reView?id=${record.id}`);
                     }}
                   >
-                    {record.projectStatus === 3 ? "审核" : "查看"}
+                    查看
+                  </Button>
+                )}
+                {props.permission("xmsh-sdgs-fbxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`);
+                    }}
+                  >
+                    审核
                   </Button>
                 )}
                 {(props.permission("xmsh-sdgs-fbxmsh-btn-ckbhyy") && record.projectStatus === 6) && (

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) => (
               <Space>
-                {props.permission("xmsh-sdgs-ejxmsh-btn-ck" || "xmsh-sdgs-ejxmsh-btn-sh") && (
+                {props.permission("xmsh-sdgs-ejxmsh-btn-ck") && (
                   <Button
                     type="link"
                     onClick={() => {
-                      props.history.push(`./reView?id=${record.id}&projectStatusLast=3`);
+                      props.history.push(`./reView?id=${record.id}`);
                     }}
                   >
-                    {record.projectStatus === 3 ? "审核" : "查看"}
+                    查看
+                  </Button>
+                )}
+                {props.permission("xmsh-sdgs-ejxmsh-btn-sh") && (record.projectStatus === 3 || record.projectStatus === 1) && (
+                  <Button
+                    type="link"
+                    onClick={() => {
+                      props.history.push(`./reView?id=${record.id}&projectStatusLast=${record.projectStatus}`);
+                    }}
+                  >
+                    审核
                   </Button>
                 )}
                 {(props.permission("xmsh-sdgs-ejxmsh-btn-ckbhyy") && record.projectStatus === 6) && (

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

@@ -89,6 +89,7 @@ function Add(props) {
         {currentStep === 1
           && (
             <StepOne
+              useRz={props.useRz}
               setFormValues={setFormValues}
               setCurrentStep={setCurrentStep}
               formValues={formValues}
@@ -136,7 +137,7 @@ const StepOneComponent = (props) => {
   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) => {
             <PersonnelSelect
               isNeedCorpInfoId={true}
               params={{ corpinfoId: props.userInfo?.corpinfoId || "" }}
-              extraParams={{ noMain: 1, flowFlag: 0 }}
+              extraParams={props.useRz ? { noMain: 1, rzFlag: 1 } : { noMain: 1, flowFlag: 0 }}
               isNeedDepartmentId={false}
               onGetLabel={(label) => {
                 form.setFieldValue("userName", label);

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}

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: <PreviewImg files={info.corpInfo?.files || []} /> },
+              { label: "营业执照", children: <PreviewImg files={info.corpInfo?.qiyefile || []} /> },
               { label: "营业执照有效期", children: info.corpInfo?.licenseStart ? `${info.corpInfo?.licenseStart}-${info.corpInfo?.licenseEnd}` : "-" },
             ]}
           />

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

@@ -76,7 +76,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                {props.permission("xmsh-xgf-yjxmbagl-btn-xmrybg") && (
+                {props.permission("xmsh-xgf-yjxmbagl-btn-xmrybg") && record.projectStatus === 4 && (
                   <Button
                     type="link"
                     onClick={() => {

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

@@ -64,7 +64,7 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                {props.permission("xmsh-xgf-ejxmbagl-btn-xmrybg") && (
+                {props.permission("xmsh-xgf-ejxmbagl-btn-xmrybg") && record.projectStatus === 4 && (
                   <Button
                     type="link"
                     onClick={() => {

src/pages/Container/Stakeholder/Qualification/Apply/List/index.js

@@ -101,6 +101,7 @@ function List(props) {
                 {props.permission("zrzz-xgf-zrzzsq-btn-ckbhyy") && (
                   <Button
                     type="link"
+                    danger
                     disabled={record.status !== 300}
                     onClick={() => {
                       onViewRejectReason(record.id);

src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/List/index.js

@@ -66,14 +66,6 @@ function List(props) {
                     查看
                   </Button>
                 )}
-                <Button
-                  type="link"
-                  onClick={() => {
-                    props.history.push(`./UserChange?id=${record.id}`);
-                  }}
-                >
-                  项目人员变更
-                </Button>
                 {props.permission(props.rybgjlbtn || "xmsh-gfd-xmbaxx-btn-rybgjl") && (
                   <Button
                     type="link"

src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChange/index.js

@@ -14,7 +14,7 @@ import { NS_QUALIFICATION_STATISTICS } from "~/enumerate/namespace";
 function UserChange(props) {
   const query = useGetUrlQuery();
   const { tableProps, getData } = useTable(props["projectUserList"], { params: { eqProjectId: query.id } });
-  const { tableProps: allData } = useTable(props["projectUserList"], { params: { eqProjectId: query.id, pageIndex: 1, pageSize: 999999 } });
+  const { tableProps: allData, getData: getAllUserData } = useTable(props["projectUserList"], { params: { eqProjectId: query.id, pageIndex: 1, pageSize: 999999 } });
   const [usercontentOpen, setUsercontentOpen] = useState(false); // 选择项目审核人员弹窗显示
   const [fetchUserList, setFetchUserList] = useState([]); // 已存在的项目人员数据
   const [viewProjectReviewUserModalOpen, setViewProjectReviewUserModalOpen] = useState(false);
@@ -29,6 +29,7 @@ function UserChange(props) {
         if (success) {
           message.success("删除成功");
           getData();
+          getAllUserData();
         }
       },
     });
@@ -36,7 +37,7 @@ function UserChange(props) {
 
   // 点击新增项目人员
   const OnUsercontentOpen = () => {
-    setUsercontentOpen(true);
+    console.log(allData.dataSource);
     // 保存已存在的项目人员数据，用于弹窗回显
     if (allData.dataSource && Array.isArray(allData.dataSource)) {
       setFetchUserList(allData.dataSource.map(item => ({
@@ -49,6 +50,7 @@ function UserChange(props) {
         projectLeader: item.projectLeader || 0,
       })));
     }
+    setUsercontentOpen(true);
   };
 
   // 项目人员确认提交
@@ -70,6 +72,7 @@ function UserChange(props) {
       message.success("新增成功");
       setUsercontentOpen(false);
       getData();
+      getAllUserData();
     }
   };
 

src/pages/Container/Supervision/ProjectReview/ProjectFilingInformation/UserChangeRecord/index.js

@@ -15,7 +15,9 @@ function UserChange(props) {
         columns={[
           { title: "姓名", dataIndex: "userName" },
           { title: "部门", dataIndex: "deptName" },
-          { title: "操作", dataIndex: "changeType", render: (text) => { return text === 1 ? "删除" : "新增"; } },
+          { title: "操作", dataIndex: "changeType", render: (_, record) => {
+            return record.changeType === 1 ? "删除" : "新增";
+          } },
           { title: "记录时间", dataIndex: "createTime" },
         ]}
         {...tableProps}