dengzhiguo 6 years ago
parent
commit
d72347a414

+ 21 - 1
js/component/dataDic.js

@@ -2193,5 +2193,25 @@ module.exports = {
 	        key: "其他"
 	    }
     ],
-    
+    slcRedit:[
+    	{
+	        value: "0",
+	        key: "A级"
+	    },{
+	        value: "1",
+	        key: "B级"
+	    }, {
+	        value: "2",
+	        key: "C级"
+	    }
+    ],
+    dataGrade:[
+    	{
+	        value: "0",
+	        key: "有效信息"
+	    },{
+	        value: "1",
+	        key: "优质信息"
+	    }
+    ],
 };

File diff suppressed because it is too large
+ 1777 - 0
js/component/manageCenter/achievement/crmAchievement.jsx


+ 460 - 257
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -1,13 +1,14 @@
 import React from 'react';
-import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconfirm, Table, Switch, message, DatePicker, Upload, Form ,Modal} from 'antd';
+import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconfirm, Table, Switch, message, DatePicker, Upload, Form ,Modal,Tabs} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
+import TechAchievementDesc from '@/manageCenter/achievement/crmAchievement.jsx';
 import { citySelect, provinceList ,areaSelect} from '@/NewDicProvinceList';
-import { socialAttribute, industry, auditStatusL, lvl, currentMember ,} from '@/dataDic.js';
-import { getSocialAttribute, beforeUploadFile,splitUrl } from '@/tools.js';
-
+import { socialAttribute, industry, auditStatusL, lvl, currentMember ,slcRedit,dataGrade} from '@/dataDic.js';
+import { getSocialAttribute, beforeUploadFile,splitUrl ,getSlcRedit,getDataGrade,getAchievementCategory,getTechAuditStatus,getboutique} from '@/tools.js';
 import './customer.less';
