feat

src/pages/Container/EnterpriseInfo/EquipInfo/index.js

@@ -131,7 +131,7 @@ function EquipInfoPage(props) {
               <Select.Option value="物理仪器">物理仪器</Select.Option>
             </ControlWrapper.Select>
           </Form.Item>,
-          <Form.Item key="deviceType" name="deviceType">
+          <Form.Item key="deviceTypeName" name="deviceTypeName">
             <ControlWrapper.Select
               label="设备类型"
               placeholder="请选择"
@@ -154,12 +154,12 @@ function EquipInfoPage(props) {
             </ControlWrapper.Select>
           </Form.Item>,
         ]}
-        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({
           </Col>
           <Col span={12}>
             <Form.Item
-              name="deviceType"
+              name="deviceTypeName"
               label="设备类型"
               rules={[{ required: true, message: "请选择设备类型" }]}
             >
@@ -528,7 +528,7 @@ function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) {
           {info.instrumentTypeName}
         </Descriptions.Item>
         <Descriptions.Item label="设备类型">
-          {info.deviceType}
+          {info.deviceTypeName}
         </Descriptions.Item>
         <Descriptions.Item label="厂家">{info.manufacturer}</Descriptions.Item>
         <Descriptions.Item label="设备流量说明" span={2}>