diff --git a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js index 532aed7..ce19d68 100644 --- a/src/pages/Container/EnterpriseInfo/EquipInfo/index.js +++ b/src/pages/Container/EnterpriseInfo/EquipInfo/index.js @@ -131,7 +131,7 @@ function EquipInfoPage(props) { 物理仪器 , - + , ]} - onReset={() => { - router.query = { ...router.query, current: 1, size: 10 }; + onReset={(value) => { + router.query = { ...value, current: 1, size: 10 }; handleSearch(); }} - onFinish={() => { - router.query = { ...router.query, current: 1, size: 10 }; + onFinish={(value) => { + router.query = { ...value, current: 1, size: 10 }; handleSearch(); }} /> @@ -174,7 +174,7 @@ function EquipInfoPage(props) { }, { title: "设备型号", dataIndex: "deviceModel" }, { title: "仪器类型", dataIndex: "instrumentTypeName" }, - { title: "设备类型", dataIndex: "deviceType" }, + { title: "设备类型", dataIndex: "deviceTypeName" }, { title: "厂家", dataIndex: "manufacturer", @@ -391,7 +391,7 @@ function EquipFormModal({ @@ -528,7 +528,7 @@ function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) { {info.instrumentTypeName} - {info.deviceType} + {info.deviceTypeName} {info.manufacturer}