dengzhiguo %!s(int64=7) %!d(string=hai) anos
pai
achega
ff1dc85348
Modificáronse 23 ficheiros con 402 adicións e 922 borrados
  1. 29 0
      js/component/addressList.jsx
  2. 135 0
      js/component/areaList.jsx
  3. 32 32
      js/component/manageCenter/customer/content.jsx
  4. 12 4
      js/component/manageCenter/customer/customerData/companyCustomer.jsx
  5. 1 1
      js/component/manageCenter/customer/customerData/myClient.jsx
  6. 13 5
      js/component/manageCenter/customer/customerManagement/expertManage.jsx
  7. 12 4
      js/component/manageCenter/customer/customerManagement/organizationManages.jsx
  8. 12 4
      js/component/manageCenter/customer/customerManagement/personalManages.jsx
  9. 13 5
      js/component/manageCenter/customer/customerManagement/publicManages.jsx
  10. 12 5
      js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx
  11. 0 1
      js/component/manageCenter/customer/customerService/businessManges.jsx
  12. 1 1
      js/component/manageCenter/customer/customerService/myBusiness.jsx
  13. 3 2
      js/component/manageCenter/customer/customerService/serviceQuery.jsx
  14. 29 817
      js/component/manageCenter/customer/individualCustomer/expertQuery.jsx
  15. 12 4
      js/component/manageCenter/customer/individualCustomer/individualCustomer.jsx
  16. 12 4
      js/component/manageCenter/customer/individualCustomer/publicQuery.jsx
  17. 12 4
      js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx
  18. 12 4
      js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx
  19. 13 5
      js/component/manageCenter/customer/release/expertRelease.jsx
  20. 12 4
      js/component/manageCenter/customer/reviewed/expertReview.jsx
  21. 12 10
      js/component/manageCenter/customer/reviewed/identityAudits.jsx
  22. 12 5
      js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx
  23. 1 1
      package.json

+ 29 - 0
js/component/addressList.jsx

@@ -0,0 +1,29 @@
+import ajax from 'jquery/src/ajax/xhr.js'
+import $ from 'jquery/src/ajax';
+
+var addressList=[];
+module.exports={
+	getProvinceList:function(){
+		$.ajax({
+    		method: "post",
+            dataType: "json",
+            crossDomain: false,
+            async:false,
+            url: globalConfig.context + "/open/listAllProvince",
+            data: {
+            	
+            },
+            success:function(data){
+            	if (!data.data) {
+	                if (data.error && data.error.length) {
+	                    message.warning(data.error[0].message);
+	                    return;
+	                };
+	            };
+	            addressList=data.data;
+	            return addressList;
+			}
+		})
+		return addressList;
+	}
+}

+ 135 - 0
js/component/areaList.jsx

