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 && (