+const TabPane = Tabs.TabPane;
 //图片组件
 const PicturesWall = React.createClass({
 	getInitialState() {
@@ -131,6 +132,66 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	loadDatas(pageNo) {
+        this.setState({
+            loading: true,
+        });
+        $.ajax({
+            method: "get",
+            dataType: "json",
+            crossDomain: false,
+            url: globalConfig.context + "/api/admin/achievement/listUserAchievement",
+            data: {
+                pageNo: pageNo || 1,
+                pageSize: this.state.pagination.pageSize,
+                uid:this.state.uid,
+            },
+            success: function (data) {
+                let theArr = [];
+                if (!data.data || !data.data.list) {
+                    if (data.error && data.error.length) {
+                        message.warning(data.error[0].message);
+                    };
+                } else {
+                    for (let i = 0; i < data.data.list.length; i++) {
+                        let thisdata = data.data.list[i];
+                        theArr.push({
+                            key: i,
+                            id: thisdata.id,
+                            serialNumber: thisdata.serialNumber,
+                            dataCategory: thisdata.dataCategory,
+                            name: thisdata.name,
+                            keyword: thisdata.keyword,
+                            theName: thisdata.username || thisdata.ownerName,
+                            category: thisdata.category,
+                            ownerName: thisdata.username ? thisdata.username : thisdata.ownerName,
+                            ownerType: thisdata.ownerType,
+                            ownerMobile: thisdata.ownerMobile,
+                            status: thisdata.status,
+                            releaseDate: thisdata.releaseDate,
+                            releaseDateFormattedDate: thisdata.releaseDateFormattedDate,
+                            auditStatus: thisdata.auditStatus,
+                            boutique: thisdata.boutique,
+                            hot: thisdata.hot,
+                            techBrokerId:thisdata.techBrokerId,
+                            createTimeFormattedDate: thisdata.createTimeFormattedDate,
+                            remark:thisdata.remark
+                        });
+                    };
+                    this.state.pagination.current = data.data.pageNo;
+                    this.state.pagination.total = data.data.totalCount;
+                };
+                this.setState({
+                    dataSourceDate: theArr,
+                    pagination: this.state.pagination
+                });
+            }.bind(this),
+        }).always(function () {
+            this.setState({
+                loading: false
+            });
+        }.bind(this));
+    },
 	getInitialState() {
 		return {
 			addressSearch: [],
@@ -144,6 +205,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			selectedRowKeys: [],
 			selectedRows: [],
 			loading: false,
+			callnub:"0",
 			modalVisible:false,
 			pagination: {
 				defaultCurrent: 1,
@@ -157,6 +219,18 @@ const IntentionCustomer = Form.create()(React.createClass({
 					return '共' + total + '条数据';
 				}
 			},
+			paginationDate: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.loadDatas(page);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
 			columns: [{
 					title: '客户名称',
 					dataIndex: 'name',
@@ -190,7 +264,51 @@ const IntentionCustomer = Form.create()(React.createClass({
 			dataman: [],
 			dataSource: [],
 			visitArrList: [],
-			searchTime: [, ]
+			columnsDate: [
+                {
+                    title: '编号',
+                    dataIndex: 'serialNumber',
+                    key: 'serialNumber',
+                }, {
+                    title: '名称',
+                    dataIndex: 'name',
+                    key: 'name',
+                }, {
+                    title: '关键字',
+                    dataIndex: 'keyword',
+                    key: 'keyword',
+                }, {
+                    title: '类型',
+                    dataIndex: 'category',
+                    key: 'category',
+                    render: text => { return getAchievementCategory(text); }
+                }, {
+                    title: '录入人',
+                    dataIndex: 'techBrokerId',
+                    key: 'techBrokerId',
+                },{
+                    title: '审核状态',
+                    dataIndex: 'auditStatus',
+                    key: 'auditStatus',
+                    render: text => { return getTechAuditStatus(text) }
+                }, 
+                {
+                    title: '是否精品',
+                    dataIndex: 'boutique',
+                    key: 'boutique',
+                    render: text => { return getboutique(text) }
+                },
+                {
+                    title: '发布时间',
+                    dataIndex: 'releaseDateFormattedDate',
+                    key: 'releaseDateFormattedDate',
+                },{
+                    title: '录入时间',
+                    dataIndex: 'createTimeFormattedDate',
+                    key: 'createTimeFormattedDate',
+                },
+            ],
+            dataSourceDate: [],
 		};
 	},
 	componentWillMount() {
@@ -252,7 +370,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 				uid:id
 			},
 			success: function(data) {
-				
 				let thisDetail= data.data;
 				if(data.error.length || data.data.list == "") {
 					if(data.error && data.error.length) {
@@ -317,19 +434,26 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//基本信息提交
 	newSubmit(e) {
 		e.preventDefault();
-		console.log(this.state.ProvinceCity);
 		if(!this.state.industry) {
 			message.warning('请选择行业');
 			return false;
 		};
 		if(!this.state.societyTag) {
-			message.warning('请选择社会性');
+			message.warning('请选择社会性');
 			return false;
 		};
 		if(!this.state.ProvinceCity[1]) {
 			message.warning('请选择地区');
 			return false;
 		};
+		if(!this.state.registeredCapital) {
+			message.warning('请填写注册资本');
+			return false;
+		};
+		if(!this.state.businessScope) {
+			message.warning('请填写公司主营产品');
+			return false;
+		};
 		var reg = /^[1-9]\d*$|^0$/;
 		if(this.state.consultationPrice) {
 			if(this.state.consultationPrice.length > 6) {
@@ -545,9 +669,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//详情关闭
 	visitCancel(e) {
 		this.setState({
-			visitModul: false
+			visitModul: false,
+			callnub:"0"
 		});
-		//this.props.closeDesc(false,false)
 	},
 	getOrgCodeUrl(e) {
 		this.setState({ orgCodeUrl: e });
@@ -566,6 +690,41 @@ const IntentionCustomer = Form.create()(React.createClass({
 			this.loadData(null,nextProps.ApiUrl);
 		};
 	},
+	callback(e) {
+		if(e == '0') {
+			this.setState({
+				callnub: e,
+			})
+		}
+		if(e == '1') {
+			this.setState({
+				callnub: e,
+			})
+			this.loadDatas();
+		}
+	},
+	//发布成果
+	addClick() {
+        this.state.RowData = {};
+        this.setState({
+            showDesc: true,
+        });
+    },
+    //关闭发布成果
+    closeDesc(e, s) {
+        this.state.showDesc = e;
+        if (s) {
+            this.loadData();
+        };
+    },
+    tableRowClickDate(record, index) {
+        this.state.RowData = record;
+        if(index!=undefined){
+        	this.setState({
+            	showDesc: true
+        	});
+        }
+    },
 	render() {
 		const {
 			RangePicker,
@@ -655,259 +814,303 @@ const IntentionCustomer = Form.create()(React.createClass({
                 <Modal	
 				      className="customeDetails"
 				      footer=''
-			          title="客户资料(绝密)"
+			          title="客户资料"
 			          width='1000px'
 			          visible={this.state.visitModul}
 			          onOk={this.visitOk}
 					  onCancel={this.visitCancel}							          							          
 			        >	
-	                <Form layout="horizontal" onSubmit={this.newSubmit} id="demand-form">
-		                <Spin spinning={this.state.loading}>
-			               	<div className="clearfix" >
-		                    	<FormItem className="half-item"
-				                     {...formItemLayout}
-				                    label="客户姓名"
-			                        >
-		                    	 <span>{this.state.identifyName}</span>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                     {...formItemLayout}
-				                    label="资料所属人"
-			                        >
-		                    	 <span>{this.state.informationMaintainerName}</span>
-			                    </FormItem>
-		                    </div>
-		                    <div className="clearfix" >
-		                    	<FormItem className="half-item" 
-		                          {...formItemLayout}
-		                         label="行业">
-								    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
-								    				onChange={(e)=>{this.setState({industry:e})}}>
-	                                      {
-	                                        industry.map(function (item) {
-	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-	                                        })
-	                                      }
-	                                </Select>
-	                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
-		                   		 </FormItem>
-		                   		 <FormItem className="half-item" 
-		                            {...formItemLayout}
-		                           label="社会属性"
-		                           > 
-									    <Select placeholder="客户社会属性" value={this.state.societyTag}  style={{width:'95%'}}
-								    				onChange={(e)=>{this.setState({societyTag:e})}}> 
-	                                     {
-	                                        socialAttribute.map(function (item) {
-	                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
-	                                        })
-	                                    }
-	                                </Select>  
-	                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
-		                   		 </FormItem>
-		                   		 <FormItem className="half-item" 
-		                            {...formItemLayout}
-		                           label="省-市-区"
-		                          > 
-		                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'95%'}}
-										onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
-										<span style={{color:'red',marginLeft:'5px'}}>*</span>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="通信地址"
-			                            >
-			                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
-										onChange={(e,pre) => { this.setState({ postalAddress: e.target.value }) }}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="固定电话"
-			                            >
-			                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
-										onChange={(e) => { this.setState({ contactsFixedTel: e.target.value }) }}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="客户传真"
-			                            >
-			                                <Input placeholder="客户传真" value={this.state.contactsFax} 
-										onChange={(e) => { this.setState({ contactsFax: e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="注册资本"
-		                           	 >
-			                            <Input placeholder="注册资本" value={this.state.registeredCapital} onChange={(e) => {
-					                        this.setState({ registeredCapital:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="企业规模"
-		                           	 >
-			                            <Input placeholder="单位规模" value={this.state.enterpriseScale} onChange={(e) => {
-					                        this.setState({ enterpriseScale:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="法人名称"
-		                           	 >
-			                            <Input placeholder="法人名称" value={this.state.legalPerson} onChange={(e) => {
-					                        this.setState({ legalPerson:  e.target.value })}}/>
-			                    </FormItem>
-		                   		<FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="法人身份证"
-		                           	 >
-			                            <Input placeholder="法人身份证" value={this.state.legalPersonIdCard} onChange={(e) => {
-					                        this.setState({ legalPersonIdCard:  e.target.value })}}/>
-			                    </FormItem>
-								<FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="主要联系人"
-		                           	 >
-			                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
-					                        this.setState({ contacts:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="主要联系人号码"
-		                           	 >
-			                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
-					                        this.setState({ contactMobile:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="法人电话"
-		                           	 >
-			                            <Input placeholder="法人电话" value={this.state.legalPersonTel} onChange={(e) => {
-					                        this.setState({ legalPersonTel:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="法人电子邮箱"
-			                            >
-			                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
-										onChange={(e) => {this.setState({legalPersonEmail: e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item" 
-				                    	 {...formItemLayout}
-				                        label="机构代码"
-		                           	 >
-			                            <Input placeholder="机构代码" value={this.state.orgCode} onChange={(e) => {
-					                        this.setState({ orgCode:  e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="上年度销售额"
-			                            >
-			                                <Input ref='consul' placeholder="请输入上年度销售额" value={this.state.yearSalesAmount} 
-										onChange={(e) => {this.setState({yearSalesAmount: e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="上年度研发费用"
-			                            >
-			                                <Input ref='consul' placeholder="请输入上年度研发费用" value={this.state.lastYearResearchAmount} 
-										onChange={(e) => {this.setState({lastYearResearchAmount: e.target.value })}}/>
-			                    </FormItem>
-			                    <FormItem className="half-item"
-				                    	 {...formItemLayout}
-				                         label="上年度总资产情况"
-			                            >
-			                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} 
-										onChange={(e) => {this.setState({assets: e.target.value })}}/>
-			                    </FormItem>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="业务范围" >
-				                            <Input type="textarea" rows={4} value={this.state.businessScope} 
-										onChange={(e,pre) => { this.setState({ businessScope: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-				                <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="客户简介" >
-				                            <Input type="textarea" rows={4} value={this.state.introduction} 
-										onChange={(e,pre) => { this.setState({ introduction: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="已有知识产权情况" >
-				                            <Input type="textarea" rows={4} value={this.state.intellectualProperty} 
-										onChange={(e,pre) => { this.setState({ intellectualProperty: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="核心技术" >
-				                            <Input type="textarea" rows={4} value={this.state.coreTechnology} 
-										onChange={(e,pre) => { this.setState({ coreTechnology: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="企业资质情况" >
-				                            <Input type="textarea" rows={4} value={this.state.qualification} 
-										onChange={(e,pre) => { this.setState({ qualification: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="客户已做项目" >
-				                            <Input type="textarea" rows={4} value={this.state.accomplishSituation} 
-										onChange={(e,pre) => { this.setState({ accomplishSituation: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className='clearfix'>
-				                    <FormItem
-				                        labelCol={{ span:4 }}
-				                        wrapperCol={{ span: 18 }}
-				                        label="企业高企合作情况" >
-				                            <Input type="textarea" rows={4} value={this.state.cooperationSituation} 
-										onChange={(e,pre) => { this.setState({ cooperationSituation: e.target.value })}}/>
-				                    </FormItem>
-			                    </div>
-			                    <div className="clearfix pictures">
-			                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'95px'}}
-				                        labelCol={{ span: 8 }}
-				                        wrapperCol={{ span: 10 }}
-				                        label="机构证(PIC)" >
-				                        <PicturesWall
-				                            fileList={this.getOrgCodeUrl}
-				                            pictureUrl={this.state.orgCodeUrl} />
-				                            <p>建议:图片要清晰。</p>
-			                        </FormItem>
-			                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginTop:'20px'}}
-				                        labelCol={{ span: 8 }}
-				                        wrapperCol={{ span: 10 }}
-				                        label="单位LOGO" > 
-				                        <PicturesWall
-				                            fileList={this.getCompanyLogoUrl}
-				                            pictureUrl={this.state.companyLogoUrl} />
-				                            <p>建议:图片要清晰。</p>
-				                    </FormItem>
-				                </div> 
-			                    <Button className="setSubmit" type="primary" htmlType="submit">保存</Button>  
-		                        <Button  type="ghost" onClick={this.visitCancel}>取消</Button>
-		                    </div>		                	
-					    </Spin>
-					</Form>		
-				</Modal> 
+                 <Tabs onChange={this.callback} activeKey={this.state.callnub}>
+             			<TabPane tab="基本信息" key="0">
+					       <div>
+					       		<Form layout="horizontal" onSubmit={this.newSubmit} id="demand-form">
+					                <Spin spinning={this.state.loading}>
+						               	<div className="clearfix" >
+					                    	<FormItem className="half-item"
+							                     {...formItemLayout}
+							                    label="客户姓名"
+						                        >
+					                    	 <span>{this.state.identifyName}</span>
+						                    </FormItem>
+						                    <FormItem className="half-item"
+							                     {...formItemLayout}
+							                    label="资料所属人"
+						                        >
+					                    	 <span>{this.state.informationMaintainerName}</span>
+						                    </FormItem>
+					                    </div>
+					                    <div className="clearfix" >
+					                    	<FormItem className="half-item" 
+					                          {...formItemLayout}
+					                         label="行业">
+											    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
+											    				onChange={(e)=>{this.setState({industry:e})}}>
+				                                      {
+				                                        industry.map(function (item) {
+				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                        })
+				                                      }
+				                                </Select>
+				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
+					                   		 </FormItem>
+					                   		 <FormItem className="half-item" 
+					                            {...formItemLayout}
+					                           label="社会属性"
+					                           > 
+												    <Select placeholder="客户社会属性" value={this.state.societyTag}  style={{width:'95%'}}
+											    				onChange={(e)=>{this.setState({societyTag:e})}}> 
+				                                     {
+				                                        socialAttribute.map(function (item) {
+				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+				                                        })
+				                                    }
+				                                </Select>  
+				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
+					                   		 </FormItem>
+					                   		 <FormItem className="half-item" 
+					                            {...formItemLayout}
+					                           label="省-市-区"
+					                          > 
+					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'95%'}}
+													onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
+													<span style={{color:'red',marginLeft:'5px'}}>*</span>
+						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="注册资本"
+					                           	 >
+						                            <Input placeholder="注册资本" style={{width:'90%'}} value={this.state.registeredCapital} onChange={(e) => {
+								                        this.setState({ registeredCapital:  e.target.value })}}/>万
+								                    <span style={{color:'red',marginLeft:'5px'}}>*</span>
+						                    </FormItem>
+						                    <div className='clearfix'>
+							                    <FormItem
+							                        labelCol={{ span:4 }}
+							                        wrapperCol={{ span: 20 }}
+							                        label="公司主营产品" >
+							                        <Input type="textarea" rows={2} value={this.state.businessScope}  style={{width:'95%'}}
+													onChange={(e,pre) => { this.setState({ businessScope: e.target.value })}}/>
+							                   		<span style={{color:'red',marginLeft:'5px'}}>*</span>
+							                   </FormItem>
+						                    </div>
+						                    <FormItem className="half-item"
+							                    	 {...formItemLayout}
+							                         label="通信地址"
+						                            >
+						                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
+													onChange={(e,pre) => { this.setState({ postalAddress: e.target.value }) }}/>
+						                    </FormItem>
+						                    <FormItem className="half-item"
+							                    	 {...formItemLayout}
+							                         label="固定电话"
+						                            >
+						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
+													onChange={(e) => { this.setState({ contactsFixedTel: e.target.value }) }}/>
+						                    </FormItem>
+						                    <FormItem className="half-item"
+							                    	 {...formItemLayout}
+							                         label="客户传真"
+						                            >
+						                                <Input placeholder="客户传真" value={this.state.contactsFax} 
+													onChange={(e) => { this.setState({ contactsFax: e.target.value })}}/>
+						                    </FormItem>
+						                    
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="企业人数"
+					                           	 >
+						                            <Input placeholder="单位规模" value={this.state.enterpriseScale} onChange={(e) => {
+								                        this.setState({ enterpriseScale:  e.target.value })}}/>
+						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="法人名称"
+					                           	 >
+						                            <Input placeholder="法人名称" value={this.state.legalPerson} onChange={(e) => {
+								                        this.setState({ legalPerson:  e.target.value })}}/>
+						                    </FormItem>
+					                   		<FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="法人身份证"
+					                           	 >
+						                            <Input placeholder="法人身份证" value={this.state.legalPersonIdCard} onChange={(e) => {
+								                        this.setState({ legalPersonIdCard:  e.target.value })}}/>
+						                    </FormItem>
+											<FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="主要联系人"
+					                           	 >
+						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
+								                        this.setState({ contacts:  e.target.value })}}/>
+						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="主要联系人号码"
+					                           	 >
+						                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
+								                        this.setState({ contactMobile:  e.target.value })}}/>
+						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="法人电话"
+					                           	 >
+						                            <Input placeholder="法人电话" value={this.state.legalPersonTel} onChange={(e) => {
+								                        this.setState({ legalPersonTel:  e.target.value })}}/>
+						                    </FormItem>
+						                    <FormItem className="half-item"
+							                    	 {...formItemLayout}
+							                         label="法人电子邮箱"
+						                            >
+						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
+													onChange={(e) => {this.setState({legalPersonEmail: e.target.value })}}/>
+						                    </FormItem>
+						                    <FormItem className="half-item" 
+							                    	 {...formItemLayout}
+							                        label="社会统一信用机构代码"
+					                           	 >
+						                            <Input placeholder="社会统一信用机构代码" value={this.state.orgCode} onChange={(e) => {
+								                        this.setState({ orgCode:  e.target.value })}}/>
+						                    </FormItem>
+						                     <div className='clearfix'>
+							                    <FormItem
+							                        labelCol={{ span:4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="客户简介" >
+							                            <Input type="textarea" rows={3} value={this.state.introduction} 
+													onChange={(e,pre) => { this.setState({ introduction: e.target.value })}}/>
+							                    </FormItem>
+						                    </div>
+						                    <div className='clearfix'>
+							                    <FormItem
+							                        labelCol={{ span:4 }}
+							                        wrapperCol={{ span: 18 }}
+							                        label="已有知识产权情况" >
+							                            <Input type="textarea" rows={3} value={this.state.intellectualProperty} 
+													onChange={(e,pre) => { this.setState({ intellectualProperty: e.target.value })}}/>
+							                    </FormItem>
+						                    </div>
+						                    <div className="clearfix pictures">
+						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'95px'}}
+							                        labelCol={{ span: 8 }}
+							                        wrapperCol={{ span: 10 }}
+							                        label="机构证书(PIC)" >
+							                        <PicturesWall
+							                            fileList={this.getOrgCodeUrl}
+							                            pictureUrl={this.state.orgCodeUrl} />
+							                            <p>建议:图片要清晰。</p>
+						                        </FormItem>
+						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginTop:'20px'}}
+							                        labelCol={{ span: 8 }}
+							                        wrapperCol={{ span: 10 }}
+							                        label="单位LOGO" > 
+							                        <PicturesWall
+							                            fileList={this.getCompanyLogoUrl}
+							                            pictureUrl={this.state.companyLogoUrl} />
+							                            <p>建议:图片要清晰。</p>
+							                    </FormItem>
+							                </div> 
+							                <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>签单客户信息完善(完善以下信息才能开单)</div>
+							                <div className='clearfix' >
+						                    	<FormItem className="half-item"
+								                    	 {...formItemLayout}
+								                         label="上年度销售额"
+							                            >
+							                                <Input ref='consul' placeholder="请输入上年度销售额" value={this.state.yearSalesAmount} 
+														onChange={(e) => {this.setState({yearSalesAmount: e.target.value })}}/>
+							                    </FormItem>
+							                    <FormItem className="half-item"
+								                    	 {...formItemLayout}
+								                         label="上年度研发费用"
+							                            >
+							                                <Input ref='consul' placeholder="请输入上年度研发费用" value={this.state.lastYearResearchAmount} 
+														onChange={(e) => {this.setState({lastYearResearchAmount: e.target.value })}}/>
+							                    </FormItem>
+							                    <FormItem className="half-item"
+								                    	 {...formItemLayout}
+								                         label="上年度总资产情况"
+							                            >
+							                                <Input ref='consul' placeholder="上年度总资产情况" value={this.state.assets} 
+														onChange={(e) => {this.setState({assets: e.target.value })}}/>
+							                    </FormItem>
+							                    <FormItem className="half-item" 
+						                            {...formItemLayout}
+						                           label="客户信用等级"
+						                           > 
+													    <Select placeholder="客户信用等级" value={this.state.societyTag}  
+												    				onChange={(e)=>{this.setState({societyTag:e})}}> 
+					                                     {
+					                                        slcRedit.map(function (item) {
+					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
+					                                        })
+					                                    }
+					                                </Select>  
+						                   		 </FormItem>
+							                    <div className='clearfix'>
+								                    <FormItem
+								                        labelCol={{ span:4 }}
+								                        wrapperCol={{ span: 19 }}
+								                        label="核心技术" >
+								                            <Input type="textarea" rows={3} value={this.state.coreTechnology} 
+														onChange={(e,pre) => { this.setState({ coreTechnology: e.target.value })}}/>
+								                    </FormItem>
+							                    </div>
+							                    <div className='clearfix'>
+								                    <FormItem
+								                        labelCol={{ span:4 }}
+								                        wrapperCol={{ span: 19 }}
+								                        label="企业资质情况" >
+								                            <Input type="textarea" rows={3} value={this.state.qualification} placeholder="请按如下格式填写:资质名称+获得时间+拥有人+发证机构"
+														onChange={(e,pre) => { this.setState({ qualification: e.target.value })}}/>
+								                    </FormItem>
+							                    </div>
+							                    <div className='clearfix'>
+								                    <FormItem
+								                        labelCol={{ span:4 }}
+								                        wrapperCol={{ span: 19 }}
+								                        label="客户已做项目" >
+								                            <Input type="textarea" rows={3} value={this.state.accomplishSituation} placeholder="请按如下格式填写:项目类型+主管部门+申报时间+立项情况+验收情况"
+														onChange={(e,pre) => { this.setState({ accomplishSituation: e.target.value })}}/>
+								                    </FormItem>
+							                    </div>
+							                    <div className='clearfix'>
+								                    <FormItem
+								                        labelCol={{ span:4 }}
+								                        wrapperCol={{ span: 19 }}
+								                        label="企业高企合作情况" >
+								                            <Input type="textarea" rows={3} value={this.state.cooperationSituation} 
+														onChange={(e,pre) => { this.setState({ cooperationSituation: e.target.value })}}/>
+								                    </FormItem>
+							                    </div>
+						                    </div>
+							               	<Button className="setSubmit" type="primary" htmlType="submit">保存</Button>  
+					                        <Button  type="ghost" onClick={this.visitCancel}>取消</Button>
+					                    </div>		                	
+								    </Spin>
+								</Form>		
+								
+					       </div>
+					    </TabPane>
+					    <TabPane tab="知识产权列表" key="1">
+					    	<Button type="primary" className="addButton" onClick={this.addClick}>发布成果<Icon type="plus" /></Button>
+				    		<Spin spinning={this.state.loading}>
+			                    <Table columns={this.state.columnsDate}
+			                        dataSource={this.state.dataSourceDate}
+			                        rowSelection={rowSelection}
+			                        pagination={this.state.paginationDate}
+			                        onRowClick={this.tableRowClickDate} />
+			                </Spin>
+					    </TabPane>
+					</Tabs>
+                </Modal> 
+                <TechAchievementDesc
+	                data={this.state.RowData}
+	                detailApiUrl={this.props['data-detailApiUrl']}
+	                achievementCategoryOption={this.state.achievementCategoryOption}
+	                showDesc={this.state.showDesc}
+	                uid={this.state.uid}
+	                closeDesc={this.closeDesc} />
           </div >
+          
 		);
 	}
 }));

+ 5 - 0
js/component/manageCenter/order/myOrder/servicesOrder/myService.jsx

@@ -24,6 +24,7 @@ const MyService=Form.create()(React.createClass({
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
                 buyerName:this.state.customerName,
+                orderNo:this.state.orderNo,
                 startDate: this.state.releaseDate[0],
 				endDate: this.state.releaseDate[1],
 				projectStage:this.state.projectProgress,
@@ -377,6 +378,7 @@ const MyService=Form.create()(React.createClass({
     	this.setState({
     		signBillVisible:false
     	})
+    	this.state.orderNo='';
     	this.state.customerName='';
     	this.state.releaseDate[0] = undefined;
 		this.state.releaseDate[1] = undefined;
@@ -419,6 +421,9 @@ const MyService=Form.create()(React.createClass({
 	                    <Input placeholder="客户名称" style={{width:'150px'}}
 	                        value={this.state.customerName}
 	                        onChange={(e) => { this.setState({ customerName: e.target.value }); }} />
+	                    <Input placeholder="订单编号" style={{width:'150px'}}
+	                        value={this.state.orderNo}
+	                        onChange={(e) => { this.setState({ orderNo: e.target.value }); }} />
 	                    <RangePicker
 		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
 		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}

+ 29 - 1
js/component/tools.js

@@ -73,7 +73,9 @@ import {
     publishStatus,
     changeState,
     distributeState,
-    customerSource
+    customerSource,
+    slcRedit,
+    dataGrade
 } from './dataDic.js';
 
 import { provinceList} from './NewDicProvinceList.js';
@@ -1369,5 +1371,31 @@ module.exports = {
             });
             return theType;
         }
+	},
+	//客户来源
+	getSlcRedit:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            slcRedit.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
+	},
+	//客户来源
+	getDataGrade:function(e){
+   		if (e||e==0) {
+   			let str=e.toString()
+            let theType = '';
+            dataGrade.map(function (item) {
+                if (item.value == str) {
+                    theType = item.key;
+                };
+            });
+            return theType;
+        }
 	}
 }