@@ -0,0 +1,135 @@
+import ajax from 'jquery/src/ajax/xhr.js'
+import $ from 'jquery/src/ajax';
+
+
+
+module.exports = {
+   
+    provinceSelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+            option.push({
+                value: item.id,
+                label: item.name
+            });
+        });
+        return option;
+    },
+    citySelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+        	if(item.cityList==null){
+        		item.cityList=[];
+        	}
+            if (item.cityList.length) {
+                let cityArr = [];
+                item.cityList.map(function (city, n) {
+                    cityArr.push({
+                        value: city.id,
+                        label: city.name
+                    });
+                });
+                option.push({
+                    value: item.id,
+                    label: item.name,
+                    children: cityArr
+                });
+            } else {
+                option.push({
+                    value: item.id,
+                    label: item.name
+                });
+            };
+        });
+        return option;
+    },
+    areaSelect(addressList) {
+        let option = [];
+        addressList.map(function (item, i) {
+        	if(item.cityList==null){
+        		item.cityList=[];
+        	}
+            if (item.cityList.length) {
+                let cityArr = [];
+                item.cityList.map(function (city, n) {
+                	if(city.areaList==null){
+		        		city.areaList=[];
+		        	}
+                    if (city.areaList.length) {
+                        let areaArr = [];
+                        city.areaList.map(function (area, j) {
+                            areaArr.push({
+                                value: area.id,
+                                label: area.name
+                            });
+                        });
+                        cityArr.push({
+                            value: city.id,
+                            label: city.name,
+                            children: areaArr
+                        });
+                    } else {
+                        cityArr.push({
+                            value: city.id,
+                            label: city.name
+                        });
+                    };
+                });
+                option.push({
+                    value: item.id,
+                    label: item.name,
+                    children: cityArr
+                });
+            } else {
+                option.push({
+                    value: item.id,
+                    label: item.name
+                });
+            };
+        });
+        return option;
+    },
+    getProvince(province, city, area) {
+        let PList = [];
+        for (let i = 0; i < addressList.length; i++) {
+            PList.push({
+                id: addressList[i].id,
+                name: addressList[i].name
+            });
+            if (addressList[i].cityList) {
+                for (let j = 0; j < addressList[i].cityList.length; j++) {
+                    PList.push({
+                        id: addressList[i].cityList[j].id,
+                        name: addressList[i].cityList[j].name
+                    });
+                    if (addressList[i].cityList[j].areaList) {
+                        for (let n = 0; n < addressList[i].cityList[j].areaList.length; n++) {
+                            PList.push({
+                                id: addressList[i].cityList[j].areaList[n].id,
+                                name: addressList[i].cityList[j].areaList[n].name
+                            });
+                        }
+                    };
+                };
+            }
+        };
+        PList.sort(function (a, b) {
+            return a.id - b.id
+        });
+        let provinceKey = "";
+        PList.map(function (item) {
+            if (province) {
+                if (province == item.id) {
+                    provinceKey = item.name;
+                };
+                if (city == item.id) {
+                    provinceKey = provinceKey + "/" + item.name;
+                };
+                if (area == item.id) {
+                    provinceKey = provinceKey + "/" + item.name;
+                };
+            };
+        });
+        return provinceKey;
+    }
+}

+ 32 - 32
js/component/manageCenter/customer/content.jsx

@@ -79,22 +79,22 @@ class Content extends Component {
 	                });
           	    });
           	    break;
-//        	case 'personalManage':
-//              require.ensure([], () => {
-//	                const PersonalManage = require('./customerManagement/personalManages').default;
-//	                this.setState({
-//	                    component:<PersonalManage />,	                    	                  
-//	                });
-//        	    });
-//        	    break;
-//        	case 'expertManage':
-//              require.ensure([], () => {
-//	                const ExpertManage = require('./customerManagement/expertManage').default;
-//	                this.setState({
-//	                    component:<ExpertManage />,	                    	                  
-//	                });
-//        	    });
-//        	    break;
+          	case 'personalManage':
+                require.ensure([], () => {
+	                const PersonalManage = require('./customerManagement/personalManages').default;
+	                this.setState({
+	                    component:<PersonalManage />,	                    	                  
+	                });
+          	    });
+          	    break;
+          	case 'expertManage':
+                require.ensure([], () => {
+	                const ExpertManage = require('./customerManagement/expertManage').default;
+	                this.setState({
+	                    component:<ExpertManage />,	                    	                  
+	                });
+          	    });
+          	    break;
           	case 'expertAudit':
                 require.ensure([], () => {
 	                const ExpertReview = require('./reviewed/expertReview').default;
@@ -119,22 +119,22 @@ class Content extends Component {
 	                });
           	    });
           	    break;
