liting2017 7 роки тому
батько
коміт
03ac62a467

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

@@ -130,10 +130,10 @@ const PublicCustomer = Form.create()(React.createClass({
                             locationProvince:thisdata.province?thisdata.province+'-'+thisdata.city||''+'-'+thisdata.area :'--'                       						                
                         });
                     };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
+                    
                 }; 
-                
+                this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -1108,6 +1108,7 @@ const PublicCustomer = Form.create()(React.createClass({
                         registeredCapital:this.state.registeredCapital,
                         enterpriseScale:this.state.enterpriseScale,
                         legalPerson:this.state.legalPerson,
+                        international:this.state.international,
                         legalPersonIdCard:this.state.legalPersonIdCard,
                         legalPersonTel:this.state.legalPersonTel,
                         legalPersonEmail:this.state.legalPersonEmail,
@@ -1173,7 +1174,7 @@ const PublicCustomer = Form.create()(React.createClass({
                 	ProvinceCity:ProvinceCityArr,
                 	proviceCityArea:ProvinceS?cityArea:'',
                 	industry:String(thisData.industry)=='null'?undefined:String(thisData.industry),
-                	
+                	international:thisData.international,
                 	societyTag:thisData.societyTag,
                 	introduction:thisData.introduction,
                 	postalAddress:thisData.postalAddress,
@@ -1539,10 +1540,6 @@ const PublicCustomer = Form.create()(React.createClass({
 	            });
 	        }.bind(this));
 	},
-	//意向服务列表修改保存
-	intentionModify(e){
-		console.log(e)
-	},
 	//拜访意向服务列表单个删除
 	intentionDelet(e,index){
 		if(!this.state.keys){
@@ -2279,7 +2276,19 @@ const PublicCustomer = Form.create()(React.createClass({
 								                        <Radio value={0}>否</Radio>
 								                        <Radio value={1}>是</Radio>
 								                  </Radio.Group>
-										     </FormItem>	
+										     </FormItem>
+										     <FormItem className="half-item"
+				                   		   		labelCol={{ span: 4 }}
+					                            wrapperCol={{ span: 18 }}
+					                            label="国际化"
+					                   		    >
+						                   		 <Radio.Group value={this.state.international} onChange={(e) => {
+								                        this.setState({international:e.target.value })
+								                    }}>
+								                        <Radio value={0}>否</Radio>
+								                        <Radio value={1}>是</Radio>
+								                  </Radio.Group>
+										     </FormItem>
 					                   		 <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
@@ -2439,7 +2448,14 @@ const PublicCustomer = Form.create()(React.createClass({
 					                            label="上市"
 					                   		    >
 								                   <span>{this.state.listed?'是':'否'}</span>
-										     </FormItem>	
+										     </FormItem>
+										     <FormItem className="half-item"
+				                   		   		labelCol={{ span: 4 }}
+					                            wrapperCol={{ span: 18 }}
+					                            label="国际化"
+					                   		    >
+								                   <span>{this.state.international?'是':'否'}</span>
+										     </FormItem>
 					                   		 <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}

+ 38 - 5
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -129,10 +129,10 @@ const MyClient = Form.create()(React.createClass({
                             locationProvince:thisdata.province?thisdata.province+'-'+thisdata.city||''+'-'+thisdata.area :'--'                       						                
                         });
                     };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
+                    
                 }; 
-                
+                this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -1048,6 +1048,9 @@ const MyClient = Form.create()(React.createClass({
                         legalPersonEmail:this.state.legalPersonEmail,
                         highTechZone:this.state.highTechZone,
                         listed:this.state.listed,
+                        contacts:this.state.contacts,
+                        contactMobile:this.state.contactMobile,
+                        international:this.state.international,
                         orgCode:this.state.orgCode,
                         businessScope:this.state.businessScope,
                         introduction:this.state.introduction,
@@ -1102,8 +1105,10 @@ const MyClient = Form.create()(React.createClass({
                 	companyLogoUrl: thisData.companyLogoUrl ? splitUrl(thisData.companyLogoUrl, ',', globalConfig.avatarHost + '/upload') : [],
                 	dataInformation:thisData,
                 	ProvinceCity:ProvinceCityArr,
+                	contacts:thisData.contacts,
+                	contactMobile:thisData.contactMobile,
                 	industry:String(thisData.industry)=='null'?undefined:String(thisData.industry),
-                	
+                	international:thisData.international,
                 	societyTag:thisData.societyTag,
                 	introduction:thisData.introduction,
                 	postalAddress:thisData.postalAddress,
@@ -2193,6 +2198,22 @@ const MyClient = Form.create()(React.createClass({
 						                                <Input placeholder="法人身份证号码" value={this.state.legalPersonIdCard} 
 											    				onChange={(e)=>{this.setState({legalPersonIdCard:e.target.value})}}/>
 						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="主要联系人"
+					                           	 >
+						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
+								                        this.setState({ contacts:  e.target.value })}}/>
+						                     </FormItem>
+						                     <FormItem className="half-item" 
+							                    	labelCol={{ span: 4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="主要联系人号码"
+					                           	 >
+						                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
+								                        this.setState({ contactMobile:  e.target.value })}}/>
+						                     </FormItem>
 						                    <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}
@@ -2232,7 +2253,19 @@ const MyClient = Form.create()(React.createClass({
 								                        <Radio value={0}>否</Radio>
 								                        <Radio value={1}>是</Radio>
 								                  </Radio.Group>
-										     </FormItem>	
+										     </FormItem>
+										     <FormItem className="half-item"
+				                   		   		labelCol={{ span: 4 }}
+					                            wrapperCol={{ span: 18 }}
+					                            label="国际化"
+					                   		    >
+						                   		 <Radio.Group value={this.state.international} onChange={(e) => {
+								                        this.setState({international:e.target.value })
+								                    }}>
+								                        <Radio value={0}>否</Radio>
+								                        <Radio value={1}>是</Radio>
+								                  </Radio.Group>
+										     </FormItem>
 					                   		 <FormItem className="half-item"
 							                    	labelCol={{ span: 4 }}
 							                        wrapperCol={{ span: 18 }}

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

@@ -54,11 +54,10 @@ const MyBusiness = Form.create()(React.createClass({
                             adminName:thisdata.adminName,
                    			createTime:thisdata.createTime			                
                         });
-                    };
-                   this.state.pagination.current = data.data.pageNo;
-                   this.state.pagination.total = data.data.totalCount;
+                    };  
                 };
-                
+                 this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination

+ 6 - 7
js/component/manageCenter/customer/customerService/serviceQuery.jsx

@@ -31,7 +31,7 @@ const ServiceQuery= Form.create()(React.createClass({
 				startDate: this.state.releaseDate[0],
                 endDate: this.state.releaseDate[1],   
             },
-            success: function (data) {            	
+            success: function (data) {  
                 let theArr = []; 
                 if (data.error.length || data.data.list=="") {
                     if (data.error && data.error.length) {
@@ -39,7 +39,7 @@ const ServiceQuery= Form.create()(React.createClass({
                     };                   
                 } else {  
                     for (let i = 0; i < data.data.list.length; i++) {
-                        let thisdata = data.data.list[i];                        
+                        let thisdata = data.data.list[i];  
                         theArr.push({
                             key: i,                           
                             id: thisdata.id,                                                  
@@ -52,10 +52,10 @@ const ServiceQuery= Form.create()(React.createClass({
                    			createTime:thisdata.createTime			                
                         });
                     };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
-                }; 
-                
+                    
+                };
+                this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination
@@ -417,7 +417,6 @@ const ServiceQuery= Form.create()(React.createClass({
         })    
     },
     followRowClick(record, index) { 
-    	console.log(record)
         this.state.RowData = record; 
         this.listFollowUp(record);
         this.setState({

+ 3 - 3
js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx

@@ -132,10 +132,10 @@ const IndividualCustomer = Form.create()(React.createClass({
                             locationProvince:thisdata.province?thisdata.province+'-'+thisdata.city||''+'-'+thisdata.area :'--'                       						                
                         });
                     };  
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
+                   
                 }; 
-                
+                this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination

+ 3 - 3
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx

@@ -136,10 +136,10 @@ const QueryCustomer = Form.create()(React.createClass({
                             locationProvince:thisdata.province?thisdata.province+'-'+thisdata.city||''+'-'+thisdata.area :'--' 
                         });
                     };
-                     this.state.pagination.current = data.data.pageNo;
-                     this.state.pagination.total = data.data.totalCount;
+                     
                 };
-               
+                this.state.pagination.current = data.data.pageNo?data.data.pageNo:'0';
+                this.state.pagination.total = data.data.totalCount?data.data.totalCount:'0';
                 this.setState({
                     dataSource: theArr,
                     pagination: this.state.pagination