Browse Source

增加 更改表格显示数据

mentoswzq 4 years ago
parent
commit
6711e49ac1
54 changed files with 3229 additions and 1345 deletions
  1. 106 71
      js/component/manageCenter/achievement/myTechAchievement.jsx
  2. 98 42
      js/component/manageCenter/achievement/releaseResults.jsx
  3. 71 35
      js/component/manageCenter/achievement/sichuan/sichuan.jsx
  4. 110 75
      js/component/manageCenter/achievement/techAchievement.jsx
  5. 98 59
      js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx
  6. 30 1
      js/component/manageCenter/achievement/techAchievementQuery.jsx
  7. 32 3
      js/component/manageCenter/customer/NEW/crm/crm.jsx
  8. 61 26
      js/component/manageCenter/customer/NEW/crm/crmAll.jsx
  9. 52 16
      js/component/manageCenter/customer/NEW/crm/crmCount.jsx
  10. 134 98
      js/component/manageCenter/customer/NEW/crm/patentPayment.jsx
  11. 30 1
      js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx
  12. 30 1
      js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx
  13. 30 1
      js/component/manageCenter/customer/NEW/query/queryCutomer.jsx
  14. 30 1
      js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx
  15. 79 25
      js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx
  16. 47 14
      js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx
  17. 50 15
      js/component/manageCenter/customer/customerMarketing/diurnalStatisticsOne.jsx
  18. 55 22
      js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx
  19. 58 23
      js/component/manageCenter/customer/customerMarketing/timeStatisticsOne.jsx
  20. 30 1
      js/component/manageCenter/customer/individualCustomer/myReject.jsx
  21. 193 159
      js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx
  22. 46 8
      js/component/manageCenter/customer/report/departmentReport.jsx
  23. 56 20
      js/component/manageCenter/customer/report/personalReport.jsx
  24. 87 49
      js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx
  25. 62 27
      js/component/manageCenter/customer/statistics/followStatistics.jsx
  26. 62 27
      js/component/manageCenter/customer/statistics/statusStatistics.jsx
  27. 57 18
      js/component/manageCenter/customer/statistics/visitStatistics.jsx
  28. 126 87
      js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx
  29. 148 98
      js/component/manageCenter/demand/myTechDemand.jsx
  30. 94 42
      js/component/manageCenter/demand/releaseDemand.jsx
  31. 72 36
      js/component/manageCenter/demand/sichuan/sichuan.jsx
  32. 59 19
      js/component/manageCenter/demand/sichuan/sichuanman.jsx
  33. 136 97
      js/component/manageCenter/demand/techDemand.jsx
  34. 32 2
      js/component/manageCenter/demand/techDemandQuery.jsx
  35. 48 15
      js/component/manageCenter/operate/messagePush/systemMessage.jsx
  36. 30 1
      js/component/manageCenter/order/orderNew/contractJsjl.js
  37. 30 1
      js/component/manageCenter/order/orderNew/contractJsy.js
  38. 30 1
      js/component/manageCenter/project/project/outsourceTaskAssignment.jsx
  39. 30 1
      js/component/manageCenter/project/task/myTaskCount.jsx
  40. 53 18
      js/component/manageCenter/project/task/payApplyReject/index.jsx
  41. 30 1
      js/component/manageCenter/project/task/taskAssignment.jsx
  42. 30 1
      js/component/manageCenter/project/task/taskCount.jsx
  43. 31 1
      js/component/manageCenter/project/task/taskQuery.jsx
  44. 37 8
      js/component/manageCenter/set/business/businessCategory.jsx
  45. 30 1
      js/component/manageCenter/set/business/businessProject.jsx
  46. 30 1
      js/component/manageCenter/set/business/businessQuery.jsx
  47. 31 2
      js/component/manageCenter/set/organization/organization.jsx
  48. 50 13
      js/component/manageCenter/set/projectConfigure/officialFees.js
  49. 50 13
      js/component/manageCenter/set/projectConfigure/patentFees.js
  50. 74 38
      js/component/manageCenter/set/projectConfigure/softwareConfigure.js
  51. 57 6
      js/component/manageCenter/set/userManagementS/jurisdiction.jsx
  52. 31 2
      js/component/manageCenter/set/userManagementS/roles.jsx
  53. 30 1
      js/component/manageCenter/set/userManagementS/user.jsx
  54. 36 1
      js/component/manageCenter/statistics/personnel/bonusList.jsx

