diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index d0c8655..0d69070 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -156,7 +156,7 @@ function EquipInfoPage(props) { ?.label ?? (v || "-"), }, - { title: "设备类型", dataIndex: "deviceTypeCode" }, + { title: "设备类型", dataIndex: "deviceTypeName" }, { title: "厂家", dataIndex: "manufacturer", @@ -568,7 +568,7 @@ function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) { (info.industryCode || "-")} - {info.deviceTypeCode || "-"} + {info.deviceTypeName || "-"} {info.manufacturer} diff --git a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx index 1bbcfef..c4a6f7c 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/OrgEquipmentSelectModal.jsx @@ -103,7 +103,7 @@ function OrgEquipmentSelectModalInner(props) { { title: "装备名称", dataIndex: "deviceName", ellipsis: true }, { title: "规格型号", dataIndex: "deviceModel",ellipsis: true }, { title: "生产厂家", dataIndex: "manufacturer",ellipsis: true }, - { title: "设备价值", dataIndex: "equipmentValue" }, + { title: "设备类型", dataIndex: "deviceTypeName" }, ]} /> diff --git a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx index b7c46ab..8ae0cf7 100644 --- a/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx +++ b/src/pages/Container/QualApplication/FilingForm/components/PersonnelStep.jsx @@ -84,7 +84,7 @@ const PersonnelStep = ({ personnelList = [], disabled, onAdd, onRemove, manageme columns={[ { title: "序号", width: 60, render: (_, __, index) => index + 1 }, { title: "姓名", dataIndex: "personName" }, - { + managementFlag&&{ title: "职务", width: 120, render: (_, record) => { @@ -94,7 +94,7 @@ const PersonnelStep = ({ personnelList = [], disabled, onAdd, onRemove, manageme return roles.length ? roles.join("、") : "-"; }, }, - { + !managementFlag&&{ title: "职称", dataIndex: "titleCodeArr", width: 100, @@ -189,7 +189,7 @@ const PersonnelStep = ({ personnelList = [], disabled, onAdd, onRemove, manageme ), }, - ]} + ].filter(Boolean)} /> ({ ...prev, materials: FILING_MATERIAL_TEMPLATE })); + setDetail((prev) => ({ ...prev, materials: getFilingMaterialTemplate(mode) })); } }, []); @@ -359,6 +359,7 @@ function FilingFormPage(props) { personnelList={(detail?.personnelList || []).filter((item) => item.technicalDirectorFlag || item.processControlLeaderFlag)} disabled={readOnly} onAdd={handlePersonnelAdd} + key="managementPersonnel" onRemove={handlePersonnelRemove} managementFlag={true} /> @@ -372,6 +373,7 @@ function FilingFormPage(props) { personnelList={(detail?.personnelList || []).filter((item) => !item.technicalDirectorFlag && !item.processControlLeaderFlag)} disabled={readOnly} onAdd={handlePersonnelAdd} + key="personnel" onRemove={handlePersonnelRemove} managementFlag={false} /> diff --git a/src/pages/Container/QualApplication/filingLocalDraft.js b/src/pages/Container/QualApplication/filingLocalDraft.js index ce00941..39a83a7 100644 --- a/src/pages/Container/QualApplication/filingLocalDraft.js +++ b/src/pages/Container/QualApplication/filingLocalDraft.js @@ -33,11 +33,11 @@ export function clearLocalDraft(mode) { } /** 新建表单:空白,不预填机构信息 */ -export function createEmptyFilingDetail() { +export function createEmptyFilingDetail(mode) { return { id: null, filingStatusCode: 5, - materials: createLocalMaterials(), + materials: createLocalMaterials(mode), commitment: { legalRepPersonnelId: "", legalRepName: "", diff --git a/src/pages/Container/QualApplication/filingMaterialTemplate.js b/src/pages/Container/QualApplication/filingMaterialTemplate.js index 14390d1..8f6cc57 100644 --- a/src/pages/Container/QualApplication/filingMaterialTemplate.js +++ b/src/pages/Container/QualApplication/filingMaterialTemplate.js @@ -1,21 +1,30 @@ -/** 备案材料通用模板(对齐后端 QualFilingMaterialTemplateProvider / 原型 10 项) */ +/** 备案材料通用模板(对齐原型 11 项,filed 模式含资质证书复印件) */ export const FILING_MATERIAL_TEMPLATE = [ - {id: 1, materialType: 1, materialContent: "申请材料目录(原件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, - {id: 2, materialType: 2, materialContent: "申请书(原件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名并加盖单位公章", requiredFlag: 1 }, - {id: 3, materialType: 3, materialContent: "法人证明(复印件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "营业执照或事业单位法人证书等", requiredFlag: 1 }, - {id: 4, materialType: 4, materialContent: "三年内无重大违法失信记录查询证明(原件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名并加盖单位公章", requiredFlag: 1 }, - {id: 5, materialType: 5, materialContent: "法定代表人承诺书(原件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名", requiredFlag: 1 }, - {id: 6, materialType: 6, materialContent: "固定资产法定证明材料或书面承诺", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, - {id: 7, materialType: 7, materialContent: "工作场所及档案室面积证明资料(复印件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "房产证、租赁协议等", requiredFlag: 1 }, - {id: 8, materialType: 8, materialContent: "安全评价师专业能力证明(彩色复印件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "学历证书、职称证及其他相关证明材料", requiredFlag: 1 }, - {id: 9, materialType: 9, materialContent: "相关负责人证明材料(复印件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "任命文件、简历、职称证等", requiredFlag: 1 }, - {id: 10, materialType: 10, materialContent: "机构内部管理制度(非受控版)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, + { id: 1, materialType: 1, materialContent: "申请材料目录", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, + { id: 2, materialType: 2, materialContent: "安全评价机构资质申请书及材料清单", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名并加盖单位公章", requiredFlag: 1 }, + { id: 3, materialType: 3, materialContent: "法人证明", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "营业执照或事业单位法人证书等", requiredFlag: 1 }, + { id: 4, materialType: 4, materialContent: "截至申请之日三年内无重大违法失信记录的查询证明", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名并加盖单位公章", requiredFlag: 1 }, + { id: 5, materialType: 5, materialContent: "申请单位法定代表人承诺书", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "法定代表人亲笔签名", requiredFlag: 1 }, + { id: 6, materialType: 6, materialContent: "固定资产法定证明材料", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, + { id: 7, materialType: 7, materialContent: "工作场所及档案室面积证明材料", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "房产证、租赁协议等", requiredFlag: 1 }, + { id: 8, materialType: 8, materialContent: "安全评价师专业能力及认定方式证明", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "学历证书、职称证及其他相关证明材料", requiredFlag: 1 }, + { id: 9, materialType: 9, materialContent: "专职技术负责人和支撑过程控制负责人证明材料", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: "任命文件、简历、职称证等", requiredFlag: 1 }, + { id: 10, materialType: 10, materialContent: "机构内部管理制度(非受控版)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1 }, + { id: 11, materialType: 11, materialContent: "安全评价机构资质证书正本及副本(复印件)", materialFormat: null, attachmentDesc: "纸质版扫描件", materialRemark: null, requiredFlag: 1, filedOnly: true }, ]; -export function createLocalMaterials() { - return FILING_MATERIAL_TEMPLATE.map((item) => ({ - id: `local-material-${item.sortOrder}`, +/** 按模式获取材料模板:已有资质备案(filed)含第 11 项资质证书复印件 */ +export function getFilingMaterialTemplate(mode) { + if (mode === "filed") { + return FILING_MATERIAL_TEMPLATE; + } + return FILING_MATERIAL_TEMPLATE.filter((item) => !item.filedOnly); +} + +export function createLocalMaterials(mode) { + return getFilingMaterialTemplate(mode).map((item) => ({ + id: `local-material-${item.materialType}`, filingId: null, ...item, uploadStatusCode: 1,