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

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

parent f6b1634d
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Select,Input } from 'amos-antd';
import { MultiSelect, Button } from 'amos-framework';
import { MultiSelect } from 'amos-framework';
import {
fetchPointQueryCriteria,
queryUserByDeptIdAction
} from './../../../services/checkInfoService';
import BizIcon from '../../common/icon/BizIcon';
const Option = Select.Option;
const multiSelectOption = MultiSelect.Option;
......@@ -25,7 +24,7 @@ class PointSearch extends Component {
departmentOptions: [],
statusData: [],
searchParam: {},
selectData:[]
selectData: []
};
}
componentWillMount() {
......@@ -38,11 +37,10 @@ class PointSearch extends Component {
componentWillReceiveProps(nextProps) {
const { countStatus } = nextProps || {};
let status = [];
let { searchParam, selectData, statusData } = this.state;
let { searchParam, statusData } = this.state;
if (countStatus){
let temp = statusData.find(item => item.value === countStatus);
console.log('temp--------------->' + temp);
console.log(`temp--------------->${temp}`);
if (temp !== undefined) {
searchParam.checkStatus = temp.value;
let checkStatus = [];
......@@ -64,10 +62,10 @@ class PointSearch extends Component {
}
onSelectedChange = (value,type) => {
let { searchParam,selectData } = this.state;
let { searchParam } = this.state;
searchParam[type] = value;
let selectStatus = [];
if(type === 'checkStatus'){
if (type === 'checkStatus') {
searchParam[type] = value.join(',');
selectStatus = value;
}
......@@ -78,34 +76,21 @@ class PointSearch extends Component {
}
onDeptChange = (value) => {
if(value===undefined){
let { searchParam} = this.state;
delete searchParam['userId'];
this.setState({ searchParam ,userData: []});
Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 });
this.setState({ searchParam});
searchParam && this.props.setSearchParam(searchParam);
}else{
let { searchParam } = this.state;
searchParam['userId'] = undefined;
Object.assign(searchParam,{ pageNumber: 0,pageSize: 10 });
this.setState({ searchParam });
if (value === undefined){
this.setState({ userData: [] });
this.props.setSearchParam(searchParam);
} else {
this.queryUserByDept(value);
}
}
queryUserByDept = deptId => {
queryUserByDeptIdAction(deptId).then(data => {
let userData = data;
this.setState({ userData: userData });
});
};
//查询巡检人员
getPointSearchConditionAction =()=>{
fetchPointQueryCriteria().then(data=>{
let userlist = [];
let departmentList = [];
let typeList = [];
let statusList = [];
......@@ -136,6 +121,13 @@ class PointSearch extends Component {
});
}
queryUserByDept = deptId => {
queryUserByDeptIdAction(deptId).then(data => {
let userData = data;
this.setState({ userData });
});
};
searchData = () => {
let { searchParam } = this.state;
Object.assign(searchParam, { pageNumber: 0,pageSize: 10 });
......@@ -194,12 +186,12 @@ class PointSearch extends Component {
allowClear
value={searchParam.userId}
>
{checkUserOptions}
{checkUserOptions}
</Select>
</div>
<div className='catalog-select-multiple'>
<MultiSelect
data = {statusData}
data={statusData}
renderOption={item => <multiSelectOption value={item.value}>{item.name}</multiSelectOption>}
values={selectData}
onChange={(e)=>this.onSelectedChange(e,'checkStatus')}
......@@ -209,7 +201,6 @@ class PointSearch extends Component {
<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} />
{/*<Button icon={<BizIcon icon='sousuo' />} transparent onClick={this.searchData} />*/}
</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