liting2017 7 jaren geleden
bovenliggende
commit
231f2df025

+ 10 - 5
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -136,7 +136,8 @@ const PublicCustomer = Form.create()(React.createClass({
 				this.state.pagination.total = data.data.totalCount ? data.data.totalCount : '0';
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
 				});
 			}.bind(this),
 		}).always(function() {
@@ -546,7 +547,8 @@ const PublicCustomer = Form.create()(React.createClass({
 					key: 'highTechZone',
 					render: text => { return getWhether(text) }
 
-				}, {
+				},
+				{
 					title: '是否上市',
 					dataIndex: 'listed',
 					key: 'listed',
@@ -891,7 +893,8 @@ const PublicCustomer = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	//选择了指定人之后的保存点击函数,需要修改函数
-	changeAssigner() {
+	changeAssigner(e) {
+		e.preventDefault();
 		this.setState({
 			visible: false,
 		});
@@ -1474,7 +1477,8 @@ const PublicCustomer = Form.create()(React.createClass({
 		});
 	},
 	//新增联系人保存函数
-	submitcontactman() {
+	submitcontactman(e) {
+		e.preventDefault();
 		this.setState({
 			loading: true
 		})
@@ -1769,7 +1773,8 @@ const PublicCustomer = Form.create()(React.createClass({
 		})
 	},
 	//tab2联系人保存
-	contactSave() {
+	contactSave(e) {
+		e.preventDefault();
 		this.setState({
 			loading: true
 		});

+ 6 - 3
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -134,7 +134,8 @@ const MyClient = Form.create()(React.createClass({
 				this.state.pagination.total = data.data.totalCount ? data.data.totalCount : '0';
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
 				});
 			}.bind(this),
 		}).always(function() {
@@ -547,7 +548,8 @@ const MyClient = Form.create()(React.createClass({
 					key: 'highTechZone',
 					render: text => { return getWhether(text) }
 
-				}, {
+				},
+				{
 					title: '是否上市',
 					dataIndex: 'listed',
 					key: 'listed',
@@ -1403,7 +1405,8 @@ const MyClient = Form.create()(React.createClass({
 		});
 	},
 	//新增联系人保存函数
-	submitcontactman() {
+	submitcontactman(e) {
+		e.preventDefault()
 		this.setState({
 			loading: true
 		})

+ 4 - 2
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -62,7 +62,8 @@ const MyBusiness = Form.create()(React.createClass({
                 
                 this.setState({
                     dataSource: theArr,
-                    pagination: this.state.pagination
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
                 });
             }.bind(this),
         }).always(function () {
@@ -524,7 +525,8 @@ const MyBusiness = Form.create()(React.createClass({
 		  }
 	},
 	//新增联系人保存函数
-	submitcontactman(){
+	submitcontactman(e){
+		e.preventDefault();
 		this.setState({
 			loading:true
 		})

+ 2 - 1
js/component/manageCenter/customer/customerService/serviceQuery.jsx

@@ -59,7 +59,8 @@ const ServiceQuery= Form.create()(React.createClass({
                
                 this.setState({
                     dataSource: theArr,
-                    pagination: this.state.pagination
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
                 });
             }.bind(this),
         }).always(function () {

+ 27 - 4
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -82,7 +82,6 @@ const IndividualCustomer = Form.create()(React.createClass({
 				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],
-				//area: this.state.addressSearch?this.state.addressSearch[2].value:'',
 				status: this.state.statusSearch,
 				industry: this.state.industrySearch,
 				businessAudit: this.state.serviceCertificationSearch,
@@ -91,6 +90,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 				lvl: this.state.lvlSearch,
 				listed: this.state.listedSearch, //是否上市
 				highTechZone: this.state.highTechZoneSearch, //是否高新
+				consultant: this.state.consultant,
 				startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
 				isMember: this.state.isMemberSearch,
@@ -129,6 +129,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 							international: thisdata.international,
 							expert: thisdata.expert,
 							celebrity: thisdata.celebrity,
+							consultant: thisdata.consultant,
 							highTechZone: thisdata.highTechZone,
 							locationProvince: thisdata.province ? thisdata.province + '-' + thisdata.city || '' + '-' + thisdata.area : '--'
 
@@ -140,7 +141,8 @@ const IndividualCustomer = Form.create()(React.createClass({
 
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
 				});
 			}.bind(this),
 		}).always(function() {
@@ -549,6 +551,12 @@ const IndividualCustomer = Form.create()(React.createClass({
 					key: 'celebrity',
 					render: text => { return getWhether(text) }
 				},
+				 {
+					title: '是否咨询师',
+					dataIndex: 'consultant',
+					key: 'consultant',
+					render: text => { return getWhether(text) }
+				},
 				{
 					title: '是否会员',
 					dataIndex: 'isMember',
@@ -1105,6 +1113,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 						sex: this.state.sex,
 						expert: this.state.expert,
 						celebrity: this.state.celebrity,
+						consultant: this.state.consultant,
 						international: this.state.international,
 						fixedTel: this.state.fixedTel,
 						qq: this.state.qq,
@@ -1194,6 +1203,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					introduction: thisData.introduction,
 					expert: thisData.expert,
 					celebrity: thisData.celebrity,
+					consultant: thisData.consultant,
 					international: thisData.international,
 					investment: thisData.investment,
 					professionalTitle: thisData.professionalTitle,
@@ -1468,7 +1478,8 @@ const IndividualCustomer = Form.create()(React.createClass({
 		});
 	},
 	//新增联系人保存函数
-	submitcontactman() {
+	submitcontactman(e) {
+		e.preventDefault();
 		this.setState({
 			loading: true
 		})
@@ -1765,7 +1776,8 @@ const IndividualCustomer = Form.create()(React.createClass({
 		})
 	},
 	//tab2联系人保存
-	contactSave() {
+	contactSave(e) {
+		e.preventDefault();
 		let err = '';
 		let contactArr = this.state.contactList;
 		contactArr.map(function(item) {
@@ -2449,6 +2461,17 @@ const IndividualCustomer = Form.create()(React.createClass({
 									                        <Radio value={1}>是</Radio>
 									                  </Radio.Group>
 									            </FormItem>
+									            <FormItem className="half-item"
+									                {...formItemLayout}
+							                        label="咨询师"
+									                > 
+							                   		 <Radio.Group value={this.state.consultant} onChange={(e) => {
+									                        this.setState({ consultant:  e.target.value })
+									                    }}>
+									                        <Radio value={0}>否</Radio>
+									                        <Radio value={1}>是</Radio>
+									                  </Radio.Group>
+									            </FormItem>
 									             <FormItem className="half-item"
 									                {...formItemLayout}
 							                        label="国际化"

+ 28 - 2
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx

@@ -123,6 +123,7 @@ const QueryCustomer = Form.create()(React.createClass({
 							lvl: thisdata.lvl,
 							shareType: thisdata.shareType,
 							isMember: thisdata.isMember,
+							consultant: thisdata.consultant,
 							societyTag: thisdata.societyTag,
 							currentMemberStatus: thisdata.currentMemberStatus,
 							international: thisdata.international,
@@ -141,7 +142,8 @@ const QueryCustomer = Form.create()(React.createClass({
 				
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
 				});
 			}.bind(this),
 		}).always(function() {
@@ -566,6 +568,12 @@ const QueryCustomer = Form.create()(React.createClass({
 					render: text => { return getWhether(text) }
 				},
 				{
+					title: '是否咨询师',
+					dataIndex: 'consultant',
+					key: 'consultant',
+					render: text => { return getWhether(text) }
+				},
+				{
 					title: '是否国际',
 					dataIndex: 'international',
 					key: 'international',
@@ -1043,6 +1051,7 @@ const QueryCustomer = Form.create()(React.createClass({
 						idNumber: this.state.idNumber,
 						email: this.state.email,
 						isMember: this.state.isMember,
+						consultant: this.state.consultant,
 						postalAddress: this.state.postalAddress,
 						introduction: this.state.introduction,
 						positiveIdUrl: thecompanyLogoUrl,
@@ -1107,6 +1116,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					identifyName: thisData.identifyName,
 					listed: thisData.listed,
 					highTechZone: thisData.highTechZone,
+					consultant: thisData.consultant,
 					headPortraitUrl: thisData.headPortraitUrl ? splitUrl(thisData.headPortraitUrl, ',', globalConfig.avatarHost + '/upload') : [],
 					positiveIdUrl: thisData.positiveIdUrl ? splitUrl(thisData.positiveIdUrl, ',', globalConfig.avatarHost + '/upload') : [],
 					oppositeIdUrl: thisData.oppositeIdUrl ? splitUrl(thisData.oppositeIdUrl, ',', globalConfig.avatarHost + '/upload') : [],
@@ -2285,7 +2295,17 @@ const QueryCustomer = Form.create()(React.createClass({
 								                        <Radio value={1}>是</Radio>
 								                  </Radio.Group>
 								            </FormItem>
-								            
+								            <FormItem className="half-item"
+								                {...formItemLayout}
+						                        label="咨询师"
+								                > 
+						                   		 <Radio.Group value={this.state.consultant} onChange={(e) => {
+								                        this.setState({ consultant:  e.target.value })
+								                    }}>
+								                        <Radio value={0}>否</Radio>
+								                        <Radio value={1}>是</Radio>
+								                  </Radio.Group>
+								            </FormItem>
 								             <FormItem className="half-item"
 								                {...formItemLayout}
 						                        label="国际化"
@@ -2401,6 +2421,12 @@ const QueryCustomer = Form.create()(React.createClass({
 								             </FormItem>
 								             <FormItem className="half-item"
 								                {...formItemLayout}
+						                        label="咨询师"
+								            > 
+								                  <span>{parseInt(this.state.consultant)?'是':'否'}</span> 
+								             </FormItem>
+								             <FormItem className="half-item"
+								                {...formItemLayout}
 						                        label="国际化"
 								            >   	
 								                  <span>{parseInt(this.state.international)?'是':'否'}</span> 

+ 1 - 1
js/component/manageCenter/customer/statistics/followStatistics.jsx

@@ -80,7 +80,7 @@ const FollowStatistics = React.createClass({
 				};
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
 				});
 			}.bind(this),
 		}).always(function() {

+ 2 - 1
js/component/manageCenter/set/userManagementS/jurisdiction.jsx

@@ -144,7 +144,8 @@ const Jurisdiction = Form.create()(React.createClass({
 		})
 	},
 	//新建二级接口保存
-	nextSubmit() {
+	nextSubmit(e) {
+		e.preventDefault();
 		this.setState({
 			loading: true
 		});

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

@@ -45,7 +45,8 @@ const Roles=Form.create()(React.createClass({
                 };
                 this.setState({
                     dataSource: theArr,
-                    pagination: this.state.pagination
+                    pagination: this.state.pagination,
+                    selectedRowKeys:[]
                 });
             }.bind(this),
         }).always(function () {

+ 2 - 2
js/component/manageCenter/set/userManagementS/user.jsx

@@ -66,7 +66,8 @@ const User = Form.create()(React.createClass({
 				};
 				this.setState({
 					dataSource: theArr,
-					pagination: this.state.pagination
+					pagination: this.state.pagination,
+					selectedRowKeys:[]
 				});
 			}.bind(this),
 		}).always(function() {
@@ -92,7 +93,6 @@ const User = Form.create()(React.createClass({
 				pageSize: 10,
 				onChange: function(page) {
 					this.loadData(page);
-					this.state.selectedRowKeys=[]
 				}.bind(this),
 				showTotal: function(total) {
 					return '共' + total + '条数据';