diff --git a/src/components/ViewProjectReviewUserModal/index.js b/src/components/ViewProjectReviewUserModal/index.js index b7d7d20..4ab89f1 100644 --- a/src/components/ViewProjectReviewUserModal/index.js +++ b/src/components/ViewProjectReviewUserModal/index.js @@ -61,7 +61,7 @@ const ViewProjectReviewUserModal = (props) => { return (
{ return ( record.isLocalCompany === 1 ? "是" : "否" }, + { title: "是否为属地公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" }, { title: "项目属地单位", dataIndex: "companyName" }, { title: "主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js index e2367b3..358691e 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/Add/index.js @@ -156,7 +156,7 @@ const StepOneComponent = (props) => { const form = props.form; const approvalCorpId = Form.useWatch("approvalCorpId", 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 recommendCorpId = Form.useWatch("recommendCorpId", form); const recommendDeptId = Form.useWatch("recommendDeptId", form); @@ -420,7 +420,7 @@ const StepOneComponent = (props) => { }, { name: "isLocalCompany", - label: "是否为股份公司审核", + label: "是否为属地公司审核", span: 24, render: FORM_ITEM_RENDER_ENUM.RADIO, items: [{ bianma: 1, name: "是" }, { bianma: 0, name: "否" }], @@ -457,7 +457,7 @@ const StepOneComponent = (props) => { ? [ { name: "recommendCorpId", - label: "推荐属地公司名称", + label: "审核属地公司名称", labelCol: { span: 6 }, items: corpInfoList, render: FORM_ITEM_RENDER_ENUM.SELECT, @@ -475,11 +475,11 @@ const StepOneComponent = (props) => { }, }, }, - { name: "recommendCorpName", label: "推荐属地公司名称", onlyForLabel: true }, + { name: "recommendCorpName", label: "审核属地公司名称", onlyForLabel: true }, { name: "recommendDeptId", labelCol: { span: 6 }, - label: "推荐属地公司部门", + label: "审核属地公司部门", render: ( { /> ), }, - { name: "recommendDeptName", label: "推荐属地公司部门", onlyForLabel: true }, + { name: "recommendDeptName", label: "审核属地公司部门", onlyForLabel: true }, { name: "recommendUserIds", - label: "推荐属地公司人员", + label: "审核属地公司人员", span: 8, labelCol: { span: 6 }, wrapperCol: { span: 19 }, @@ -509,7 +509,7 @@ const StepOneComponent = (props) => { /> ), }, - { name: "recommendUserNames", label: "推荐属地公司人员", onlyForLabel: true }, + { name: "recommendUserNames", label: "审核属地公司人员", onlyForLabel: true }, ] : [ { diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js index 04f376e..67ef467 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/List/index.js @@ -71,7 +71,7 @@ function List(props) { )} columns={[ { title: "项目名称", dataIndex: "projectName" }, - { title: "是否为股份公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" }, + { title: "是否为属地公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" }, { title: "项目属地单位", dataIndex: "companyName" }, { title: "主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js index d212475..afa005b 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplication/ReView/index.js @@ -285,7 +285,7 @@ function Review(props) { { label: "是否涉及夜间作业", children: info.nightWorkFlag === 1 ? "是" : "否" }, { label: "项目类别", children: info.qualificationsTypeName }, { label: "是否存在分包项目", children: info.subcontractFlag === 1 ? "是" : "否" }, - { label: "是否为股份公司审核", children: info.isLocalCompany === 1 ? "是" : "否" }, + { label: "是否为属地公司审核", children: info.isLocalCompany === 1 ? "是" : "否" }, { label: "安全管理协议", children: ( <> diff --git a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js index a1ad8f4..918859c 100644 --- a/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js +++ b/src/pages/Container/Stakeholder/ProjectReview/ProjectFilingApplicationManagement/List/index.js @@ -50,7 +50,7 @@ function List(props) { record.isLocalCompany === 1 ? "是" : "否" }, + { title: "是否为属地公司审核", dataIndex: "isLocalCompany", render: (_, record) => record.isLocalCompany === 1 ? "是" : "否" }, { title: "项目属地单位", dataIndex: "companyName" }, { title: "主管部门", dataIndex: "manageDeptName" }, { title: "项目类别", dataIndex: "qualificationsTypeName" }, diff --git a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js index 4e11e54..8e0efc3 100644 --- a/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js +++ b/src/pages/Container/Supervision/Qualification/Maintenance/Add/index.js @@ -37,6 +37,8 @@ function Add(props) { ...values, managerUser: values.managerUser.join(","), managerUserName: values.managerUserName.join(","), + shareUserId: values.shareUserId.join(","), + shareUserName: values.shareUserName.join(","), id: query.id, }); if (success) { @@ -162,8 +164,8 @@ function Add(props) { form.setFieldValue("shareDeptName", label); }} onChange={() => { - form.setFieldValue("shareUserId", ""); - form.setFieldValue("shareUserName", ""); + form.setFieldValue("shareUserId", []); + form.setFieldValue("shareUserName", []); }} /> ), @@ -179,6 +181,7 @@ function Add(props) { disabled={query.id} params={{ departmentId: shareDeptId }} extraParams={{ noMain: 1 }} + mode="multiple" onGetLabel={(label) => { form.setFieldValue("shareUserName", label); }}