fix
parent
942fc4a55f
commit
043dc53da7
|
|
@ -45,12 +45,6 @@ export default function EquipmentStep({
|
||||||
>
|
>
|
||||||
<Space>
|
<Space>
|
||||||
<span style={{ fontWeight: 600 }}>申请单位装备清单</span>
|
<span style={{ fontWeight: 600 }}>申请单位装备清单</span>
|
||||||
<span style={{ color: "#666" }}>
|
|
||||||
设备总价值:{(equipmentList || [])
|
|
||||||
.reduce((sum, item) => sum + (item.equipmentValue || 0), 0)
|
|
||||||
.toLocaleString()}{" "}
|
|
||||||
元
|
|
||||||
</span>
|
|
||||||
</Space>
|
</Space>
|
||||||
{!disabled && (
|
{!disabled && (
|
||||||
<Space size="small">
|
<Space size="small">
|
||||||
|
|
@ -83,7 +77,6 @@ export default function EquipmentStep({
|
||||||
{ title: "装备名称", dataIndex: "deviceName", ellipsis: true },
|
{ title: "装备名称", dataIndex: "deviceName", ellipsis: true },
|
||||||
{ title: "规格型号", dataIndex: "deviceModel", ellipsis: true },
|
{ title: "规格型号", dataIndex: "deviceModel", ellipsis: true },
|
||||||
{ title: "生产厂家", dataIndex: "manufacturer" },
|
{ title: "生产厂家", dataIndex: "manufacturer" },
|
||||||
{ title: "设备价值(元)", dataIndex: "equipmentValue", width: 150 },
|
|
||||||
{
|
{
|
||||||
title: "计量检定情况",
|
title: "计量检定情况",
|
||||||
width: 180,
|
width: 180,
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ export default function OrgPersonnelSelectModal(props) {
|
||||||
<>
|
<>
|
||||||
<Modal
|
<Modal
|
||||||
open={open}
|
open={open}
|
||||||
title="添加备案人员"
|
title="选择已维护人员"
|
||||||
width={900}
|
width={900}
|
||||||
destroyOnHidden
|
destroyOnHidden
|
||||||
onCancel={onCancel}
|
onCancel={onCancel}
|
||||||
|
|
@ -94,6 +94,7 @@ export default function OrgPersonnelSelectModal(props) {
|
||||||
dataSource={dataSource}
|
dataSource={dataSource}
|
||||||
rowSelection={{
|
rowSelection={{
|
||||||
selectedRowKeys,
|
selectedRowKeys,
|
||||||
|
fixed: "left",
|
||||||
preserveSelectedRowKeys: true,
|
preserveSelectedRowKeys: true,
|
||||||
onChange: (keys, rows) => {
|
onChange: (keys, rows) => {
|
||||||
setSelectedRowKeys(keys);
|
setSelectedRowKeys(keys);
|
||||||
|
|
|
||||||
|
|
@ -351,9 +351,21 @@ function FilingFormPage(props) {
|
||||||
),
|
),
|
||||||
forceRender: true,
|
forceRender: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: "personnel",
|
||||||
|
label: "2. 专职人员备案",
|
||||||
|
children: (
|
||||||
|
<PersonnelStep
|
||||||
|
personnelList={detail?.personnelList || []}
|
||||||
|
disabled={readOnly}
|
||||||
|
onAdd={handlePersonnelAdd}
|
||||||
|
onRemove={handlePersonnelRemove}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: "materials",
|
key: "materials",
|
||||||
label: "2. 备案材料上传",
|
label: "4. 申请材料",
|
||||||
children: (
|
children: (
|
||||||
<MaterialStep
|
<MaterialStep
|
||||||
materials={detail?.materials || []}
|
materials={detail?.materials || []}
|
||||||
|
|
@ -362,9 +374,22 @@ function FilingFormPage(props) {
|
||||||
/>
|
/>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: "equipment",
|
||||||
|
label: "5. 设备清单",
|
||||||
|
children: (
|
||||||
|
<EquipmentStep
|
||||||
|
equipmentList={detail?.equipmentList || []}
|
||||||
|
disabled={readOnly}
|
||||||
|
onAdd={handleEquipmentAdd}
|
||||||
|
onRemove={handleEquipmentRemove}
|
||||||
|
onUploadCalibration={handleEquipmentCalibration}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
},
|
||||||
{
|
{
|
||||||
key: "commitment",
|
key: "commitment",
|
||||||
label: "3. 法定代表人承诺书",
|
label: "6. 机构负责人签字",
|
||||||
children: (
|
children: (
|
||||||
<CommitmentStep
|
<CommitmentStep
|
||||||
form={commitmentForm}
|
form={commitmentForm}
|
||||||
|
|
@ -377,31 +402,8 @@ function FilingFormPage(props) {
|
||||||
),
|
),
|
||||||
forceRender: true,
|
forceRender: true,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
key: "personnel",
|
|
||||||
label: "4. 专职人员备案",
|
|
||||||
children: (
|
|
||||||
<PersonnelStep
|
|
||||||
personnelList={detail?.personnelList || []}
|
|
||||||
disabled={readOnly}
|
|
||||||
onAdd={handlePersonnelAdd}
|
|
||||||
onRemove={handlePersonnelRemove}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
{
|
|
||||||
key: "equipment",
|
|
||||||
label: "5. 装备清单",
|
|
||||||
children: (
|
|
||||||
<EquipmentStep
|
|
||||||
equipmentList={detail?.equipmentList || []}
|
|
||||||
disabled={readOnly}
|
|
||||||
onAdd={handleEquipmentAdd}
|
|
||||||
onRemove={handleEquipmentRemove}
|
|
||||||
onUploadCalibration={handleEquipmentCalibration}
|
|
||||||
/>
|
|
||||||
),
|
|
||||||
},
|
|
||||||
];
|
];
|
||||||
|
|
||||||
const stepIndex = STEP_ITEMS.findIndex((item) => item.key === activeStep);
|
const stepIndex = STEP_ITEMS.findIndex((item) => item.key === activeStep);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue