bug修改

src/view/bizview/point/PointSearch.js

 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Select,Input } from 'amos-antd';
-import { MultiSelect } from 'amos-framework';
+import { MultiSelect, Icon } from 'amos-framework';
 import {
   fetchPointQueryCriteria,
   queryUserByDeptIdAction
@@ -9,6 +9,7 @@ import {
 
 const Option = Select.Option;
 const multiSelectOption = MultiSelect.Option;
+const { Search } = Input;
 /**
  *
  *
@@ -24,7 +25,8 @@ class PointSearch extends Component {
       departmentOptions: [],
       statusData: [],
       searchParam: {},
-      selectData: []
+      selectData: [],
+      checkUserOptions: []
     };
   }
   componentWillMount() {
@@ -76,24 +78,30 @@ class PointSearch extends Component {
   }
 
   onDeptChange = (value) => {
+    console.log(this.state.userData);
+    debugger
     let { searchParam } = this.state;
     if (searchParam['deptId'] !== value) {
       searchParam['deptId'] = value;
       searchParam['userId'] = undefined;
-      Object.assign(searchParam,{ pageNumber: 0, pageSize: 10 });
+      Object.assign(searchParam, { pageNumber: 0, pageSize: 10 });
       this.setState({ searchParam });
-      if (value === undefined){
-        this.setState({ userData: [] });
+      this.props.setSearchParam(searchParam);
+      if (value === undefined) {
+        this.setState({ userData: [], checkUserOptions: [] });
         this.props.setSearchParam(searchParam);
       } else {
-        this.queryUserByDept(value);
+        this.setState({
+          userData: [],
+          checkUserOptions: []
+        }, () => this.queryUserByDept(value));
       }
     }
   }
 
-  //查询巡检人员
-  getPointSearchConditionAction =()=>{
-    fetchPointQueryCriteria().then(data=>{
+  // 查询巡检人员
+  getPointSearchConditionAction = () => {
+    fetchPointQueryCriteria().then((data) => {
       let departmentList = [];
       let typeList = [];
       let statusList = [];
@@ -124,22 +132,36 @@ class PointSearch extends Component {
     });
   }
 
-  queryUserByDept = deptId => {
-    queryUserByDeptIdAction(deptId).then(data => {
+  queryUserByDept = (deptId) => {
+    console.log(this.state.userData);
+    console.log(this.state.checkUserOptions);
+    queryUserByDeptIdAction(deptId).then((data) => {
       let userData = data;
-      this.setState({ userData });
+      let userOptions = [];
+      if (data && data.length > 0) {
+        data.map(d=>{
+          if (d) {
+            userOptions.push(<Option key={d.id}>{d.name}</Option>);
+          }
+        });
+        this.setState({
+          checkUserOptions: userOptions,
+          userData
+        });
+      }
     });
   };
 
   searchData = () => {
     let { searchParam } = this.state;
-    Object.assign(searchParam, { pageNumber: 0,pageSize: 10 });
+    Object.assign(searchParam, { pageNumber: 0, pageSize: 10 });
     searchParam && this.props.setSearchParam(searchParam);
   }
 
   render() {
-    let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions ,selectData,searchParam } = this.state;
-    const checkUserOptions = userData.map(d => <Option key={d.id}>{d.name}</Option>);
+    let { userData, dataTypeOptions, departmentOptions, statusData, pointLevelOptions, selectData, searchParam } = this.state;
+    const checkUserOptions = userData ? userData.map(d => <Option key={d.id}>{d.name}</Option>) : [];
+    console.log(checkUserOptions);
     return (
       <div className='create-device-search-root'>
         <div className='catalog-select'>
@@ -202,8 +224,7 @@ class PointSearch extends Component {
           />
         </div>
         <div className='search-device'>
-          <Input placeholder="请输入搜索内容" onChange={this.onChange} onPressEnter={this.searchData} style={{ width: '150px','border-radius': '10px' }} />
-          <img src={require('./../../../assets/fsc/check/search.png')} alt='' onClick={this.searchData} />
+          <Search placeholder='输入名称或编号' onChange={this.onChange} onSearch={this.searchData} style={{ width: '150px', 'border-radius': '10px' }} />
         </div>
       </div>
     );