-//        	case 'publicManage':
-//              require.ensure([], () => {
-//	                const PublicManages = require('./customerManagement/publicManages').default;
-//	                this.setState({
-//	                    component:<PublicManages />,	                    	                  
-//	                });
-//        	    });
-//        	    break;
-//        	case 'organizationManage':
-//              require.ensure([], () => {
-//	                const OrganizationManage = require('./customerManagement/organizationManages').default;
-//	                this.setState({
-//	                    component:<OrganizationManage />,	                    	                  
-//	                });
-//        	    });
-//        	    break;
+          	case 'publicManage':
+                require.ensure([], () => {
+	                const PublicManages = require('./customerManagement/publicManages').default;
+	                this.setState({
+	                    component:<PublicManages />,	                    	                  
+	                });
+          	    });
+          	    break;
+          	case 'organizationManage':
+                require.ensure([], () => {
+	                const OrganizationManage = require('./customerManagement/organizationManages').default;
+	                this.setState({
+	                    component:<OrganizationManage />,	                    	                  
+	                });
+          	    });
+          	    break;
       	    case 'myBusiness':
 	            require.ensure([], () => {
 	                const MyBusiness = require('./customerService/myBusiness').default;

+ 12 - 4
js/component/manageCenter/customer/customerData/companyCustomer.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 import CustomerDetail from './myClientDesc.jsx';
@@ -580,9 +581,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		this.setState({ companyLogoUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1207,7 +1215,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -1376,7 +1384,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 1 - 1
js/component/manageCenter/customer/customerData/myClient.jsx

@@ -2042,7 +2042,7 @@ const MyClient = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>我的客户</span>
+                    <span>我的单位客户</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"

+ 13 - 5
js/component/manageCenter/customer/customerManagement/expertManage.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -846,9 +847,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1950,7 +1958,7 @@ const QueryCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>个人客户管理</span>
+                    <span>专家管理</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户姓名"
@@ -1963,7 +1971,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2106,7 +2114,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/customerManagement/organizationManages.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 import CustomerDetail from './myClientDesc.jsx';
@@ -950,9 +951,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		this.setState({ companyLogoUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2020,7 +2028,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2192,7 +2200,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 12 - 4
js/component/manageCenter/customer/customerManagement/personalManages.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -846,9 +847,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1963,7 +1971,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2122,7 +2130,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 13 - 5
js/component/manageCenter/customer/customerManagement/publicManages.jsx

@@ -4,14 +4,15 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
 import CustomerDetail from './myClientDesc.jsx';
 import QueryCustomer from './publicManagesOne.jsx';
 import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
-import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
+import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getfllowSituation,  getWhether, getcustomerStatue,  getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
 
 
 
@@ -996,9 +997,16 @@ const PublicCustomer = Form.create()(React.createClass({
 	},
 	componentWillMount() {
 		this.selectSuperId();
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2082,7 +2090,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2251,7 +2259,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 12 - 5
js/component/manageCenter/customer/customerManagement/publicManagesOne.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -887,11 +888,17 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
-		
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		this.selectSuperId();
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2025,7 +2032,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2181,7 +2188,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 0 - 1
js/component/manageCenter/customer/customerService/businessManges.jsx

@@ -6,7 +6,6 @@ import moment from 'moment';
 const Option = AutoComplete.Option;
 const OptGroup = AutoComplete.OptGroup;
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';

+ 1 - 1
js/component/manageCenter/customer/customerService/myBusiness.jsx

@@ -6,7 +6,7 @@ import moment from 'moment';
 const Option = AutoComplete.Option;
 const OptGroup = AutoComplete.OptGroup;
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
+
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';

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

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { areaSelect} from '../../../NewDicProvinceList';
+
+
 const { Column, ColumnGroup } = Table;
 import {socialAttribute,newFollow,lvl, customerStatus,intentionalService} from '../../../dataDic.js';
 import {getcustomerStatue,getprovince,getStatusFollow,getCompanyIntention,getfllowSituation,getContactType } from '../../../tools.js';
@@ -487,7 +488,7 @@ const ServiceQuery= Form.create()(React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">                  
-                    <span>我的业务</span>
+                    <span>业务查询</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 29 - 817
js/component/manageCenter/customer/individualCustomer/expertQuery.jsx


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

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 import CustomerDetail from './myClientDesc.jsx';
@@ -906,9 +907,16 @@ const IndividualCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2091,7 +2099,7 @@ const IndividualCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <Button type="primary" onClick={this.search}>搜索</Button>
@@ -2306,7 +2314,7 @@ const IndividualCustomer = Form.create()(React.createClass({
 					                            {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/individualCustomer/publicQuery.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -575,9 +576,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		this.setState({ companyLogoUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1355,7 +1363,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -1524,7 +1532,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 12 - 4
js/component/manageCenter/customer/individualCustomer/publicQueryOne.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -591,9 +592,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1246,7 +1254,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -1401,7 +1409,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/individualCustomer/queryCustomer.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -811,9 +812,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1928,7 +1936,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2083,7 +2091,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 13 - 5
js/component/manageCenter/customer/release/expertRelease.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -906,9 +907,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		this.setState({ oppositeIdUrl: e });
 	},
 	componentWillMount() {
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -2010,7 +2018,7 @@ const QueryCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>专家申请审核</span>
+                    <span>专家发布审核</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户姓名"
@@ -2023,7 +2031,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2178,7 +2186,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 4
js/component/manageCenter/customer/reviewed/expertReview.jsx

@@ -4,7 +4,8 @@ import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -865,8 +866,15 @@ const QueryCustomer = Form.create()(React.createClass({
 	},
 	componentWillMount() {
 		//城市
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1981,7 +1989,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -2143,7 +2151,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 12 - 10
js/component/manageCenter/customer/reviewed/identityAudits.jsx

@@ -5,18 +5,14 @@ import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import './myClient.less';
 import QueryCustomer from './identityAuditsOne.jsx';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
 import CustomerDetail from './myClientDesc.jsx';
 import { socialAttribute, industry, auditStatusL, newFollow, lvl, currentMember, statuslist, customerStatus, intentionalService } from '../../../dataDic.js';
 import { getSocialAttribute, splitUrl,getAuditStatus, getCompanyIntention, getStatuslist, getContactType, getIndustryType, getfllowSituation, beforeUploadFile, getWhether, getcustomerStatue, getfllowSituationOn, getCertification, getcustomerTyp, getLvl, getCurrentMember, getprovince } from '../../../tools.js';
-
-
-
-
-
 //图片组件
 const PicturesWalls = React.createClass({
 	getInitialState() {
@@ -667,10 +663,16 @@ const PublicCustomer = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	componentWillMount() {
-		
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1367,7 +1369,7 @@ const PublicCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                      <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -1531,7 +1533,7 @@ const PublicCustomer = Form.create()(React.createClass({
 					                           wrapperCol={{ span: 18 }}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />   
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                   </FormItem>

+ 12 - 5
js/component/manageCenter/customer/reviewed/identityAuditsOne.jsx

@@ -3,7 +3,8 @@ import { Radio, Icon, Button, Cascader, Input, Select, Tabs, Spin, Popconfirm, T
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
-import { citySelect, provinceList, areaSelect } from '../../../NewDicProvinceList';
+import { citySelect, provinceList, areaSelect } from '../../../areaList';
+import {getProvinceList} from '../../../addressList';
 const { Column, ColumnGroup } = Table;
 const TabPane = Tabs.TabPane;
 const monthFormat = 'YYYY/MM';
@@ -588,10 +589,16 @@ const QueryCustomer = Form.create()(React.createClass({
 		}.bind(this));
 	},
 	componentWillMount() {
-		
+		let areaArr= getProvinceList();
+		let Citys=citySelect(areaArr);
+		let Areas=areaSelect(areaArr);
+		this.setState({ 
+			City: Citys,
+			Area: Areas
+		});
 		//城市
 		let Province = [];
-		provinceList.map(function(item) {
+		areaArr.map(function(item) {
 			var id = String(item.id)
 			Province.push(
 				<Select.Option value={id} key={item.name}>{item.name}</Select.Option>
@@ -1402,7 +1409,7 @@ const QueryCustomer = Form.create()(React.createClass({
                             {this.state.Provinces}
                     </Select> 
                     <span style={{marginRight:'10px'}}>                   
-	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
+	                     <Cascader options={this.state.City}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
                     <span style={{marginRight:'10px'}}>客户类型:</span>
@@ -1554,7 +1561,7 @@ const QueryCustomer = Form.create()(React.createClass({
 					                           {...formItemLayout}
 					                           label="省-市-区"
 					                          > 
-					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
+					                            <Cascader options={this.state.Area}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'300px'}}
     												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} /> 
     											<span style={{color:'red',marginLeft:'15px'}}>*</span>
 						                    </FormItem>

+ 1 - 1
package.json

@@ -10,7 +10,7 @@
     "dllstage": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy stage --env.host 'http://aftts.hnzhiming.com'",
     "dllpro": "webpack --progress --colors --config ./webpack-dll.config.js --env.deploy prod --env.host 'http://static.goafanti.com'",
     "build": "node bin/clean.js && webpack --progress --colors --env.deploy dev",
-    "buildtest": "set NODE_ENV=production && node --max_old_space_size=4096 bin/clean.js && webpack --progress --colors --env.deploy test",
+    "buildtest": "node --max_old_space_size=4096 bin/clean.js && webpack --progress --colors --env.deploy test",
     "buildstage": "node bin/clean.js && webpack --progress --colors --env.deploy stage",
     "pro": "node bin/clean.js && webpack --progress --colors --env.deploy prod",
 		"dev": "webpack-dev-server --port 80 --devtool eval --progress --colors --hot --content-base build --env.deploy dev --env.watch watch"