bug768修复-电力设备，添加配套设备页面，按分类搜索结果错误

src/consts/urlConsts.js

@@ -151,6 +151,7 @@ export const FasSerUrl = {
   fireEquipmentClassifyAllListUrl: completePrefix(fireBaseURI, 'api/firequment/point/listByType?equipClassify={equipClassify}'),  //获取消防装备列表
   fireEquipmentListUrl: completePrefix(fireBaseURI, 'api/fireSource/info/page?name={name}&code={code}&equipClassify={equipClassify}&pageNumber={page}&pageSize={size}&bindStation={bindStation}'),  //获取消防装备列表
   getFireEquipmentListstUrl: completePrefix(fireBaseURI, 'api/equipment/getEquipmentBySpe?name={name}&code={code}&pageNumber={page}&pageSize={size}&equipmentId={equipmentId}'),  //新-获取消防装备列表
+  getFireEquipmentListstUrlV2: completePrefix(fireBaseURI, 'api/equipment/getEquipmentBySpeV2?name={name}&code={code}&pageNumber={page}&pageSize={size}&equipmentId={equipmentId}'),  //新-获取消防装备列表
   monitorPointListUrl: completePrefix(fireBaseURI, 'api/firequment/point/page?pageNumber={page}&pageSize={size}&type={type}&searchValue={searchValue}'),  //获取消防装备已配置监测点位列表
   monitorPointEditUrl: completePrefix(fireBaseURI, 'api/firequment/point'),  //新增/更新消防装备监测点位
   monitorPointDeleteUrl: completePrefix(fireBaseURI, 'api/firequment/point/batch/delete?pointIds={ids}'),  //删除消防装备监测点位

src/services/ledgerService.js

@@ -46,12 +46,19 @@ export const getFireEquipmentListsAction = (filter,equipmentId, page, size) => {
   name = name === undefined ? null : name;
   code = code === undefined ? null : code;
   equipmentId = equipmentId === undefined ? null : equipmentId;
-  // bindStation = bindStation === undefined ? '' : bindStation;
-  // equipClassify = equipClassify === undefined ? '0,1,3' : equipClassify;
   let url = formatUrl(FasSerUrl.getFireEquipmentListstUrl, { name, code, page, size ,equipmentId });
   return commonGet(url);
 };
 
+export const getFireEquipmentListsActionV2 = (filter,equipmentId, page, size) => {
+  let { name, code } = filter;
+  name = name === undefined ? null : name;
+  code = code === undefined ? null : code;
+  equipmentId = equipmentId === undefined ? null : equipmentId;
+  let url = formatUrl(FasSerUrl.getFireEquipmentListstUrlV2, { name, code, page, size ,equipmentId });
+  return commonGet(url);
+};
+
 /**
  * 已配置点位列表
  *

src/view/bizview/equipmentLedger/Equipment/EquipmentFireEquipmentAdd.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Select, Input } from 'amos-framework';
-import AmosGridTable from './../../common/tableComponent/table/AmosGridTable';
+import { Input } from 'amos-framework';
 import { TreeSelect } from 'amos-antd';
+import AmosGridTable from './../../common/tableComponent/table/AmosGridTable';
 // import { getFireEquipmentListAction } from './../../../../services/ledgerService';
-import { getFiltersAction,getFireEquipmentListsAction } from './../../../../services/ledgerService';
+import { getFiltersAction,getFireEquipmentListsActionV2 } from './../../../../services/ledgerService';
 import EditableCell from './../../common/editableCell/EditableCell';
-import { consts } from 'amos-tool';
 import '../index.scss';
 
-const Option = Select.Option;
-
-
 const fireEquipmentTableColumns = self => {
   return [
     {
@@ -123,7 +119,7 @@ class EquipmentFireEquipmentAdd extends Component {
 
   onSelectChange(value) {
     const { searchParam } = this.state;
-    searchParam.code = value;
+    searchParam.equipmentId = value;
     searchParam.pageNumber = this.pageConfig.pageNumber;
     searchParam.pageSize = this.pageConfig.pageSize;
     this.setState({
@@ -182,7 +178,7 @@ class EquipmentFireEquipmentAdd extends Component {
     //     totalCount: data.totalElements
     //   });
     // });
-    getFireEquipmentListsAction(searchParam, null,param.pageNumber, param.pageSize).then(data => {
+    getFireEquipmentListsActionV2(searchParam, param.equipmentId, param.pageNumber, param.pageSize).then(data => {
       this.setState({
         dataList: data.content,
         totalCount: data.totalElements
@@ -220,7 +216,7 @@ class EquipmentFireEquipmentAdd extends Component {
     let data = [];
     if (arr.length > 0) {
       arr.forEach((item, i) => {
-        data.push({ label: item.name, value: item.code, children: [] });
+        data.push({ label: item.name, value: item.id, children: [] });
         if (item.children.length > 0) {
           data[i].children = this.formatterCategory(item.children);
         }