liting2017 vor 7 Jahren
Ursprung
Commit
feed0d6692

+ 26 - 0
js/component/dataDic.js

@@ -995,6 +995,10 @@ module.exports = {
             value: "7",
             key: "已面签"
         },
+        {
+            value: "8",
+            key: "无进度"
+        },
     ],
     //最新跟进反
     newFollowOn:[
@@ -1101,7 +1105,25 @@ module.exports = {
          {
             value: "6",
             key: "技术成果"
+        },{
+            value: "7",
+            key: "技术需求"
+        },
+         {
+            value: "8",
+            key: "专家咨询"
+        },{
+            value: "9",
+            key: "团单合作"
+        },
+         {
+            value: "10",
+            key: "商标"
+        },{
+            value: "11",
+            key: "系统集成"
         }
+        
     ],
     //意向服务反
     intentionalServiceOn:[
@@ -1155,6 +1177,10 @@ module.exports = {
             value: '1',
             key: "公司客户"
         },
+         {
+            value: '2',
+            key: "团体单位"
+        },
        
     ], 
     //性别

+ 18 - 5
js/component/manageCenter/customer/companyCustomer.jsx

@@ -9,6 +9,7 @@ import { orderStatusList,cityArr,customerStatus,intentionalService,newFollow} fr
 import { beforeUploadFile,getOrderStatus, getSearchUrl,getcustomerTyp,getcityArr,getcustomerStatue,getCompanyIntention,getfllowSituation,getsex} from '../../tools.js';
 
 //查询功能和初始列表
+
 const PublicCustomer = React.createClass({
     loadData(pageNo, detailApiUrl) {    	
         this.state.data = [];
@@ -91,7 +92,15 @@ const PublicCustomer = React.createClass({
                 id: deletedIds
             },
             success: function (data) {
-                let thisData = data.data;                
+                let thisData = data.data; 
+                let companyArr=[]; 	
+                let companyText=[];
+   				let companyString=thisData.companyIntention;				
+   				companyArr=companyString.split(",") 
+   				console.log(companyArr)
+   				for(var i=0;i<companyArr.length;i++){
+   					companyText+=getCompanyIntention(companyArr[i])+"-"
+   				}
                 if (!thisData) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
@@ -99,6 +108,7 @@ const PublicCustomer = React.createClass({
                     thisData = {};
                 };
                 this.setState({
+                	companyIntention:companyText,
                     data: thisData,
                    	followSituation:thisData.followSituation,
 		            		customerStatus:thisData.customerStatus,		            		
@@ -617,8 +627,11 @@ const PublicCustomer = React.createClass({
                                 <Col span={6}>{theData.companyIndustry}</Col>
                             </Row>
                             <Row style={{marginLeft:'100px'}}>
-                                <Col span={3}>意向服务:</Col>
-                                <Col span={6}>{getCompanyIntention(theData.companyIntention)}</Col>
+	                            <Col span={3}>意向服务:</Col>
+	                            <Col span={18}>{this.state.companyIntention}</Col>
+	                         </Row>
+                            <Row style={{marginLeft:'100px'}}>
+                                
                                 <Col span={3}>地区:</Col>
                                 <Col span={6}>{getcityArr(theData.locationProvince)}</Col>
                             </Row>
@@ -632,9 +645,9 @@ const PublicCustomer = React.createClass({
                                 <Col span={3}>详细地址:</Col>                                
                                 <Col span={6}>{theData.adress}</Col>
                             </Row>
-                            <Row style={{marginLeft:'100px'}}>   
+                            <Row style={{marginLeft:'100px'}} >   
                                 <Col span={3}>备注:</Col>
-                                <Col span={6}>{theData.remarks}</Col>
+                                <Col span={18}>{theData.remarks}</Col>
                             </Row>
                                                        
                         </Spin>

Datei-Diff unterdrückt, da er zu groß ist
+ 1152 - 1005
js/component/manageCenter/customer/myClient.jsx


+ 4 - 1
js/component/manageCenter/customer/myClient.less

@@ -28,6 +28,7 @@
         }
     }
 }
+.tabcolor .ant-table-thead > tr > th{background: none!important;}
 .avatar-uploader,
 .avatar-uploader-trigger,
 .avatar {
@@ -130,4 +131,6 @@
             display: none;
         }
     }
-}
+}
+
+

+ 37 - 88
js/component/manageCenter/customer/myClientDesc.jsx

@@ -359,12 +359,13 @@ const AchievementDetailShow = Form.create()(React.createClass({
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
         }; 
-        const selectOption=[];
-        intentionalService.map(function (item) {
-                    selectOption.push(
-                        <Select.Option key={item.id}>{item.name}</Select.Option>
-                    )                    
-                });
+        //意向服务多选
+//      const selectOption=[];
+//      intentionalService.map(function (item) {
+//                  selectOption.push(
+//                      <Select.Option key={item.id}>{item.name}</Select.Option>
+//                  )                    
+//              });
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
@@ -412,41 +413,21 @@ const AchievementDetailShow = Form.create()(React.createClass({
 	                            })(
 	                                <Input />
 	                                )}
-	                        </FormItem>        
-                     {/*<FormItem className="half-item"
-	                            {...formItemLayout}
-	                            label="意向服务" >
-	                            {getFieldDecorator('companyIntention', {
-	                            	rules: [{ required: true, message: '此项为必填项!' }],
+	                        </FormItem>                           
+                    <FormItem className="half-item"
+                        {...formItemLayout}
+                        label="意向服务" >                       						   
+                            {getFieldDecorator('companyIntention', {
 	                                initialValue: theData.companyIntention
 	                            })(
-	                               <Select placeholder="选择服务类型" >
+	                                <Select placeholder="选择意向服务" style={{ width: 160 }} >
 	                                    {
 	                                        intentionalService.map(function (item) {
 	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 	                                        })
 	                                    }
 	                                </Select>
-	                                )}
-	                        </FormItem>*/}
-                    <FormItem className="half-item"
-                        {...formItemLayout}
-                        label="意向服务" >                       
-						   <Select
-                                multiple
-                                style={{ width: '80%' }}
-                                placeholder="选择服务类型"                               
-                                filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
-                                value={this.state.companyIntention}
-                                onChange={(pids) => {
-                                    this.state.companyIntention = pids;
-                                    this.setState({
-                                        companyIntention: this.state.companyIntention
-                                    })
-                                }}
-                            >
-                                {selectOption}
-                            </Select>						
+	                        )}
                     </FormItem>
                      <FormItem className="half-item"
 	                            {...formItemLayout}
@@ -611,16 +592,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
 	              	<div className="clearfix" style={{paddingLeft:"200px",marginBottom:"20px"}}>
                        <Button className="set-submit" type="primary" htmlType="submit" id="change_keep" style={{marginTop:"20px"}}>保存</Button>
                        <Button className="set-submit" type="ghost" onClick={this.props.closeDesc} id='change_rem' style={{marginTop:"20px"}}>取消</Button>
-                  	</div>
-                    
-                  {/*  <FormItem wrapperCol={{ span: 12, offset: 4 }}>
-                        {theData.auditStatus == 2 ? <Button className="set-submit" type="primary" htmlType="submit">保存</Button> : <span></span>}
-                        {theData.auditStatus == 3 ? <Button className="set-submit" type="primary" onClick={() => { this.modifyBroker(); }}>保存</Button> : <span></span>}
-                        <Button className="set-submit" type="ghost" onClick={this.props.closeDesc}>取消</Button> */}
-                        {/*{window.showAuditStatus ? <Button className="set-submit" loading={this.state.buttonLoading} type="primary" onClick={this.buildMatchList}>生成匹配列表</Button> : <span></span>}*/}
-                    {/* </FormItem>  
-                    */}
-                    
+                  	</div>                                    
                 </Spin>
             </Form >
         )
@@ -814,14 +786,15 @@ const AchievementDetailForm = Form.create()(React.createClass({
                 });
                 theMaturityPictureUrl = picArr.join(",");
             };
-            let companyMore = [];
-            if (values.companyIntention.length) {
-                let companyList = [];
-                values.companyIntention.map(function (item) {
-                    companyList.push(item);
-                });
-                companyMore = companyList.join(",");
-            };
+            //意向服务多选
+//          let companyMore = [];
+//          if (values.companyIntention.length) {
+//              let companyList = [];
+//              values.companyIntention.map(function (item) {
+//                  companyList.push(item);
+//              });
+//              companyMore = companyList.join(",");
+//          };
             console.log(values.companyIntention)
             if (!err) {
                 this.setState({
@@ -840,7 +813,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                        
                         companyName: values.companyName,//公司名称  1
                         companyIndustry: values.companyIndustry,//公司行业  
-                        companyIntention: companyMore,//公司意向1
+                        companyIntention: values.companyIntention,//公司意向1
                         tag: values.tag,
                         locationProvince: values.locationProvince,//省份1
                         adress: values.adress,//详细地址1
@@ -922,7 +895,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                            })(
 		                                <Select placeholder="选择客户类型" style={{ width: 160 }} >
 		                                    <Select.Option value="0" >个人客户</Select.Option>
-		                                    <Select.Option value="1" >公司客户</Select.Option>                                   
+		                                    <Select.Option value="1" >公司客户</Select.Option>
+		                                    <Select.Option value="2" >团体单位</Select.Option> 
 		                                </Select>
 		                                )}
 		                </FormItem>
@@ -938,21 +912,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                                 <DatePicker />
                                 )}	 
                                
-	                    </FormItem> 
-	                {/*    <FormItem className="half-item" style={{marginLeft:'-160px'}}
-	                            {...formItemLayout}
-	                            label="" >
-	                                                        
-	                    </FormItem> */}
-	                      {/*    <FormItem className="half-item"
-	                            {...formItemLayout}
-	                            label="跟单人" >
-	                            {getFieldDecorator('ownerId', {
-	                                initialValue: theData.ownerId
-	                            })(
-	                                <Input />
-	                                )}
-	                        </FormItem> */}
+	                    </FormItem> 	              
                         </div>
                         <div className="clearfix" style={{marginLeft:'40px',marginBottom:'20px',color:'#000000'}}>公司资料:</div>	                    		                           	                                                       	                                               
                         <div>
@@ -1053,27 +1013,16 @@ const AchievementDetailForm = Form.create()(React.createClass({
 			                        label="意向服务" > 
 			                        {getFieldDecorator('companyIntention', {
 			                            	rules: [{ required: true, message: '此项为必填项!' }],	
-			                            	
+			                            	initialValue: theData.companyIntention
 	                                })(
-									   <Select 
-			                                multiple	
-			                                style={{width:'600px'}}
-			                                placeholder="选择服务类型"                               
-			                                filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
-			                                value={this.state.companyIntention}
-			                                onChange={(pids) => {
-			                                    this.state.companyIntention = pids;
-			                                    this.setState({
-			                                        companyIntention: this.state.companyIntention
-			                                    })
-			                                }}
-			                            >
-			                                {
-		                                        intentionalService.map(function (item) {
-		                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-		                                        })
-		                                    }
-			                            </Select>)}					
+									    <Select placeholder="选择意向服务" style={{ width: 160 }} >
+	                                    {
+	                                        intentionalService.map(function (item) {
+	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+	                                        })
+	                                    }
+	                                </Select>
+	                                )}
 			                    </FormItem>
 		                    </div>
 	                        <div  className="clearfix">