feat:相关方项目审核、相关方项目申请:人员列表操作栏“特种证书”文字修改为“资质证书”,一级项目申请:申请一级项目时“项目选取形式”字段删除;“是否为属地公司推”修改为“是否为股份公司审核”;“推荐属地公司审核中”状态修改为“属地公司审核中”,同一个资质,相关方申请审批通过后,资料及资质都正常的情况下,不可重复申请(次修改需要修改代码逻辑)
parent
f9a3c3b87d
commit
b83d4bbdd1
|
|
@ -15,7 +15,7 @@ export {};
|
||||||
export const PROJECT_STATUS_MAP = [
|
export const PROJECT_STATUS_MAP = [
|
||||||
{ name: "主管部门审核中", bianma: "1" },
|
{ name: "主管部门审核中", bianma: "1" },
|
||||||
{ name: "项目属地单位确认中", bianma: "2" },
|
{ name: "项目属地单位确认中", bianma: "2" },
|
||||||
{ name: "推荐属地公司审核中", bianma: "3" },
|
{ name: "属地公司审核中", bianma: "3" },
|
||||||
{ name: "集团单位审核中", bianma: "7" },
|
{ name: "集团单位审核中", bianma: "7" },
|
||||||
{ name: "已完成", bianma: "4" },
|
{ name: "已完成", bianma: "4" },
|
||||||
{ name: "已驳回", bianma: "6" },
|
{ name: "已驳回", bianma: "6" },
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ function List(props) {
|
||||||
<Table
|
<Table
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "项目名称", dataIndex: "projectName" },
|
{ title: "项目名称", dataIndex: "projectName" },
|
||||||
{ title: "是否为属地公司推荐", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
{ title: "是否为股份公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
||||||
{ title: "项目属地单位", dataIndex: "companyName" },
|
{ title: "项目属地单位", dataIndex: "companyName" },
|
||||||
{ title: "主管部门", dataIndex: "manageDeptName" },
|
{ title: "主管部门", dataIndex: "manageDeptName" },
|
||||||
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
||||||
|
|
|
||||||
|
|
@ -156,7 +156,7 @@ const StepOneComponent = (props) => {
|
||||||
const form = props.form;
|
const form = props.form;
|
||||||
const approvalCorpId = Form.useWatch("approvalCorpId", form); // 项目审核部门公司
|
const approvalCorpId = Form.useWatch("approvalCorpId", form); // 项目审核部门公司
|
||||||
const approvalDeptId = Form.useWatch("approvalDeptId", form); // 项目审核部门
|
const approvalDeptId = Form.useWatch("approvalDeptId", form); // 项目审核部门
|
||||||
const isLocalCompany = Form.useWatch("isLocalCompany", form); // 是否为属地公司推荐
|
const isLocalCompany = Form.useWatch("isLocalCompany", form); // 是否为股份公司审核
|
||||||
const qualificationsTypeId = Form.useWatch("qualificationsTypeId", form);
|
const qualificationsTypeId = Form.useWatch("qualificationsTypeId", form);
|
||||||
const recommendCorpId = Form.useWatch("recommendCorpId", form);
|
const recommendCorpId = Form.useWatch("recommendCorpId", form);
|
||||||
const recommendDeptId = Form.useWatch("recommendDeptId", form);
|
const recommendDeptId = Form.useWatch("recommendDeptId", form);
|
||||||
|
|
@ -323,17 +323,17 @@ const StepOneComponent = (props) => {
|
||||||
render: FORM_ITEM_RENDER_ENUM.DATE,
|
render: FORM_ITEM_RENDER_ENUM.DATE,
|
||||||
rules: [validatorEndTime(startProjectTime)],
|
rules: [validatorEndTime(startProjectTime)],
|
||||||
},
|
},
|
||||||
{
|
// {
|
||||||
name: "chooseForm",
|
// name: "chooseForm",
|
||||||
label: "项目选取形式",
|
// label: "项目选取形式",
|
||||||
render: (
|
// render: (
|
||||||
<DictionarySelect
|
// <DictionarySelect
|
||||||
dictValue="project_choose_form"
|
// dictValue="project_choose_form"
|
||||||
onGetLabel={label => form.setFieldValue("chooseFormName", label)}
|
// onGetLabel={label => form.setFieldValue("chooseFormName", label)}
|
||||||
/>
|
// />
|
||||||
),
|
// ),
|
||||||
},
|
// },
|
||||||
{ name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true },
|
// { name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true },
|
||||||
{
|
{
|
||||||
name: "fourNewFlag",
|
name: "fourNewFlag",
|
||||||
label: "是否涉及四新工作内容",
|
label: "是否涉及四新工作内容",
|
||||||
|
|
@ -420,7 +420,7 @@ const StepOneComponent = (props) => {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: "isLocalCompany",
|
name: "isLocalCompany",
|
||||||
label: "是否为属地公司推荐",
|
label: "是否为股份公司审核",
|
||||||
span: 24,
|
span: 24,
|
||||||
render: FORM_ITEM_RENDER_ENUM.RADIO,
|
render: FORM_ITEM_RENDER_ENUM.RADIO,
|
||||||
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }],
|
items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }],
|
||||||
|
|
@ -959,7 +959,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
查看特种证书
|
查看资质证书
|
||||||
</Button>
|
</Button>
|
||||||
</Space>
|
</Space>
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ function List(props) {
|
||||||
)}
|
)}
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "项目名称", dataIndex: "projectName" },
|
{ title: "项目名称", dataIndex: "projectName" },
|
||||||
{ title: "是否为属地公司推荐", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
{ title: "是否为股份公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
||||||
{ title: "项目属地单位", dataIndex: "companyName" },
|
{ title: "项目属地单位", dataIndex: "companyName" },
|
||||||
{ title: "主管部门", dataIndex: "manageDeptName" },
|
{ title: "主管部门", dataIndex: "manageDeptName" },
|
||||||
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
||||||
|
|
|
||||||
|
|
@ -279,13 +279,13 @@ function Review(props) {
|
||||||
{ label: "立项时间", children: info.initiationTime },
|
{ label: "立项时间", children: info.initiationTime },
|
||||||
{ label: "计划开始时间", children: info.startProjectTime },
|
{ label: "计划开始时间", children: info.startProjectTime },
|
||||||
{ label: "计划竣工时间", children: info.endProjectTime },
|
{ label: "计划竣工时间", children: info.endProjectTime },
|
||||||
{ label: "选取形式", children: info.chooseFormName },
|
// { label: "选取形式", children: info.chooseFormName },
|
||||||
{ label: "是否涉及四新工作内容", children: info.fourNewFlag === 1 ? "是" : "否" },
|
{ label: "是否涉及四新工作内容", children: info.fourNewFlag === 1 ? "是" : "否" },
|
||||||
{ label: "是否涉及三人及以上工作内容", children: info.threePeopleFlag === 1 ? "是" : "否" },
|
{ label: "是否涉及三人及以上工作内容", children: info.threePeopleFlag === 1 ? "是" : "否" },
|
||||||
{ label: "是否涉及夜间作业", children: info.nightWorkFlag === 1 ? "是" : "否" },
|
{ label: "是否涉及夜间作业", children: info.nightWorkFlag === 1 ? "是" : "否" },
|
||||||
{ label: "项目类别", children: info.qualificationsTypeName },
|
{ label: "项目类别", children: info.qualificationsTypeName },
|
||||||
{ label: "是否存在分包项目", children: info.subcontractFlag === 1 ? "是" : "否" },
|
{ label: "是否存在分包项目", children: info.subcontractFlag === 1 ? "是" : "否" },
|
||||||
{ label: "是否为属地公司推荐", children: info.isLocalCompany === 1 ? "是" : "否" },
|
{ label: "是否为股份公司审核", children: info.isLocalCompany === 1 ? "是" : "否" },
|
||||||
{ label: "安全管理协议", children: (
|
{ label: "安全管理协议", children: (
|
||||||
<>
|
<>
|
||||||
<PreviewImg files={info.imgFiles} />
|
<PreviewImg files={info.imgFiles} />
|
||||||
|
|
@ -380,7 +380,7 @@ function Review(props) {
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
查看特种证书
|
查看资质证书
|
||||||
</Button>
|
</Button>
|
||||||
</Space>
|
</Space>
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ function List(props) {
|
||||||
<Table
|
<Table
|
||||||
columns={[
|
columns={[
|
||||||
{ title: "项目名称", dataIndex: "projectName" },
|
{ title: "项目名称", dataIndex: "projectName" },
|
||||||
{ title: "是否为属地公司推荐", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
{ title: "是否为股份公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" },
|
||||||
{ title: "项目属地单位", dataIndex: "companyName" },
|
{ title: "项目属地单位", dataIndex: "companyName" },
|
||||||
{ title: "主管部门", dataIndex: "manageDeptName" },
|
{ title: "主管部门", dataIndex: "manageDeptName" },
|
||||||
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
{ title: "项目类别", dataIndex: "qualificationsTypeName" },
|
||||||
|
|
|
||||||
|
|
@ -298,8 +298,8 @@ const StepOneComponent = (props) => {
|
||||||
{ name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE },
|
{ name: "initiationTime", label: "立项时间", render: FORM_ITEM_RENDER_ENUM.DATE },
|
||||||
{ name: "startProjectTime", label: "计划开始时间", render: FORM_ITEM_RENDER_ENUM.DATE },
|
{ name: "startProjectTime", label: "计划开始时间", render: FORM_ITEM_RENDER_ENUM.DATE },
|
||||||
{ name: "endProjectTime", label: "计划竣工时间", render: FORM_ITEM_RENDER_ENUM.DATE, rules: [validatorEndTime(startProjectTime)] },
|
{ name: "endProjectTime", label: "计划竣工时间", render: FORM_ITEM_RENDER_ENUM.DATE, rules: [validatorEndTime(startProjectTime)] },
|
||||||
{ name: "chooseForm", label: "项目选取形式", render: <DictionarySelect dictValue="project_choose_form" onGetLabel={label => form.setFieldValue("chooseFormName", label)} /> },
|
// { name: "chooseForm", label: "项目选取形式", render: <DictionarySelect dictValue="project_choose_form" onGetLabel={label => form.setFieldValue("chooseFormName", label)} /> },
|
||||||
{ name: "chooseFormName", label: "项目选取形式名称", onlyForLabel: true },
|
// { 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: "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: 9 }, 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: "nightWorkFlag", label: "是否涉及夜间作业", labelCol: { span: 8 }, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }] },
|
||||||
|
|
@ -698,7 +698,7 @@ const StepTwoComponent = forwardRef((props, ref) => {
|
||||||
});
|
});
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
特种证书
|
资质证书
|
||||||
</Button>
|
</Button>
|
||||||
</Space>
|
</Space>
|
||||||
),
|
),
|
||||||
|
|
|
||||||
|
|
@ -113,10 +113,10 @@ function UserChange(props) {
|
||||||
...record,
|
...record,
|
||||||
userRealId: record.userId,
|
userRealId: record.userId,
|
||||||
});
|
});
|
||||||
// 查看特种证书逻辑
|
// 查看资质证书逻辑
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
查看特种证书
|
查看资质证书
|
||||||
</Button>
|
</Button>
|
||||||
{record.projectLeader === 0 && (
|
{record.projectLeader === 0 && (
|
||||||
<Button
|
<Button
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue