dengzhiguo il y a 7 ans
Parent
commit
0a7f88d0a3

+ 32 - 1
js/component/dataDic.js

@@ -1055,6 +1055,20 @@ module.exports = {
             key: "科技项目"
         }
     ],
+    //客户标签
+    tag:[
+        {
+            value: "0",
+            key: "科技专家"
+        }, {
+            value: "1",
+            key: "科研单位"
+        },
+        {
+            value: "2",
+            key: "民间达人"
+        },        
+    ],
     //客户类型
     customerTyp:[
         {
@@ -1076,5 +1090,22 @@ module.exports = {
             key: "女"
         },
        
-    ],  
+    ], 
+     //联系方式
+    contact:[
+        {
+            value: '0',
+            key: "电话"
+        }, {
+            value: '1',
+            key: "邮件"
+        },
+        {
+            value: '2',
+            key: "面谈"
+        }, {
+            value: '3',
+            key: "短信"
+        },      
+    ], 
 };

+ 5 - 6
js/component/manageCenter/customer/content.jsx

@@ -20,15 +20,14 @@ class Content extends Component {
         };
     }
     getKey(key) {
-        switch (key) {   
-        	
+        switch (key) {          	
             case 'myClient':
                 require.ensure([], () => {
                     const TechAchievement = require('./myClient').default;
                     this.setState({
                         component: TechAchievement ,  
-                        listApiUrl: '/api/admin/achievement/orgList',
-                        detailApiUrl: '/api/admin/achievement/orgDetail'
+                        listApiUrl: '/api/admin/customer/orgList',
+                        detailApiUrl: '/api/admin/customer/findCustomerUserDetails'
                     });
                 });
                 break;           
@@ -37,8 +36,8 @@ class Content extends Component {
                     const AchievementOrder = require('./publicCustomer').default;
                     this.setState({
                         component:AchievementOrder,
-                        listApiUrl: '/api/admin/achievement/orgList',
-                        detailApiUrl: '/api/admin/achievement/orgDetail'
+                        listApiUrl: '/api/admin/customer/orgList',
+                        detailApiUrl: '/api/admin/customer/orgDetail'
                     });
                 });
                 break;

Fichier diff supprimé car celui-ci est trop grand
+ 839 - 97
js/component/manageCenter/customer/myClient.jsx


+ 54 - 584
js/component/manageCenter/customer/myClientDesc.jsx

@@ -1,11 +1,11 @@
 import React from 'react';
-import { Tabs, Table, Icon, Tooltip, Modal, message, AutoComplete, Spin, DatePicker,Upload, Input, InputNumber, Select, Button, Radio, Form, Cascader, Tag, Switch } from 'antd';
+import { Tabs, Table, Icon, Tooltip, Modal, message, AutoComplete, Spin, DatePicker,Upload, Input, InputNumber, Select,TimePicker, Button, Radio, Form, Cascader, Tag, Switch } from 'antd';
 import './myClient.less';
 import ajax from 'jquery/src/ajax/xhr.js';
 import moment from 'moment';
 import $ from 'jquery/src/ajax';
 import { areaSelect } from '../../NewDicProvinceList';
-import { maturityList, innovationList, transferModeList,cityArr ,newFollow,customerStatus,intentionalService} from '../../dataDic';
+import { maturityList, innovationList, transferModeList,cityArr ,newFollow,customerStatus,intentionalService,tag} from '../../dataDic';
 import { IndustryObject, getIndustryCategory } from '../../DicIndustryList.js';
 import { beforeUploadFile, splitUrl, companySearch, getTransferMode, getAchievementCategory, getTechAuditStatus, getDemandType, getMaturity, getInnovation,beforeUpload, getBase64,getsex,getCompanyIntention,getcityArr,getfllowSituation,getcustomerStatue} from '../../tools.js';
 import throttle from '../../throttle.js';
@@ -149,12 +149,13 @@ const AchievementDetailShow = Form.create()(React.createClass({
             businessPlanFileList: []
         };
     },
+    //鼠标点击整行的时候的函数
     loadData(id, detailApiUrl) {
         this.setState({
             loading: true
         });
         $.ajax({
-            method: "get",
+            method: "post",
             dataType: "json",
             crossDomain: false,
             url: globalConfig.context + detailApiUrl,
@@ -360,15 +361,8 @@ const AchievementDetailShow = Form.create()(React.createClass({
                 	<div className="clearfix">
                 		<FormItem className="half-item"
                             {...formItemLayout}
-                            label="客户类型" >
-                            {(() => {
-                                switch (theData.customerTyp) {
-                                    case "0":
-                                        return <span>个人客户</span>;
-                                    case "1":
-                                        return <span>公司客户</span>;                                   
-                                }
-                            })()}
+                            label="客户类型5555" >
+                            <span>{theData._shareType}</span>
                         </FormItem>
                         <FormItem className="half-item"
                             {...formItemLayout}
@@ -377,7 +371,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
                         </FormItem>
                         <div className="clearfix" style={{marginLeft:'40px',marginBottom:'20px',color:'#000000'}}>基本资料:</div>	
                		</div>
-                    <FormItem className="half-item"
+                  {/* <FormItem className="half-item"
 	                        {...formItemLayout}
 	                        label="录入时间" >
 	                        {getFieldDecorator('createTime', {
@@ -385,7 +379,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
 	                        })(
 	                        <DatePicker />
 	                        )}
-	                 </FormItem>
+	                 </FormItem> */} 
                     <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="跟单人" >
@@ -466,8 +460,8 @@ const AchievementDetailShow = Form.create()(React.createClass({
 	                 <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="客户状态" >
-	                            {getFieldDecorator('customerStatue', {
-	                                initialValue: theData.customerStatue
+	                            {getFieldDecorator('customerStatus', {
+	                                initialValue: theData.customerStatus
 	                            })(
 	                                <Select placeholder="选择客户状态" style={{ width: 160 }} >
 	                                    {
@@ -486,7 +480,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
 		                            })(
 		                                <Input />
 		                                )}
-		                    </FormItem>
+		                    </FormItem>		             
                      <div  className="clearfix">		                        
 				                <FormItem
 			                        labelCol={{ span: 4 }}
@@ -594,7 +588,7 @@ const AchievementDetailShow = Form.create()(React.createClass({
  					</div>        
 	                <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                        <Button className="set-submit" type="primary" htmlType="submit" id="change_keep">保存</Button>
-                        <Button className="set-submit" type="ghost" onClick={this.props.closeDesc} id='change_rem'>取消</Button>
+                       <Button className="set-submit" type="ghost" onClick={this.props.closeDesc} id='change_rem'>取消</Button>
                     </FormItem>    
                     
                   {/*  <FormItem wrapperCol={{ span: 12, offset: 4 }}>
@@ -611,6 +605,9 @@ const AchievementDetailShow = Form.create()(React.createClass({
     }
 }));
 
+
+
+
 const AchievementDetailForm = Form.create()(React.createClass({
     getInitialState() {
         return {
@@ -811,11 +808,12 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         companyName: values.companyName,//公司名称  1
                         companyIndustry: values.companyIndustry,//公司行业  
                         companyIntention: values.companyIntention,//公司意向1
+                        tag: values.tag,
                         locationProvince: values.locationProvince,//省份1
                         adress: values.adress,//详细地址1
                         remarks: values.remarks,//备注1
                         followSituation: values.followSituation,//最新跟进1
-                        customerStatue: values.customerStatue,//客户状态1
+                        customerStatus: values.customerStatus,//客户状态1
                         name: values.name,//客户姓名1                        
                         mobile: values.mobile,//座机1
                         telNum: values.telNum,//手机号码1
@@ -825,51 +823,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         qq: values.qq,//qq     1                 
                         depatrment: values.depatrment,//部门             1
                         email: values.email,//邮箱     1                   
-                       	shareTyp:1,
-                        
-//                      keyword: this.state.tags ? this.state.tags.join(",") : this.props.tags.join(","),
-//                      keywords: this.state.tags ? this.state.tags : this.props.tags,
-//                      category: values.category,
-//                      summary: values.summary,
-//                      introduction: values.introduction,
-//                      technicalPictureUrl: theTechnicalPictureUrl,
-//                      coverImg: thecoverImg,
-//                      fieldA: values.field ? values.field[0] : undefined,
-//                      fieldB: values.field ? values.field[1] : undefined,
-//                      maturity: values.maturity,
-//                      maturityPictureUrl: theMaturityPictureUrl,
-//                      maturityTextFileUrl: this.state.maturityTextFileUrl,
-//                      maturityVideoUrl: values.maturityVideoUrl,
-//                      innovation: values.innovation,
-//                      //
-//                      switchSign: this.state.switchValue ? 1 : 0,
-//                      //
-//                      ownerId: !this.state.switchValue ? (this.state.dataSourceObj ? this.state.dataSourceObj[values.iOwnerName] : this.state.data.ownerId) : undefined,
-//                      contacts: !this.state.switchValue ? values.contacts : undefined,
-//                      ownerType: this.props.detailApiUrl.indexOf('org') != -1 ? 1 : 0,
-//                      //自定义
-//                      ownerName: this.state.switchValue ? values.ownerName : undefined,
-//                      ownerIdNumber: this.state.switchValue ? values.ownerIdNumber : undefined,
-//                      ownerId: this.state.switchValue ? values.ownerId : undefined,//拥有者
-//                      ownerEmail: this.state.switchValue ? values.ownerEmail : undefined,
-//                      ownerPostalAddress: this.state.switchValue ? values.ownerPostalAddress : undefined,
-//                      //
-//                      cooperationMode: values.cooperationMode,
-//                      transferMode: values.transferMode,
-//                      bargainingMode: values.bargainingMode,
-//                      transferPrice: values.transferPrice,
-//                      technicalScene: values.technicalScene,
-//                      breakthrough: values.breakthrough,
-//                      patentCase: values.patentCase,
-//                      awards: values.awards,
-//                      teamDes: values.teamDes,
-//                      parameter: values.parameter,
-//                      releaseStatus: values.releaseStatus,
-//                      techPlanUrl: this.state.techPlanUrl,
-//                      businessPlanUrl: this.state.businessPlanUrl,
-//                      auditStatus: this.state.auditStatus,                       
-//                      boutique: values.boutique, 
-//                      hot: values.hot,                       
+                       	shareTyp:0,
+                                                     
                     }
                 }).done(function (data) {
                     this.state.auditStatus = 0;
@@ -925,7 +880,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                     <div className="clearfix">
                     	<FormItem className="half-item"
 		                            {...formItemLayout}
-		                            label="客户类型" >
+		                            label="客户类型11111" >
 		                            {getFieldDecorator('customerTyp', {
 		                                rules: [{ required: true, message: '此项为必填项!' }],
 		                                initialValue: theData.customerTyp
@@ -943,15 +898,26 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         </FormItem>
                     	<div className="clearfix" style={{marginLeft:'40px',marginBottom:'20px',color:'#000000'}}>基本资料:</div>	                    	                       
                         <div>	                    	
-		                    <FormItem className="half-item"
+		                 {/*  <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="录入时间" >
 	                            {getFieldDecorator('createTime', {
 	                                initialValue: theData.createTime ? moment(theData.createTime) : null
 	                            })(
 	                                <DatePicker />
-	                                )}
-	                        </FormItem>
+	                               
+	                                )}	                            
+	                        </FormItem>  */} 
+	                    {/*      <FormItem className="half-item" style={{marginLeft:'-160px'}}
+	                            {...formItemLayout}
+	                            label="" >
+	                            {getFieldDecorator('createTim', {
+	                                initialValue: theData.createTime ? moment(theData.createTime) : null
+	                            })(
+	                                <TimePicker />
+	                               
+	                                )}	                            
+	                        </FormItem> */} 
 	                        <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="跟单人" >
@@ -1032,8 +998,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                        <FormItem className="half-item"
 	                            {...formItemLayout}
 	                            label="客户状态" >
-	                            {getFieldDecorator('customerStatue', {
-	                                initialValue: getcustomerStatue(theData.customerStatue)
+	                            {getFieldDecorator('customerStatus', {
+	                                initialValue: getcustomerStatue(theData.customerStatus)
 	                            })(
 	                                <Select placeholder="选择客户状态" style={{ width: 160 }} >
 	                                    {
@@ -1053,6 +1019,21 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                                <Input />
 		                                )}
 		                    </FormItem>
+		                     <FormItem className="half-item"
+	                            {...formItemLayout}
+	                            label="标签" >
+	                            {getFieldDecorator('tag', {	                            	
+	                                initialValue: theData.tag
+	                            })(
+	                               <Select placeholder="选择客户标签" >
+	                                    {
+	                                        tag.map(function (item) {
+	                                            return <Select.Option key={item.key} >{item.key}</Select.Option>
+	                                        })
+	                                    }
+	                                </Select>
+	                                )}
+	                        </FormItem>
 	                        <div  className="clearfix">		                        
 				                <FormItem
 			                        labelCol={{ span: 4 }}
@@ -1155,520 +1136,8 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                                <Input />
 	                                )}
 	                        </FormItem>
-                        </div>
-                        
-                       {/* <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="编号" >
-                            <span>{theData.serialNumber}</span>
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="名称" >
-                            {getFieldDecorator('name', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.name
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="数据类别" >
-                            {getFieldDecorator('dataCategory', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.dataCategory
-                            })(
-                                <Select placeholder="选择数据类型" style={{ width: 160 }} >
-                                    <Select.Option value="0" >成果</Select.Option>
-                                    <Select.Option value="1" >技术</Select.Option>
-                                    <Select.Option value="2" >项目</Select.Option>
-                                </Select>
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="类型" >
-                            {getFieldDecorator('category', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.category
-                            })(
-                                <Select style={{ width: 160 }} placeholder="请选择成果类型">
-                                    {this.props.achievementCategoryOption}
-                                </Select>
-                                )}
-                        </FormItem>                                              
-                        <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="精品成果" >
-                                {getFieldDecorator('boutique', {
-                                    initialValue: theData.boutique
-                                })(
-                                    <Radio.Group>
-                                        <Radio value="0">否</Radio>
-                                        <Radio value="1">是</Radio>
-                                    </Radio.Group>
-                                    )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="首页展示:" >
-                                {getFieldDecorator('hot', {
-                                    initialValue: theData.hot
-                                })(
-                                    <Radio.Group onChange={(e) => { this.setState({ radios: e.target.value }); }}>
-                                        <Radio value="0">否</Radio>
-                                        <Radio value="1">是</Radio>
-                                    </Radio.Group>
-                                    )}
-                        </FormItem>                                           		
-                        {this.state.radios==true ? <FormItem
-	                        labelCol={{ span: 4 }}
-	                        wrapperCol={{ span: 18 }}
-	                        label="首页展示图片:" >
-	                        <PicturesWall
-	                            pictureSign="achievement_cover_picture"
-	                            fileList={this.getcoverImg}	                            
-	                            pictureUrl={this.state.coverImg} />
-	                        <p>图片尺寸建议:220X140(像素)</p>
-	                    </FormItem>:<div></div>}
-	                    
-                        <div className="clearfix">
-                            <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="是否发布" >
-                                {(() => {
-                                    switch (theData.releaseStatus) {
-                                        case "0":
-                                            return <span>未发布</span>;
-                                        case "1":
-                                            return <span>已发布</span>;
-                                    }
-                                })()}
-                            </FormItem>
-                            <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="发布时间" >
-                                <span>{theData.releaseDateFormattedDate}</span>
-                            </FormItem>
-                            <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="审核状态" >
-                                <span>{getTechAuditStatus(theData.auditStatus)}</span>
-                            </FormItem>
-                        </div>
-                        */}
-                    </div>
-                    {/*
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="关键词" >
-                        <KeyWordTagGroup
-                            keyWordArr={this.state.tags}
-                            tagsArr={this.getTagsArr} />
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="摘要" >
-                        {getFieldDecorator('summary', {
-                            initialValue: theData.summary
-                        })(
-                            <Input type="textarea" rows={4} />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="成果简介" >
-                        {getFieldDecorator('introduction', {
-                            initialValue: theData.introduction
-                        })(
-                            <Input type="textarea" rows={4} placeholder="项目成果简介;项目核心创新点;项目详细用途;预期效益说明;主要技术(性能)指标;市场前景;应用范围;发展历程。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="技术图片" >
-                        <PicturesWall
-                            pictureSign="achievement_technical_picture"
-                            fileList={this.getTechnicalPictureUrl}
-                            pictureUrl={this.state.technicalPictureUrl} />
-                        <p>图片建议:专利证书或专利申请书图片、技术图纸、样品图片、技术相关网络图片;成熟度处于非研发阶段的项目,必须上传样品图片,如未上传,成熟度将视为处在研发阶段。</p>
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="应用领域" >
-                        {getFieldDecorator('field', {
-                            rules: [{ type: 'array', required: true, message: '此项为必填项!' }],
-                            initialValue: [theData.fieldA, theData.fieldB]
-                        })(
-                            <Cascader style={{ width: 300 }} options={IndustryObject} placeholder="应用领域" />
-                            )}
-                    </FormItem>
-                    <div className="clearfix">
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="成熟度" >
-                            {getFieldDecorator('maturity', {
-                                initialValue: theData.maturity
-                            })(
-                                <Select placeholder="选择成熟度" style={{ width: 160 }} >
-                                    {
-                                        maturityList.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                        })
-                                    }
-                                </Select>
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="创新度" >
-                            {getFieldDecorator('innovation', {
-                                initialValue: theData.innovation
-                            })(
-                                <Select placeholder="选择创新度" style={{ width: 160 }} >
-                                    {
-                                        innovationList.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                        })
-                                    }
-                                </Select>
-                                )}
-                        </FormItem>
-                    </div>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="成熟度证明材料(图片)" >
-                        <PicturesWall
-                            pictureSign="achievement_maturity_picture"
-                            fileList={this.getMaturityPictureUrl}
-                            pictureUrl={this.state.maturityPictureUrl} />
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 6 }}
-                        label="成熟度证明材料(文本)" >
-                        <Upload
-                            name="ratepay"
-                            action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
-                            data={{ 'sign': 'achievement_maturity_text_file' }}
-                            beforeUpload={beforeUploadFile}
-                            fileList={this.state.textFileList}
-                            onChange={(info) => {
-                                if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
-                                }
-                                if (info.file.status === 'done') {
-                                    if (!info.file.response.error.length) {
-                                        message.success(`${info.file.name} 文件上传成功!`);
-                                    } else {
-                                        message.warning(info.file.response.error[0].message);
-                                        return;
-                                    };
-                                    this.state.maturityTextFileUrl = info.file.response.data;
-                                } else if (info.file.status === 'error') {
-                                    message.error(`${info.file.name} 文件上传失败。`);
-                                };
-                                this.setState({ textFileList: info.fileList.slice(-1) });
-                            }} >
-                            <Button><Icon type="upload" /> 上传成熟度证明文本 </Button>
-                        </Upload>
-                        <p style={{ marginTop: '10px' }}>{theData.maturityTextFileUrl ?
-                            <span className="download-file">
-                                <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_maturity_text_file') }}>成熟度证明材料(文本文件)</a>
-                            </span>
-                            : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="成熟度证明材料(视频地址)" >
-                        {getFieldDecorator('maturityVideoUrl', {
-                            initialValue: theData.maturityVideoUrl
-                        })(
-                            <Input />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="自定义成果所有人" >
-                        <Switch checked={this.state.switchValue} onChange={(e) => { this.setState({ switchValue: e }); }} />
-                    </FormItem>
-                    {this.state.switchValue ? <div className="clearfix" >
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="成果所有人" >
-                            {getFieldDecorator('ownerName', {
-                                initialValue: theData.ownerName
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="联系电话" >
-                            {getFieldDecorator('ownerMobile', {
-                                initialValue: theData.ownerMobile
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="证件号" >
-                            {getFieldDecorator('ownerIdNumber', {
-                                initialValue: theData.ownerIdNumber
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="电子邮箱" >
-                            {getFieldDecorator('ownerEmail', {
-                                initialValue: theData.ownerEmail
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="通讯地址" >
-                            {getFieldDecorator('ownerPostalAddress', {
-                                initialValue: theData.ownerPostalAddress
-                            })(
-                                <Input />
-                                )}
-                        </FormItem>
-                    </div> : <div className="clearfix" >
-                            <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="成果所有人" >
-                                {getFieldDecorator('iOwnerName', {
-                                    initialValue: theData.iOwnerName || ''
-                                })(
-                                    <AutoComplete
-                                        dataSource={this.state.dataSource}
-                                        style={{ width: 200 }}
-                                        onSearch={this.state.therottleSearch}
-                                        placeholder="输入成果所有人"
-                                        onSelect={(e) => {
-                                            this.getContactsList(this.state.dataSourceObj[e]);
-                                        }} />
-                                    )}
-                            </FormItem>
-                            {this.props.detailApiUrl.indexOf('org') >= 0 ? <FormItem className="half-item"
-                                {...formItemLayout}
-                                label="联系人" >
-                                {getFieldDecorator('contacts', {
-                                    initialValue: theData.contacts
-                                })(
-                                    <Select style={{ width: 260 }}
-                                        placeholder="请选择联系人"
-                                        notFoundContent="未获取到联系人列表"
-                                        showSearch
-                                        filterOption={companySearch}>
-                                        {this.state.contactsOption}
-                                    </Select>
-                                    )}
-                            </FormItem> : <div></div>}
-                        </div>}
-                    <div className="clearfix">
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="合作方式" >
-                            {getFieldDecorator('cooperationMode', {
-                                rules: [{ required: true, message: '此项为必填项!' }],
-                                initialValue: theData.cooperationMode
-                            })(
-                                <Radio.Group>
-                                    <Radio value="0">技术转让</Radio>
-                                    <Radio value="1">授权生产</Radio>
-                                </Radio.Group>
-                                )}
-                        </FormItem>
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="转让方式" >
-                            {getFieldDecorator('transferMode', {
-                                initialValue: theData.transferMode
-                            })(
-                                <Select placeholder="选择转让方式" style={{ width: 160 }} >
-                                    {
-                                        transferModeList.map(function (item) {
-                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-                                        })
-                                    }
-                                </Select>
-                                )}
-                        </FormItem>
-                    </div>
-                    <div className="clearfix">
-                        <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="议价方式" >
-                            {getFieldDecorator('bargainingMode', {
-                                initialValue: theData.bargainingMode
-                            })(
-                                <Radio.Group onChange={(e) => {
-                                    this.setState({
-                                        transferPriceDis: (e.target.value == 1 ? true : false)
-                                    })
-                                }}>
-                                    <Radio value="0">面议</Radio>
-                                    <Radio value="1">定价</Radio>
-                                </Radio.Group>
-                                )}
-                        </FormItem>
-                        {this.state.transferPriceDis ? <FormItem className="half-item"
-                            {...formItemLayout}
-                            label="转让价格" >
-                            {getFieldDecorator('transferPrice', {
-                                initialValue: theData.transferPrice || 0
-                            })(
-                                <InputNumber min={0} max={999999} step={0.01} />
-                                )}
-                            <span style={{ marginLeft: '20px' }}>万元</span>
-                        </FormItem> : <div></div>}
-                    </div>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="技术场景" >
-                        {getFieldDecorator('technicalScene', {
-                            initialValue: theData.technicalScene
-                        })(
-                            <Input type="textarea" rows={2} placeholder="说明解决了什么问题。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="技术突破" >
-                        {getFieldDecorator('breakthrough', {
-                            initialValue: theData.breakthrough
-                        })(
-                            <Input type="textarea" rows={2} placeholder="说明该技术成果突破性的研究。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="专利情况" >
-                        {getFieldDecorator('patentCase', {
-                            initialValue: theData.patentCase
-                        })(
-                            <Input type="textarea" rows={2} placeholder="一个“技术”可能由多个专利构成,需要说明技术-专利的关系。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="获奖情况" >
-                        {getFieldDecorator('awards', {
-                            initialValue: theData.awards
-                        })(
-                            <Input type="textarea" rows={2} placeholder="一个“技术”可能存在社会奖励情况,需要说明社会奖励情况。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="技术团队情况" >
-                        {getFieldDecorator('teamDes', {
-                            initialValue: theData.teamDes
-                        })(
-                            <Input type="textarea" rows={2} placeholder="一个“技术”、“项目”可能存在团队,需要说明团队情况。" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 18 }}
-                        label="技术参数" >
-                        {getFieldDecorator('parameter', {
-                            initialValue: theData.parameter
-                        })(
-                            <Input type="textarea" rows={2} placeholder="描述技术参数信息" />
-                            )}
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 6 }}
-                        label="技术方案" >
-                        <Upload
-                            name="ratepay"
-                            action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
-                            data={{ 'sign': 'achievement_tech_plan' }}
-                            beforeUpload={beforeUploadFile}
-                            fileList={this.state.techPlanFileList}
-                            onChange={(info) => {
-                                if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
-                                }
-                                if (info.file.status === 'done') {
-                                    if (!info.file.response.error.length) {
-                                        message.success(`${info.file.name} 文件上传成功!`);
-                                    } else {
-                                        message.warning(info.file.response.error[0].message);
-                                        return;
-                                    };
-                                    this.state.techPlanUrl = info.file.response.data;
-                                } else if (info.file.status === 'error') {
-                                    message.error(`${info.file.name} 文件上传失败。`);
-                                };
-                                this.setState({ techPlanFileList: info.fileList.slice(-1) });
-                            }} >
-                            <Button><Icon type="upload" /> 上传技术方案文件 </Button>
-                        </Upload>
-                        <p style={{ marginTop: '10px' }}>{theData.techPlanUrl ?
-                            <span className="download-file">
-                                <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_tech_plan') }}>技术方案</a>
-                            </span>
-                            : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
-                    </FormItem>
-                    <FormItem
-                        labelCol={{ span: 4 }}
-                        wrapperCol={{ span: 6 }}
-                        label="商业计划书" >
-                        <Upload
-                            name="ratepay"
-                            action={globalConfig.context + "/api/admin/achievement/uploadTextFile"}
-                            data={{ 'sign': 'achievement_business_plan' }}
-                            beforeUpload={beforeUploadFile}
-                            fileList={this.state.businessPlanFileList}
-                            onChange={(info) => {
-                                if (info.file.status !== 'uploading') {
-                                    console.log(info.file, info.fileList);
-                                }
-                                if (info.file.status === 'done') {
-                                    if (!info.file.response.error.length) {
-                                        message.success(`${info.file.name} 文件上传成功!`);
-                                    } else {
-                                        message.warning(info.file.response.error[0].message);
-                                        return;
-                                    };
-                                    this.state.businessPlanUrl = info.file.response.data;
-                                } else if (info.file.status === 'error') {
-                                    message.error(`${info.file.name} 文件上传失败。`);
-                                };
-                                this.setState({ businessPlanFileList: info.fileList.slice(-1) });
-                            }} >
-                            <Button><Icon type="upload" /> 上传商业计划书文件 </Button>
-                        </Upload>
-                        <p style={{ marginTop: '10px' }}>{theData.businessPlanUrl ?
-                            <span className="download-file">
-                                <a onClick={() => { window.open(globalConfig.context + '/api/admin/achievement/download?id=' + this.props.data.id + '&sign=achievement_business_plan') }}>商业计划书</a>
-                            </span>
-                            : <span><Icon type="exclamation-circle" style={{ color: '#ffbf00', marginRight: '6px' }} />未上传!</span>}</p>
-                    </FormItem>
-                     */}
+                        </div>                        
+        			</div>
                     <FormItem wrapperCol={{ span: 12, offset: 4 }}>
                         <Button className="set-submit" type="primary" htmlType="submit">保存</Button>
                         {/*<Button className="set-submit" type="ghost" onClick={(e) => { this.state.auditStatus = 1; }} htmlType="submit">发布</Button>*/}
@@ -1883,4 +1352,5 @@ const AchievementDetail = React.createClass({
     },
 });
 
+
 export default AchievementDetail;

+ 23 - 21
js/component/manageCenter/customer/publicCustomer.jsx

@@ -144,9 +144,9 @@ const AchievementDetail = React.createClass({
                             </Row>
                             <Row>
                                 <Col span={2}>最新跟进:</Col>
-                                <Col span={10}>{getfllowSituation(theData.fllowSituation)}</Col>
+                                <Col span={10}>{getfllowSituation(theData.followSituation)}</Col>
                                 <Col span={2}>客户状态:</Col>
-                                <Col span={10}>{getcustomerStatue(theData.customerStatue)}</Col>
+                                <Col span={10}>{getcustomerStatue(theData.customerStatus)}</Col>
                             </Row>
                             <Row>
                                 <Col span={2}>详细地址:</Col>                                
@@ -157,7 +157,7 @@ const AchievementDetail = React.createClass({
                             <Row>联系资料:</Row>
                             <Row>
                                 <Col span={2}>姓名:</Col>
-                                <Col span={10}>{theData.customerName}</Col>
+                                <Col span={10}>{theData.contactName}</Col>
                                 <Col span={2}>性别:</Col>
                                 <Col span={10}>{getsex(theData.sex)}</Col>
                             </Row>
@@ -215,9 +215,11 @@ const AchievementOrderList = React.createClass({
                 companyName: this.state.companyName, //名称
 				customerTyp: this.state.customerTyp, //客户类型
               	province:this.state.province,//地区
-				customerStatue:this.state.customerStatue,//客户状态
-				customerName:this.state.customerName,//联系人姓名
-				adminName:this.state.adminName,//跟单人
+				customerStatus:this.state.customerStatus,//客户状态1
+				contactName:this.state.contactName,//联系人姓名1
+				adminName:this.state.adminName,//跟单人1
+				companyIntention:this.state.companyIntention,//意向服务1
+				followSituation:this.state.followSituation,//跟进进度1
             },
             success: function (data) {            	
                 let theArr = [];
@@ -234,11 +236,11 @@ const AchievementOrderList = React.createClass({
                             companyName:thisdata.companyName,
                             customerTyp:thisdata.customerTyp,
                             province:thisdata.province,
-                            customerName:thisdata.customerName,
+                            contactName:thisdata.contactName,
                             telNum:thisdata.telNum,
-                            customerStatue:thisdata.customerStatue,
+                            customerStatus:thisdata.customerStatus,
                             companyIntention:thisdata.companyIntention,
-                            fllowSituation:thisdata.fllowSituation,
+                            followSituation:thisdata.followSituation,
                             adminName:thisdata.adminName                                                                                       
                         });
                     };
@@ -294,8 +296,8 @@ const AchievementOrderList = React.createClass({
                     render: text => { return getcityArr(text); }
                 }, {
                     title: '联系人姓名',
-                    dataIndex: 'customerName',
-                    key: 'customerName',                    
+                    dataIndex: 'contactName',
+                    key: 'contactName',                    
                 }, 
                 {
                     title: '手机号',
@@ -304,8 +306,8 @@ const AchievementOrderList = React.createClass({
                 },
                  {
                     title: '客户状态',
-                    dataIndex: 'customerStatue',
-                    key: 'customerStatue',
+                    dataIndex: 'customerStatus',
+                    key: 'customerStatus',
                     render: text => { return getcustomerStatue(text) }
                 },
                 {
@@ -316,8 +318,8 @@ const AchievementOrderList = React.createClass({
                 },
                  {
                     title: '最新跟进',
-                    dataIndex: 'fllowSituation',
-                    key: 'fllowSituation',
+                    dataIndex: 'followSituation',
+                    key: 'followSituation',
                     render: text => { return getfllowSituation(text) }
                 },
                  {
@@ -377,10 +379,10 @@ const AchievementOrderList = React.createClass({
         this.state.customerTyp = undefined;
         this.state.province = undefined;
         this.state.ownerType = undefined;
-        this.state.customerStatue = undefined;
+        this.state.customerStatus = undefined;
         this.state.auditStatus = undefined;
         this.state.ownerId = undefined;
-        this.state.customerName = undefined;  
+        this.state.contactName = undefined;  
         this.state.releaseDate = [];
         this.loadData(); 
     },
@@ -423,8 +425,8 @@ const AchievementOrderList = React.createClass({
                             {this.state.auditStatusOption}
                     </Select>
                     <Select placeholder="客户状态" style={{ width: 120 }}
-                            value={this.state.customerStatue}
-                            onChange={(e) => { this.setState({ customerStatue: e }) }}>                           
+                            value={this.state.customerStatus}
+                            onChange={(e) => { this.setState({ customerStatus: e }) }}>                           
                             {this.state.customerStatuarr}
                     </Select>
                     <Button type="primary" onClick={this.search}>搜索</Button>
@@ -435,8 +437,8 @@ const AchievementOrderList = React.createClass({
 		                    value={this.state.ownerId}
 		                    onChange={(e) => { this.setState({ ownerId: e.target.value }); }} />
 		                <Input placeholder="联系人姓名" style={{width:'140px',marginRight:'10px'}}
-		                    value={this.state.customerName}
-		                    onChange={(e) => { this.setState({ customerName: e.target.value }); }} />                                        	
+		                    value={this.state.contactName}
+		                    onChange={(e) => { this.setState({ contactName: e.target.value }); }} />                                        	
                         <span>发布时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,

+ 1 - 1
js/component/manageCenter/demand/techDemandDesc.jsx

@@ -554,7 +554,7 @@ const DemandDetailShow = Form.create()(React.createClass({
                     <FormItem
                         labelCol={{ span: 3 }}
                         wrapperCol={{ span: 18 }}
-                        label="行业类别111" >
+                        label="行业类别" >
                         <span>{getIndustryCategory(theData.industryCategoryA, theData.industryCategoryB)}</span>
                     </FormItem>
                     <div className="clearfix">

+ 27 - 1
js/component/tools.js

@@ -36,7 +36,9 @@ import {
     customerStatus,
     intentionalService,
     newFollow,
-    sex
+    sex,
+    tag,
+    contact
 } from './dataDic.js';
 module.exports = {
     splitUrl: function (string, i, url) {
@@ -705,6 +707,18 @@ module.exports = {
             return theType;
         }
     },
+    //客户标签
+    tag: function (e) {
+         if (e) {
+            let theType = '';
+            tag.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+    },
      //最新跟进
 	getfllowSituation: function (e) {
          if (e) {
@@ -729,4 +743,16 @@ module.exports = {
             return theType;
         }
     },
+     //联系方式
+	getcontact: function (e) {
+         if (e) {
+            let theType = '';
+            contact.map(function (item) {
+                if (item.value == e) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+    },
 }