liting2017 7 years ago
parent
commit
ab9735182c

+ 2 - 2
js/component/account/set/hrSituation.jsx

@@ -396,7 +396,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                     </FormItem>
                     </FormItem>
                     <FormItem className="half-item"
                     <FormItem className="half-item"
                         {...formItemLayout}
                         {...formItemLayout}
-                        label="31-34"
+                        label="31-40"
                     >
                     >
                         {getFieldDecorator('thirtyoneToThirtyfour', {
                         {getFieldDecorator('thirtyoneToThirtyfour', {
                             initialValue: this.props.data.thirtyoneToThirtyfour || 0
                             initialValue: this.props.data.thirtyoneToThirtyfour || 0
@@ -416,7 +416,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                     </FormItem>
                     </FormItem>
                     <FormItem className="half-item"
                     <FormItem className="half-item"
                         {...formItemLayout}
                         {...formItemLayout}
-                        label="50以上"
+                        label="51及以上"
                     >
                     >
                         {getFieldDecorator('aboveFifty', {
                         {getFieldDecorator('aboveFifty', {
                             initialValue: this.props.data.aboveFifty || 0
                             initialValue: this.props.data.aboveFifty || 0

+ 1 - 1
js/component/manageCenter/customer/companyCustomer.jsx

@@ -647,7 +647,7 @@ const PublicCustomer = React.createClass({
                             </Row>
                             </Row>
                             <Row style={{marginLeft:'100px'}}>
                             <Row style={{marginLeft:'100px'}}>
                                 <Col span={3}>详细地址:</Col>                                
                                 <Col span={3}>详细地址:</Col>                                
-                                <Col span={6}>{theData.adress}</Col>
+                                <Col span={6}>{theData.address}</Col>
                             </Row>
                             </Row>
                             <Row style={{marginLeft:'100px'}} >   
                             <Row style={{marginLeft:'100px'}} >   
                                 <Col span={3}>备注:</Col>
                                 <Col span={3}>备注:</Col>

+ 13 - 12
js/component/manageCenter/customer/myClient.jsx

@@ -262,7 +262,7 @@ const AchievementList = Form.create()(React.createClass({
                 	addCid:thisData.cid,
                 	addCid:thisData.cid,
                     datak: thisData,
                     datak: thisData,
                     companyIndustry:thisData.companyIndustry,
                     companyIndustry:thisData.companyIndustry,
-                    adress:thisData.adress,                    
+                    address:thisData.address,                    
                    	followSituation:followSituationTxt,
                    	followSituation:followSituationTxt,
             		customerStatus:thisData.customerStatus.toString(),
             		customerStatus:thisData.customerStatus.toString(),
             		companyIntention:thisData.companyIntention,
             		companyIntention:thisData.companyIntention,
@@ -723,8 +723,8 @@ const AchievementList = Form.create()(React.createClass({
             let customerTypechange="";
             let customerTypechange="";
             switch(custype){
             switch(custype){
             	case "个人客户":customerTypechange=0;break;
             	case "个人客户":customerTypechange=0;break;
-            	case "机构单位":customerTypechange=1;break;
-            	case "团体单位":customerTypechange=2;break;
+            	case "公司客户":customerTypechange=1;break;
+            	case "团体客户":customerTypechange=2;break;
             }              
             }              
             let customerStatus= getcustomerStatueOn(this.state.customerStatus);
             let customerStatus= getcustomerStatueOn(this.state.customerStatus);
             let followSituation= getfllowSituationOn(this.state.followSituation);
             let followSituation= getfllowSituationOn(this.state.followSituation);
@@ -827,7 +827,7 @@ const AchievementList = Form.create()(React.createClass({
             switch(custype){
             switch(custype){
             	case "个人客户":customerTypechange=0;break;
             	case "个人客户":customerTypechange=0;break;
             	case "公司客户":customerTypechange=1;break;
             	case "公司客户":customerTypechange=1;break;
-            	case "团体单位":customerTypechange=2;break;
+            	case "团体客户":customerTypechange=2;break;
             }      
             }      
             let companyIntentions= getCompanyIntentionOn(values.companyIntention);
             let companyIntentions= getCompanyIntentionOn(values.companyIntention);
             let followSituations= getfllowSituationOn(values.followSituation);         
             let followSituations= getfllowSituationOn(values.followSituation);         
@@ -855,7 +855,7 @@ const AchievementList = Form.create()(React.createClass({
                         companyIndustry: this.state.companyIndustry,//公司行业                          
                         companyIndustry: this.state.companyIndustry,//公司行业                          
                         tag: theDatak.tag,
                         tag: theDatak.tag,
                         locationProvince:this.state.locationProvince ,//省份1
                         locationProvince:this.state.locationProvince ,//省份1
-                        adress: this.state.adress,//详细地址1
+                        address: this.state.address,//详细地址1
                         remarks: values.remarks,//备注1
                         remarks: values.remarks,//备注1
                         companyIntention:this.state.companyIntention,//公司意向
                         companyIntention:this.state.companyIntention,//公司意向
                         followSituation:theDatak.followSituation,//最新跟进1
                         followSituation:theDatak.followSituation,//最新跟进1
@@ -1743,10 +1743,10 @@ const AchievementList = Form.create()(React.createClass({
                 <div className="content-title">                  
                 <div className="content-title">                  
                     <span>我的客户管理</span>
                     <span>我的客户管理</span>
                     <div className="patent-addNew clearfix"  style={{marginRight:"22px"}}>
                     <div className="patent-addNew clearfix"  style={{marginRight:"22px"}}>
-                        <Button onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/downloadTemplate?sign=achievement_template') }}>下载批量导入模板</Button>
-                   		<Upload
-                            action={globalConfig.context + "/api/admin/achievement/uploadTemplate"}
-                            data={{ 'sign': 'achievement_template' }}
+                        <Button disabled onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/downloadTemplate?sign=achievement_template') }}>下载批量导入模板</Button>
+                   		<Upload 
+                   		    name="file"
+                            action={globalConfig.context + "/api/admin/customer/uploadExcel"}                            
                             beforeUpload={beforeUploadFile}
                             beforeUpload={beforeUploadFile}
                             showUploadList={false}
                             showUploadList={false}
                             onChange={(info) => {
                             onChange={(info) => {
@@ -1756,6 +1756,7 @@ const AchievementList = Form.create()(React.createClass({
                                 if (info.file.status === 'done') {
                                 if (info.file.status === 'done') {
                                     if (!info.file.response.error.length) {
                                     if (!info.file.response.error.length) {
                                         message.success(`${info.file.name} 文件上传成功!`);
                                         message.success(`${info.file.name} 文件上传成功!`);
+                                        this.loadData();
                                     } else {
                                     } else {
                                         message.warning(info.file.response.error[0].message);
                                         message.warning(info.file.response.error[0].message);
                                         return;
                                         return;
@@ -1777,8 +1778,8 @@ const AchievementList = Form.create()(React.createClass({
                             value={this.state.customerTypet }
                             value={this.state.customerTypet }
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             onChange={(e) => { this.setState({ customerTypet : e }) }}>
                             <Select.Option value="0" >个人客户</Select.Option>
                             <Select.Option value="0" >个人客户</Select.Option>
-                            <Select.Option value="1" >机构单位</Select.Option>
-                            <Select.Option value="2" >团体单位</Select.Option>
+                            <Select.Option value="1" >公司客户</Select.Option>
+                            <Select.Option value="2" >团体客户</Select.Option>
                     </Select>     
                     </Select>     
                     <Select placeholder="意向服务"
                     <Select placeholder="意向服务"
                             style={{ width: 160 }}
                             style={{ width: 160 }}
@@ -2139,7 +2140,7 @@ const AchievementList = Form.create()(React.createClass({
 										<FormItem className="half-item"
 										<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            {...formItemLayout}
 				                            label="详细地址" >
 				                            label="详细地址" >
-				                            <Input type="text" value={this.state.adress} onChange={(e) => { this.setState({adress: e.target.value }); }}/>
+				                            <Input type="text" value={this.state.address} onChange={(e) => { this.setState({address: e.target.value }); }}/>
 										</FormItem>
 										</FormItem>
 										<FormItem className="half-item"
 										<FormItem className="half-item"
 				                            {...formItemLayout}
 				                            {...formItemLayout}

+ 5 - 5
js/component/manageCenter/customer/myClientDesc.jsx

@@ -66,7 +66,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         companyIntention: values.companyIntention,//公司意向1
                         companyIntention: values.companyIntention,//公司意向1
                         tag: tags,
                         tag: tags,
                         locationProvince: values.locationProvince,//省份1
                         locationProvince: values.locationProvince,//省份1
-                        adress: values.adress,//详细地址1
+                        address: values.address,//详细地址1
                         remarks: values.remarks,//备注1
                         remarks: values.remarks,//备注1
                         followSituation: values.followSituation,//最新跟进1
                         followSituation: values.followSituation,//最新跟进1
                         customerStatus: values.customerStatus,//客户状态1
                         customerStatus: values.customerStatus,//客户状态1
@@ -145,8 +145,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                            })(
 		                            })(
 		                                <Select placeholder="选择客户类型" style={{ width: 160 }} >
 		                                <Select placeholder="选择客户类型" style={{ width: 160 }} >
 		                                    <Select.Option value="0" >个人客户</Select.Option>
 		                                    <Select.Option value="0" >个人客户</Select.Option>
-		                                    <Select.Option value="1" >机构单位</Select.Option>
-		                                    <Select.Option value="2" >团体单位</Select.Option> 
+		                                    <Select.Option value="1" >公司客户</Select.Option>
+		                                    <Select.Option value="2" >团体客户</Select.Option> 
 		                                </Select>
 		                                </Select>
 		                                )}
 		                                )}
 		                </FormItem>
 		                </FormItem>
@@ -228,8 +228,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                        <FormItem className="half-item"
 	                        <FormItem className="half-item"
 		                            {...formItemLayout}
 		                            {...formItemLayout}
 		                            label="详细地址" >
 		                            label="详细地址" >
-		                            {getFieldDecorator('adress', {		                            	
-		                                initialValue: theData.adress
+		                            {getFieldDecorator('address', {		                            	
+		                                initialValue: theData.address
 		                            })(
 		                            })(
 		                                <Input />
 		                                <Input />
 		                                )}
 		                                )}

+ 2 - 2
js/component/manageCenter/servicesManage/highTech/fosterDesc/hrSituation.jsx

@@ -398,7 +398,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                     </FormItem>
                     </FormItem>
                     <FormItem className="half-item"
                     <FormItem className="half-item"
                         {...formItemLayout}
                         {...formItemLayout}
-                        label="31-34"
+                        label="31-40"
                     >
                     >
                         {getFieldDecorator('thirtyoneToThirtyfour', {
                         {getFieldDecorator('thirtyoneToThirtyfour', {
                             initialValue: this.props.data.thirtyoneToThirtyfour || 0
                             initialValue: this.props.data.thirtyoneToThirtyfour || 0
@@ -418,7 +418,7 @@ const HrSituationDescFrom = Form.create()(React.createClass({
                     </FormItem>
                     </FormItem>
                     <FormItem className="half-item"
                     <FormItem className="half-item"
                         {...formItemLayout}
                         {...formItemLayout}
-                        label="50以上"
+                        label="51及以上"
                     >
                     >
                         {getFieldDecorator('aboveFifty', {
                         {getFieldDecorator('aboveFifty', {
                             initialValue: this.props.data.aboveFifty || 0
                             initialValue: this.props.data.aboveFifty || 0