+ 106 - 71
js/component/manageCenter/achievement/myTechAchievement.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -8,6 +8,9 @@ import TechAchievementDesc from './techAchievementDesc.jsx';
 import { achievementCategoryList, techAuditStatusList } from '../../dataDic.js';
 import { beforeUploadFile, companySearch, getAchievementCategory, getSearchUrl, getTechAuditStatus ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const AchievementList = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -283,6 +286,19 @@ const AchievementList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -327,78 +343,97 @@ const AchievementList = React.createClass({
                         <BatchImport closeDesc={this.closeDesc} />
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="成果所有人"
-                        value={this.state.ownerName}
-                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                <Select placeholder="选择类型" style={{ width: 160 }}
-                            value={this.state.category}
-                            onChange={(e) => { this.setState({ category: e }) }}>
-                            {this.state.achievementCategoryOption}
-                        </Select>
-                        <Select placeholder="选择审核状态"
-                            style={{ width: 160 }}
-                            value={this.state.auditStatus}
-                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                            {this.state.auditStatusOption}
-                        </Select>
-                        <Select placeholder="选择是否发布" style={{ width: 120 }}
-                            value={this.state.releaseStatus}
-                            onChange={(e) => { this.setState({ releaseStatus: e }) }}>
-                            <Select.Option value="0" >未发布</Select.Option>
-                            <Select.Option value="1" >已发布</Select.Option>
-                        </Select>
-                        <Select placeholder="选择所有人类型" style={{ width: 120 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{marginTop:'10px'}}>
-                        <span>发布时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                         <span style={{marginLeft:'5px'}}>录入时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
-                    	</div>
-                    </div>
-                </div>
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="成果所有人"
+                                   value={this.state.ownerName}
+                                   onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                                    disabled={!hasSelected}
+                                    onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+                                <Select placeholder="选择类型" style={{ width: 160 }}
+                                        value={this.state.category}
+                                        onChange={(e) => { this.setState({ category: e }) }}>
+                                    {this.state.achievementCategoryOption}
+                                </Select>
+                                <Select placeholder="选择审核状态"
+                                        style={{ width: 160 }}
+                                        value={this.state.auditStatus}
+                                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
+                                    {this.state.auditStatusOption}
+                                </Select>
+                                <Select placeholder="选择是否发布" style={{ width: 120 }}
+                                        value={this.state.releaseStatus}
+                                        onChange={(e) => { this.setState({ releaseStatus: e }) }}>
+                                    <Select.Option value="0" >未发布</Select.Option>
+                                    <Select.Option value="1" >已发布</Select.Option>
+                                </Select>
+                                <Select placeholder="选择所有人类型" style={{ width: 120 }}
+                                        value={this.state.ownerType}
+                                        onChange={(e) => { this.setState({ ownerType: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{marginTop:'10px'}}>
+                                    <span>发布时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{marginLeft:'5px'}}>录入时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                            }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 98 - 42
js/component/manageCenter/achievement/releaseResults.jsx

@@ -3,9 +3,29 @@ import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './content.less';
-import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete } from 'antd';
+import {
+    Form,
+    Radio,
+    Icon,
+    Button,
+    Input,
+    Select,
+    Spin,
+    Table,
+    Switch,
+    message,
+    DatePicker,
+    Modal,
+    Upload,
+    Popconfirm,
+    AutoComplete,
+    Tabs
+} from 'antd';
 import {patternOrganization,conditionOrganization,client,stick} from '../../dataDic.js';
 import {getPattern,getAchievementCategory,getboutique,getClient,getStick} from '../../tools.js';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const Organization=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -700,6 +720,19 @@ const Organization=Form.create()(React.createClass({
         this.state.hot='' ;
         this.loadDatas();       
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     searchSwitch() {
         this.setState({
             searchMore: !this.state.searchMore
@@ -749,49 +782,72 @@ const Organization=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-	                <div className="user-search">
-	                    <Input placeholder="成果名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
-	                        value={this.state.name}
-	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-	                    <Input placeholder="成果所有人"
-	                        value={this.state.ownerName}
-	                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
-	                    <Select placeholder="发布子平台"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		                </Select>
-		                <Select placeholder="发布客户端"
-                            style={{width:'150px',marginRight:'20px'}}
-                            value={this.state.publishClient}
-                            onChange={(e) => { this.setState({ publishClient: e }) }}>
-                            <Select.Option value="0" >网站</Select.Option>
-                            <Select.Option value="1" >APP</Select.Option>
-		                </Select>
-	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-                        <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-	                    <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
-	                    	<Select placeholder="发布页面"
-	                            style={{ width:'200px',marginRight:'10px' }}
-	                            value={this.state.publishPage}
-	                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
-	                            {this.state.contactsOptions}
-			                </Select>
-			                <Select placeholder="是否置顶"
-	                            style={{width:'150px',marginRight:'50px'}}
-	                            value={this.state.ifTop}
-	                            onChange={(e) => { this.setState({ ifTop: e }) }}>
-	                            <Select.Option value="0" >置顶</Select.Option>
-	                            <Select.Option value="1" >不置顶</Select.Option>
-			                </Select>
-		                </div>
-	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布成果<Icon type="plus" /></Button>
-	                </div>
+                    <Tabs
+                        defaultActiveKey="1"
+                        onChange={this.callback}
+                        className="test"
+                    >
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search">
+                                <Input placeholder="成果名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
+                                       value={this.state.name}
+                                       onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                                <Input placeholder="成果所有人"
+                                       value={this.state.ownerName}
+                                       onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
+                                <Select placeholder="发布子平台"
+                                        style={{ width:'200px',marginRight:'10px' }}
+                                        value={this.state.superId}
+                                        onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+                                    {this.state.contactsOption}
+                                </Select>
+                                <Select placeholder="发布客户端"
+                                        style={{width:'150px',marginRight:'20px'}}
+                                        value={this.state.publishClient}
+                                        onChange={(e) => { this.setState({ publishClient: e }) }}>
+                                    <Select.Option value="0" >网站</Select.Option>
+                                    <Select.Option value="1" >APP</Select.Option>
+                                </Select>
+                                <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
+                                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
+                                <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                                <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
+                                    <Select placeholder="发布页面"
+                                            style={{ width:'200px',marginRight:'10px' }}
+                                            value={this.state.publishPage}
+                                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
+                                        {this.state.contactsOptions}
+                                    </Select>
+                                    <Select placeholder="是否置顶"
+                                            style={{width:'150px',marginRight:'50px'}}
+                                            value={this.state.ifTop}
+                                            onChange={(e) => { this.setState({ ifTop: e }) }}>
+                                        <Select.Option value="0" >置顶</Select.Option>
+                                        <Select.Option value="1" >不置顶</Select.Option>
+                                    </Select>
+                                </div>
+                                <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布成果<Icon type="plus" /></Button>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 71 - 35
js/component/manageCenter/achievement/sichuan/sichuan.jsx

@@ -16,7 +16,7 @@ import {
 	Row,
 	Col,
 	InputNumber,
-	notification
+	notification, Tabs
 } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
@@ -24,8 +24,11 @@ import $ from 'jquery/src/ajax';
 import 'antd/dist/antd.css';
 const FormItem = Form.Item;
 import './sichuan.css';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const { TextArea } = Input;
 
+const TabPane = Tabs.TabPane;
+
 class Achievement extends React.Component {
 	loadData(pageNo) {
 		this.setState({
@@ -145,6 +148,7 @@ class Achievement extends React.Component {
 				}
 			]
 		};
+		this.changeList = this.changeList.bind(this);
 	}
 	
 	//删除
@@ -322,6 +326,19 @@ class Achievement extends React.Component {
 	componentWillMount() {
 		this.loadData(1);
 	}
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	}
 	render() {
 		const url="https://api.qrserver.com/v1/create-qr-code/?data=http://"+window.location.host+"/open/achievementDetails?id="+this.state.id+"&size=100x100"
 		const rowSelection = {
@@ -347,43 +364,62 @@ class Achievement extends React.Component {
 						</Button>
 					</div>
 				</div>
-				<div className="user-search">
-					<Input
-						placeholder="成果名称"
-						value={this.state.seachName}
-						className="searchInp"
-						onChange={(e) => {
-							this.setState({ seachName: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Input
-						placeholder="所有权人"
-						value={this.state.seachOwnerName}
-						onChange={(e) => {
-							this.setState({ seachOwnerName: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Input
-						placeholder="专利编号"
-						value={this.state.seachPatentNumber}
-						onChange={(e) => {
-							this.setState({ seachPatentNumber: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Button type="primary" onClick={this.search.bind(this)} className="interval">
-						搜索
-					</Button>
-					<Button onClick={this.reset.bind(this)} className="interval">
-						重置
-					</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="user-search">
+							<Input
+								placeholder="成果名称"
+								value={this.state.seachName}
+								className="searchInp"
+								onChange={(e) => {
+									this.setState({ seachName: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Input
+								placeholder="所有权人"
+								value={this.state.seachOwnerName}
+								onChange={(e) => {
+									this.setState({ seachOwnerName: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Input
+								placeholder="专利编号"
+								value={this.state.seachPatentNumber}
+								onChange={(e) => {
+									this.setState({ seachPatentNumber: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Button type="primary" onClick={this.search.bind(this)} className="interval">
+								搜索
+							</Button>
+							<Button onClick={this.reset.bind(this)} className="interval">
+								重置
+							</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div className="patent-table">
 					<Spin spinning={this.state.loading}>
 						<Table
-							columns={this.state.columns}
+							columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 							dataSource={this.state.dataSource}
 							rowSelection={rowSelection}
 							pagination={this.state.pagination}

+ 110 - 75
js/component/manageCenter/achievement/techAchievement.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -8,6 +8,9 @@ import TechAchievementDesc from './techAchievementDesc.jsx';
 import { achievementCategoryList, techAuditStatusList } from '../../dataDic.js';
 import { beforeUploadFile, companySearch, getAchievementCategory, getSearchUrl, getTechAuditStatus ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const AchievementList = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -280,6 +283,19 @@ const AchievementList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -324,82 +340,101 @@ const AchievementList = React.createClass({
                         
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="录入人名称"
-                        value={this.state.recordPerson}
-                        onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
-                    <Input placeholder="成果所有人"
-                        value={this.state.ownerName}
-                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />    
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                
-                        <Select placeholder="选择类型" style={{ width: 160 }}
-                            value={this.state.category}
-                            onChange={(e) => { this.setState({ category: e }) }}>
-                            {this.state.achievementCategoryOption}
-                        </Select>
-                        <Select placeholder="选择审核状态"
-                            style={{ width: 160 }}
-                            value={this.state.auditStatus}
-                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                            {this.state.auditStatusOption}
-                        </Select>
-                        <Select placeholder="选择是否发布" style={{ width: 120 }}
-                            value={this.state.releaseStatus}
-                            onChange={(e) => { this.setState({ releaseStatus: e }) }}>
-                            <Select.Option value="0" >未发布</Select.Option>
-                            <Select.Option value="1" >已发布</Select.Option>
-                        </Select>
-                        <Select placeholder="选择所有人类型" style={{ width: 120 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{marginTop:'10px'}}>
-                        <span>发布时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                         <span style={{marginLeft:'5px'}}>录入时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
-                    	</div>
-                    </div>
-                </div>
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="录入人名称"
+                                   value={this.state.recordPerson}
+                                   onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                            <Input placeholder="成果所有人"
+                                   value={this.state.ownerName}
+                                   onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                                    disabled={!hasSelected}
+                                    onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+
+                                <Select placeholder="选择类型" style={{ width: 160 }}
+                                        value={this.state.category}
+                                        onChange={(e) => { this.setState({ category: e }) }}>
+                                    {this.state.achievementCategoryOption}
+                                </Select>
+                                <Select placeholder="选择审核状态"
+                                        style={{ width: 160 }}
+                                        value={this.state.auditStatus}
+                                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
+                                    {this.state.auditStatusOption}
+                                </Select>
+                                <Select placeholder="选择是否发布" style={{ width: 120 }}
+                                        value={this.state.releaseStatus}
+                                        onChange={(e) => { this.setState({ releaseStatus: e }) }}>
+                                    <Select.Option value="0" >未发布</Select.Option>
+                                    <Select.Option value="1" >已发布</Select.Option>
+                                </Select>
+                                <Select placeholder="选择所有人类型" style={{ width: 120 }}
+                                        value={this.state.ownerType}
+                                        onChange={(e) => { this.setState({ ownerType: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{marginTop:'10px'}}>
+                                    <span>发布时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{marginLeft:'5px'}}>录入时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                            }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 98 - 59
js/component/manageCenter/achievement/techAchievementAudit/techAchievementAudit.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -7,6 +7,9 @@ import '../techAchievement.less';
 import TechAchievementDesc from './auditDesc.jsx';
 import { achievementCategoryList, techAuditStatusList } from '../../../dataDic.js';
 import { beforeUploadFile, companySearch, getAchievementCategory, getSearchUrl, getTechAuditStatus ,getboutique,gethot} from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const AchievementList = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -318,6 +321,19 @@ const AchievementList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -362,66 +378,89 @@ const AchievementList = React.createClass({
                         
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="成果所有人"
-                        value={this.state.ownerName}
-                        onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />    
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
-                    <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                
-                        <Select placeholder="选择类型" style={{ width: 160 }}
-                            value={this.state.category}
-                            onChange={(e) => { this.setState({ category: e }) }}>
-                            {this.state.achievementCategoryOption}
-                        </Select>
-                        <Select placeholder="选择所有人类型" style={{ width: 120 }}
-                            value={this.state.ownerType}
-                            onChange={(e) => { this.setState({ ownerType: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{marginTop:'10px'}}>
-                        <span>发布时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                         <span style={{marginLeft:'5px'}}>录入时间 :</span>
-                        <RangePicker
-                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
-                    	</div>
-                    </div>
-                </div>
+                <Tabs
+                    defaultActiveKey="1"
+                    onChange={this.callback}
+                    className="test"
+                >
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="成果所有人"
+                                   value={this.state.ownerName}
+                                   onChange={(e) => { this.setState({ ownerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
+                            <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+
+                                <Select placeholder="选择类型" style={{ width: 160 }}
+                                        value={this.state.category}
+                                        onChange={(e) => { this.setState({ category: e }) }}>
+                                    {this.state.achievementCategoryOption}
+                                </Select>
+                                <Select placeholder="选择所有人类型" style={{ width: 120 }}
+                                        value={this.state.ownerType}
+                                        onChange={(e) => { this.setState({ ownerType: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{marginTop:'10px'}}>
+                                    <span>发布时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{marginLeft:'5px'}}>录入时间 :</span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                        }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/achievement/techAchievementQuery.jsx

@@ -8,6 +8,7 @@ import TechAchievementDesc from './techAchievementQueryDesc.jsx';
 import { achievementCategoryList, techAuditStatusList } from '../../dataDic.js';
 import { beforeUploadFile, companySearch, getAchievementCategory, getSearchUrl, getTechAuditStatus ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const AchievementList = React.createClass({
@@ -252,6 +253,19 @@ const AchievementList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -372,10 +386,25 @@ const AchievementList = React.createClass({
                     </div>
                 </div>
                 </TabPane>
+            <TabPane tab="更改表格显示数据" key="2">
+                <div style={{ marginLeft: 10 }}>
+                    <ChooseList
+                        columns={this.state.columns}
+                        changeFn={this.changeList}
+                        changeList={this.state.changeList}
+                        top={55}
+                        margin={11}
+                    />
+                </div>
+            </TabPane>
             </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                        }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 32 - 3
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -28,6 +28,7 @@ import './customer.less';
 const TabPane = Tabs.TabPane;
 import ShowModalDiv from "@/showModal.jsx";
 import ImgList from "../../../../common/imgList";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 const Dragger = Upload.Dragger;
 //图片组件
 const PicturesWall = React.createClass({
@@ -1293,6 +1294,19 @@ const IntentionCustomer = Form.create()(React.createClass({
             };
         }.bind(this));
     },
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		let paginationss = null;
 		if (this.state.pagec>=0) {
@@ -1361,7 +1375,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         <Tabs
           defaultActiveKey="1"
           className="test">
-             <TabPane tab="搜索" key="1">
+            <TabPane tab="搜索" key="1">
           <Input
             placeholder="客户名称"
             value={this.state.nameSearch}
@@ -1431,7 +1445,7 @@ const IntentionCustomer = Form.create()(React.createClass({
           </Button>
           <Button onClick={this.reset}>重置</Button>
           </TabPane>
-          <TabPane key="2" tab="转交" >
+          	<TabPane key="2" tab="转交" >
           <AutoComplete
             className="certain-category-search"
             dropdownClassName="certain-category-search-dropdown"
@@ -1457,12 +1471,27 @@ const IntentionCustomer = Form.create()(React.createClass({
             转交
           </Button>
           </TabPane>
+			<TabPane tab="更改表格显示数据" key="3">
+				<div style={{ marginLeft: 10 }}>
+					<ChooseList
+						columns={this.state.columns}
+						changeFn={this.changeList}
+						changeList={this.state.changeList}
+						top={55}
+						margin={11}
+					/>
+				</div>
+			</TabPane>
           </Tabs>
         </div>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+				columns={
+					this.state.changeList
+						? this.state.changeList
+						: this.state.columns
+				}
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 61 - 26
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -9,6 +9,7 @@ import { socialAttribute, industry, auditStatusL, lvl, currentMember ,slcRedit,d
 import { getSocialAttribute, beforeUploadFile,splitUrl ,getSlcRedit,getDataGrade,getAchievementCategory,getTechAuditStatus,getboutique,getXiangmoState} from '@/tools.js';
 import './customer.less';
 import ImgList from "../../../../common/imgList";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 //图片组件
 const PicturesWall = React.createClass({
@@ -904,6 +905,19 @@ const IntentionCustomer = Form.create()(React.createClass({
         	});
         }
     },
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const {
 			RangePicker,
@@ -941,36 +955,57 @@ const IntentionCustomer = Form.create()(React.createClass({
                 <div className="content-title">                  
                     <span>客户资料管理</span>
                 </div>
-                <div className="user-search">                    
-                    <Input placeholder="客户名称"  
-                        value={this.state.nameSearch}
-                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />    
-                    <Select placeholder="省"
-                            style={{ width: 80 }}
-                            value={this.state.provinceSearch}
-                            onChange={(e) => {this.setState({ provinceSearch: e});}}>
-                            {this.state.Provinces}
-                    </Select> 
-                    <span style={{marginRight:'10px'}}>                   
+				<Tabs
+					defaultActiveKey="1"
+					className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="user-search">
+							<Input placeholder="客户名称"
+								   value={this.state.nameSearch}
+								   onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
+							<Select placeholder="省"
+									style={{ width: 80 }}
+									value={this.state.provinceSearch}
+									onChange={(e) => {this.setState({ provinceSearch: e});}}>
+								{this.state.Provinces}
+							</Select>
+							<span style={{marginRight:'10px'}}>
 	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
-    						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
+								   onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />
                     </span>
-                    <Select placeholder="资料是否完善" style={{ width: 120 }}
-                        value={this.state.dataGrade}
-                        onChange={(e) => { this.setState({ dataGrade: e }) }}>
-                        <Select.Option value="0" >未完善</Select.Option>
-                        <Select.Option value="1" >已完善</Select.Option>
-                    </Select>
-                    <RangePicker style={{marginRight:'10px'}}
-                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> 
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>                      
-                </div>                                               
+							<Select placeholder="资料是否完善" style={{ width: 120 }}
+									value={this.state.dataGrade}
+									onChange={(e) => { this.setState({ dataGrade: e }) }}>
+								<Select.Option value="0" >未完善</Select.Option>
+								<Select.Option value="1" >已完善</Select.Option>
+							</Select>
+							<RangePicker style={{marginRight:'10px'}}
+										 value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+											 this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+										 onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+							<Button type="primary" onClick={this.search}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+							this.state.changeList
+								? this.state.changeList
+								: this.state.columns
+						}
                             dataSource={this.state.dataSource}    
                             rowSelection={rowSelection}
                             pagination={this.state.pagination} 

+ 52 - 16
js/component/manageCenter/customer/NEW/crm/crmCount.jsx

@@ -1,10 +1,13 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,DatePicker} from 'antd';
+import {Select, Spin, message, Table, Button, DatePicker, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery';
 import './customer.less';
 import { post } from '@/dataDic.js';
 import moment from 'moment';
+import {ChooseList} from "../../../order/orderNew/chooseList";
+
+const { TabPane } = Tabs;
 
 const DiurnalStatisticsOne = React.createClass({
 	loadData(timeTypes,totalArr) {
@@ -563,25 +566,55 @@ const DiurnalStatisticsOne = React.createClass({
 			Nowtime:nowTime
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const { RangePicker } = DatePicker;
 		let departmentArr = this.state.departmentArr || [];
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户资料填写统计</p>
-				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs
+					defaultActiveKey="1"
+					className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix" style={{ marginTop: 10 }}>
+							<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
+							<span style={{fontSize:'16px'}}>部门机构 : </span>
+							<Select placeholder="选择部门"
+									style={{ width:'200px',marginRight:'10px' }}
+									value={this.state.superId}
+									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+								{this.state.contactsOption}
+							</Select>
+
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div id='daochu1'>
 					<div className="surfaceTitle">
 						<span>客户资料填写统计表</span>
@@ -589,9 +622,12 @@ const DiurnalStatisticsOne = React.createClass({
 					<div className="patent-table">
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+		                        <Table columns={
+									this.state.changeList
+										? this.state.changeList
+										: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
-		                            bordered
 									pagination={false}
 									bordered
 									size="small"

+ 134 - 98
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -23,7 +23,9 @@ import {
 import './customer.less';
 import ShowModalDiv from "@/showModal.jsx";
 import ImgList from "../../../../common/imgList";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 const Option = AutoComplete.Option;
+const { TabPane } = Tabs;
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -501,6 +503,19 @@ const PatentPayment = Form.create()(React.createClass({
 	getOrgCodeUrl(e) {
 	    this.setState({ orgCodeUrl: e });
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 
 	render(){
 		const theData = this.state.RowData || {};
@@ -516,106 +531,123 @@ const PatentPayment = Form.create()(React.createClass({
         <ShowModalDiv ShowModal={this.state.showModal} />
         <div className="content-title">
           <span style={{ fontSize: "16px" }}>客户专利提醒</span>
-          <div className="user-search">
-            <Select
-              value={this.state.typeSearch}
-              placeholder="请选择专利类型"
-              onChange={e => {
-                this.setState({
-                  typeSearch: e
-                });
-              }}
-              style={{ width: "140px" }}
-            >
-              <Option value={1}>实用新型</Option>
-              <Option value={2}>外观设计</Option>
-              <Option value={3}>发明</Option>
-            </Select>
-            <Input
-              value={this.state.nameSearch}
-              placeholder="请输入授权公司"
-              onChange={e => {
-                this.setState({
-                  nameSearch: e.target.value
-                });
-              }}
-            />
-            <Select
-              value={this.state.departmentSearch}
-              placeholder="请选择录入公司"
-              onChange={e => {
-                this.setState({
-                  departmentSearch: e
-                });
-              }}
-              style={{ width: "140px" }}
-            >
-              {this.state.departmentArr.map(e => {
-                return <Option value={e.id}>{e.name}</Option>;
-              })}
-            </Select>
-            <Input
-              value={this.state.anameSearch}
-              placeholder="请输入录入人"
-              onChange={e => {
-                this.setState({
-                  anameSearch: e.target.value
-                });
-              }}
-            />
-            <Select
-              value={this.state.statusSearch}
-              placeholder="请选择状态"
-              onChange={e => {
-                this.setState({
-                  statusSearch: e
-                });
-              }}
-              style={{ width: "140px" }}
-            >
-              <Option value={0}>正常</Option>
-              <Option value={1}>提醒中</Option>
-            </Select>
-            <Input
-              value={this.state.patentNoSearch}
-              placeholder="请输入专利号"
-              onChange={e => {
-                this.setState({
-                  patentNoSearch: e.target.value
-                });
-              }}
-            />
-            <Button
-              type="primary"
-              onClick={this.search}
-              style={{ marginLeft: "10px" }}
-            >
-              搜索
-            </Button>
-            <Button
-              type="primary"
-              onClick={this.searchReset}
-              style={{ marginLeft: "10px" }}
-            >
-              重置
-            </Button>
-            <span>
+			<Tabs
+				defaultActiveKey="1"
+				className="test">
+				<TabPane tab="搜索" key="1">
+					<div className="user-search">
+						<Select
+							value={this.state.typeSearch}
+							placeholder="请选择专利类型"
+							onChange={e => {
+								this.setState({
+									typeSearch: e
+								});
+							}}
+							style={{ width: "140px" }}
+						>
+							<Option value={1}>实用新型</Option>
+							<Option value={2}>外观设计</Option>
+							<Option value={3}>发明</Option>
+						</Select>
+						<Input
+							value={this.state.nameSearch}
+							placeholder="请输入授权公司"
+							onChange={e => {
+								this.setState({
+									nameSearch: e.target.value
+								});
+							}}
+						/>
+						<Select
+							value={this.state.departmentSearch}
+							placeholder="请选择录入公司"
+							onChange={e => {
+								this.setState({
+									departmentSearch: e
+								});
+							}}
+							style={{ width: "140px" }}
+						>
+							{this.state.departmentArr.map(e => {
+								return <Option value={e.id}>{e.name}</Option>;
+							})}
+						</Select>
+						<Input
+							value={this.state.anameSearch}
+							placeholder="请输入录入人"
+							onChange={e => {
+								this.setState({
+									anameSearch: e.target.value
+								});
+							}}
+						/>
+						<Select
+							value={this.state.statusSearch}
+							placeholder="请选择状态"
+							onChange={e => {
+								this.setState({
+									statusSearch: e
+								});
+							}}
+							style={{ width: "140px" }}
+						>
+							<Option value={0}>正常</Option>
+							<Option value={1}>提醒中</Option>
+						</Select>
+						<Input
+							value={this.state.patentNoSearch}
+							placeholder="请输入专利号"
+							onChange={e => {
+								this.setState({
+									patentNoSearch: e.target.value
+								});
+							}}
+						/>
+						<Button
+							type="primary"
+							onClick={this.search}
+							style={{ marginLeft: "10px" }}
+						>
+							搜索
+						</Button>
+						<Button
+							type="primary"
+							onClick={this.searchReset}
+							style={{ marginLeft: "10px" }}
+						>
+							重置
+						</Button>
+						<span>
               更多搜索
               <Switch
-                onChange={mark => {
-                  this.setState({ mark: mark });
-                }}
-              />
+				  onChange={mark => {
+					  this.setState({ mark: mark });
+				  }}
+			  />
             </span>
-			  {!this.props.isOnlyRead ? <Button
-              type="primary"
-              onClick={this.new}
-              style={{ marginRight: "10px", float: "right" }}
-            >
-              新建
-            </Button> : <div/>}
-            {/*<Button onClick={this.reset}>导出</Button>*/}
-          </div>
+						{!this.props.isOnlyRead ? <Button
+							type="primary"
+							onClick={this.new}
+							style={{ marginRight: "10px", float: "right" }}
+						>
+							新建
+						</Button> : <div/>}
+						{/*<Button onClick={this.reset}>导出</Button>*/}
+					</div>
+				</TabPane>
+				<TabPane tab="更改表格显示数据" key="2">
+					<div style={{ marginLeft: 10 }}>
+						<ChooseList
+							columns={this.state.columns}
+							changeFn={this.changeList}
+							changeList={this.state.changeList}
+							top={55}
+							margin={11}
+						/>
+					</div>
+				</TabPane>
+			</Tabs>
           {this.state.mark ? (
             <div className="user-search" style={{ paddingTop: "10px" }}>
               <span style={{ fontSize: "14px" }}>请选择申请时间:</span>
@@ -641,7 +673,11 @@ const PatentPayment = Form.create()(React.createClass({
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
-                columns={this.state.columns}
+				  columns={
+					  this.state.changeList
+						  ? this.state.changeList
+						  : this.state.columns
+				  }
                 dataSource={this.state.dataSource}
                 pagination={this.state.pagination}
                 onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -14,6 +14,7 @@ import FollowDetail from './followDetail.jsx'
 import IntentionDetail from './intentionDetail/intentionDetail.jsx'
 import ShowModalDiv from "@/showModal.jsx";
 import './customer.less';
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const IntentionCustomer = Form.create()(
@@ -661,6 +662,19 @@ const IntentionCustomer = Form.create()(
         onCancel() {},
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     showConfirms(fn, record) {
       Modal.confirm({
         title: "您确定将以下客户移至公共客户吗?",
@@ -954,13 +968,28 @@ const IntentionCustomer = Form.create()(
                   移除客户
                 </Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="3">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
           </div>
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
                 className={'intentionCustomerTable'}
-                columns={this.state.columns}
+                columns={
+                  this.state.changeList
+                      ? this.state.changeList
+                      : this.state.columns
+                }
                 dataSource={this.state.dataSource}
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/customer/NEW/publicCustomer/publicCustomer.jsx

@@ -5,6 +5,7 @@ import $ from 'jquery/src/ajax';
 import { citySelect, provinceList } from '@/NewDicProvinceList';
 import {ShowModal} from '../../../../tools.js'
 import ShowModalDiv from "@/showModal.jsx";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const QueryCustomer = React.createClass({
 	loadData(pageNo, apiUrl) {
@@ -197,6 +198,19 @@ const QueryCustomer = React.createClass({
 		this.state.Provinces = Province;
 		this.loadData();
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render(){
 		const intentionState=this.props.intentionState;
 		const FormItem = Form.Item;
@@ -266,12 +280,27 @@ const QueryCustomer = React.createClass({
               <Button onClick={this.reset}>重置</Button>
             </div>
           </TabPane>
+			<TabPane tab="更改表格显示数据" key="2">
+				<div style={{ marginLeft: 10 }}>
+					<ChooseList
+						columns={this.state.columns}
+						changeFn={this.changeList}
+						changeList={this.state.changeList}
+						top={55}
+						margin={11}
+					/>
+				</div>
+			</TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
 			  size="middle"
-              columns={this.state.columns}
+			  columns={
+				  this.state.changeList
+					  ? this.state.changeList
+					  : this.state.columns
+			  }
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/customer/NEW/query/queryCutomer.jsx

@@ -7,6 +7,7 @@ import { citySelect, provinceList } from '@/NewDicProvinceList';
 import ShowModalDiv from "@/showModal.jsx";
 import ZhuanjiaoDetail from "@/zhuanjiaoDetail.jsx";
 import Detaile from './detail.jsx';
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const {TabPane} =Tabs
 const QueryCustomer = React.createClass({
@@ -307,6 +308,19 @@ const QueryCustomer = React.createClass({
       auto: e,
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     let departmentArr = this.state.departmentArr || [];
     const intentionState = this.props.intentionState;
@@ -382,12 +396,27 @@ const QueryCustomer = React.createClass({
               <Button onClick={this.reset}>重置</Button>
             </div>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
               size="middle"
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -11,6 +11,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import ZhuanjiaoDetail from "@/zhuanjiaoDetail.jsx";
 import IntentionDetail from './intentionDetail/intentionDetail.jsx'
 import './customer.less';
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const IntentionCustomer = Form.create()(React.createClass({
@@ -353,6 +354,19 @@ const IntentionCustomer = Form.create()(React.createClass({
 			this.loadData(null,nextProps.ApiUrl);
 		};
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const FormItem = Form.Item;
 		const rowSelection = {
@@ -469,12 +483,27 @@ const IntentionCustomer = Form.create()(React.createClass({
               </span> */}
             </div>
           </TabPane>
+			<TabPane tab="更改表格显示数据" key="2">
+				<div style={{ marginLeft: 10 }}>
+					<ChooseList
+						columns={this.state.columns}
+						changeFn={this.changeList}
+						changeList={this.state.changeList}
+						top={55}
+						margin={11}
+					/>
+				</div>
+			</TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
 			  size="middle"
-              columns={this.state.columns}
+			  columns={
+				  this.state.changeList
+					  ? this.state.changeList
+					  : this.state.columns
+			  }
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 79 - 25
js/component/manageCenter/customer/customerManagement/adminCustomerStatistics.jsx

@@ -3,11 +3,30 @@ import React from 'react';
 import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { Form, Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Popconfirm } from 'antd';
+import {
+	Form,
+	Radio,
+	Icon,
+	Button,
+	Input,
+	Select,
+	Spin,
+	Table,
+	Switch,
+	message,
+	DatePicker,
+	Modal,
+	Upload,
+	Popconfirm,
+	Tabs
+} from 'antd';
 import moment from 'moment';
 import '../../order/userMangagement.less';
 import { orderState, orderChannel, orderType } from '../../../dataDic.js';
 import { getProjectState, getOrderChannel, getOrderType, getOrderState, getPaymentState, getApprovedState } from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const {TabPane} = Tabs
 
 const AdminCustomerStatistics = Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -439,6 +458,19 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 		this.state.isDistributionFinance = undefined;
 		this.loadData();
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const rowSelection = {
 			selectedRowKeys: this.state.selectedRowKeys,
@@ -462,35 +494,57 @@ const AdminCustomerStatistics = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">
-                	<span style={{fontSize:'16px'}}>部门客户统计</span>	
-	                <div className="user-search">
- 	                    {/*<Input placeholder="客户名称" style={{width:'150px'}}
+                	<span style={{fontSize:'16px'}}>部门客户统计</span>
+					<Tabs
+						defaultActiveKey="1"
+						onChange={this.callback}
+						className="test"
+					>
+						<TabPane tab="搜索" key="1">
+							<div className="user-search">
+								{/*<Input placeholder="客户名称" style={{width:'150px'}}
  	                        value={this.state.buyerNameSearch}
 	                        onChange={(e) => { this.setState({ buyerNameSearch: e.target.value }); }} />
 						*/}
-	                    <RangePicker
-		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> 
-		                <Select placeholder="订单部门"
-	                            style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
-	                            value={this.state.departmenttSearch}
-	                            onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
-	                            {
-                                    departmentArr.map(function (item) {
-                                            return <Select.Option key={item.id} >{item.name}</Select.Option>
-                                    })
-                                }
-	                    </Select>
-	                    <Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset}>重置</Button>
-	                    {/*<span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-						*/}    
-	                </div>
-	                
+								<RangePicker
+									value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+										this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+									onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+								<Select placeholder="订单部门"
+										style={{ width: 150 ,marginRight:'10px',marginLeft:'10px'}}
+										value={this.state.departmenttSearch}
+										onChange={(e) => { this.setState({ departmenttSearch: e }) }}>
+									{
+										departmentArr.map(function (item) {
+											return <Select.Option key={item.id} >{item.name}</Select.Option>
+										})
+									}
+								</Select>
+								<Button type="primary" onClick={this.search} style={{marginLeft:'10px'}}>搜索</Button>
+								<Button onClick={this.reset}>重置</Button>
+								{/*<span style={{marginLeft:'10px',marginRight:'20px'}}>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+						*/}
+							</div>
+						</TabPane>
+						<TabPane tab="更改表格显示数据" key="2">
+							<div style={{ marginLeft: 10 }}>
+								<ChooseList
+									columns={this.state.columns}
+									changeFn={this.changeList}
+									changeList={this.state.changeList}
+									top={55}
+									margin={11}
+								/>
+							</div>
+						</TabPane>
+					</Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 	                            dataSource={this.state.dataSource}
 	                            pagination={this.state.pagination} />
 	                    </Spin>

+ 47 - 14
js/component/manageCenter/customer/customerMarketing/diurnalStatistics.jsx

@@ -5,6 +5,7 @@ import $ from 'jquery/src/ajax';
 import './report.less';
 import DiurnalStatisticsOne from './diurnalStatisticsOne.jsx';
 import { post } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 
 const DiurnalStatistics = React.createClass({
@@ -525,6 +526,19 @@ const DiurnalStatistics = React.createClass({
 		console.log(pagination)
 		console.log(sorter)
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	componentWillMount() {
 		//this.loadData();
 		this.totalData();
@@ -539,19 +553,34 @@ const DiurnalStatistics = React.createClass({
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(部门)</p>
-				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix" style={{paddingTop:'11px'}}>
+							<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
+							<span style={{fontSize:'16px'}}>部门机构 : </span>
+							<Select placeholder="选择部门"
+									style={{ width:'200px',marginRight:'10px' }}
+									value={this.state.superId}
+									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+									{this.state.contactsOption}
+							</Select>
+
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div id='daochu'>
 					<div className="surfaceTitle">
 						<span className="nowtime" style={{fontWeight:'bold'}}>{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
@@ -560,7 +589,11 @@ const DiurnalStatistics = React.createClass({
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+		                        <Table columns={
+									this.state.changeList
+										? this.state.changeList
+										: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
 		                            //scroll={{ x: 600,y:500}}
 		                            bordered

+ 50 - 15
js/component/manageCenter/customer/customerMarketing/diurnalStatisticsOne.jsx

@@ -1,9 +1,12 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,DatePicker} from 'antd';
+import {Select, Spin, Input, Table, Button, DatePicker, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './report.less';
 import { post } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const DiurnalStatisticsOne = React.createClass({
 	loadData(totalArr) {
@@ -484,6 +487,19 @@ const DiurnalStatisticsOne = React.createClass({
 		this.state.superId = undefined;//部门机构清零
 		this.totalData();
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	componentWillMount() {
 		this.totalData();
 		let times=new Date();
@@ -497,19 +513,34 @@ const DiurnalStatisticsOne = React.createClass({
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(员工)</p>
-				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix" style={{paddingTop:'11px'}}>
+							<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
+							<span style={{fontSize:'16px'}}>部门机构 : </span>
+							<Select placeholder="选择部门"
+									style={{ width:'200px',marginRight:'10px' }}
+									value={this.state.superId}
+									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+									{this.state.contactsOption}
+							</Select>
+
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div id='daochu1'>
 					<div className="surfaceTitle">
 						<span className="nowtime" style={{fontWeight:'bold'}}>{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
@@ -518,7 +549,11 @@ const DiurnalStatisticsOne = React.createClass({
 					<div className="patent-table">
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+		                        <Table columns={
+									this.state.changeList
+										? this.state.changeList
+										: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
 		                            bordered
 		                            pagination={false}

+ 55 - 22
js/component/manageCenter/customer/customerMarketing/timeStatistics.jsx

@@ -6,6 +6,7 @@ import './report.less';
 import DiurnalStatisticsOne from './timeStatisticsOne.jsx';
 import { post } from '../../../dataDic.js';
 import moment from 'moment';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 
 const DiurnalStatistics = React.createClass({
@@ -488,38 +489,70 @@ const DiurnalStatistics = React.createClass({
 			Nowtime:nowTime
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const { RangePicker } = DatePicker;
 		let departmentArr = this.state.departmentArr || [];
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(部门)</p>
-				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
-		          	<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
-		          	<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
-		          	<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
-		          	<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
-						<RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix" style={{paddingTop:'11px'}}>
+							<Button type="primary" onClick={this.tabExel} style={{ float:'right' }}>导出到表格</Button>
+							<span style={{fontSize:'16px'}}>部门机构 : </span>
+							<Select placeholder="选择部门"
+									style={{ width:'200px',marginRight:'10px' }}
+									value={this.state.superId}
+									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+								{this.state.contactsOption}
+							</Select>
+							<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
+							<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
+							<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
+							<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
+							<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
+							<RangePicker
+								value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+									this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+								onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div id='daochu'>
 					<div className="patent-table" id='daochu'>
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+		                        <Table columns={
+									this.state.changeList
+										? this.state.changeList
+										: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
 		                            //scroll={{ x: 600,y:500}}
 		                            bordered

+ 58 - 23
js/component/manageCenter/customer/customerMarketing/timeStatisticsOne.jsx

@@ -1,10 +1,13 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,DatePicker} from 'antd';
+import {Select, Spin, Input, Table, Button, DatePicker, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './report.less';
 import { post } from '../../../dataDic.js';
 import moment from 'moment';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const DiurnalStatisticsOne = React.createClass({
 	loadData(timeTypes,totalArr) {
@@ -489,6 +492,19 @@ const DiurnalStatisticsOne = React.createClass({
 			yearColor:true
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	componentWillMount() {
 		this.totalData(0);
 		let times=new Date();
@@ -503,27 +519,42 @@ const DiurnalStatisticsOne = React.createClass({
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>客户营销统计表(员工)</p>
-				<div className="clearfix">
-					<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
-					<span style={{fontSize:'16px'}}>部门机构 : </span>
-					<Select placeholder="选择部门"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		          	</Select>
-		          	<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
-		          	<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
-		          	<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
-		          	<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
-		          	<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
-						<RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix" style={{paddingTop:'11px'}}>
+							<Button type="primary" onClick={this.tabExel} style={{float:'right'}}>导出到表格</Button>
+							<span style={{fontSize:'16px'}}>部门机构 : </span>
+							<Select placeholder="选择部门"
+									style={{ width:'200px',marginRight:'10px' }}
+									value={this.state.superId}
+									onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+								{this.state.contactsOption}
+							</Select>
+							<Button onClick={this.week} style={{marginRight:'5px'}} type={this.state.weekColor?"primary":''}>本周</Button>
+							<Button onClick={this.month} style={{marginRight:'5px'}} type={this.state.monthColor?"primary":''}>本月</Button>
+							<Button onClick={this.quarter} style={{marginRight:'5px'}} type={this.state.quarterColor?"primary":''}>本季</Button>
+							<Button onClick={this.year} style={{marginRight:'5px'}} type={this.state.yearColor?"primary":''}>本年</Button>
+							<span className="titleTime" style={{marginRight:'5px'}}>起止时间:</span>
+							<RangePicker
+								value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+									this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+								onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div id='daochu1'>
 					<div className="surfaceTitle">
 						<span>客户营销统计表(员工)</span>
@@ -531,7 +562,11 @@ const DiurnalStatisticsOne = React.createClass({
 					<div className="patent-table">
 						<div className="scroll">
 		                    <Spin spinning={this.state.loading}>
-		                        <Table columns={this.state.columns}
+		                        <Table columns={
+									this.state.changeList
+										? this.state.changeList
+										: this.state.columns
+									}
 		                            dataSource={this.state.dataSource}
 		                            bordered
 		                            pagination={false}

+ 30 - 1
js/component/manageCenter/customer/individualCustomer/myReject.jsx

@@ -33,6 +33,7 @@ import {
   ShowModal
 } from "../../../tools.js";
 import ShowModalDiv from "@/showModal.jsx";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const PublicCustomer = Form.create()(React.createClass({
 	loadData(pageNo) {
 		this.state.data = [];
@@ -349,6 +350,19 @@ const PublicCustomer = Form.create()(React.createClass({
 
 		};
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const FormItem = Form.Item
 		const rowSelection = {
@@ -428,12 +442,27 @@ const PublicCustomer = Form.create()(React.createClass({
           <Button onClick={this.reset}>重置</Button>
         </div>
         </TabPane>
+			<TabPane tab="更改表格显示数据" key="2">
+				<div style={{ marginLeft: 10 }}>
+					<ChooseList
+						columns={this.state.columns}
+						changeFn={this.changeList}
+						changeList={this.state.changeList}
+						top={55}
+						margin={11}
+					/>
+				</div>
+			</TabPane>
 		</Tabs>
 		<div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
 			  size="middle"
-              columns={this.state.columns}
+			  columns={
+				  this.state.changeList
+					  ? this.state.changeList
+					  : this.state.columns
+			  }
               dataSource={this.state.dataSource}
               rowSelection={rowSelection}
               pagination={this.state.pagination}

+ 193 - 159
js/component/manageCenter/customer/managementFollow/customerFollow/index.jsx

@@ -20,6 +20,7 @@ import ShowModalDiv from "@/showModal.jsx";
 import moment from "moment";
 import $ from "jquery/src/ajax";
 import IntentionDetail from "../../NEW/intentionCustomer/intentionDetail/intentionDetail";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs;
 const { RangePicker } = DatePicker;
@@ -39,6 +40,106 @@ class CustomerFollow extends Component{
             filteredInfo: null,
             sortedInfo: null,
 
+            columns : [
+                {
+                    title: "客户名称",
+                    dataIndex: "name",
+                    key: "name",
+                },
+                {
+                    title: "地区",
+                    dataIndex: "locationProvince",
+                    key: "locationProvince",
+                },
+                {
+                    title: "联系人",
+                    dataIndex: "contacts",
+                    key: "contacts",
+                },
+                {
+                    title: "联系电话",
+                    dataIndex: "contactMobile",
+                    key: "contactMobile",
+                },
+                {
+                    title: "社会性质",
+                    dataIndex: "societyTag",
+                    key: "societyTag",
+                    render: (text) => {
+                        return getSocialAttribute(text);
+                    },
+                },
+                {
+                    title: "客户初始时间",
+                    dataIndex: "transferTime",
+                    key: "transferTime",
+                },
+                {
+                    title: "剩余私有天数",
+                    dataIndex: "surplusFollowTime",
+                    key: "surplusFollowTime",
+                },
+                {
+                    title: "剩余签单天数",
+                    dataIndex: "surplusSignTime",
+                    key: "surplusSignTime",
+                },
+                {
+                    title: "最新跟进时间",
+                    dataIndex: "lastFollowTime",
+                    key: "lastFollowTime",
+                    //0无 1转换倒序 2转换正序
+                    sorter: true,
+                    sortOrder: (this.sortedInfo || {}).columnKey === 'lastFollowTime' && (this.sortedInfo || {}).order,
+                    filteredValue: (this.filteredInfo || {}).lastFollowTime || null,
+                },
+                {
+                    title: "客户等级",
+                    dataIndex: "level",
+                    key: "level",
+                    render: (text) => {
+                        if(text === 0) {
+                            return <Tag color="#87d068">一般客户</Tag>;
+                        }else if(text === 1) {
+                            return <Tag color="#D2691E">意向客户</Tag>;
+                        }else if(text === 2) {
+                            return <Tag color="#FF0000">重点客户</Tag>;
+                        }else {
+                            return "";
+                        }
+                    },
+                },
+                {
+                    title: "跟进人",
+                    dataIndex: "aName",
+                    key: "aName",
+                },
+                {
+                    title: "跟进操作",
+                    dataIndex: "abc",
+                    key: "abc",
+                    render: (text, record, index) => {
+                        return (
+                            <div>
+                                <Button
+                                    onClick={(e) => {
+                                        e.stopPropagation();
+                                        this.setState({
+                                            tabsKey:"4",
+                                        },()=>{
+                                            this.tableRowClick(record)
+                                        })
+                                    }}
+                                    type="primary"
+                                >
+                                    {this.props.isEditGuidanceLv ? '指导' : '查看指导'}
+                                </Button>
+                            </div>
+                        );
+                    },
+                },
+            ],
+
             provinces: [],
             dataSource: [],
             categoryArr: [],
@@ -70,6 +171,7 @@ class CustomerFollow extends Component{
         this.tableRowClick = this.tableRowClick.bind(this);
         this.closeDesc = this.closeDesc.bind(this);
         this.releaseGuidance = this.releaseGuidance.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -273,135 +375,50 @@ class CustomerFollow extends Component{
         );
     }
 
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
     render() {
-        let { sortedInfo, filteredInfo } = this.state;
-        sortedInfo = sortedInfo || {};
-        filteredInfo = filteredInfo || {};
-        const columns = [
-            {
-                title: "客户名称",
-                dataIndex: "name",
-                key: "name",
-            },
-            {
-                title: "地区",
-                dataIndex: "locationProvince",
-                key: "locationProvince",
-            },
-            {
-                title: "联系人",
-                dataIndex: "contacts",
-                key: "contacts",
-            },
-            {
-                title: "联系电话",
-                dataIndex: "contactMobile",
-                key: "contactMobile",
-            },
-            {
-                title: "社会性质",
-                dataIndex: "societyTag",
-                key: "societyTag",
-                render: (text) => {
-                    return getSocialAttribute(text);
-                },
-            },
-            {
-                title: "客户初始时间",
-                dataIndex: "transferTime",
-                key: "transferTime",
-            },
-            {
-                title: "剩余私有天数",
-                dataIndex: "surplusFollowTime",
-                key: "surplusFollowTime",
-            },
-            {
-                title: "剩余签单天数",
-                dataIndex: "surplusSignTime",
-                key: "surplusSignTime",
-            },
-            {
-                title: "最新跟进时间",
-                dataIndex: "lastFollowTime",
-                key: "lastFollowTime",
-                //0无 1转换倒序 2转换正序
-                sorter: true,
-                sortOrder: sortedInfo.columnKey === 'lastFollowTime' && sortedInfo.order,
-                filteredValue: filteredInfo.lastFollowTime || null,
-            },
-            {
-                title: "客户等级",
-                dataIndex: "level",
-                key: "level",
-                render: (text) => {
-                    if(text === 0) {
-                      return <Tag color="#87d068">一般客户</Tag>;
-                    }else if(text === 1) {
-                      return <Tag color="#D2691E">意向客户</Tag>;
-                    }else if(text === 2) {
-                      return <Tag color="#FF0000">重点客户</Tag>;
-                    }else {
-                      return "";
-                    }
-                },
-            },
-            {
-                title: "跟进人",
-                    dataIndex: "aName",
-                key: "aName",
-            },
-            {
-                title: "跟进操作",
-                    dataIndex: "abc",
-                key: "abc",
-                render: (text, record, index) => {
-                return (
-                    <div>
-                        <Button
-                            onClick={(e) => {
-                                e.stopPropagation();
-                                this.setState({
-                                    tabsKey:"4",
-                                },()=>{
-                                    this.tableRowClick(record)
-                                })
-                            }}
-                            type="primary"
-                        >
-                            {this.props.isEditGuidanceLv ? '指导' : '查看指导'}
-                        </Button>
-                    </div>
-                );
-            },
-        },
-    ];
+        let { sortedInfo, filteredInfo,columns } = this.state;
         return(
             <div className="user-content">
                 <ShowModalDiv ShowModal={this.state.showModal} />
                 <div className="content-title">
                     <span>指导意见</span>
                 </div>
-                <div className="user-search">
-                    <Input
-                        placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        style={{ width: 150, marginRight: 10, marginLeft: 10 }}
-                        onChange={(e) => {
-                            this.setState({ nameSearch: e.target.value });
-                        }}
-                    />
-                    <Select
-                        placeholder="选择地区"
-                        style={{ width: 80 }}
-                        value={this.state.provinceSearch}
-                        onChange={(e) => {
-                            this.setState({ provinceSearch: e });
-                        }}
-                    >
-                        {this.state.provinces}
-                    </Select>
-                    <span style={{ marginRight: "10px" }}>
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input
+                                placeholder="客户名称"
+                                value={this.state.nameSearch}
+                                style={{ width: 150, marginRight: 10, marginLeft: 10 }}
+                                onChange={(e) => {
+                                    this.setState({ nameSearch: e.target.value });
+                                }}
+                            />
+                            <Select
+                                placeholder="选择地区"
+                                style={{ width: 80 }}
+                                value={this.state.provinceSearch}
+                                onChange={(e) => {
+                                    this.setState({ provinceSearch: e });
+                                }}
+                            >
+                                {this.state.provinces}
+                            </Select>
+                            <span style={{ marginRight: "10px" }}>
                               <Cascader
                                   options={citySelect()}
                                   value={this.state.addressSearch}
@@ -411,46 +428,63 @@ class CustomerFollow extends Component{
                                   }}
                               />
                             </span>
-                    <Select
-                        style={{ width: 120 }}
-                        value={this.state.level}
-                        onChange={(e) => {
-                            this.setState({ level: e });
-                        }}
-                        placeholder="选择客户等级"
-                    >
-                        <Select.Option value="0">一般客户</Select.Option>
-                        <Select.Option value="1">意向客户</Select.Option>
-                        <Select.Option value="2">重点客户</Select.Option>
-                    </Select>
-                    <RangePicker
-                        value={[
-                            this.state.releaseDate[0]
-                                ? moment(this.state.releaseDate[0])
-                                : null,
-                            this.state.releaseDate[1]
-                                ? moment(this.state.releaseDate[1])
-                                : null,
-                        ]}
-                        onChange={(data, dataString) => {
-                            this.setState({ releaseDate: dataString });
-                        }}
-                    />
-                    <Button
-                        type="primary"
-                        style={{ marginLeft: "10px", marginRight: 10 }}
-                        onClick={()=>{
-                            this.loadData();
-                        }}
-                    >
-                        搜索
-                    </Button>
-                    <Button onClick={this.reset}>重置</Button>
-                </div>
+                            <Select
+                                style={{ width: 120 }}
+                                value={this.state.level}
+                                onChange={(e) => {
+                                    this.setState({ level: e });
+                                }}
+                                placeholder="选择客户等级"
+                            >
+                                <Select.Option value="0">一般客户</Select.Option>
+                                <Select.Option value="1">意向客户</Select.Option>
+                                <Select.Option value="2">重点客户</Select.Option>
+                            </Select>
+                            <RangePicker
+                                value={[
+                                    this.state.releaseDate[0]
+                                        ? moment(this.state.releaseDate[0])
+                                        : null,
+                                    this.state.releaseDate[1]
+                                        ? moment(this.state.releaseDate[1])
+                                        : null,
+                                ]}
+                                onChange={(data, dataString) => {
+                                    this.setState({ releaseDate: dataString });
+                                }}
+                            />
+                            <Button
+                                type="primary"
+                                style={{ marginLeft: "10px", marginRight: 10 }}
+                                onClick={()=>{
+                                    this.loadData();
+                                }}
+                            >
+                                搜索
+                            </Button>
+                            <Button onClick={this.reset}>重置</Button>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table
-                            columns={columns}
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : columns
+                            }
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={this.tableRowClick}

+ 46 - 8
js/component/manageCenter/customer/report/departmentReport.jsx

@@ -1,9 +1,12 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,DatePicker} from 'antd';
+import {Select, Spin, Input, Table, Button, DatePicker, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './report.less';
 import { post } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const { TabPane } = Tabs;
 
 const PersonalReport = React.createClass({
 	loadData(totalArr) {
@@ -524,6 +527,19 @@ const PersonalReport = React.createClass({
 		this.state.timeState=false;
 		this.totalData()
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	componentWillMount() {
 		this.totalData();
 		let times=new Date();
@@ -537,12 +553,30 @@ const PersonalReport = React.createClass({
 		return(
 			<div className='set-content'>
 				<p style={{fontSize:'20px',marginBottom:'10px'}}>部门业绩统计报表</p>
-				<div className="clearfix">
-					<span style={{fontSize:'16px'}}>选择日期 : </span>
-					<DatePicker onChange={this.selTime} value={this.state.Dtime}/>
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs
+					defaultActiveKey="1"
+					onChange={this.callback}
+					className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix">
+							<span style={{fontSize:'16px'}}>选择日期 : </span>
+							<DatePicker onChange={this.selTime} value={this.state.Dtime}/>
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div className="surfaceTitle">
 					<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
 					<span>部门营销业绩统计表</span>
@@ -551,7 +585,11 @@ const PersonalReport = React.createClass({
 				<div className="patent-table">
 					<div className="scroll">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 	                            dataSource={this.state.dataSource}
 	                            scroll={{ x: 3200,y:500}}
 	                            bordered

+ 56 - 20
js/component/manageCenter/customer/report/personalReport.jsx

@@ -1,9 +1,13 @@
 import React from 'react';
-import { Select, Spin, Input, Table, Button ,message,DatePicker} from 'antd';
+import {Select, Spin, Input, Table, Button, message, DatePicker, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './report.less';
 import { post } from '../../../dataDic.js';
+import {SearchInput} from "../../order/orderNew/changeComponent/searchInput";
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const { TabPane } = Tabs;
 
 const PersonalReport = React.createClass({
 	loadData(totalArr,pageNo) {
@@ -482,29 +486,57 @@ const PersonalReport = React.createClass({
 			Nowtime:nowTime
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		let departmentArr = this.state.departmentArr || [];
 		return(
 			<div className='set-content'>
 				<span style={{fontSize:'20px'}}>个人业绩统计报表</span>
-				<div className="clearfix">
-					<Select placeholder="部门机构"
-                        style={{ width: 150 ,marginRight:'10px',marginTop:'10px',marginBottom:'10px'}}
-                        value={this.state.departmentSearch}
-                        onChange={(e) => { this.setState({ departmentSearch: e }) }}>
-                        {
-                            departmentArr.map(function (item) {
-                                return <Select.Option key={item.name} >{item.name}</Select.Option>
-                            })
-                        }
-                  	</Select>
-                  	<Input  value={this.state.uesrNameSearch} placeholder="用户姓名" style={{width:'150px',marginRight:'5px'}}
-                  			onChange={(e)=>{this.setState({uesrNameSearch:e.target.value})}} />
-                  	<span style={{fontSize:'16px'}}>选择日期 : </span>
-					<DatePicker onChange={this.selTime} value={this.state.Dtime}/>
-                  	<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
-	                <Button onClick={this.reset}>重置</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="clearfix">
+							<Select placeholder="部门机构"
+									style={{ width: 150 ,marginRight:'10px',marginTop:'10px',marginBottom:'10px'}}
+									value={this.state.departmentSearch}
+									onChange={(e) => { this.setState({ departmentSearch: e }) }}>
+								{
+									departmentArr.map(function (item) {
+										return <Select.Option key={item.name} >{item.name}</Select.Option>
+									})
+								}
+							</Select>
+							<Input  value={this.state.uesrNameSearch} placeholder="用户姓名" style={{width:'150px',marginRight:'5px'}}
+									onChange={(e)=>{this.setState({uesrNameSearch:e.target.value})}} />
+							<span style={{fontSize:'16px'}}>选择日期 : </span>
+							<DatePicker onChange={this.selTime} value={this.state.Dtime}/>
+							<Button type="primary" onClick={this.search} style={{marginLeft:'10px',marginRight:'10px'}}>搜索</Button>
+							<Button onClick={this.reset}>重置</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div className="surfaceTitle">
 					<span className="nowtime">{this.state.timeState?this.state.txtTime:this.state.Nowtime}</span>
 					<span>个人营销业绩统计表</span>
@@ -513,7 +545,11 @@ const PersonalReport = React.createClass({
 				<div className="patent-table">
 					<div className="scroll">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 	                            dataSource={this.state.dataSource}
 	                            bordered
 	                            scroll={{x:1780}}

+ 87 - 49
js/component/manageCenter/customer/statistics/departmentStatistics/index.jsx

@@ -5,14 +5,16 @@ import {
     message,
     Select,
     Spin,
-    Table,
+    Table, Tabs,
 } from "antd";
 import './index.less';
 import $ from "jquery/src/ajax";
 import CustomerDetails from './customerDetails';
 import moment from "moment";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const { RangePicker } = DatePicker;
+const { TabPane } = Tabs;
 
 class DepartmentStatistics extends Component{
     constructor(props) {
@@ -161,6 +163,7 @@ class DepartmentStatistics extends Component{
         this.loadData = this.loadData.bind(this);
         this.reset = this.reset.bind(this);
         this.selectSuperId = this.selectSuperId.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -299,63 +302,98 @@ class DepartmentStatistics extends Component{
         }.bind(this));
     }
 
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
     render() {
         return(
             <div className="user-content">
                 <div className="content-title">
                     <span>部门统计</span>
                 </div>
-                <div className="user-search" style={{display:'flex',alignItems:'center'}}>
-                    <div>
-                        <Select
-                            placeholder="请选择部门"
-                            style={{ width:200,marginLeft:10}}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }}
-                            notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-                        </Select>
-                    </div>
-                    <Input
-                        placeholder="客户名称"
-                        value={this.state.nameSearch}
-                        style={{ width: 150, marginRight: 10, marginLeft: 10 }}
-                        onChange={(e) => {
-                            this.setState({ nameSearch: e.target.value });
-                        }}
-                    />
-                    <div style={{
-                        marginTop: '10px',
-                    }}>
-                        <RangePicker
-                            value={[
-                                this.state.releaseDate[0]
-                                    ? moment(this.state.releaseDate[0])
-                                    : null,
-                                this.state.releaseDate[1]
-                                    ? moment(this.state.releaseDate[1])
-                                    : null,
-                            ]}
-                            onChange={(data, dataString) => {
-                                this.setState({ releaseDate: dataString });
-                            }}
-                        />
-                    </div>
-                    <Button
-                        type="primary"
-                        style={{ marginLeft: "10px", marginRight: 10 }}
-                        onClick={()=>{
-                            this.loadData();
-                        }}
-                    >
-                        搜索
-                    </Button>
-                    <Button onClick={this.reset}>重置</Button>
-                </div>
+                <Tabs
+                    defaultActiveKey="1"
+                    className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search" style={{display:'flex',alignItems:'center'}}>
+                            <div>
+                                <Select
+                                    placeholder="请选择部门"
+                                    style={{ width:200,marginLeft:10}}
+                                    value={this.state.superId}
+                                    onChange={(e) => { this.setState({ superId: e }) }}
+                                    notFoundContent="未获取到上级组织列表">
+                                    {this.state.contactsOption}
+                                </Select>
+                            </div>
+                            <Input
+                                placeholder="客户名称"
+                                value={this.state.nameSearch}
+                                style={{ width: 150, marginRight: 10, marginLeft: 10 }}
+                                onChange={(e) => {
+                                    this.setState({ nameSearch: e.target.value });
+                                }}
+                            />
+                            <div style={{
+                                marginTop: '10px',
+                            }}>
+                                <RangePicker
+                                    value={[
+                                        this.state.releaseDate[0]
+                                            ? moment(this.state.releaseDate[0])
+                                            : null,
+                                        this.state.releaseDate[1]
+                                            ? moment(this.state.releaseDate[1])
+                                            : null,
+                                    ]}
+                                    onChange={(data, dataString) => {
+                                        this.setState({ releaseDate: dataString });
+                                    }}
+                                />
+                            </div>
+                            <Button
+                                type="primary"
+                                style={{ marginLeft: "10px", marginRight: 10 }}
+                                onClick={()=>{
+                                    this.loadData();
+                                }}
+                            >
+                                搜索
+                            </Button>
+                            <Button onClick={this.reset}>重置</Button>
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table
-                            columns={this.state.columns}
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
                             dataSource={this.state.dataSource}
                             pagination={false}
                         />

+ 62 - 27
js/component/manageCenter/customer/statistics/followStatistics.jsx

@@ -6,6 +6,7 @@ import { Button, Select, Table, Spin, message, Tabs, DatePicker } from 'antd';
 const TabPane = Tabs.TabPane;
 import moment from 'moment';
 import { intentionalService,newFollow } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const FollowStatistics = React.createClass({
 	loadData(pageNo, nub) {
@@ -220,6 +221,19 @@ const FollowStatistics = React.createClass({
 		this.state.followSearch=undefined;
 		this.loadData(1, this.state.callnub);
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	componentWillMount() {
 		this.loadData();
 		this.departmentList()
@@ -229,32 +243,49 @@ const FollowStatistics = React.createClass({
 		let departmentArr = this.state.departmentArr || [];
 		return <div className="visitContant">
 					<div className="visitTitle">
-						<span className="titleTime">起止时间</span>
-						<RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                        <span style={{marginRight:'15px',marginLeft:'15px'}}>业务类型:</span>
-                        <Select placeholder="业务类型" value={this.state.followSearch} onChange={(e) => {
-								        this.setState({followSearch:e})}} style={{width:'150px'}}>
-	                      {
-	                        intentionalService.map(function (item) {
-	                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-	                        })
-	                      }
-                        </Select> 
-                        <span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
-                        <Select placeholder="选择部门" style={{width:'150px'}}
-                            value={this.state.departmentt}
-                            onChange={(e) => { this.setState({ departmentt: e }) }}>
-                            {
-                                departmentArr.map(function (item) {
-                                        return <Select.Option key={item.depNo} >{item.name}</Select.Option>
-                                })
-                            }
-	                    </Select>
-                        <Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
-                        <Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>
+						<Tabs defaultActiveKey="1" className="test">
+							<TabPane tab="搜索" key="1">
+								<div className="user-search" style={{paddingTop:'11px'}}>
+									<span className="titleTime">起止时间</span>
+									<RangePicker
+										value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+											this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+										onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+									<span style={{marginRight:'15px',marginLeft:'15px'}}>业务类型:</span>
+									<Select placeholder="业务类型" value={this.state.followSearch} onChange={(e) => {
+										this.setState({followSearch:e})}} style={{width:'150px'}}>
+										{
+											intentionalService.map(function (item) {
+												return <Select.Option key={item.value} >{item.key}</Select.Option>
+											})
+										}
+									</Select>
+									<span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
+									<Select placeholder="选择部门" style={{width:'150px'}}
+											value={this.state.departmentt}
+											onChange={(e) => { this.setState({ departmentt: e }) }}>
+										{
+											departmentArr.map(function (item) {
+												return <Select.Option key={item.depNo} >{item.name}</Select.Option>
+											})
+										}
+									</Select>
+									<Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
+									<Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>
+								</div>
+							</TabPane>
+							<TabPane tab="更改表格显示数据" key="2">
+								<div style={{ marginLeft: 10 }}>
+									<ChooseList
+										columns={this.state.columns}
+										changeFn={this.changeList}
+										changeList={this.state.changeList}
+										top={55}
+										margin={11}
+									/>
+								</div>
+							</TabPane>
+						</Tabs>
                         
 						<div className="clearfix" style={{marginTop:'30px',marginLeft:'20px'}}>
 						    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub}>
@@ -270,7 +301,11 @@ const FollowStatistics = React.createClass({
 							<div className="maintitle">业务跟进进度情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={this.state.columns}
+			                        <Table columns={
+										this.state.changeList
+											? this.state.changeList
+											: this.state.columns
+										}
 			                            dataSource={this.state.dataSource}
 			                            pagination={this.state.pagination}
 			                            onRowClick={this.tableRowClick} />

+ 62 - 27
js/component/manageCenter/customer/statistics/statusStatistics.jsx

@@ -6,6 +6,7 @@ import { Button, Select, Table, Spin, message, Tabs, DatePicker } from 'antd';
 const TabPane = Tabs.TabPane;
 import moment from 'moment';
 import { intentionalService } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const StatusStatistics = React.createClass({
 	loadData(pageNo, nub) {
@@ -216,37 +217,67 @@ const StatusStatistics = React.createClass({
 		this.loadData();
 		this.departmentList()
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const { RangePicker } = DatePicker;
 		let departmentArr = this.state.departmentArr || [];
 		return <div className="visitContant">
 					<div className="visitTitle">
-						<span className="titleTime">起止时间</span>
-						<RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-                        <span style={{marginRight:'15px',marginLeft:'15px'}}>业务类型:</span>
-                        <Select placeholder="业务品种" value={this.state.intentionalSearch} onChange={(e) => {
-								        this.setState({intentionalSearch:e})}} style={{width:'150px'}}>
-	                      {
-	                        intentionalService.map(function (item) {
-	                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-	                        })
-	                      }
-                        </Select> 
-                        <span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
-                        <Select placeholder="选择部门" style={{width:'150px'}}
-                            value={this.state.departmentt}
-                            onChange={(e) => { this.setState({ departmentt: e }) }}>
-                            {
-                                departmentArr.map(function (item) {
-                                        return <Select.Option key={item.depNo} >{item.name}</Select.Option>
-                                })
-                            }
-	                    </Select>
-                        <Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
-                        <Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>
+						<Tabs defaultActiveKey="1" className="test">
+							<TabPane tab="搜索" key="1">
+								<div className="user-search" style={{paddingTop:'11px'}}>
+									<span className="titleTime">起止时间</span>
+									<RangePicker
+										value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+											this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+										onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+									<span style={{marginRight:'15px',marginLeft:'15px'}}>业务类型:</span>
+									<Select placeholder="业务品种" value={this.state.intentionalSearch} onChange={(e) => {
+										this.setState({intentionalSearch:e})}} style={{width:'150px'}}>
+										{
+											intentionalService.map(function (item) {
+												return <Select.Option key={item.value} >{item.key}</Select.Option>
+											})
+										}
+									</Select>
+									<span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
+									<Select placeholder="选择部门" style={{width:'150px'}}
+											value={this.state.departmentt}
+											onChange={(e) => { this.setState({ departmentt: e }) }}>
+										{
+											departmentArr.map(function (item) {
+												return <Select.Option key={item.depNo} >{item.name}</Select.Option>
+											})
+										}
+									</Select>
+									<Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
+									<Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>
+								</div>
+							</TabPane>
+							<TabPane tab="更改表格显示数据" key="2">
+								<div style={{ marginLeft: 10 }}>
+									<ChooseList
+										columns={this.state.columns}
+										changeFn={this.changeList}
+										changeList={this.state.changeList}
+										top={55}
+										margin={11}
+									/>
+								</div>
+							</TabPane>
+						</Tabs>
                         
 						<div className="clearfix" style={{marginTop:'30px',marginLeft:'20px'}}>
 						    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub}>
@@ -262,7 +293,11 @@ const StatusStatistics = React.createClass({
 							<div className="maintitle">业务客户状态情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={this.state.columns}
+			                        <Table columns={
+										this.state.changeList
+											? this.state.changeList
+											: this.state.columns
+										}
 			                            dataSource={this.state.dataSource}
 			                            pagination={this.state.pagination}
 			                            onRowClick={this.tableRowClick} />

+ 57 - 18
js/component/manageCenter/customer/statistics/visitStatistics.jsx

@@ -6,6 +6,7 @@ import { Button, Table, Spin, message, Tabs, DatePicker, Select } from 'antd';
 var intentionalService = [];
 const TabPane = Tabs.TabPane;
 import moment from 'moment';
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const VisitStatistics = React.createClass({
 	loadData(pageNo, nub) {
@@ -222,28 +223,62 @@ const VisitStatistics = React.createClass({
 		this.loadData();
 		this.departmentList()
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const { RangePicker } = DatePicker;
 		let departmentArr = this.state.departmentArr || [];
 		return <div className="visitContant">
 					<div className="visitTitle">
-						<span className="titleTime">起止时间</span>
-						<RangePicker
-                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-						<span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
-						<Select placeholder="选择部门" style={{width:'150px'}}
-                            value={this.state.departmentt}
-                            onChange={(e) => { this.setState({ departmentt: e }) }}>
-                            {
-                                departmentArr.map(function (item) {
-                                        return <Select.Option key={item.depNo} >{item.name}</Select.Option>
-                                })
-                            }
-	                    </Select>
-                            <Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
-                            <Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>   
+						<Tabs
+							defaultActiveKey="1"
+							onChange={this.callback}
+							className="test"
+						>
+							<TabPane tab="搜索" key="1">
+								<div className="user-search" style={{paddingTop:'11px'}}>
+									<span className="titleTime">起止时间</span>
+									<RangePicker
+										value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+											this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+										onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+									<span style={{marginRight:'15px',marginLeft:'15px'}}>部门:</span>
+									<Select placeholder="选择部门" style={{width:'150px'}}
+											value={this.state.departmentt}
+											onChange={(e) => { this.setState({ departmentt: e }) }}>
+										{
+											departmentArr.map(function (item) {
+												return <Select.Option key={item.depNo} >{item.name}</Select.Option>
+											})
+										}
+									</Select>
+									<Button  onClick={this.search} className="blue" style={{background:'red',color:'#ffffff',border:'none'}}>统计</Button>
+									<Button  onClick={this.reset} className="green" style={{background:'green',color:'#ffffff',border:'none'}}>重置</Button>
+								</div>
+							</TabPane>
+							<TabPane tab="更改表格显示数据" key="2">
+								<div style={{ marginLeft: 10 }}>
+									<ChooseList
+										columns={this.state.columns}
+										changeFn={this.changeList}
+										changeList={this.state.changeList}
+										top={55}
+										margin={11}
+									/>
+								</div>
+							</TabPane>
+						</Tabs>
 						<div className="clearfix" style={{marginTop:'30px',marginLeft:'20px'}}>
 						    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} >
 						         <TabPane tab="所有客户拜访统计" key="1"></TabPane>
@@ -258,7 +293,11 @@ const VisitStatistics = React.createClass({
 							<div className="maintitle">客户拜访情况统计表</div>
 							<div className="patent-table">
 			                    <Spin spinning={this.state.loading}>
-			                        <Table columns={this.state.columns}
+			                        <Table columns={
+										this.state.changeList
+											? this.state.changeList
+											: this.state.columns
+										}
 			                            dataSource={this.state.dataSource}
 			                            pagination={this.state.pagination}
 			                            onRowClick={this.tableRowClick} />

+ 126 - 87
js/component/manageCenter/demand/demandAudit/techDemandAudit.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -7,6 +7,9 @@ import '../techDemand.less';
 import TechDemandDesc from './demandAuditDesc.jsx';
 import { demandTypeList } from '../../../dataDic.js';
 import { companySearch, getDemandType, getSearchUrl, beforeUploadFile ,getboutique,gethot} from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const TechDemandPublish = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -443,6 +446,19 @@ const TechDemandPublish = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -487,95 +503,118 @@ const TechDemandPublish = React.createClass({
                        
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="需求编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="需求名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="需求雇主名称"
-                        value={this.state.employerName}
-                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>                   
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                     <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
-                    <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                <Select placeholder="选择信息来源" style={{ width: 120 }}
-                            value={this.state.infoSources}
-                            onChange={(e) => { this.setState({ infoSources: e }) }}>
-                            <Select.Option value="0" >平台采集</Select.Option>
-                            <Select.Option value="1" >客户发布</Select.Option>
-                            <Select.Option value="2" >批量导入</Select.Option>
-                            <Select.Option value="3" >三方对接</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类型"
-                            style={{ width: 120 }}
-                            value={this.state.demandType}
-                            onChange={(e) => { this.setState({ demandType: e }) }}>
-                            {this.state.demandTypeOption}
-                        </Select>
-                        <Select placeholder="选择需求状态" style={{ width: 120 }}
-                            value={this.state.status}
-                            onChange={(e) => { this.setState({ status: e }) }}>
-                            <Select.Option value="0" >进行中</Select.Option>
-                            <Select.Option value="1" >未解决</Select.Option>
-                            <Select.Option value="2" >已解决</Select.Option>
-                        </Select>
-                        <Select placeholder="选择审核状态" style={{ width: 160 }}
-                            value={this.state.auditStatus}
-                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                            <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                            <Select.Option value="1" >提交审核</Select.Option>
-                            <Select.Option value="2" >审核中</Select.Option>
-                            <Select.Option value="3" >审核通过</Select.Option>
-                            <Select.Option value="4" >审核未通过</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类别" style={{ width: 120 }}
-                            value={this.state.dataCategory}
-                            onChange={(e) => { this.setState({ dataCategory: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{ marginTop: '10px' }}>
-	                        <span style={{ marginLeft: '10px' }}>有效期限 : </span>
-	                        <RangePicker
-	                            value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
-	                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>发布时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-	                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>录入时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-	                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                <Tabs
+                    defaultActiveKey="1"
+                    onChange={this.callback}
+                    className="test"
+                >
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="需求编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="需求名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="需求雇主名称"
+                                   value={this.state.employerName}
+                                   onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button type='primary' onClick={this.examineOK} disabled={!hasSelected} style={{"display":"none"}}>审核通过</Button>
+                            <Button type='primary' onClick={this.examineCancel} disabled={!hasSelected} style={{"display":"none"}}>审核不通过</Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+                                <Select placeholder="选择信息来源" style={{ width: 120 }}
+                                        value={this.state.infoSources}
+                                        onChange={(e) => { this.setState({ infoSources: e }) }}>
+                                    <Select.Option value="0" >平台采集</Select.Option>
+                                    <Select.Option value="1" >客户发布</Select.Option>
+                                    <Select.Option value="2" >批量导入</Select.Option>
+                                    <Select.Option value="3" >三方对接</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类型"
+                                        style={{ width: 120 }}
+                                        value={this.state.demandType}
+                                        onChange={(e) => { this.setState({ demandType: e }) }}>
+                                    {this.state.demandTypeOption}
+                                </Select>
+                                <Select placeholder="选择需求状态" style={{ width: 120 }}
+                                        value={this.state.status}
+                                        onChange={(e) => { this.setState({ status: e }) }}>
+                                    <Select.Option value="0" >进行中</Select.Option>
+                                    <Select.Option value="1" >未解决</Select.Option>
+                                    <Select.Option value="2" >已解决</Select.Option>
+                                </Select>
+                                <Select placeholder="选择审核状态" style={{ width: 160 }}
+                                        value={this.state.auditStatus}
+                                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
+                                    <Select.Option value="0" >未提交审核(草稿)</Select.Option>
+                                    <Select.Option value="1" >提交审核</Select.Option>
+                                    <Select.Option value="2" >审核中</Select.Option>
+                                    <Select.Option value="3" >审核通过</Select.Option>
+                                    <Select.Option value="4" >审核未通过</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类别" style={{ width: 120 }}
+                                        value={this.state.dataCategory}
+                                        onChange={(e) => { this.setState({ dataCategory: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{ marginTop: '10px' }}>
+                                    <span style={{ marginLeft: '10px' }}>有效期限 : </span>
+                                    <RangePicker
+                                        value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
+                                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>发布时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>录入时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                            }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 148 - 98
js/component/manageCenter/demand/myTechDemand.jsx

@@ -1,5 +1,20 @@
 import React from 'react';
-import {Form, Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {
+    Form,
+    Radio,
+    Icon,
+    Button,
+    Input,
+    Select,
+    Spin,
+    Table,
+    Switch,
+    message,
+    DatePicker,
+    Modal,
+    Upload,
+    Tabs
+} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -8,6 +23,9 @@ import TechDemandDesc from './techDemandDesc.jsx';
 import { demandTypeList } from '../../dataDic.js';
 import { companySearch, getDemandType, getSearchUrl, beforeUploadFile ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const DemandList = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -1025,6 +1043,19 @@ const DemandList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -1080,106 +1111,125 @@ const DemandList = React.createClass({
                         <BatchImport closeDesc={this.closeDesc} />
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="需求编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="需求名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="需求雇主名称"
-                        value={this.state.employerName}
-                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>                   
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    <Button type="primary"
-                        disabled={!hasSelected}
-                        onClick={this.mate}>匹配跟进<Icon type="minus" /></Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                
-                        <Select placeholder="选择信息来源" style={{ width: 120 }}
-                            value={this.state.infoSources}
-                            onChange={(e) => { this.setState({ infoSources: e }) }}>
-                            <Select.Option value="0" >平台采集</Select.Option>
-                            <Select.Option value="1" >客户发布</Select.Option>
-                            <Select.Option value="2" >批量导入</Select.Option>
-                            <Select.Option value="3" >三方对接</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类型"
-                            style={{ width: 120 }}
-                            value={this.state.demandType}
-                            onChange={(e) => { this.setState({ demandType: e }) }}>
-                            {this.state.demandTypeOption}
-                        </Select>
-                        <Select placeholder="选择需求状态" style={{ width: 120 }}
-                            value={this.state.status}
-                            onChange={(e) => { this.setState({ status: e }) }}>
-                            <Select.Option value="0" >进行中</Select.Option>
-                            <Select.Option value="1" >未解决</Select.Option>
-                            <Select.Option value="2" >已解决</Select.Option>
-                        </Select>
-                        <Select placeholder="选择审核状态" style={{ width: 160 }}
-                            value={this.state.auditStatus}
-                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                            <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                            <Select.Option value="1" >提交审核</Select.Option>
-                            <Select.Option value="2" >审核中</Select.Option>
-                            <Select.Option value="3" >审核通过</Select.Option>
-                            <Select.Option value="4" >审核未通过</Select.Option>
-                        </Select>
-                        <Select placeholder="选择是否发布" style={{ width: 120 }}
-                            value={this.state.releaseStatus}
-                            onChange={(e) => { this.setState({ releaseStatus: e }) }}>
-                            <Select.Option value="0" >未发布</Select.Option>
-                            <Select.Option value="1" >已发布</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类别" style={{ width: 120 }}
-                            value={this.state.dataCategory}
-                            onChange={(e) => { this.setState({ dataCategory: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{ marginTop: '10px' }}>
-	                        <span style={{ marginLeft: '10px' }}>有效期限 : </span>
-	                        <RangePicker
-	                            value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
-	                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>发布时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-	                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>录入时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-	                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                <Tabs defaultActiveKey="1" className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="需求编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="需求名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="需求雇主名称"
+                                   value={this.state.employerName}
+                                   onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                                    disabled={!hasSelected}
+                                    onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                            <Button type="primary"
+                                    disabled={!hasSelected}
+                                    onClick={this.mate}>匹配跟进<Icon type="minus" /></Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+
+                                <Select placeholder="选择信息来源" style={{ width: 120 }}
+                                        value={this.state.infoSources}
+                                        onChange={(e) => { this.setState({ infoSources: e }) }}>
+                                    <Select.Option value="0" >平台采集</Select.Option>
+                                    <Select.Option value="1" >客户发布</Select.Option>
+                                    <Select.Option value="2" >批量导入</Select.Option>
+                                    <Select.Option value="3" >三方对接</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类型"
+                                        style={{ width: 120 }}
+                                        value={this.state.demandType}
+                                        onChange={(e) => { this.setState({ demandType: e }) }}>
+                                    {this.state.demandTypeOption}
+                                </Select>
+                                <Select placeholder="选择需求状态" style={{ width: 120 }}
+                                        value={this.state.status}
+                                        onChange={(e) => { this.setState({ status: e }) }}>
+                                    <Select.Option value="0" >进行中</Select.Option>
+                                    <Select.Option value="1" >未解决</Select.Option>
+                                    <Select.Option value="2" >已解决</Select.Option>
+                                </Select>
+                                <Select placeholder="选择审核状态" style={{ width: 160 }}
+                                        value={this.state.auditStatus}
+                                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
+                                    <Select.Option value="0" >未提交审核(草稿)</Select.Option>
+                                    <Select.Option value="1" >提交审核</Select.Option>
+                                    <Select.Option value="2" >审核中</Select.Option>
+                                    <Select.Option value="3" >审核通过</Select.Option>
+                                    <Select.Option value="4" >审核未通过</Select.Option>
+                                </Select>
+                                <Select placeholder="选择是否发布" style={{ width: 120 }}
+                                        value={this.state.releaseStatus}
+                                        onChange={(e) => { this.setState({ releaseStatus: e }) }}>
+                                    <Select.Option value="0" >未发布</Select.Option>
+                                    <Select.Option value="1" >已发布</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类别" style={{ width: 120 }}
+                                        value={this.state.dataCategory}
+                                        onChange={(e) => { this.setState({ dataCategory: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{ marginTop: '10px' }}>
+                                    <span style={{ marginLeft: '10px' }}>有效期限 : </span>
+                                    <RangePicker
+                                        value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
+                                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>发布时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>录入时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                        }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 94 - 42
js/component/manageCenter/demand/releaseDemand.jsx

@@ -3,9 +3,29 @@ import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import './content.less';
-import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete } from 'antd';
+import {
+    Form,
+    Radio,
+    Icon,
+    Button,
+    Input,
+    Select,
+    Spin,
+    Table,
+    Switch,
+    message,
+    DatePicker,
+    Modal,
+    Upload,
+    Popconfirm,
+    AutoComplete,
+    Tabs
+} from 'antd';
 import {patternOrganization,conditionOrganization,client,stick} from '../../dataDic.js';
 import {getPattern,getAchievementCategory,getboutique,getClient,getStick} from '../../tools.js';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const Organization=Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -711,6 +731,19 @@ const Organization=Form.create()(React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item
         const rowSelection = {
@@ -755,49 +788,68 @@ const Organization=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-	                <div className="user-search">
-	                    <Input placeholder="需求名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
-	                        value={this.state.name}
-	                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-	                    <Input placeholder="需求雇主名称"
-	                        value={this.state.employerName}
-	                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
-	                    <Select placeholder="发布子平台"
-                            style={{ width:'200px',marginRight:'10px' }}
-                            value={this.state.superId}
-                            onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
-                            {this.state.contactsOption}
-		                </Select>
-		                <Select placeholder="发布客户端"
-                            style={{width:'150px',marginRight:'20px'}}
-                            value={this.state.publishClient}
-                            onChange={(e) => { this.setState({ publishClient: e }) }}>
-                            <Select.Option value="0" >网站</Select.Option>
-                            <Select.Option value="1" >APP</Select.Option>
-		                </Select>
-	                    <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
-	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-                        <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-	                    <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
-	                    	<Select placeholder="发布页面"
-	                            style={{ width:'200px',marginRight:'10px' }}
-	                            value={this.state.publishPage}
-	                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
-	                            {this.state.contactsOptions}
-			                </Select>
-			                <Select placeholder="是否置顶"
-	                            style={{width:'150px',marginRight:'50px'}}
-	                            value={this.state.ifTop}
-	                            onChange={(e) => { this.setState({ ifTop: e }) }}>
-	                            <Select.Option value="0" >置顶</Select.Option>
-	                            <Select.Option value="1" >不置顶</Select.Option>
-			                </Select>
-		                </div>
-	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布需求<Icon type="plus" /></Button>
-	                </div>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search">
+                                <Input placeholder="需求名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
+                                       value={this.state.name}
+                                       onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                                <Input placeholder="需求雇主名称"
+                                       value={this.state.employerName}
+                                       onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
+                                <Select placeholder="发布子平台"
+                                        style={{ width:'200px',marginRight:'10px' }}
+                                        value={this.state.superId}
+                                        onChange={(e) => { this.setState({ superId: e }) }} notFoundContent="未获取到上级组织列表">
+                                    {this.state.contactsOption}
+                                </Select>
+                                <Select placeholder="发布客户端"
+                                        style={{width:'150px',marginRight:'20px'}}
+                                        value={this.state.publishClient}
+                                        onChange={(e) => { this.setState({ publishClient: e }) }}>
+                                    <Select.Option value="0" >网站</Select.Option>
+                                    <Select.Option value="1" >APP</Select.Option>
+                                </Select>
+                                <Button type="primary" onClick={this.search} style={{marginRight:'10px'}}>搜索</Button>
+                                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
+                                <span style={{marginRight:'20px'}}>更多搜索    <Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                                <div  style={this.state.searchMore ? { display: 'none' } : {display: 'inline-block'}}>
+                                    <Select placeholder="发布页面"
+                                            style={{ width:'200px',marginRight:'10px' }}
+                                            value={this.state.publishPage}
+                                            onChange={(e) => { this.setState({ publishPage: e }) }} notFoundContent="未获取到发布页面">
+                                        {this.state.contactsOptions}
+                                    </Select>
+                                    <Select placeholder="是否置顶"
+                                            style={{width:'150px',marginRight:'50px'}}
+                                            value={this.state.ifTop}
+                                            onChange={(e) => { this.setState({ ifTop: e }) }}>
+                                        <Select.Option value="0" >置顶</Select.Option>
+                                        <Select.Option value="1" >不置顶</Select.Option>
+                                    </Select>
+                                </div>
+                                <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px'}}>发布需求<Icon type="plus" /></Button>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 72 - 36
js/component/manageCenter/demand/sichuan/sichuan.jsx

@@ -15,7 +15,7 @@ import {
 	Modal,
 	Row,
 	Col,
-	InputNumber,
+	InputNumber, Tabs,
 } from 'antd';
 import { citySelect, provinceList ,areaSelect} from '@/NewDicProvinceList';
 import {demandProfile} from '../../../dataDic.js';
@@ -25,9 +25,12 @@ import $ from 'jquery/src/ajax';
 import 'antd/dist/antd.css';
 const FormItem = Form.Item;
 import './sichuan.css';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const { TextArea } = Input;
 const CheckboxGroup = Checkbox.Group;
 
+const TabPane = Tabs.TabPane;
+
 class Achievement extends React.Component {
 	loadData(pageNo) {
 		this.setState({
@@ -142,6 +145,7 @@ class Achievement extends React.Component {
 				}
 			]
 		};
+		this.changeList = this.changeList.bind(this);
 	}
 	
 	
@@ -353,6 +357,19 @@ class Achievement extends React.Component {
 	componentWillMount() {
 		this.loadData(1);
 	}
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	}
 	render() {
 		const url="https://api.qrserver.com/v1/create-qr-code/?data=http://"+window.location.host+"/open/demandDetails?id="+this.state.id+"&size=100x100"
 		const rowSelection = {
@@ -378,44 +395,63 @@ class Achievement extends React.Component {
 						</Button>
 					</div>
 				</div>
-				<div className="user-search">
-					<Input
-						placeholder="需求名称"
-						value={this.state.seachNames}
-						className="searchInp"
-						onChange={(e) => {
-							this.setState({ seachNames: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Input
-						placeholder="企业名称"
-						value={this.state.seachName}
-						className="searchInp"
-						onChange={(e) => {
-							this.setState({ seachName: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Input
-						placeholder="对接单位"
-						value={this.state.seachReserveButtUnit}
-						onChange={(e) => {
-							this.setState({ seachReserveButtUnit: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Button type="primary" onClick={this.search.bind(this)} className="interval">
-						搜索
-					</Button>
-					<Button onClick={this.reset.bind(this)} className="interval">
-						重置
-					</Button>
-				</div>
+				<Tabs defaultActiveKey="1" className="test">
+					<TabPane tab="搜索" key="1">
+						<div className="user-search">
+							<Input
+								placeholder="需求名称"
+								value={this.state.seachNames}
+								className="searchInp"
+								onChange={(e) => {
+									this.setState({ seachNames: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Input
+								placeholder="企业名称"
+								value={this.state.seachName}
+								className="searchInp"
+								onChange={(e) => {
+									this.setState({ seachName: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Input
+								placeholder="对接单位"
+								value={this.state.seachReserveButtUnit}
+								onChange={(e) => {
+									this.setState({ seachReserveButtUnit: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Button type="primary" onClick={this.search.bind(this)} className="interval">
+								搜索
+							</Button>
+							<Button onClick={this.reset.bind(this)} className="interval">
+								重置
+							</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div className="patent-table">
 					<Spin spinning={this.state.loading}>
 						<Table
-							columns={this.state.columns}
+							columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 							dataSource={this.state.dataSource}
 							rowSelection={rowSelection}
 							pagination={this.state.pagination}

+ 59 - 19
js/component/manageCenter/demand/sichuan/sichuanman.jsx

@@ -15,7 +15,7 @@ import {
 	Modal,
 	Row,
 	Col,
-	InputNumber,
+	InputNumber, Tabs,
 } from 'antd';
 import { citySelect, provinceList ,areaSelect} from '@/NewDicProvinceList';
 import {demandProfile} from '../../../dataDic.js';
@@ -25,9 +25,12 @@ import $ from 'jquery/src/ajax';
 import 'antd/dist/antd.css';
 const FormItem = Form.Item;
 import './sichuan.css';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const { TextArea } = Input;
 const CheckboxGroup = Checkbox.Group;
 
+const TabPane = Tabs.TabPane;
+
 class Achievement extends React.Component {
 	loadData(pageNo) {
 		this.setState({
@@ -136,6 +139,7 @@ class Achievement extends React.Component {
 				}
 			]
 		};
+		this.changeList = this.changeList.bind(this);
 	}
 	
 	
@@ -331,6 +335,19 @@ class Achievement extends React.Component {
         this.state.investmentCost= ''//经费投入
         
 	}
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	}
 	render() {
 		const url="https://api.qrserver.com/v1/create-qr-code/?data=http://"+window.location.host+"/open/demandDetails?id="+this.state.id+"&size=100x100"
 		const rowSelection = {
@@ -356,27 +373,50 @@ class Achievement extends React.Component {
 						</Button>
 					</div>
 				</div>
-				<div className="user-search">
-					<Input
-						placeholder="企业名称"
-						value={this.state.seachOrgName}
-						className="searchInp"
-						onChange={(e) => {
-							this.setState({ seachOrgName: e.target.value });
-						}}
-						style={{ width: 120 }}
-					/>
-					<Button type="primary" onClick={this.search.bind(this)} className="interval">
-						搜索
-					</Button>
-					<Button onClick={this.reset.bind(this)} className="interval">
-						重置
-					</Button>
-				</div>
+				<Tabs
+					defaultActiveKey="1"
+					onChange={this.callback}
+					className="test"
+				>
+					<TabPane tab="搜索" key="1">
+						<div className="user-search">
+							<Input
+								placeholder="企业名称"
+								value={this.state.seachOrgName}
+								className="searchInp"
+								onChange={(e) => {
+									this.setState({ seachOrgName: e.target.value });
+								}}
+								style={{ width: 120 }}
+							/>
+							<Button type="primary" onClick={this.search.bind(this)} className="interval">
+								搜索
+							</Button>
+							<Button onClick={this.reset.bind(this)} className="interval">
+								重置
+							</Button>
+						</div>
+					</TabPane>
+					<TabPane tab="更改表格显示数据" key="2">
+						<div style={{ marginLeft: 10 }}>
+							<ChooseList
+								columns={this.state.columns}
+								changeFn={this.changeList}
+								changeList={this.state.changeList}
+								top={55}
+								margin={11}
+							/>
+						</div>
+					</TabPane>
+				</Tabs>
 				<div className="patent-table">
 					<Spin spinning={this.state.loading}>
 						<Table
-							columns={this.state.columns}
+							columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+							}
 							dataSource={this.state.dataSource}
 							rowSelection={rowSelection}
 							pagination={this.state.pagination}

+ 136 - 97
js/component/manageCenter/demand/techDemand.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload, Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
@@ -8,6 +8,9 @@ import TechDemandDesc from './techDemandDesc.jsx';
 import { demandTypeList } from '../../dataDic.js';
 import { companySearch, getDemandType, getSearchUrl, beforeUploadFile ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const DemandList = React.createClass({
     loadData(pageNo, apiUrl) {
@@ -410,6 +413,19 @@ const DemandList = React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -454,105 +470,128 @@ const DemandList = React.createClass({
                        
                     </div>
                 </div>
-                <div className="user-search">
-                    <Input placeholder="需求编号"
-                        value={this.state.serialNumber}
-                        onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
-                    <Input placeholder="需求名称"
-                        value={this.state.name}
-                        onChange={(e) => { this.setState({ name: e.target.value }); }} />
-                    <Input placeholder="关键字"
-                        value={this.state.keyword}
-                        onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
-                    <Input placeholder="录入人名称"
-                        value={this.state.recordPerson}
-                        onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
-                    <Input placeholder="需求雇主名称"
-                        value={this.state.employerName}
-                        onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
-                    <Radio.Group value={this.state.searchType} onChange={(e) => {
-                        this.setState({ searchType: e.target.value })
-                    }}>
-                        <Radio value={0}>认证用户</Radio>
-                        <Radio value={1}>非认证用户</Radio>
-                    </Radio.Group>                   
-                    <Button type="primary" onClick={this.search}>搜索</Button>
-                    <Button onClick={this.reset}>重置</Button>
-                    <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
-                        disabled={!hasSelected}
-                        onClick={this.delectRow}>删除<Icon type="minus" /></Button>
-                    <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
-                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-                    	<Radio.Group value={this.state.boutique} onChange={(e) => {
-		                    this.setState({ boutique: e.target.value })
-		                    }}>
-		                        <Radio value={1}>精品</Radio>
-		                        <Radio value={0}>非精品</Radio>
-		                </Radio.Group>
-		                <Select placeholder="选择信息来源" style={{ width: 120 }}
-                            value={this.state.infoSources}
-                            onChange={(e) => { this.setState({ infoSources: e }) }}>
-                            <Select.Option value="0" >平台采集</Select.Option>
-                            <Select.Option value="1" >客户发布</Select.Option>
-                            <Select.Option value="2" >批量导入</Select.Option>
-                            <Select.Option value="3" >三方对接</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类型"
-                            style={{ width: 120 }}
-                            value={this.state.demandType}
-                            onChange={(e) => { this.setState({ demandType: e }) }}>
-                            {this.state.demandTypeOption}
-                        </Select>
-                        <Select placeholder="选择需求状态" style={{ width: 120 }}
-                            value={this.state.status}
-                            onChange={(e) => { this.setState({ status: e }) }}>
-                            <Select.Option value="0" >进行中</Select.Option>
-                            <Select.Option value="1" >未解决</Select.Option>
-                            <Select.Option value="2" >已解决</Select.Option>
-                        </Select>
-                        <Select placeholder="选择审核状态" style={{ width: 160 }}
-                            value={this.state.auditStatus}
-                            onChange={(e) => { this.setState({ auditStatus: e }) }}>
-                            <Select.Option value="0" >未提交审核(草稿)</Select.Option>
-                            <Select.Option value="1" >提交审核</Select.Option>
-                            <Select.Option value="2" >审核中</Select.Option>
-                            <Select.Option value="3" >审核通过</Select.Option>
-                            <Select.Option value="4" >审核未通过</Select.Option>
-                        </Select>
-                        <Select placeholder="选择是否发布" style={{ width: 120 }}
-                            value={this.state.releaseStatus}
-                            onChange={(e) => { this.setState({ releaseStatus: e }) }}>
-                            <Select.Option value="0" >未发布</Select.Option>
-                            <Select.Option value="1" >已发布</Select.Option>
-                        </Select>
-                        <Select placeholder="选择需求类别" style={{ width: 120 }}
-                            value={this.state.dataCategory}
-                            onChange={(e) => { this.setState({ dataCategory: e }) }}>
-                            <Select.Option value="0" >个人</Select.Option>
-                            <Select.Option value="1" >组织</Select.Option>
-                        </Select>
-                        <div style={{ marginTop: '10px' }}>
-	                        <span style={{ marginLeft: '10px' }}>有效期限 : </span>
-	                        <RangePicker
-	                            value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
-	                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>发布时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-	                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
-	                        <span style={{ marginLeft: '10px' }}>录入时间 : </span>
-	                        <RangePicker
-	                            value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
-	                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
-	                            onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                <Tabs
+                    defaultActiveKey="1"
+                    onChange={this.callback}
+                    className="test"
+                >
+                    <TabPane tab="搜索" key="1">
+                        <div className="user-search">
+                            <Input placeholder="需求编号"
+                                   value={this.state.serialNumber}
+                                   onChange={(e) => { this.setState({ serialNumber: e.target.value }); }} />
+                            <Input placeholder="需求名称"
+                                   value={this.state.name}
+                                   onChange={(e) => { this.setState({ name: e.target.value }); }} />
+                            <Input placeholder="关键字"
+                                   value={this.state.keyword}
+                                   onChange={(e) => { this.setState({ keyword: e.target.value }); }} />
+                            <Input placeholder="录入人名称"
+                                   value={this.state.recordPerson}
+                                   onChange={(e) => { this.setState({ recordPerson: e.target.value }); }} />
+                            <Input placeholder="需求雇主名称"
+                                   value={this.state.employerName}
+                                   onChange={(e) => { this.setState({ employerName: e.target.value }); }} />
+                            <Radio.Group value={this.state.searchType} onChange={(e) => {
+                                this.setState({ searchType: e.target.value })
+                            }}>
+                                <Radio value={0}>认证用户</Radio>
+                                <Radio value={1}>非认证用户</Radio>
+                            </Radio.Group>
+                            <Button type="primary" onClick={this.search}>搜索</Button>
+                            <Button onClick={this.reset}>重置</Button>
+                            <Button style={{ background: "#3fcf9e", border: "none", color: "#fff" }}
+                                    disabled={!hasSelected}
+                                    onClick={this.delectRow}>删除<Icon type="minus" /></Button>
+                            <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
+                            <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+                                <Radio.Group value={this.state.boutique} onChange={(e) => {
+                                    this.setState({ boutique: e.target.value })
+                                }}>
+                                    <Radio value={1}>精品</Radio>
+                                    <Radio value={0}>非精品</Radio>
+                                </Radio.Group>
+                                <Select placeholder="选择信息来源" style={{ width: 120 }}
+                                        value={this.state.infoSources}
+                                        onChange={(e) => { this.setState({ infoSources: e }) }}>
+                                    <Select.Option value="0" >平台采集</Select.Option>
+                                    <Select.Option value="1" >客户发布</Select.Option>
+                                    <Select.Option value="2" >批量导入</Select.Option>
+                                    <Select.Option value="3" >三方对接</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类型"
+                                        style={{ width: 120 }}
+                                        value={this.state.demandType}
+                                        onChange={(e) => { this.setState({ demandType: e }) }}>
+                                    {this.state.demandTypeOption}
+                                </Select>
+                                <Select placeholder="选择需求状态" style={{ width: 120 }}
+                                        value={this.state.status}
+                                        onChange={(e) => { this.setState({ status: e }) }}>
+                                    <Select.Option value="0" >进行中</Select.Option>
+                                    <Select.Option value="1" >未解决</Select.Option>
+                                    <Select.Option value="2" >已解决</Select.Option>
+                                </Select>
+                                <Select placeholder="选择审核状态" style={{ width: 160 }}
+                                        value={this.state.auditStatus}
+                                        onChange={(e) => { this.setState({ auditStatus: e }) }}>
+                                    <Select.Option value="0" >未提交审核(草稿)</Select.Option>
+                                    <Select.Option value="1" >提交审核</Select.Option>
+                                    <Select.Option value="2" >审核中</Select.Option>
+                                    <Select.Option value="3" >审核通过</Select.Option>
+                                    <Select.Option value="4" >审核未通过</Select.Option>
+                                </Select>
+                                <Select placeholder="选择是否发布" style={{ width: 120 }}
+                                        value={this.state.releaseStatus}
+                                        onChange={(e) => { this.setState({ releaseStatus: e }) }}>
+                                    <Select.Option value="0" >未发布</Select.Option>
+                                    <Select.Option value="1" >已发布</Select.Option>
+                                </Select>
+                                <Select placeholder="选择需求类别" style={{ width: 120 }}
+                                        value={this.state.dataCategory}
+                                        onChange={(e) => { this.setState({ dataCategory: e }) }}>
+                                    <Select.Option value="0" >个人</Select.Option>
+                                    <Select.Option value="1" >组织</Select.Option>
+                                </Select>
+                                <div style={{ marginTop: '10px' }}>
+                                    <span style={{ marginLeft: '10px' }}>有效期限 : </span>
+                                    <RangePicker
+                                        value={[this.state.validityPeriodDate[0] ? moment(this.state.validityPeriodDate[0]) : null,
+                                            this.state.validityPeriodDate[1] ? moment(this.state.validityPeriodDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ validityPeriodDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>发布时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+                                            this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                                    <span style={{ marginLeft: '10px' }}>录入时间 : </span>
+                                    <RangePicker
+                                        value={[this.state.releaseDateS[0] ? moment(this.state.releaseDateS[0]) : null,
+                                            this.state.releaseDateS[1] ? moment(this.state.releaseDateS[1]) : null]}
+                                        onChange={(data, dataString) => { this.setState({ releaseDateS: dataString }); }} />
+                                </div>
+                            </div>
                         </div>
-                    </div>
-                </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                        }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 32 - 2
js/component/manageCenter/demand/techDemandQuery.jsx

@@ -8,6 +8,7 @@ import TechDemandDesc from './techDemandQueryDesc.jsx';
 import { demandTypeList } from '../../dataDic.js';
 import { companySearch, getDemandType, getSearchUrl, beforeUploadFile ,getboutique,gethot} from '../../tools.js';
 import BatchImport from './batchImport';
+import {ChooseList} from "../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const DemandList = React.createClass({
@@ -405,6 +406,19 @@ const DemandList = React.createClass({
         this.state.releaseDateS = [];
         this.loadData();
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     searchSwitch() {
         this.setState({
             searchMore: !this.state.searchMore
@@ -555,10 +569,26 @@ const DemandList = React.createClass({
                         </div>
                     </div>
                 </div>
-                </TabPane></Tabs>
+                </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
-                        <Table columns={this.state.columns}
+                        <Table columns={
+                            this.state.changeList
+                                ? this.state.changeList
+                                : this.state.columns
+                        }
                             dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             pagination={this.state.pagination}

+ 48 - 15
js/component/manageCenter/operate/messagePush/systemMessage.jsx

@@ -7,6 +7,7 @@ import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '..
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs,Checkbox,Tree,Cascader} from 'antd';
 import {patternOrganization,conditionOrganization,intentionalService,messageType,designatedObjects,socialAttributeS,industry,socialAttribute,industryS,designatedObjectse,auditStatusL} from '../../../dataDic.js';
 import {getPattern,getProvince,getCondition,getcustomerTyp,getSocialAttribute,getDesignated,getCertification,getAuditStatus, getContactType, getfllowSituation,getWhether,getLvl,getCurrentMember,getStatuslist,getMessageType} from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 const TreeNodet = Tree.TreeNode;
 const CheckboxGroup = Checkbox.Group;
@@ -1344,6 +1345,19 @@ const SystemMessage=Form.create()(React.createClass({
     	});
     	this.handleCancel5();
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	let departmentArr = this.state.departmentArr || [];
     	const FormItem = Form.Item
@@ -1389,20 +1403,35 @@ const SystemMessage=Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-	                <div className="user-search">
-	                	<Button type="danger" className="addButton" onClick={this.repairData}>禁用默认账号</Button>
-	                	<Button type="primary" className="addButton" onClick={this.addClick}>创建系统消息<Icon type="plus" /></Button>
-	                	<Button type="primary" onClick={this.bianji} style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px'}} disabled={!hasSelected}>编辑</Button>
-	                	<div style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px',marginTop:'10px'}}>
-		                	<Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
-							     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
-		                   			 disabled={!hasSelected} 
-		                    		 >删除<Icon type="minus" />
-		           			     </Button>
-							</Popconfirm>
-						</div>
-	                </div>
-	                <div className="clearfix" style={{marginTop:'-30px',marginLeft:'20px'}}>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search">
+                                <Button type="danger" className="addButton" onClick={this.repairData}>禁用默认账号</Button>
+                                <Button type="primary" className="addButton" onClick={this.addClick}>创建系统消息<Icon type="plus" /></Button>
+                                <Button type="primary" onClick={this.bianji} style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px'}} disabled={!hasSelected}>编辑</Button>
+                                <div style={!this.state.bianjiMore ? { display: 'none',float:'right',marginRight:'10px'} : {display: 'inline-block',float:'right',marginRight:'10px',marginTop:'10px'}}>
+                                    <Popconfirm title="是否删除?" onConfirm={this.delectRow} okText="是" cancelText="否">
+                                        <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px'}}
+                                                disabled={!hasSelected}
+                                        >删除<Icon type="minus" />
+                                        </Button>
+                                    </Popconfirm>
+                                </div>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
+	                <div className="clearfix" style={{marginLeft:'20px'}}>
 					    <Tabs onChange={this.callback} type="card" activeKey={this.state.callnub} style={{paddingLeft:'15px',paddingRight:'15px',marginRight:'20px'}}>
 					         <TabPane tab="已发送" key="0" ></TabPane>
 							 <TabPane tab="未发送" key="1"></TabPane>
@@ -1410,7 +1439,11 @@ const SystemMessage=Form.create()(React.createClass({
 					</div>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                                }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/order/orderNew/contractJsjl.js

@@ -18,6 +18,7 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "./chooseList";
 
 const contractChange = Form.create()(
   React.createClass({
@@ -1099,6 +1100,19 @@ const contractChange = Form.create()(
         }
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const tabList = this.state.tabList || [];
       const formItemLayout = {
@@ -1123,13 +1137,28 @@ const contractChange = Form.create()(
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="2">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
                   size="small"
                   bordered
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/order/orderNew/contractJsy.js

@@ -18,6 +18,7 @@ import { SearchInput } from "./changeComponent/searchInput.js";
 import OrderDetail from "./changeComponent/orderDetail";
 import ShowModalDiv from "@/showModal.jsx";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "./chooseList";
 const contractChange = Form.create()(
   React.createClass({
     loadData(pageNo) {
@@ -1042,6 +1043,19 @@ const contractChange = Form.create()(
         visible: false
       });
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const tabList = this.state.tabList || [];
       const formItemLayout = {
@@ -1066,13 +1080,28 @@ const contractChange = Form.create()(
                   <SearchInput search={this.search} />
                 </div>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="2">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
                   size="small"
                   bordered
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick}

+ 30 - 1
js/component/manageCenter/project/project/outsourceTaskAssignment.jsx

@@ -17,6 +17,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "../task/resolutionPro";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
 const {TabPane} = Tabs
 const OutsourceTaskAssignment = React.createClass({
@@ -777,6 +778,19 @@ const OutsourceTaskAssignment = React.createClass({
       }.bind(this),
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const expandedRowRender = (e) => {
       const data = e.splitList;
@@ -993,11 +1007,26 @@ const OutsourceTaskAssignment = React.createClass({
                     </div> */}
             </div>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               dataSource={this.state.dataSource}
               expandedRowRender={expandedRowRender}
               // rowSelection={rowSelection}

+ 30 - 1
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -26,6 +26,7 @@ import {
   getprovince,
   getProjectStatus
 } from "@/tools.js";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const { TabPane } = Tabs
 const MyTaskCount = Form.create()(
@@ -974,6 +975,19 @@ const MyTaskCount = Form.create()(
         }.bind(this)
       );
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1152,11 +1166,26 @@ const MyTaskCount = Form.create()(
                   导出工时数据
                 </Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="3">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loading}>
                 <Table
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick.bind(this)}

+ 53 - 18
js/component/manageCenter/project/task/payApplyReject/index.jsx

@@ -13,6 +13,7 @@ import OrderPaymentModal from './component/orderPaymentModal';
 import './index.less';
 import CheckProject from "../../../components/checkProject";
 import PayRecord from "../../../components/checkProject/payRecord";
+import {ChooseList} from "../../../order/orderNew/chooseList";
 
 const { TabPane } = Tabs;
 
@@ -217,6 +218,7 @@ class PayApplyReject extends Component{
             payRecordVisible: false,
             orderPaymentsId: 0,
         }
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -280,33 +282,66 @@ class PayApplyReject extends Component{
         })
     }
 
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
     render() {
         return (
             <div className="user-content">
                 <div className="content-title">
                     <span>付款驳回列表</span>
                 </div>
-                <div style={{paddingTop:'10px'}}>
-                    <FilterColumn
-                        {...this.props}
-                        onSearch={(data)=>{
-                            this.setState({
-                                searchInfor: data
-                            });
-                            this.loadData(1,data);
-                        }}
-                        onResetSearch={()=>{
-                            this.setState({
-                                searchInfor: {}
-                            });
-                            this.loadData();
-                        }}
-                    />
-                </div>
+                <Tabs defaultActiveKey="1" onChange={this.callback} className="test">
+                    <TabPane tab="搜索" key="1">
+                        <div style={{paddingTop:'10px'}}>
+                            <FilterColumn
+                                {...this.props}
+                                onSearch={(data)=>{
+                                    this.setState({
+                                        searchInfor: data
+                                    });
+                                    this.loadData(1,data);
+                                }}
+                                onResetSearch={()=>{
+                                    this.setState({
+                                        searchInfor: {}
+                                    });
+                                    this.loadData();
+                                }}
+                            />
+                        </div>
+                    </TabPane>
+                    <TabPane tab="更改表格显示数据" key="2">
+                        <div style={{ marginLeft: 10 }}>
+                            <ChooseList
+                                columns={this.state.columns}
+                                changeFn={this.changeList}
+                                changeList={this.state.changeList}
+                                top={55}
+                                margin={11}
+                            />
+                        </div>
+                    </TabPane>
+                </Tabs>
                 <div className="patent-table">
                     <Spin spinning={this.state.loading}>
                         <Table
-                            columns={this.state.columns}
+                            columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
                             dataSource={this.state.dataSource}
                             pagination={this.state.pagination}
                             onRowClick={(record)=>{

+ 30 - 1
js/component/manageCenter/project/task/taskAssignment.jsx

@@ -17,6 +17,7 @@ import {
 } from "@/tools";
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionPro from "./resolutionPro"
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
 const {TabPane} = Tabs
 const Task = React.createClass({
@@ -790,6 +791,19 @@ const Task = React.createClass({
       }.bind(this),
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     const expandedRowRender = (e) => {
       const data = e.splitList;
@@ -1002,11 +1016,26 @@ const Task = React.createClass({
                     </div> */}
             </div>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               dataSource={this.state.dataSource}
               expandedRowRender={expandedRowRender}
               // rowSelection={rowSelection}

+ 30 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -16,6 +16,7 @@ import {
 import ShowModalDiv from "@/showModal.jsx";
 import ResolutionDetail from "@/resolutionDetail";
 import OrderRiZi from "@/orderRiZi.jsx";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 
@@ -1001,6 +1002,19 @@ const IntentionCustomer = Form.create()(
       });
       this.rizhi();
     },
+    changeList(arr) {
+      const newArr = [];
+      this.state.columns.forEach(item => {
+        arr.forEach(val => {
+          if (val === item.title) {
+            newArr.push(item);
+          }
+        });
+      });
+      this.setState({
+        changeList: newArr
+      });
+    },
     render() {
       const formItemLayout = {
         labelCol: { span: 8 },
@@ -1177,11 +1191,26 @@ const IntentionCustomer = Form.create()(
                   导出工时数据
                 </Button>
               </TabPane>
+              <TabPane tab="更改表格显示数据" key="3">
+                <div style={{ marginLeft: 10 }}>
+                  <ChooseList
+                      columns={this.state.columns}
+                      changeFn={this.changeList}
+                      changeList={this.state.changeList}
+                      top={55}
+                      margin={11}
+                  />
+                </div>
+              </TabPane>
             </Tabs>
             <div className="patent-table">
               <Spin spinning={this.state.loadingA}>
                 <Table
-                  columns={this.state.columns}
+                  columns={
+                    this.state.changeList
+                        ? this.state.changeList
+                        : this.state.columns
+                  }
                   dataSource={this.state.dataSource}
                   pagination={this.state.pagination}
                   onRowClick={this.tableRowClick.bind(this)}

+ 31 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -34,6 +34,7 @@ const FormItem =Form.Item;
 const {TabPane} = Tabs
 import ShowModalDiv from "@/showModal.jsx";
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const Task = React.createClass({
   loadData(pageNo) {
@@ -975,6 +976,20 @@ const Task = React.createClass({
     });
     this.rizhi();
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
+
   render() {
     const utils = {
       getSatisfaction: function (num) {
@@ -1062,13 +1077,28 @@ const Task = React.createClass({
                     </div> */}
             </div>
           </TabPane>
+          <TabPane tab="更改表格显示数据" key="2">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
         </Tabs>
         <div className="patent-table">
           <Spin spinning={this.state.loading}>
             <Table
               bordered
               size="small"
-              columns={this.state.columns}
+              columns={
+                this.state.changeList
+                    ? this.state.changeList
+                    : this.state.columns
+              }
               dataSource={this.state.dataSource}
               onHeaderRow={(column) => {
                 console.log(column.index);

+ 37 - 8
js/component/manageCenter/set/business/businessCategory.jsx

@@ -8,6 +8,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import {categoryState} from '../../../dataDic.js';
 import {getCategoryState,splitUrl} from '../../../tools.js';
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -657,6 +658,19 @@ const BusinessCategory=Form.create()(React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item
         const rowSelection = {
@@ -729,18 +743,33 @@ const BusinessCategory=Form.create()(React.createClass({
 
                     </div>
                  </TabPane>
-                <TabPane tab="新增项目" key="2">
-	                <Button type="primary" className="addButton" onClick={this.addClick} style={{float:'left',marginRight:'200px',marginLeft:10,marginBottom:10}}>新增品类<Icon type="plus" /></Button>
-                    </TabPane>
-                <TabPane tab="品类移动" key="3">    
-                        <Button type="primary" className="addButton" onClick={this.downClick} style={{ float: 'left',marginBottom:10,marginLeft:10 }} disabled={!hasSelected}>品类下移</Button>
-                        <Button type="primary" className="addButton" onClick={this.upClick} style={{ float: 'left',marginBottom:10,marginLeft:10 }} disabled={!hasSelected}>品类上移</Button>
-                </TabPane>
+                        <TabPane tab="新增项目" key="2">
+                            <Button type="primary" className="addButton" onClick={this.addClick} style={{float:'left',marginRight:'200px',marginLeft:10,marginBottom:10}}>新增品类<Icon type="plus" /></Button>
+                            </TabPane>
+                        <TabPane tab="品类移动" key="3">
+                                <Button type="primary" className="addButton" onClick={this.downClick} style={{ float: 'left',marginBottom:10,marginLeft:10 }} disabled={!hasSelected}>品类下移</Button>
+                                <Button type="primary" className="addButton" onClick={this.upClick} style={{ float: 'left',marginBottom:10,marginLeft:10 }} disabled={!hasSelected}>品类上移</Button>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="4">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
 					</Tabs>
                    
                     <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/set/business/businessProject.jsx

@@ -9,6 +9,7 @@ import { Form,Radio, Icon, Button, Input,Tabs, Select, Spin, Table, Switch, mess
 import {categoryState,industry,conditionOrganization,gameState} from '../../../dataDic.js';
 import {getCategoryState,getGameState,splitUrl,getprovince} from '../../../tools.js';
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 //图片组件
 const PicturesWall = React.createClass({
@@ -1074,6 +1075,19 @@ const BusinessProject=Form.create()(React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item
         const rowSelection = {
@@ -1292,11 +1306,26 @@ const BusinessProject=Form.create()(React.createClass({
                     <Icon type="plus" />
                   </Button>
                 </TabPane>
+                <TabPane tab="更改表格显示数据" key="3">
+                  <div style={{ marginLeft: 10 }}>
+                      <ChooseList
+                          columns={this.state.columns}
+                          changeFn={this.changeList}
+                          changeList={this.state.changeList}
+                          top={55}
+                          margin={11}
+                      />
+                  </div>
+                </TabPane>
               </Tabs>
               <div className="patent-table">
                 <Spin spinning={this.state.loading}>
                   <Table
-                    columns={this.state.columns}
+                    columns={
+                      this.state.changeList
+                          ? this.state.changeList
+                          : this.state.columns
+                    }
                     dataSource={this.state.dataSource}
                     rowSelection={rowSelection}
                     pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/set/business/businessQuery.jsx

@@ -9,6 +9,7 @@ import { Form,Radio, Icon, Button, Input,Tabs, Select, Spin, Table, Switch, mess
 import {categoryState,industry,conditionOrganization,gameState} from '../../../dataDic.js';
 import {getCategoryState,getGameState,splitUrl,getprovince} from '../../../tools.js';
 import ImgList from "../../../common/imgList";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
 //图片组件
 const PicturesWall = React.createClass({
@@ -979,6 +980,19 @@ const BusinessProject=Form.create()(React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item
         const rowSelection = {
@@ -1055,10 +1069,25 @@ const BusinessProject=Form.create()(React.createClass({
 	                    </div>	
 	                </div>
 					</TabPane>
+                        <TabPane tab="更改表格显示数据" key="3">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
 					</Tabs>
 					<div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 31 - 2
js/component/manageCenter/set/organization/organization.jsx

@@ -6,6 +6,7 @@ import '../content.less';
 import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,AutoComplete,Tabs } from 'antd';
 import {patternOrganization,conditionOrganization} from '../../../dataDic.js';
 import {getPattern,getCondition} from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const Organization=Form.create()(React.createClass({
@@ -624,6 +625,19 @@ const Organization=Form.create()(React.createClass({
             searchMore: !this.state.searchMore
         });
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
     	const FormItem = Form.Item
         const rowSelection = {
@@ -696,13 +710,28 @@ const Organization=Form.create()(React.createClass({
 	                    </div>
                     </div>
                     </TabPane>
-                    <TabPane tab="新增组织" key="2"   > 
+                        <TabPane tab="新增组织" key="2"   >
                         <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'10px',float:'left'}}>新增组织<Icon type="plus" /></Button>
                     </TabPane>
+                        <TabPane tab="更改表格显示数据" key="3">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
                     </Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                    this.state.changeList
+                                        ? this.state.changeList
+                                        : this.state.columns
+                                }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 50 - 13
js/component/manageCenter/set/projectConfigure/officialFees.js

@@ -1,8 +1,11 @@
 import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm} from "antd";
+import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm, Tabs} from "antd";
 import AddOfficialFeePrice from './addOfficialFeePrice'
 import $ from "jquery/src/ajax";
 import '../content.less';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 class OfficialFees extends Component{
     constructor(props) {
@@ -64,6 +67,7 @@ class OfficialFees extends Component{
         this.loadData = this.loadData.bind(this);
         this.tableRowClick = this.tableRowClick.bind(this);
         this.reset = this.reset.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -145,24 +149,57 @@ class OfficialFees extends Component{
         }.bind(this));
     }
 
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
     render() {
         return(
             <div className="user-content" >
                 <div className="content-title">
-                    <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
-                        <span style={{marginLeft: 'auto'}}>
-                            <Button type="primary" size={'middle'} onClick={()=>{
-                                this.setState({
-                                    addSoftVisible : true
-                                })
-                            }}>
-                                增加
-                            </Button>
-                        </span>
-                    </div>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="操作" key="1">
+                            <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
+                                <span style={{marginLeft: 'auto'}}>
+                                    <Button type="primary" size={'middle'} onClick={()=>{
+                                        this.setState({
+                                            addSoftVisible : true
+                                        })
+                                    }}>
+                                        增加
+                                    </Button>
+                                </span>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
                     <div className="patent-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.columns}
+                            <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
                                    dataSource={this.state.dataSource}
                                    pagination={false}
                                    onRowClick={this.tableRowClick}/>

+ 50 - 13
js/component/manageCenter/set/projectConfigure/patentFees.js

@@ -1,9 +1,12 @@
 //专利费用列表
 import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm} from "antd";
+import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm, Tabs} from "antd";
 import AddPatentPrice from './addPatentPrice'
 import $ from "jquery/src/ajax";
 import '../content.less';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 class PatentFees extends Component{
     constructor(props) {
@@ -67,6 +70,7 @@ class PatentFees extends Component{
         this.loadData = this.loadData.bind(this);
         this.tableRowClick = this.tableRowClick.bind(this);
         this.reset = this.reset.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -148,24 +152,57 @@ class PatentFees extends Component{
         }.bind(this));
     }
 
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
+
     render() {
         return(
             <div className="user-content" >
                 <div className="content-title">
-                    <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
-                        <span style={{marginLeft: 'auto'}}>
-                            <Button type="primary" size={'middle'} onClick={()=>{
-                                this.setState({
-                                    addSoftVisible : true
-                                })
-                            }}>
-                                增加
-                            </Button>
-                        </span>
-                    </div>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
+                                <span style={{marginLeft: 'auto'}}>
+                                    <Button type="primary" size={'middle'} onClick={()=>{
+                                        this.setState({
+                                            addSoftVisible : true
+                                        })
+                                    }}>
+                                        增加
+                                    </Button>
+                                </span>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
                     <div className="patent-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.columns}
+                            <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                            }
                                    dataSource={this.state.dataSource}
                                    pagination={false}
                                    onRowClick={this.tableRowClick}/>

+ 74 - 38
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -1,8 +1,11 @@
 import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Tag, Popconfirm} from "antd";
+import {Button, Input, message, Select, Spin, Table, Tag, Popconfirm, Tabs} from "antd";
 import AddSoftWritingPrice from './addSoftWritingPrice'
 import $ from "jquery/src/ajax";
 import '../content.less';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 class SoftwareConfigure extends Component{
     constructor(props) {
@@ -111,6 +114,7 @@ class SoftwareConfigure extends Component{
         this.loadData = this.loadData.bind(this);
         this.tableRowClick = this.tableRowClick.bind(this);
         this.reset = this.reset.bind(this);
+        this.changeList = this.changeList.bind(this);
     }
 
     componentDidMount() {
@@ -205,46 +209,61 @@ class SoftwareConfigure extends Component{
             }
         }.bind(this));
     }
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    }
 
     render() {
         return(
             <div className="user-content" >
                 <div className="content-title">
-                    <div className="user-search" style={{display:'flex',flexFlow:'row'}}>
-                        <Input placeholder="公司名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px',marginLeft:10}}
-                               value={this.state.companyName}
-                               onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
-                        <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                            <div style={{marginLeft:10,marginRight:10}}>材料:</div>
-                            <Select
-                                placeholder="材料"
-                                style={{ width:'200px',marginRight:'10px' }}
-                                value={this.state.material}
-                                onChange={(e) => {this.setState({ material: e }) }}>
-                                    <Select.Option value={0}>无</Select.Option>
-                                    <Select.Option value={1}>有</Select.Option>
-                            </Select>
-                        </div>
-                        <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                            <div style={{marginLeft:10,marginRight:10}}>加急天数:</div>
-                            <Select placeholder="加急天数"
-                                    style={{ width:'200px',marginRight:'10px' }}
-                                    value={this.state.urgent}
-                                    onChange={(e) => { this.setState({ urgent: e }) }}>
-                                <Select.Option value={0}>无加急</Select.Option>
-                                <Select.Option value={1}>加急3-5个工作日</Select.Option>
-                                <Select.Option value={2}>加急6-10个工作日</Select.Option>
-                                <Select.Option value={3}>加急11-15个工作日</Select.Option>
-                                <Select.Option value={4}>加急16-20个工作日</Select.Option>
-                                <Select.Option value={5}>加急21-25个工作日</Select.Option>
-                                <Select.Option value={6}>加急26-30个工作日</Select.Option>
-                            </Select>
-                        </div>
-                        <Button type="primary" onClick={()=>{
-                            this.loadData();
-                        }} style={{marginRight:'10px'}}>搜索</Button>
-                        <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-                        <span style={{marginLeft: 'auto'}}>
+                    <Tabs defaultActiveKey="1" className="test">
+                        <TabPane tab="搜索" key="1">
+                            <div className="user-search" style={{display:'flex',flexFlow:'row'}}>
+                                <Input placeholder="公司名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px',marginLeft:10}}
+                                       value={this.state.companyName}
+                                       onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
+                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
+                                    <div style={{marginLeft:10,marginRight:10}}>材料:</div>
+                                    <Select
+                                        placeholder="材料"
+                                        style={{ width:'200px',marginRight:'10px' }}
+                                        value={this.state.material}
+                                        onChange={(e) => {this.setState({ material: e }) }}>
+                                        <Select.Option value={0}>无</Select.Option>
+                                        <Select.Option value={1}>有</Select.Option>
+                                    </Select>
+                                </div>
+                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
+                                    <div style={{marginLeft:10,marginRight:10}}>加急天数:</div>
+                                    <Select placeholder="加急天数"
+                                            style={{ width:'200px',marginRight:'10px' }}
+                                            value={this.state.urgent}
+                                            onChange={(e) => { this.setState({ urgent: e }) }}>
+                                        <Select.Option value={0}>无加急</Select.Option>
+                                        <Select.Option value={1}>加急3-5个工作日</Select.Option>
+                                        <Select.Option value={2}>加急6-10个工作日</Select.Option>
+                                        <Select.Option value={3}>加急11-15个工作日</Select.Option>
+                                        <Select.Option value={4}>加急16-20个工作日</Select.Option>
+                                        <Select.Option value={5}>加急21-25个工作日</Select.Option>
+                                        <Select.Option value={6}>加急26-30个工作日</Select.Option>
+                                    </Select>
+                                </div>
+                                <Button type="primary" onClick={()=>{
+                                    this.loadData();
+                                }} style={{marginRight:'10px'}}>搜索</Button>
+                                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
+                                <span style={{marginLeft: 'auto'}}>
                             <Button type="primary" size={'middle'} onClick={()=>{
                                 this.setState({
                                     addSoftVisible : true
@@ -253,10 +272,27 @@ class SoftwareConfigure extends Component{
                                 增加
                             </Button>
                         </span>
-                    </div>
+                            </div>
+                        </TabPane>
+                        <TabPane tab="更改表格显示数据" key="2">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
+                    </Tabs>
                     <div className="patent-table">
                         <Spin spinning={this.state.loading}>
-                            <Table columns={this.state.columns}
+                            <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                                    }
                                    dataSource={this.state.dataSource}
                                    pagination={this.state.pagination}
                                    onRowClick={this.tableRowClick}/>

+ 57 - 6
js/component/manageCenter/set/userManagementS/jurisdiction.jsx

@@ -2,10 +2,29 @@ import React from 'react';
 import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import { Form, Radio, Icon, Button, Input, Select, Popconfirm, Spin, Table, Switch, message, DatePicker, Modal, Upload } from 'antd';
+import {
+	Form,
+	Radio,
+	Icon,
+	Button,
+	Input,
+	Select,
+	Popconfirm,
+	Spin,
+	Table,
+	Switch,
+	message,
+	DatePicker,
+	Modal,
+	Upload,
+	Tabs
+} from 'antd';
 import Addjurisdiction from "./addjurisdiction.jsx"
 import './userMangagement.less'
 import { techAuditStatusList, station, post,urlType } from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
+
+const TabPane = Tabs.TabPane;
 
 const Jurisdiction = Form.create()(React.createClass({
 	loadData(pageNo) {
@@ -195,6 +214,19 @@ const Jurisdiction = Form.create()(React.createClass({
 			}
 		}.bind(this));
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const FormItem = Form.Item;
 		const formItemLayout = {
@@ -205,13 +237,32 @@ const Jurisdiction = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">
-                	<div className="user-search">
-	                	<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>测试欠款催发</Button>
-	                    <Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'15px'}}>新增权限<Icon type="user"/></Button>
-	                </div>
+					<Tabs defaultActiveKey="1" className="test">
+						<TabPane tab="操作" key="1">
+							<div className="user-search">
+								<Button type="primary" onClick={this.handles} style={{marginLeft:'10px',float:'right'}}>测试欠款催发</Button>
+								<Button type="primary" className="addButton" onClick={this.addClick} style={{marginBottom:'15px'}}>新增权限<Icon type="user"/></Button>
+							</div>
+						</TabPane>
+						<TabPane tab="更改表格显示数据" key="2">
+							<div style={{ marginLeft: 10 }}>
+								<ChooseList
+									columns={this.state.columns}
+									changeFn={this.changeList}
+									changeList={this.state.changeList}
+									top={55}
+									margin={11}
+								/>
+							</div>
+						</TabPane>
+					</Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+								this.state.changeList
+									? this.state.changeList
+									: this.state.columns
+								}
 	                            dataSource={this.state.dataSource}
 	                            pagination={false}
 	                            onRowClick={this.tableRowClick} />

+ 31 - 2
js/component/manageCenter/set/userManagementS/roles.jsx

@@ -6,6 +6,7 @@ import { Form,Radio, Icon, Button, Input, Select, Spin, Table, Switch, message,
 import Newrole from "./newRole.jsx"
 import './userMangagement.less'
 import {roleResources} from '../../../dataDic.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 const CheckboxGroup = Checkbox.Group;
 
 const {TabPane} = Tabs
@@ -252,6 +253,19 @@ const Roles=Form.create()(React.createClass({
     	this.state.roleNameSearch='';
         this.loadData();       
     },
+    changeList(arr) {
+        const newArr = [];
+        this.state.columns.forEach(item => {
+            arr.forEach(val => {
+                if (val === item.title) {
+                    newArr.push(item);
+                }
+            });
+        });
+        this.setState({
+            changeList: newArr
+        });
+    },
     render() {
         const rowSelection = {
             selectedRowKeys: this.state.selectedRowKeys,
@@ -289,13 +303,28 @@ const Roles=Form.create()(React.createClass({
 	                   
                     </div>
                     </TabPane>
-                    <TabPane tab="新增用户" key="2">
+                        <TabPane tab="新增用户" key="2">
                             <Button type="primary" className="addButton" style={{float:"left",marginBottom:10,marginLeft:10}} onClick={this.addClick} >新增用户<Icon type="user" /></Button>
                     </TabPane>
+                        <TabPane tab="更改表格显示数据" key="3">
+                            <div style={{ marginLeft: 10 }}>
+                                <ChooseList
+                                    columns={this.state.columns}
+                                    changeFn={this.changeList}
+                                    changeList={this.state.changeList}
+                                    top={55}
+                                    margin={11}
+                                />
+                            </div>
+                        </TabPane>
                     </Tabs>
 	                <div className="patent-table">
 	                    <Spin spinning={this.state.loading}>
-	                        <Table columns={this.state.columns}
+	                        <Table columns={
+                                this.state.changeList
+                                    ? this.state.changeList
+                                    : this.state.columns
+                                 }
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}

+ 30 - 1
js/component/manageCenter/set/userManagementS/user.jsx

@@ -7,6 +7,7 @@ import Newuser from "./newUser.jsx"
 import './userMangagement.less'
 import { techAuditStatusList, station, post } from '../../../dataDic.js';
 import {getPost,getStation} from '../../../tools.js';
+import {ChooseList} from "../../order/orderNew/chooseList";
 
 const {TabPane} = Tabs
 const User = Form.create()(React.createClass({
@@ -713,6 +714,19 @@ const User = Form.create()(React.createClass({
 			auto: e
 		})
 	},
+	changeList(arr) {
+		const newArr = [];
+		this.state.columns.forEach(item => {
+			arr.forEach(val => {
+				if (val === item.title) {
+					newArr.push(item);
+				}
+			});
+		});
+		this.setState({
+			changeList: newArr
+		});
+	},
 	render() {
 		const rowSelection = {
 			selectedRowKeys: this.state.selectedRowKeys,
@@ -928,11 +942,26 @@ const User = Form.create()(React.createClass({
                 <Icon type="user" />
               </Button>
             </TabPane>
+		    <TabPane tab="更改表格显示数据" key="3">
+			  <div style={{ marginLeft: 10 }}>
+				  <ChooseList
+					  columns={this.state.columns}
+					  changeFn={this.changeList}
+					  changeList={this.state.changeList}
+					  top={55}
+					  margin={11}
+				  />
+			  </div>
+		    </TabPane>
           </Tabs>
           <div className="patent-table">
             <Spin spinning={this.state.loading}>
               <Table
-                columns={this.state.columns}
+				columns={
+				  this.state.changeList
+					  ? this.state.changeList
+					  : this.state.columns
+				}
                 dataSource={this.state.dataSource}
                 rowSelection={rowSelection}
                 pagination={this.state.pagination}

+ 36 - 1
js/component/manageCenter/statistics/personnel/bonusList.jsx

@@ -3,7 +3,9 @@ import $ from "jquery/src/ajax";
 import { Spin, Button, Tabs, Table, message, Modal, Input, Form } from "antd";
 import "@/manageCenter/financialManage/distribute/public.less";
 import { splitUrl } from "@/tools";
+import {ChooseList} from "../../order/orderNew/chooseList";
 const FormItem = Form.Item;
+const { TabPane } = Tabs;
 
 const BonusList = React.createClass({
   getInitialState() {
@@ -166,12 +168,45 @@ const BonusList = React.createClass({
       threeRewards: record.threeRewards,
     });
   },
+  changeList(arr) {
+    const newArr = [];
+    this.state.columns.forEach(item => {
+      arr.forEach(val => {
+        if (val === item.title) {
+          newArr.push(item);
+        }
+      });
+    });
+    this.setState({
+      changeList: newArr
+    });
+  },
   render() {
     return (
       <div className="user-content">
+        <Tabs
+            defaultActiveKey="1"
+            onChange={this.callback}
+            className="test">
+          <TabPane tab="更改表格显示数据" key="1">
+            <div style={{ marginLeft: 10 }}>
+              <ChooseList
+                  columns={this.state.columns}
+                  changeFn={this.changeList}
+                  changeList={this.state.changeList}
+                  top={55}
+                  margin={11}
+              />
+            </div>
+          </TabPane>
+        </Tabs>
         <Table
           bordered
-          columns={this.state.columns}
+          columns={
+            this.state.changeList
+                ? this.state.changeList
+                : this.state.columns
+          }
           onRowClick={this.tableRowClick}
           dataSource={this.state.dataSource}
           scroll={{ x: "max-content", y: 0 }}