dengzhiguo 7 years ago
parent
commit
1f4434858d

+ 21 - 10
js/component/manageCenter/set/messagePush/jitaoMessage.jsx

@@ -3,7 +3,7 @@ import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../content.less';
-import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceListAll';
+import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceList';
 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,designatedObjectes,socialAttributeS,industry,socialAttribute,industryS,designatedObjectse,auditStatusL,featuredContent} from '../../../dataDic.js';
 import {getPattern,getProvince,getprovince,getFeatured,getDesignated,getGameState,getCategoryState,getCondition,getcustomerTyp,getSocialAttribute,getCertification,getAuditStatus, getContactType, getfllowSituation,getWhether,getLvl,getCurrentMember,getStatuslist,getboutique,getAchievementCategory,gethot,getDemandType} from '../../../tools.js';
@@ -859,10 +859,12 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '消息时间',
                     dataIndex: 'createTime',
                     key: 'createTime',
+                    width:'150px',
                 }, {
                     title: '消息标题',
                     dataIndex: 'title',
                     key: 'title',
+                    width:'200px',
                 },{
                     title: '消息内容',
                     dataIndex: 'body',
@@ -871,11 +873,13 @@ const JitaoMessage=Form.create()(React.createClass({
                     title: '推送类型',
                     dataIndex: 'resourceType',
                     key: 'resourceType',
+                    width:'100px',
                     render: text => { return getFeatured(text) }
                 },{
                     title: '发送目标',
                     dataIndex: 'consumerType',
                     key: 'consumerType',
+                    width:'100px',
                     render: text => { return getDesignated(text) }
                 }
             ],
@@ -1615,12 +1619,14 @@ const JitaoMessage=Form.create()(React.createClass({
 		if(e == 0) {
 			this.setState({
 				bianjiMore: false,
+				selectedRowKeys:[],
 			})
 			this.loadData(1,0);
 		}
 		if(e == 1) {
 			this.setState({
 				bianjiMore: true,
+				selectedRowKeys:[],
 			})
 			this.loadData(1,1);
 		}
@@ -1665,7 +1671,6 @@ const JitaoMessage=Form.create()(React.createClass({
 	},
 	//切换创建系统消息中的指定发送对象
 	selectObjects(e) {
-		console.log(e);
 		this.setState({
 			addObject:e
 		})
@@ -1997,7 +2002,8 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.state.selectedRowKeys1=[];
     },
     //散户
-    sanhuSubmit(){
+    sanhuSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		sanhu:this.state.selectedRowKeys
@@ -2005,7 +2011,8 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.rowReset();
     	this.handleCancel1();
     },
-    sanhuSubmit21(){
+    sanhuSubmit21(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		sanhu21:this.state.selectedRowKeys
@@ -2014,14 +2021,16 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.handleCancel21();
     },
     //社会属性
-    shehuiSubmit(){
+    shehuiSubmit(e){
+    	e.preventDefault();
     	this.setState({
     		shehui:this.state.shehui
     	});
     	this.handleCancel2();
     },
     //分公司
-    fengongsiSubmit(){
+    fengongsiSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		fengongsi:this.state.selectedRowKeys
@@ -2030,7 +2039,8 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.handleCancel3();
     },
     //地区
-    diquSubmit(){
+    diquSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		diqu:this.state.checkedKeys
@@ -2038,7 +2048,8 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.handleCancel4();
     },
     //行业
-    hangyeSubmit(){
+    hangyeSubmit(e){
+    	e.preventDefault();
     	this.setState({
     		hangye:this.state.hangye
     	});
@@ -2049,9 +2060,9 @@ const JitaoMessage=Form.create()(React.createClass({
     	this.state.xiaoxi=undefined;
     },
     //消息
-    xiaoxiSubmit(){
+    xiaoxiSubmit(e){
+    	e.preventDefault();
     	this.xiaoxiReset();
-    	console.log(this.state.selectedRowKeys1);
     	this.setState({
     		xiaoxi:this.state.selectedRowKeys1
     	});

+ 56 - 301
js/component/manageCenter/set/messagePush/systemMessage.jsx

@@ -3,7 +3,7 @@ import ReactDom from 'react-dom';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import '../content.less';
-import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceListAll';
+import { citySelect,provinceList,areaSelect,provinceSelect,addressList} from '../../../NewDicProvinceList';
 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';
@@ -37,7 +37,6 @@ const SystemMessage=Form.create()(React.createClass({
                 } else {
                     for (let i = 0; i < data.data.list.length; i++) {
                         let thisdata = data.data.list[i];
-                        console.log(thisdata.consumerType);
                         theArr.push({
                             key: i,
                             id: thisdata.messageId,//每一条消息的ID
@@ -75,21 +74,8 @@ const SystemMessage=Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
 				name: this.state.nameSearch,
-				//province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
-				//city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
-				status: this.state.statusSearch,
-				industry: this.state.industrySearch,
-				businessAudit: this.state.serviceCertificationSearch,
-				auditStatus: this.state.userCertificationSearch,
-				international: this.state.internationalSearch,
-				currentMemberStatus: this.state.currentMemberStatusSearch,
-				lvl: this.state.lvlSearch,
-				isMember: this.state.isMemberSearch,
 				societyTag: this.state.societyTagSearch,
-				listed: this.state.listedSearch, //是否上市
-				highTechZone: this.state.highTechZoneSearch, //是否高新
 			},
 			success: function(data) {
 				let theArr = [];
@@ -150,21 +136,8 @@ const SystemMessage=Form.create()(React.createClass({
 			data: {
 				pageNo: pageNo || 1,
 				pageSize: this.state.pagination.pageSize,
-				type: this.state.typeSearch, //名称1   
 				name: this.state.nameSearch,
-				//province: !(this.state.addressSearch).length ? this.state.provinceSearch : this.state.addressSearch[0],
-				//city: !(this.state.addressSearch).length ? '' : this.state.addressSearch[1],
-				status: this.state.statusSearch,
-				industry: this.state.industrySearch,
-				businessAudit: this.state.serviceCertificationSearch,
-				auditStatus: this.state.userCertificationSearch,
-				international: this.state.internationalSearch,
-				currentMemberStatus: this.state.currentMemberStatusSearch,
-				lvl: this.state.lvlSearch,
-				isMember: this.state.isMemberSearch,
 				societyTag: this.state.societyTagSearch,
-				listed: this.state.listedSearch, //是否上市
-				highTechZone: this.state.highTechZoneSearch, //是否高新
 			},
 			success: function(data) {
 				let theArr = [];
@@ -466,10 +439,12 @@ const SystemMessage=Form.create()(React.createClass({
                     title: '消息时间',
                     dataIndex: 'createTime',
                     key: 'createTime',
+                    width:'150px',
                 }, {
                     title: '消息标题',
                     dataIndex: 'title',
                     key: 'title',
+                    width:'300px',
                 },{
                     title: '消息内容',
                     dataIndex: 'body',
@@ -478,11 +453,13 @@ const SystemMessage=Form.create()(React.createClass({
                     title: '消息类型',
                     dataIndex: 'subject',
                     key: 'subject',
+                    width:'100px',
                     render: text => { return getMessageType(text) }
                 },{
                     title: '发送目标',
                     dataIndex: 'consumerType',
                     key: 'consumerType',
+                    width:'100px',
                     render: text => { return getDesignated(text) }
                     
                 }
@@ -528,13 +505,7 @@ const SystemMessage=Form.create()(React.createClass({
 					title: '客户名称',
 					dataIndex: 'name',
 					key: 'name',
-				}, {
-					title: '客户类型',
-					dataIndex: 'type',
-					key: 'type',
-					render: text => { return getcustomerTyp(text) }
-
-				}, {
+				},{
 					title: '地区',
 					dataIndex: 'locationProvince',
 					key: 'locationProvince',
@@ -565,36 +536,6 @@ const SystemMessage=Form.create()(React.createClass({
 					key: 'createTime',
 				},
 				{
-					title: '业务认证',
-					dataIndex: 'businessAudit',
-					key: 'businessAudit',
-					render: text => { return getCertification(text) }
-				},
-				{
-					title: '实名认证',
-					dataIndex: 'auditStatus',
-					key: 'auditStatus',
-					render: text => { return getAuditStatus(text) }
-				},
-				{
-					title: '是否高新',
-					dataIndex: 'highTechZone',
-					key: 'highTechZone',
-					render: text => { return getWhether(text) }
-
-				}, {
-					title: '是否上市',
-					dataIndex: 'listed',
-					key: 'listed',
-					render: text => { return getWhether(text) }
-				},
-				{
-					title: '是否国际',
-					dataIndex: 'international',
-					key: 'international',
-					render: text => { return getWhether(text) }
-				},
-				{
 					title: '会员等级',
 					dataIndex: 'lvl',
 					key: 'lvl',
@@ -618,13 +559,8 @@ const SystemMessage=Form.create()(React.createClass({
 					title: '客户名称',
 					dataIndex: 'name',
 					key: 'name',
-				}, {
-					title: '客户类型',
-					dataIndex: 'type',
-					key: 'type',
-					render: text => { return getcustomerTyp(text) }
-
-				}, {
+				},
+				{
 					title: '地区',
 					dataIndex: 'locationProvince',
 					key: 'locationProvince',
@@ -654,43 +590,7 @@ const SystemMessage=Form.create()(React.createClass({
 					dataIndex: 'createTime',
 					key: 'createTime',
 				},
-				{
-					title: '业务认证',
-					dataIndex: 'businessAudit',
-					key: 'businessAudit',
-					render: text => { return getCertification(text) }
-				},
-				{
-					title: '实名认证',
-					dataIndex: 'auditStatus',
-					key: 'auditStatus',
-					render: text => { return getAuditStatus(text) }
-				},
-				{
-					title: '是否高新',
-					dataIndex: 'highTechZone',
-					key: 'highTechZone',
-					render: text => { return getWhether(text) }
-
-				}, {
-					title: '是否上市',
-					dataIndex: 'listed',
-					key: 'listed',
-					render: text => { return getWhether(text) }
-				},
-				{
-					title: '是否国际',
-					dataIndex: 'international',
-					key: 'international',
-					render: text => { return getWhether(text) }
-				},
-				{
-					title: '会员等级',
-					dataIndex: 'lvl',
-					key: 'lvl',
-					render: text => { return getLvl(text) }
-				},
-				{
+			    {
 					title: '会员状态',
 					dataIndex: 'currentMemberStatus',
 					key: 'currentMemberStatus',
@@ -960,7 +860,7 @@ const SystemMessage=Form.create()(React.createClass({
                     if (!data.error.length) {
                         message.success('保存成功!'); 
                         this.handleCancel();
-                       
+                        this.loadData(1,this.state.callnub);
                     } else {
                         message.warning(data.error[0].message);
                     }
@@ -1074,12 +974,14 @@ const SystemMessage=Form.create()(React.createClass({
 		if(e == 0) {
 			this.setState({
 				bianjiMore: false,
+				selectedRowKeys:[],
 			})
 			this.loadData(1,0);
 		}
 		if(e == 1) {
 			this.setState({
 				bianjiMore: true,
+				selectedRowKeys:[],
 			})
 			this.loadData(1,1);
 		}
@@ -1105,12 +1007,14 @@ const SystemMessage=Form.create()(React.createClass({
 			addObject:e
 		})
 		if(e == 61) {
-			this.sanhuLoadData();
+			this.sanhuReset();
 			this.setState({ visible1: true })
+			
 		}
 		if(e == 62) {
-			this.sanhuLoadData21();
+			this.sanhuReset21();
 			this.setState({ visible21: true })
+			
 		}
 		if(e == 1) {
 			this.setState({ visible2: true })
@@ -1131,12 +1035,14 @@ const SystemMessage=Form.create()(React.createClass({
 			addObject:e
 		})
 		if(e == 5) {
-			this.sanhuLoadData1();
+			this.sanhuReset1();
 			this.setState({ visible6: true })
+			
 		}
 		if(e == 4) {
-			this.jueseLoadData();
+			this.jueseReset();
 			this.setState({ visible7: true })
+			
 		}
 		if(e == 3) {
 			this.fengongsiLoadData();
@@ -1191,7 +1097,6 @@ const SystemMessage=Form.create()(React.createClass({
     },
    	handleCancel() {
         this.setState({ visible: false })
-        this.reset();
     },
     handleCancel1() {
         this.setState({ visible1: false })
@@ -1263,10 +1168,14 @@ const SystemMessage=Form.create()(React.createClass({
     search() {
         this.loadData();
     },
-    //户搜索
+    //个人客户搜索
     sanhusearch(){
     	this.sanhuLoadData();
     },
+    //单位客户搜索
+    sanhusearch21(){
+    	this.sanhuLoadData21();
+    },
     //用户搜索
     sanhusearch1(){
     	this.sanhuLoadData1();
@@ -1275,30 +1184,18 @@ const SystemMessage=Form.create()(React.createClass({
     juesesearch(){
     	this.jueseLoadData();
     },
-    //户重置
+    //个人客户重置
     sanhuReset() {
-		this.state.isMemberSearch = undefined;
-		this.state.internationalSearch = undefined;
-		this.state.typeSearch = undefined; //名称1   
 		this.state.nameSearch = '';
-		this.state.addressSearch = [];
-		this.state.provinceSearch = undefined;
-		this.state.citySearch = undefined;
-		this.state.statusSearch = undefined;
-		this.state.contactsSearch = undefined;
-		this.state.contactMobileSearch = undefined;
-		this.state.industrySearch = undefined;
-		this.state.serviceCertificationSearch = undefined;
-		this.state.userCertificationSearch = undefined;
-		this.state.currentMemberStatusSearch = undefined;
-		this.state.lvlSearch = undefined;
-		this.state.listedSearch = undefined;
-		this.state.highTechZoneSearch = undefined;
-		this.state.releaseDate[0] = undefined;
-		this.state.releaseDate[1] = undefined;
 		this.state.societyTagSearch = undefined;
 		this.sanhuLoadData();
 	},
+	//单位客户重置
+    sanhuReset21() {
+		this.state.nameSearch = '';
+		this.state.societyTagSearch = undefined;
+		this.sanhuLoadData21();
+	},
 	//用户重置
 	sanhuReset1() {
     	this.state.departmentt=undefined;
@@ -1341,7 +1238,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.state.selectedRowKeys=[];
     },
     //散户
-    sanhuSubmit(){
+    sanhuSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		sanhu:this.state.selectedRowKeys
@@ -1349,7 +1247,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.rowReset();
     	this.handleCancel1();
     },//散户
-    sanhuSubmit21(){
+    sanhuSubmit21(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		sanhu21:this.state.selectedRowKeys
@@ -1358,7 +1257,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.handleCancel21();
     },
     //用户
-    yonghuSubmit(){
+    yonghuSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		yonghu:this.state.selectedRowKeys
@@ -1367,7 +1267,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.handleCancel6();
     },
     //角色
-    jueseSubmit(){
+    jueseSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		juese:this.state.selectedRowKeys
@@ -1376,14 +1277,16 @@ const SystemMessage=Form.create()(React.createClass({
     	this.handleCancel7();
     },
     //社会属性
-    shehuiSubmit(){
+    shehuiSubmit(e){
+    	e.preventDefault();
     	this.setState({
     		shehui:this.state.shehui
     	});
     	this.handleCancel2();
     },
     //分公司
-    fengongsiSubmit(){
+    fengongsiSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		fengongsi:this.state.selectedRowKeys
@@ -1392,7 +1295,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.handleCancel3();
     },
     //地区
-    diquSubmit(){
+    diquSubmit(e){
+    	e.preventDefault();
     	this.objectReset();
     	this.setState({
     		diqu:this.state.checkedKeys
@@ -1401,7 +1305,8 @@ const SystemMessage=Form.create()(React.createClass({
     	this.handleCancel4();
     },
     //行业
-    hangyeSubmit(){
+    hangyeSubmit(e){
+    	e.preventDefault();
     	this.setState({
     		hangye:this.state.hangye
     	});
@@ -1649,7 +1554,7 @@ const SystemMessage=Form.create()(React.createClass({
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible6}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel6}
-	                        width='1500px'
+	                        width='1100px'
 	                        title='用户列表'                       
 	                        footer=''
 	                        className="admin-desc-content">
@@ -1662,16 +1567,7 @@ const SystemMessage=Form.create()(React.createClass({
 				                        <Input placeholder="管理员名字" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 				                            value={this.state.searchName}
 				                            onChange={(e) => { this.setState({ searchName: e.target.value }); }} />
-				                        <Select placeholder="选择部门" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
-				                            value={this.state.departmentt}
-				                            onChange={(e) => { this.setState({ departmentt: e }) }}>
-				                            {
-				                                departmentArr.map(function (item) {
-				                                        return <Select.Option key={item.id} >{item.name}</Select.Option>
-				                                })
-				                            }
-					                    </Select>
-					                    <Button type="primary" onClick={this.sanhusearch1} style={{marginRight:'10px'}}>搜索</Button>
+				                        <Button type="primary" onClick={this.sanhusearch1} style={{marginRight:'10px'}}>搜索</Button>
 					                    <Button onClick={this.sanhuReset1} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
 				                    <div className="foster-table">
@@ -1727,7 +1623,7 @@ const SystemMessage=Form.create()(React.createClass({
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible1}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel1}
-	                        width='1500px'
+	                        width='1200px'
 	                        title='个人客户'                       
 	                        footer=''
 	                        className="admin-desc-content">
@@ -1737,77 +1633,7 @@ const SystemMessage=Form.create()(React.createClass({
 					                    <Input placeholder="客户名称" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 					                        value={this.state.nameSearch}
 					                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
-					                     <Select placeholder="账户状态"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.statusSearch}
-				                            onChange={(e) => { this.setState({ statusSearch: e }) }}>
-				                            <Select.Option value="0" >正常</Select.Option>
-				                            <Select.Option value="2" >锁定</Select.Option>
-				                        </Select>
-				                        <Select placeholder="行业"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.industrySearch}
-				                            onChange={(e) => { this.setState({ industrySearch: e }) }}>
-				                            {this.state.intentionalOption}
-				                        </Select>
-				                        <Select placeholder="业务认证"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.serviceCertificationSearch}
-				                            onChange={(e) => { this.setState({ serviceCertificationSearch: e }) }}>
-				                            <Select.Option value="0" >未认证</Select.Option>
-				                            <Select.Option value="1" >已认证</Select.Option>
-				                        </Select>
-				                        <Select placeholder="实名认证"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.userCertificationSearch}
-				                            onChange={(e) => { this.setState({ userCertificationSearch: e }) }}>
-				                            {
-				                                auditStatusL.map(function (item) {
-				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-				                                })
-				                            }
-				                        </Select>
-				                       <Select placeholder="是否国际"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.internationalSearch}
-				                            onChange={(e) => { this.setState({ internationalSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否高新"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.highTechZoneSearch}
-				                            onChange={(e) => { this.setState({ highTechZoneSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否上市"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.listedSearch}
-				                            onChange={(e) => { this.setState({ listedSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否会员"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.isMemberSearch}
-				                            onChange={(e) => { this.setState({ isMemberSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="会员等级"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.lvlSearch}
-				                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
-				                            {this.state.lvlArrOption}
-				                        </Select>  
-				                        <Select placeholder="会员状态"
-				                             style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
-				                            value={this.state.currentMemberStatusSearch}
-				                            onChange={(e) => { this.setState({ currentMemberStatusSearch: e }) }}>
-				                            {this.state.currentMemberArrOption}
-				                        </Select>
-				                        <Select placeholder="社会性质"
+					                    <Select placeholder="社会性质"
 				                             style={{width:'100px',marginRight:'10px'}}
 				                            value={this.state.societyTagSearch}
 				                            onChange={(e) => { this.setState({ societyTagSearch: e }) }}>
@@ -1841,7 +1667,7 @@ const SystemMessage=Form.create()(React.createClass({
                 	 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible21}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel21}
-	                        width='1500px'
+	                        width='1200px'
 	                        title='单位客户'                       
 	                        footer=''
 	                        className="admin-desc-content">
@@ -1851,77 +1677,7 @@ const SystemMessage=Form.create()(React.createClass({
 					                    <Input placeholder="客户名称" style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
 					                        value={this.state.nameSearch}
 					                        onChange={(e) => { this.setState({ nameSearch: e.target.value }); }} />
-					                     <Select placeholder="账户状态"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.statusSearch}
-				                            onChange={(e) => { this.setState({ statusSearch: e }) }}>
-				                            <Select.Option value="0" >正常</Select.Option>
-				                            <Select.Option value="2" >锁定</Select.Option>
-				                        </Select>
-				                        <Select placeholder="行业"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.industrySearch}
-				                            onChange={(e) => { this.setState({ industrySearch: e }) }}>
-				                            {this.state.intentionalOption}
-				                        </Select>
-				                        <Select placeholder="业务认证"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.serviceCertificationSearch}
-				                            onChange={(e) => { this.setState({ serviceCertificationSearch: e }) }}>
-				                            <Select.Option value="0" >未认证</Select.Option>
-				                            <Select.Option value="1" >已认证</Select.Option>
-				                        </Select>
-				                        <Select placeholder="实名认证"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.userCertificationSearch}
-				                            onChange={(e) => { this.setState({ userCertificationSearch: e }) }}>
-				                            {
-				                                auditStatusL.map(function (item) {
-				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-				                                })
-				                            }
-				                        </Select>
-				                       <Select placeholder="是否国际"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.internationalSearch}
-				                            onChange={(e) => { this.setState({ internationalSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否高新"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.highTechZoneSearch}
-				                            onChange={(e) => { this.setState({ highTechZoneSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否上市"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.listedSearch}
-				                            onChange={(e) => { this.setState({ listedSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="是否会员"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.isMemberSearch}
-				                            onChange={(e) => { this.setState({ isMemberSearch: e }) }}>
-				                            <Select.Option value="0" >否</Select.Option>
-				                            <Select.Option value="1" >是</Select.Option>
-				                        </Select>
-				                        <Select placeholder="会员等级"
-				                             style={{width:'100px',marginRight:'10px'}}
-				                            value={this.state.lvlSearch}
-				                            onChange={(e) => { this.setState({ lvlSearch: e }) }}>
-				                            {this.state.lvlArrOption}
-				                        </Select>  
-				                        <Select placeholder="会员状态"
-				                             style={{width:'100px',marginRight:'10px',marginBottom:'10px'}}
-				                            value={this.state.currentMemberStatusSearch}
-				                            onChange={(e) => { this.setState({ currentMemberStatusSearch: e }) }}>
-				                            {this.state.currentMemberArrOption}
-				                        </Select>
-				                        <Select placeholder="社会性质"
+					                    <Select placeholder="社会性质"
 				                             style={{width:'100px',marginRight:'10px'}}
 				                            value={this.state.societyTagSearch}
 				                            onChange={(e) => { this.setState({ societyTagSearch: e }) }}>
@@ -1931,9 +1687,8 @@ const SystemMessage=Form.create()(React.createClass({
 				                                    })
 				                                }
 				                        </Select>
-					                    
-					                    <Button type="primary" onClick={this.sanhusearch} style={{marginRight:'10px'}}>搜索</Button>
-					                    <Button onClick={this.sanhuReset} style={{marginRight:'10px'}}>重置</Button>
+					                    <Button type="primary" onClick={this.sanhusearch21} style={{marginRight:'10px'}}>搜索</Button>
+					                    <Button onClick={this.sanhuReset21} style={{marginRight:'10px'}}>重置</Button>
 					                </div>
 				                    <div className="foster-table">
 				                        <Spin spinning={this.state.loading}>