Commit 9c176092 authored by 田涛's avatar 田涛

bug932-巡查统计,部门更换人员显示id

parent f6b1634d
import React, { Component } from 'react'; import React, { Component } from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { Select,Input } from 'amos-antd'; import { Select,Input } from 'amos-antd';
import { MultiSelect, Button } from 'amos-framework'; import { MultiSelect } from 'amos-framework';
import { import {
fetchPointQueryCriteria, fetchPointQueryCriteria,
queryUserByDeptIdAction queryUserByDeptIdAction
} from './../../../services/checkInfoService'; } from './../../../services/checkInfoService';
import BizIcon from '../../common/icon/BizIcon';
const Option = Select.Option; const Option = Select.Option;
const multiSelectOption = MultiSelect.Option; const multiSelectOption = MultiSelect.Option;
...@@ -25,7 +24,7 @@ class PointSearch extends Component { ...@@ -25,7 +24,7 @@ class PointSearch extends Component {
departmentOptions: [], departmentOptions: [],
statusData: [], statusData: [],
searchParam: {}, searchParam: {},
selectData:[] selectData: []
}; };
} }
componentWillMount() { componentWillMount() {
...@@ -38,11 +37,10 @@ class PointSearch extends Component { ...@@ -38,11 +37,10 @@ class PointSearch extends Component {
componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
const { countStatus } = nextProps || {}; const { countStatus } = nextProps || {};
let status = []; let { searchParam, statusData } = this.state;
let { searchParam, selectData, statusData } = this.state;
if (countStatus){ if (countStatus){
let temp = statusData.find(item => item.value === countStatus); let temp = statusData.find(item => item.value === countStatus);
console.log('temp--------------->' + temp); console.log(`temp--------------->${temp}`);
if (temp !== undefined) { if (temp !== undefined) {
searchParam.checkStatus = temp.value; searchParam.checkStatus = temp.value;
let checkStatus = []; let checkStatus = [];
...@@ -64,10 +62,10 @@ class PointSearch extends Component { ...@@ -64,10 +62,10 @@ class PointSearch extends Component {
} }
onSelectedChange = (value,type) => { onSelectedChange = (value,type) => {
let { searchParam,selectData } = this.state; let { searchParam } = this.state;
searchParam[type] = value; searchParam[type] = value;
let selectStatus = []; let selectStatus = [];
if(type === 'checkStatus'){ if (type === 'checkStatus') {
searchParam[type] = value.join(','); searchParam[type] = value.join(',');
selectStatus = value; selectStatus = value;
} }
...@@ -78,34 +76,21 @@ class PointSearch extends Component { ...@@ -78,34 +76,21 @@ class PointSearch extends Component {
} }
onDeptChange = (value) => { onDeptChange = (value) => {
if(value===undefined){ let { searchParam } = this.state;
let { searchParam} = this.state; searchParam['userId'] = undefined;
delete searchParam['userId']; Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 });
this.setState({ searchParam });
this.setState({ searchParam ,userData: []}); if (value === undefined){
this.setState({ userData: [] });
Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 }); this.props.setSearchParam(searchParam);
this.setState({ searchParam}); } else {
searchParam && this.props.setSearchParam(searchParam);
}else{
this.queryUserByDept(value); this.queryUserByDept(value);
} }
} }
queryUserByDept = deptId => {
queryUserByDeptIdAction(deptId).then(data => {
let userData = data;
this.setState({ userData: userData });
});
};
//查询巡检人员 //查询巡检人员
getPointSearchConditionAction =()=>{ getPointSearchConditionAction =()=>{
fetchPointQueryCriteria().then(data=>{ fetchPointQueryCriteria().then(data=>{
let userlist = [];
let departmentList = []; let departmentList = [];
let typeList = []; let typeList = [];
let statusList = []; let statusList = [];
...@@ -136,6 +121,13 @@ class PointSearch extends Component { ...@@ -136,6 +121,13 @@ class PointSearch extends Component {
}); });
} }
queryUserByDept = deptId => {
queryUserByDeptIdAction(deptId).then(data => {
let userData = data;
this.setState({ userData });
});
};
searchData = () => { searchData = () => {
let { searchParam } = this.state; let { searchParam } = this.state;
Object.assign(searchParam, { pageNumber: 0,pageSize: 10 }); Object.assign(searchParam, { pageNumber: 0,pageSize: 10 });
...@@ -194,12 +186,12 @@ class PointSearch extends Component { ...@@ -194,12 +186,12 @@ class PointSearch extends Component {
allowClear allowClear
value={searchParam.userId} value={searchParam.userId}
> >
{checkUserOptions} {checkUserOptions}
</Select> </Select>
</div> </div>
<div className='catalog-select-multiple'> <div className='catalog-select-multiple'>
<MultiSelect <MultiSelect
data = {statusData} data={statusData}
renderOption={item => <multiSelectOption value={item.value}>{item.name}</multiSelectOption>} renderOption={item => <multiSelectOption value={item.value}>{item.name}</multiSelectOption>}
values={selectData} values={selectData}
onChange={(e)=>this.onSelectedChange(e,'checkStatus')} onChange={(e)=>this.onSelectedChange(e,'checkStatus')}
...@@ -209,7 +201,6 @@ class PointSearch extends Component { ...@@ -209,7 +201,6 @@ class PointSearch extends Component {
<div className='search-device'> <div className='search-device'>
<Input placeholder="请输入搜索内容" onChange={this.onChange} onPressEnter={this.searchData} style={{ width: '150px','border-radius': '10px' }} /> <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} /> <img src={require('./../../../assets/fsc/check/search.png')} alt='' onClick={this.searchData} />
{/*<Button icon={<BizIcon icon='sousuo' />} transparent onClick={this.searchData} />*/}
</div> </div>
</div> </div>
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment