Quellcode durchsuchen

项目汇总更新

HW vor 4 Jahren
Ursprung
Commit
95e0dbb013

+ 174 - 50
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
 import React from 'react';
-import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconfirm, Table, Switch, message,Calendar , DatePicker, Upload, Form ,Modal,Tabs,Card } from 'antd';
+import {Tag, Tooltip, Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconfirm, Table, Switch, message,Calendar , DatePicker, Upload, Form ,Modal,Tabs,Card } from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import Jquery from 'jquery/dist/jquery.js';
 import Jquery from 'jquery/dist/jquery.js';
@@ -329,6 +329,12 @@ const IntentionCustomer = Form.create()(React.createClass({
 	},
 	},
 	getInitialState() {
 	getInitialState() {
 		return {
 		return {
+			businessScope: [],
+			inputVisible: false,
+			inputValue: '',
+			salesTarget: [],
+			inputVisible1: false,
+			inputValue1: '',
 			pages:1,
 			pages:1,
 			pdfUrl:'',
 			pdfUrl:'',
 			addressSearch: [],
 			addressSearch: [],
@@ -396,14 +402,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '资料完整度',
 					title: '资料完整度',
 					dataIndex: 'dataGrade',
 					dataIndex: 'dataGrade',
 					key: 'dataGrade',
 					key: 'dataGrade',
-					
+
 				},
 				},
 				{
 				{
 					title: '行业',
 					title: '行业',
 					dataIndex: 'industry',
 					dataIndex: 'industry',
 					key: 'industry'
 					key: 'industry'
 				},
 				},
-				
+
 				{
 				{
 					title: '创建时间',
 					title: '创建时间',
 					dataIndex: 'createTime',
 					dataIndex: 'createTime',
@@ -435,7 +441,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     dataIndex: 'auditStatus',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
                     key: 'auditStatus',
                     render: text => { return getTechAuditStatus(text) }
                     render: text => { return getTechAuditStatus(text) }
-                }, 
+                },
                 {
                 {
                     title: '是否精品',
                     title: '是否精品',
                     dataIndex: 'boutique',
                     dataIndex: 'boutique',
@@ -483,7 +489,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     	return (
                     	return (
                     		<div>
                     		<div>
 								<Popconfirm title={'您将删除该条财务信息,请确认!'} onConfirm={(e)=>{this.deltalc(record)}} okText="确认" cancelText="取消">
 								<Popconfirm title={'您将删除该条财务信息,请确认!'} onConfirm={(e)=>{this.deltalc(record)}} okText="确认" cancelText="取消">
-							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>
 								</Popconfirm>
 								</Popconfirm>
 							</div>
 							</div>
 							)
 							)
@@ -499,7 +505,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '年份',
 					title: '年份',
 					dataIndex: 'year',
 					dataIndex: 'year',
 					key: 'year',
 					key: 'year',
-				}, 
+				},
 				{
 				{
 					title: '项目状态',
 					title: '项目状态',
 					dataIndex: 'status',
 					dataIndex: 'status',
@@ -517,7 +523,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     	return (
                     	return (
                     		<div>
                     		<div>
 								<Popconfirm title={'您将删除该项目,请确认!'} onConfirm={(e)=>{this.deltalx(record)}} okText="确认" cancelText="取消">
 								<Popconfirm title={'您将删除该项目,请确认!'} onConfirm={(e)=>{this.deltalx(record)}} okText="确认" cancelText="取消">
-							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>                 
+							   	   <Button style={{marginRight:'5px'}} onClick={(e) =>{ e.stopPropagation()}} type="danger">删除</Button>
 								</Popconfirm>
 								</Popconfirm>
 							</div>
 							</div>
 							)
 							)
@@ -527,6 +533,66 @@ const IntentionCustomer = Form.create()(React.createClass({
 			dataSourcex: [],
 			dataSourcex: [],
 		};
 		};
 	},
 	},
+	handleClose(removedTag){
+		const businessScope = this.state.businessScope.filter(tag => tag !== removedTag);
+		this.setState({ businessScope });
+	},
+
+	showInput(){
+		this.setState({ inputVisible: true }, () => this.input.focus());
+	},
+
+	handleInputChange(e){
+		this.setState({ inputValue: e.target.value });
+	},
+
+	handleInputConfirm(){
+		const state = this.state;
+		const inputValue = state.inputValue;
+		let businessScope = state.businessScope;
+		if(inputValue.length > 16){
+			message.warning('标签字数不能超过16个字符')
+			return;
+		}
+		if (inputValue && businessScope.indexOf(inputValue) === -1) {
+			businessScope = [...businessScope, inputValue];
+		}
+		this.setState({
+			businessScope,
+			inputVisible: false,
+			inputValue: '',
+		});
+	},
+	handleClose1(removedTag){
+		const salesTarget = this.state.salesTarget.filter(tag => tag !== removedTag);
+		this.setState({ salesTarget });
+	},
+
+	showInput1(){
+		this.setState({ inputVisible1: true }, () => this.input1.focus());
+	},
+
+	handleInputChange1(e){
+		this.setState({ inputValue1: e.target.value });
+	},
+
+	handleInputConfirm1(){
+		const state = this.state;
+		const inputValue = state.inputValue1;
+		let salesTarget = state.salesTarget;
+		if(inputValue.length > 16){
+			message.warning('标签字数不能超过16个字符')
+			return;
+		}
+		if (inputValue && salesTarget.indexOf(inputValue) === -1) {
+			salesTarget = [...salesTarget, inputValue];
+		}
+		this.setState({
+			salesTarget,
+			inputVisible1: false,
+			inputValue1: '',
+		});
+	},
 	componentWillMount() {
 	componentWillMount() {
 		//城市
 		//城市
 		let Province = [];
 		let Province = [];
@@ -584,7 +650,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.state.researchAmount=undefined;//研发费用
 		this.state.researchAmount=undefined;//研发费用
 		this.state.salesAmount = undefined;//销售额
 		this.state.salesAmount = undefined;//销售额
 		this.state.year = undefined;//年份清零
 		this.state.year = undefined;//年份清零
-		
+
 	},
 	},
 	resetx() {
 	resetx() {
 		this.state.id=undefined;//年报ID
 		this.state.id=undefined;//年报ID
@@ -592,7 +658,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.state.status=undefined;//项目状态
 		this.state.status=undefined;//项目状态
 		this.state.remark = undefined;//备注
 		this.state.remark = undefined;//备注
 		this.state.year = undefined;//年份清零
 		this.state.year = undefined;//年份清零
-		
+
 	},
 	},
 	//列表详情
 	//列表详情
 	details(id) {
 	details(id) {
@@ -642,7 +708,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 						international:thisDetail.international,//是否国际化
 						international:thisDetail.international,//是否国际化
 						orgCode:thisDetail.orgCode,//社会统一机构
 						orgCode:thisDetail.orgCode,//社会统一机构
 						orgCodeUrl:thisDetail.orgCodeUrl? splitUrl(thisDetail.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],//社会统一机构地址
 						orgCodeUrl:thisDetail.orgCodeUrl? splitUrl(thisDetail.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],//社会统一机构地址
-						businessScope:thisDetail.businessScope,//业务范围
+						businessScope:thisDetail.businessScope ? thisDetail.businessScope.split(',').filter((v)=> v) : [],//业务范围
+						salesTarget:thisDetail.salesTarget ? thisDetail.salesTarget.split(',').filter((v)=> v) : [],//销售目标企业
 						contacts:thisDetail.contacts,//主要联系人姓名
 						contacts:thisDetail.contacts,//主要联系人姓名
 						contactMobile:thisDetail.contactMobile,//主要联系人电话
 						contactMobile:thisDetail.contactMobile,//主要联系人电话
 						investment:thisDetail.investment,//投资机构
 						investment:thisDetail.investment,//投资机构
@@ -661,7 +728,6 @@ const IntentionCustomer = Form.create()(React.createClass({
 						creditRating:thisDetail.creditRating?thisDetail.creditRating.toString():"",//信用等级
 						creditRating:thisDetail.creditRating?thisDetail.creditRating.toString():"",//信用等级
 						pojectApplicationUrl:thisDetail.pojectApplicationUrl,//文件地址
 						pojectApplicationUrl:thisDetail.pojectApplicationUrl,//文件地址
 					});
 					});
-					console.log(this.state.ProvinceCity)
 			}}.bind(this),
 			}}.bind(this),
 		}).always(function() {
 		}).always(function() {
 			this.setState({
 			this.setState({
@@ -688,10 +754,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 			message.warning('请填写注册资本');
 			message.warning('请填写注册资本');
 			return false;
 			return false;
 		};
 		};
-		if(!this.state.businessScope) {
+		if(this.state.businessScope.length <=0) {
 			message.warning('请填写公司主营产品');
 			message.warning('请填写公司主营产品');
 			return false;
 			return false;
 		};
 		};
+		if(this.state.salesTarget.length <=0) {
+			message.warning('请填写销售目标企业');
+			return false;
+		};
 		var reg = /^[1-9]\d*$|^0$/;
 		var reg = /^[1-9]\d*$|^0$/;
 		if(this.state.consultationPrice) {
 		if(this.state.consultationPrice) {
 			if(this.state.consultationPrice.length > 6) {
 			if(this.state.consultationPrice.length > 6) {
@@ -766,7 +836,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				international:this.state.international,//是否国际化
 				international:this.state.international,//是否国际化
 				orgCode:this.state.orgCode,//社会统一机构
 				orgCode:this.state.orgCode,//社会统一机构
 				orgCodeUrl: theorgCodeUrl.length != 0 ? theorgCodeUrl : '',//社会统一机构地址
 				orgCodeUrl: theorgCodeUrl.length != 0 ? theorgCodeUrl : '',//社会统一机构地址
-				businessScope:this.state.businessScope,//业务范围
+				businessScope:this.state.businessScope.join(','),//业务范围
+				salesTarget:this.state.salesTarget.join(','),//销售目标企业
 				contacts:this.state.contacts,//主要联系人姓名
 				contacts:this.state.contacts,//主要联系人姓名
 				contactMobile:this.state.contactMobile,//主要联系人电话
 				contactMobile:this.state.contactMobile,//主要联系人电话
 				investment:this.state.investment,//投资机构
 				investment:this.state.investment,//投资机构
@@ -917,9 +988,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.state.isXian=0;
 		this.state.isXian=0;
 		this.details(record.id);
 		this.details(record.id);
 	},
 	},
-	
+
 	//指定转交人自动补全
 	//指定转交人自动补全
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
 		$.ajax({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
@@ -928,23 +999,23 @@ const IntentionCustomer = Form.create()(React.createClass({
             data:{
             data:{
             	adminName:e
             	adminName:e
             },
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				       let thedata=data.data;
 				    if (!thedata) {
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
                     });
 				}.bind(this),
 				}.bind(this),
 			}).always(function () {
 			}).always(function () {
             this.setState({
             this.setState({
                 loading: false
                 loading: false
             });
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	},
 	//输入转交人输入框失去焦点是判断客户是否存在
 	//输入转交人输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
 	selectAuto(value,options){
@@ -960,7 +1031,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                 if (item.name == e.toString()) {
                 if (item.name == e.toString()) {
                     theType = item.id;
                     theType = item.id;
                 }
                 }
-           });     
+           });
    	    }
    	    }
 		this.setState({
 		this.setState({
 			theTypes:theType
 			theTypes:theType
@@ -969,8 +1040,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//值改变时请求客户名称
 	//值改变时请求客户名称
 	httpChange(e){
 	httpChange(e){
 		if(e.length>=1){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 		this.setState({
 			auto:e
 			auto:e
 		})
 		})
@@ -995,8 +1066,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				url: globalConfig.context + "/api/admin/customer/updateInformationMaintainerr",
 				url: globalConfig.context + "/api/admin/customer/updateInformationMaintainerr",
 				data: {
 				data: {
 					id: id, //客户ID
 					id: id, //客户ID
-					aid: this.state.theTypes, //指定转交人的ID 
-					
+					aid: this.state.theTypes, //指定转交人的ID
+
 				}
 				}
 			}).done(function(data) {
 			}).done(function(data) {
 				if(!data.error.length) {
 				if(!data.error.length) {
@@ -1014,7 +1085,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			message.warning('请输入转交人姓名')
 			message.warning('请输入转交人姓名')
 		}
 		}
 	},
 	},
-	
+
 	//详情打开
 	//详情打开
 	visitOk(e) {
 	visitOk(e) {
 		this.setState({
 		this.setState({
@@ -1045,14 +1116,14 @@ const IntentionCustomer = Form.create()(React.createClass({
 			visitModulx: false,
 			visitModulx: false,
 		});
 		});
 	},
 	},
-	
+
 	//PDF打开
 	//PDF打开
 	visitOk1(e) {
 	visitOk1(e) {
 		this.getPrevie(this.state.uid, 'techProject', 'organization_application');
 		this.getPrevie(this.state.uid, 'techProject', 'organization_application');
 		this.setState({
 		this.setState({
 			visitModul1: true
 			visitModul1: true
 		});
 		});
-		
+
 	},
 	},
 	//PDF关闭
 	//PDF关闭
 	visitCancel1(e) {
 	visitCancel1(e) {
@@ -1099,7 +1170,7 @@ const IntentionCustomer = Form.create()(React.createClass({
   	handlePrevious (){
   	handlePrevious (){
     	this.setState({ pagec: this.state.pagec - 1 });
     	this.setState({ pagec: this.state.pagec - 1 });
   	},
   	},
- 
+
  	handleNext (){
  	handleNext (){
     	this.setState({ pagec: this.state.pagec + 1 });
     	this.setState({ pagec: this.state.pagec + 1 });
  	},
  	},
@@ -1121,10 +1192,10 @@ const IntentionCustomer = Form.create()(React.createClass({
       </nav>
       </nav>
       );
       );
   	},
   	},
-  	
+
  	//上面是做PDF分页的
  	//上面是做PDF分页的
- 	
- 	
+
+
 	getOrgCodeUrl(e) {
 	getOrgCodeUrl(e) {
 		this.setState({ orgCodeUrl: e });
 		this.setState({ orgCodeUrl: e });
 	},
 	},
@@ -1239,7 +1310,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         	});
         	});
         }
         }
     },
     },
-    
+
   	//删除财务信息
   	//删除财务信息
     deltalc(record){
     deltalc(record){
     	this.setState({
     	this.setState({
@@ -1346,12 +1417,13 @@ const IntentionCustomer = Form.create()(React.createClass({
         const options = dataSources.map((group) =>
         const options = dataSources.map((group) =>
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     )
 				     )
+		const { businessScope, inputVisible, inputValue,salesTarget, inputVisible1, inputValue1 } = this.state;
         const intentionState = this.props.intentionState ||'';
         const intentionState = this.props.intentionState ||'';
         const props = {
         const props = {
 			  name: 'file',
 			  name: 'file',
 			  multiple: true,
 			  multiple: true,
 			  action: '/api/admin/techproject/upload',
 			  action: '/api/admin/techproject/upload',
-			 
+
 			  onChange(info) {
 			  onChange(info) {
 			    const status = info.file.status;
 			    const status = info.file.status;
 			    if (status !== 'uploading') {
 			    if (status !== 'uploading') {
@@ -1362,9 +1434,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 			      message.error(`${info.file.name} file upload failed.`);
 			      message.error(`${info.file.name} file upload failed.`);
 			    }
 			    }
 			  },
 			  },
-			  
+
 			};
 			};
 		let pdfUrl =this.state.pdfUrl||'';
 		let pdfUrl =this.state.pdfUrl||'';
+		this.saveInputRef = input => this.input = input
+		this.saveInputRef1 = input => this.input1 = input
 		return (
 		return (
       <div className="user-content">
       <div className="user-content">
         <ShowModalDiv ShowModal={this.state.showModal} />
         <ShowModalDiv ShowModal={this.state.showModal} />
@@ -1642,20 +1716,70 @@ const IntentionCustomer = Form.create()(React.createClass({
                           wrapperCol={{ span: 20 }}
                           wrapperCol={{ span: 20 }}
                           label="主营产品"
                           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>
+							<div>
+								{businessScope.map((tag, index) => {
+									const isLongTag = tag.length > 20;
+									const tagElem = (
+										<Tag closable key={tag} afterClose={() => this.handleClose(tag)}>
+											{isLongTag ? `${tag.slice(0, 20)}...` : tag}
+										</Tag>
+									);
+									return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+								})}
+								{inputVisible && (
+									<Input
+										ref={this.saveInputRef}
+										type="text"
+										size="small"
+										style={{ width: 78 }}
+										value={inputValue}
+										onChange={this.handleInputChange}
+										onBlur={this.handleInputConfirm}
+										onPressEnter={this.handleInputConfirm}
+									/>
+								)}
+								{!inputVisible && <Button size="small" type="primary" onClick={this.showInput}>+ 新增主营产品</Button>}
+								<span style={{ color: "red", marginLeft: "5px" }}>
+									*
+								</span>
+							</div>
                         </FormItem>
                         </FormItem>
                       </div>
                       </div>
+						<div className="clearfix">
+							<FormItem
+								labelCol={{ span: 4 }}
+								wrapperCol={{ span: 20 }}
+								label="销售目标企业"
+							>
+								<div>
+									{salesTarget.map((tag, index) => {
+										const isLongTag = tag.length > 20;
+										const tagElem = (
+											<Tag closable key={tag} afterClose={() => this.handleClose1(tag)}>
+												{isLongTag ? `${tag.slice(0, 20)}...` : tag}
+											</Tag>
+										);
+										return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+									})}
+									{inputVisible1 && (
+										<Input
+											ref={this.saveInputRef1}
+											type="text"
+											size="small"
+											style={{ width: 78 }}
+											value={inputValue1}
+											onChange={this.handleInputChange1}
+											onBlur={this.handleInputConfirm1}
+											onPressEnter={this.handleInputConfirm1}
+										/>
+									)}
+									{!inputVisible1 && <Button size="small" type="primary" onClick={this.showInput1}>+ 新增销售目标企业</Button>}
+									<span style={{ color: "red", marginLeft: "5px" }}>
+										*
+									</span>
+								</div>
+							</FormItem>
+						</div>
                       <div
                       <div
                         style={{
                         style={{
                           fontSize: "18px",
                           fontSize: "18px",
@@ -2151,7 +2275,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         >
         >
           <div>
           <div>
             {/*<Button type="primary"  onClick={this.pdfShows(pdfUrl)}>点击查看</Button>
             {/*<Button type="primary"  onClick={this.pdfShows(pdfUrl)}>点击查看</Button>
-			       		
+
 			       		<div id="pdfContent" style={{height:"500px",width:"500px",marginLeft:"300px"}} >
 			       		<div id="pdfContent" style={{height:"500px",width:"500px",marginLeft:"300px"}} >
     					</div>
     					</div>
     					onDocumentLoad={this.onDocumentComplete}
     					onDocumentLoad={this.onDocumentComplete}
@@ -2373,4 +2497,4 @@ const IntentionCustomer = Form.create()(React.createClass({
     );
     );
 	}
 	}
 }));
 }));
-export default IntentionCustomer;
+export default IntentionCustomer;

+ 112 - 68
js/component/manageCenter/customer/NEW/crm/crmAll.jsx

@@ -1,5 +1,24 @@
 import React from 'react';
 import React from 'react';
-import { Radio, Icon, Button, AutoComplete,Cascader,Input, Select, Spin, Popconfirm, Table, Switch, message, DatePicker, Upload, Form ,Modal,Tabs} from 'antd';
+import {
+	Radio,
+	Icon,
+	Button,
+	AutoComplete,
+	Cascader,
+	Input,
+	Select,
+	Spin,
+	Popconfirm,
+	Table,
+	Switch,
+	message,
+	DatePicker,
+	Upload,
+	Form,
+	Modal,
+	Tabs,
+	Tag, Tooltip
+} from 'antd';
 import ajax from 'jquery/src/ajax/xhr.js';
 import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
 import $ from 'jquery/src/ajax';
 import moment from 'moment';
 import moment from 'moment';
@@ -362,7 +381,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '资料完整度',
 					title: '资料完整度',
 					dataIndex: 'dataGrade',
 					dataIndex: 'dataGrade',
 					key: 'dataGrade',
 					key: 'dataGrade',
-					
+
 				}, {
 				}, {
 					title: '客户资料所属人',
 					title: '客户资料所属人',
 					dataIndex: 'iname',
 					dataIndex: 'iname',
@@ -373,13 +392,15 @@ const IntentionCustomer = Form.create()(React.createClass({
 					dataIndex: 'industry',
 					dataIndex: 'industry',
 					key: 'industry'
 					key: 'industry'
 				},
 				},
-				
+
 				{
 				{
 					title: '创建时间',
 					title: '创建时间',
 					dataIndex: 'createTime',
 					dataIndex: 'createTime',
 					key: 'createTime',
 					key: 'createTime',
 				}
 				}
 			],
 			],
+			businessScope:[],
+			salesTarget: [],
 			data: [],
 			data: [],
 			dataSource: [],
 			dataSource: [],
 			columnsDate: [
 			columnsDate: [
@@ -405,7 +426,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     dataIndex: 'auditStatus',
                     dataIndex: 'auditStatus',
                     key: 'auditStatus',
                     key: 'auditStatus',
                     render: text => { return getTechAuditStatus(text) }
                     render: text => { return getTechAuditStatus(text) }
-                }, 
+                },
                 {
                 {
                     title: '是否精品',
                     title: '是否精品',
                     dataIndex: 'boutique',
                     dataIndex: 'boutique',
@@ -456,7 +477,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 					title: '年份',
 					title: '年份',
 					dataIndex: 'year',
 					dataIndex: 'year',
 					key: 'year',
 					key: 'year',
-				}, 
+				},
 				{
 				{
 					title: '项目状态',
 					title: '项目状态',
 					dataIndex: 'status',
 					dataIndex: 'status',
@@ -569,7 +590,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 						international:thisDetail.international,//是否国际化
 						international:thisDetail.international,//是否国际化
 						orgCode:thisDetail.orgCode,//社会统一机构
 						orgCode:thisDetail.orgCode,//社会统一机构
 						orgCodeUrl:thisDetail.orgCodeUrl? splitUrl(thisDetail.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],//社会统一机构地址
 						orgCodeUrl:thisDetail.orgCodeUrl? splitUrl(thisDetail.orgCodeUrl, ',', globalConfig.avatarHost + '/upload') : [],//社会统一机构地址
-						businessScope:thisDetail.businessScope,//业务范围
+						businessScope: thisDetail.businessScope ? thisDetail.businessScope.split(',').filter((v)=> v) : [],//业务范围
+						salesTarget:thisDetail.salesTarget ? thisDetail.salesTarget.split(',').filter((v)=> v) : [],//销售目标企业
 						contacts:thisDetail.contacts,//主要联系人姓名
 						contacts:thisDetail.contacts,//主要联系人姓名
 						contactMobile:thisDetail.contactMobile,//主要联系人电话
 						contactMobile:thisDetail.contactMobile,//主要联系人电话
 						investment:thisDetail.investment,//投资机构
 						investment:thisDetail.investment,//投资机构
@@ -733,7 +755,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.details(record.id);
 		this.details(record.id);
 	},
 	},
 	//指定转交人自动补全
 	//指定转交人自动补全
-	supervisor(e){ 
+	supervisor(e){
 		$.ajax({
 		$.ajax({
             method: "get",
             method: "get",
             dataType: "json",
             dataType: "json",
@@ -742,23 +764,23 @@ const IntentionCustomer = Form.create()(React.createClass({
             data:{
             data:{
             	adminName:e
             	adminName:e
             },
             },
-            success: function (data) {                	  
+            success: function (data) {
 				       let thedata=data.data;
 				       let thedata=data.data;
 				    if (!thedata) {
 				    if (!thedata) {
                     if (data.error && data.error.length) {
                     if (data.error && data.error.length) {
                         message.warning(data.error[0].message);
                         message.warning(data.error[0].message);
-                    };	
-                    thedata = {}; 
-              }; 
+                    };
+                    thedata = {};
+              };
 					this.setState({
 					this.setState({
-						customerArr:thedata,	
+						customerArr:thedata,
                     });
                     });
 				}.bind(this),
 				}.bind(this),
 			}).always(function () {
 			}).always(function () {
             this.setState({
             this.setState({
                 loading: false
                 loading: false
             });
             });
-        }.bind(this));  
+        }.bind(this));
 	},
 	},
 	//输入转交人输入框失去焦点是判断客户是否存在
 	//输入转交人输入框失去焦点是判断客户是否存在
 	selectAuto(value,options){
 	selectAuto(value,options){
@@ -774,7 +796,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                 if (item.name == e.toString()) {
                 if (item.name == e.toString()) {
                     theType = item.id;
                     theType = item.id;
                 }
                 }
-           });     
+           });
    	    }
    	    }
 		this.setState({
 		this.setState({
 			theTypes:theType
 			theTypes:theType
@@ -783,8 +805,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//值改变时请求客户名称
 	//值改变时请求客户名称
 	httpChange(e){
 	httpChange(e){
 		if(e.length>=1){
 		if(e.length>=1){
-			this.supervisor(e); 
-		}	
+			this.supervisor(e);
+		}
 		this.setState({
 		this.setState({
 			auto:e
 			auto:e
 		})
 		})
@@ -809,8 +831,8 @@ const IntentionCustomer = Form.create()(React.createClass({
 				url: globalConfig.context + "/api/admin/customer/updateInformationMaintainerr",
 				url: globalConfig.context + "/api/admin/customer/updateInformationMaintainerr",
 				data: {
 				data: {
 					id: id, //客户ID
 					id: id, //客户ID
-					aid: this.state.theTypes, //指定转交人的ID 
-					
+					aid: this.state.theTypes, //指定转交人的ID
+
 				}
 				}
 			}).done(function(data) {
 			}).done(function(data) {
 				if(!data.error.length) {
 				if(!data.error.length) {
@@ -952,7 +974,7 @@ const IntentionCustomer = Form.create()(React.createClass({
         const intentionState = this.props.intentionState ||'';
         const intentionState = this.props.intentionState ||'';
 		return(
 		return(
 			<div className="user-content" >
 			<div className="user-content" >
-                <div className="content-title">                  
+                <div className="content-title">
                     <span>客户资料管理</span>
                     <span>客户资料管理</span>
                 </div>
                 </div>
 				<Tabs
 				<Tabs
@@ -1006,24 +1028,24 @@ const IntentionCustomer = Form.create()(React.createClass({
 								? this.state.changeList
 								? this.state.changeList
 								: this.state.columns
 								: this.state.columns
 						}
 						}
-                            dataSource={this.state.dataSource}    
+                            dataSource={this.state.dataSource}
                             rowSelection={rowSelection}
                             rowSelection={rowSelection}
-                            pagination={this.state.pagination} 
+                            pagination={this.state.pagination}
 							onRowClick={this.tableRowClick}
 							onRowClick={this.tableRowClick}
 							bordered
 							bordered
 							size="small"
 							size="small"
                            />
                            />
                     </Spin>
                     </Spin>
-                </div> 
-                <Modal	
+                </div>
+                <Modal
 				      className="customeDetails"
 				      className="customeDetails"
 				      footer=''
 				      footer=''
 			          title="客户资料"
 			          title="客户资料"
 			          width='1000px'
 			          width='1000px'
 			          visible={this.state.visitModul}
 			          visible={this.state.visitModul}
 			          onOk={this.visitOk}
 			          onOk={this.visitOk}
-					  onCancel={this.visitCancel}							          							          
-			        >	
+					  onCancel={this.visitCancel}
+			        >
                  <Tabs onChange={this.callback} activeKey={this.state.callnub}>
                  <Tabs onChange={this.callback} activeKey={this.state.callnub}>
              			<TabPane tab="基本信息" key="0">
              			<TabPane tab="基本信息" key="0">
 					       <div>
 					       <div>
@@ -1045,7 +1067,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 						                    </FormItem>
 						                    </FormItem>
 					                    </div>
 					                    </div>
 					                    <div className="clearfix" >
 					                    <div className="clearfix" >
-					                    	<FormItem className="half-item" 
+					                    	<FormItem className="half-item"
 					                          {...formItemLayout}
 					                          {...formItemLayout}
 					                         label="企业行业">
 					                         label="企业行业">
 											    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
 											    <Select placeholder="选择行业" value={this.state.industry}  style={{width:'95%'}}
@@ -1058,29 +1080,29 @@ const IntentionCustomer = Form.create()(React.createClass({
 				                                </Select>
 				                                </Select>
 				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
 				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
 					                   		 </FormItem>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            {...formItemLayout}
 					                           label="社会属性"
 					                           label="社会属性"
-					                           > 
+					                           >
 												    <Select placeholder="客户社会属性" value={this.state.societyTag}  style={{width:'95%'}}
 												    <Select placeholder="客户社会属性" value={this.state.societyTag}  style={{width:'95%'}}
-											    				onChange={(e)=>{this.setState({societyTag:e})}} disabled={true}> 
+											    				onChange={(e)=>{this.setState({societyTag:e})}} disabled={true}>
 				                                     {
 				                                     {
 				                                        socialAttribute.map(function (item) {
 				                                        socialAttribute.map(function (item) {
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 				                                        })
 				                                        })
 				                                    }
 				                                    }
-				                                </Select>  
+				                                </Select>
 				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
 				                                <span style={{color:'red',marginLeft:'5px'}}>*</span>
 					                   		 </FormItem>
 					                   		 </FormItem>
-					                   		 <FormItem className="half-item" 
+					                   		 <FormItem className="half-item"
 					                            {...formItemLayout}
 					                            {...formItemLayout}
 					                           label="省-市-区"
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'95%'}}
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择城市" style={{width:'95%'}}
 													onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} disabled={true}/>
 													onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} disabled={true}/>
 													<span style={{color:'red',marginLeft:'5px'}}>*</span>
 													<span style={{color:'red',marginLeft:'5px'}}>*</span>
 						                    </FormItem>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="注册资本"
 							                        label="注册资本"
 					                           	 >
 					                           	 >
@@ -1093,71 +1115,93 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                        labelCol={{ span:4 }}
 							                        labelCol={{ span:4 }}
 							                        wrapperCol={{ span: 20 }}
 							                        wrapperCol={{ span: 20 }}
 							                        label="主营产品" >
 							                        label="主营产品" >
-							                        <Input type="textarea" rows={2} value={this.state.businessScope}  style={{width:'95%'}}
-													onChange={(e,pre) => { this.setState({ businessScope: e.target.value })}} disabled={true}/>
-							                   		<span style={{color:'red',marginLeft:'5px'}}>*</span>
+													{this.state.businessScope.map((tag) => {
+														const isLongTag = tag.length > 20;
+														const tagElem = (
+															<Tag key={tag}>
+																{isLongTag ? `${tag.slice(0, 20)}...` : tag}
+															</Tag>
+														);
+														return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+													})}
 							                   </FormItem>
 							                   </FormItem>
 						                    </div>
 						                    </div>
-						                    
+											<div className='clearfix'>
+												<FormItem
+													labelCol={{ span:4 }}
+													wrapperCol={{ span: 20 }}
+													label="销售目标企业" >
+													{this.state.salesTarget.map((tag) => {
+														const isLongTag = tag.length > 20;
+														const tagElem = (
+															<Tag key={tag}>
+																{isLongTag ? `${tag.slice(0, 20)}...` : tag}
+															</Tag>
+														);
+														return isLongTag ? <Tooltip title={tag} key={tag}>{tagElem}</Tooltip> : tagElem;
+													})}
+												</FormItem>
+											</div>
+
 						                    <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>企业资料</div>
 						                    <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>企业资料</div>
 						                    <FormItem className="half-item"
 						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                         label="通信地址"
 							                         label="通信地址"
 						                            >
 						                            >
-						                                <Input placeholder="客户通信地址" value={this.state.postalAddress} 
+						                                <Input placeholder="客户通信地址" value={this.state.postalAddress}
 													onChange={(e,pre) => { this.setState({ postalAddress: e.target.value }) }} disabled={true}/>
 													onChange={(e,pre) => { this.setState({ postalAddress: e.target.value }) }} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                         label="固定电话"
 							                         label="固定电话"
 						                            >
 						                            >
-						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel} 
+						                                <Input placeholder="客户固定电话" value={this.state.contactsFixedTel}
 													onChange={(e) => { this.setState({ contactsFixedTel: e.target.value }) }} disabled={true}/>
 													onChange={(e) => { this.setState({ contactsFixedTel: e.target.value }) }} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
 						                    <FormItem className="half-item"
 						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                         label="客户传真"
 							                         label="客户传真"
 						                            >
 						                            >
-						                                <Input placeholder="客户传真" value={this.state.contactsFax} 
+						                                <Input placeholder="客户传真" value={this.state.contactsFax}
 													onChange={(e) => { this.setState({ contactsFax: e.target.value })}} disabled={true}/>
 													onChange={(e) => { this.setState({ contactsFax: e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-						                    
-						                    <FormItem className="half-item" 
+
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="企业人数"
 							                        label="企业人数"
 					                           	 >
 					                           	 >
 						                            <Input placeholder="单位规模" value={this.state.enterpriseScale} onChange={(e) => {
 						                            <Input placeholder="单位规模" value={this.state.enterpriseScale} onChange={(e) => {
 								                        this.setState({ enterpriseScale:  e.target.value })}} disabled={true}/>
 								                        this.setState({ enterpriseScale:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="法人名称"
 							                        label="法人名称"
 					                           	 >
 					                           	 >
 						                            <Input placeholder="法人名称" value={this.state.legalPerson} onChange={(e) => {
 						                            <Input placeholder="法人名称" value={this.state.legalPerson} onChange={(e) => {
 								                        this.setState({ legalPerson:  e.target.value })}} disabled={true}/>
 								                        this.setState({ legalPerson:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-					                   		<FormItem className="half-item" 
+					                   		<FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="法人身份证"
 							                        label="法人身份证"
 					                           	 >
 					                           	 >
 						                            <Input placeholder="法人身份证" value={this.state.legalPersonIdCard} onChange={(e) => {
 						                            <Input placeholder="法人身份证" value={this.state.legalPersonIdCard} onChange={(e) => {
 								                        this.setState({ legalPersonIdCard:  e.target.value })}} disabled={true}/>
 								                        this.setState({ legalPersonIdCard:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-											<FormItem className="half-item" 
+											<FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="联系人"
 							                        label="联系人"
 					                           	 >
 					                           	 >
 						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
 						                            <Input placeholder="主要联系人" value={this.state.contacts} onChange={(e) => {
 								                        this.setState({ contacts:  e.target.value })}} disabled={true}/>
 								                        this.setState({ contacts:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="联系人号码"
 							                        label="联系人号码"
 					                           	 >
 					                           	 >
 						                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
 						                            <Input placeholder="主要联系人号码" value={this.state.contactMobile} onChange={(e) => {
 								                        this.setState({ contactMobile:  e.target.value })}} disabled={true}/>
 								                        this.setState({ contactMobile:  e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="法人电话"
 							                        label="法人电话"
 					                           	 >
 					                           	 >
@@ -1168,10 +1212,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                         label="法人邮箱"
 							                         label="法人邮箱"
 						                            >
 						                            >
-						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail} 
+						                                <Input placeholder="法人电子邮箱" value={this.state.legalPersonEmail}
 													onChange={(e) => {this.setState({legalPersonEmail: e.target.value })}} disabled={true}/>
 													onChange={(e) => {this.setState({legalPersonEmail: e.target.value })}} disabled={true}/>
 						                    </FormItem>
 						                    </FormItem>
-						                    <FormItem className="half-item" 
+						                    <FormItem className="half-item"
 							                    	 {...formItemLayout}
 							                    	 {...formItemLayout}
 							                        label="社会统一信用机构代码"
 							                        label="社会统一信用机构代码"
 					                           	 >
 					                           	 >
@@ -1183,11 +1227,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 							                        labelCol={{ span:4 }}
 							                        labelCol={{ span:4 }}
 							                        wrapperCol={{ span: 18 }}
 							                        wrapperCol={{ span: 18 }}
 							                        label="客户简介" >
 							                        label="客户简介" >
-							                            <Input type="textarea" rows={3} value={this.state.introduction} 
+							                            <Input type="textarea" rows={3} value={this.state.introduction}
 													onChange={(e,pre) => { this.setState({ introduction: e.target.value })}} disabled={true}/>
 													onChange={(e,pre) => { this.setState({ introduction: e.target.value })}} disabled={true}/>
 							                    </FormItem>
 							                    </FormItem>
 						                    </div>
 						                    </div>
-						                    
+
 						                    <div className="clearfix pictures">
 						                    <div className="clearfix pictures">
 						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'95px'}}
 						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginLeft:'95px'}}
 							                        labelCol={{ span: 8 }}
 							                        labelCol={{ span: 8 }}
@@ -1202,35 +1246,35 @@ const IntentionCustomer = Form.create()(React.createClass({
 						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginTop:'20px'}}
 						                        <FormItem style={{display:'inline-block',width:'350px',marginTop:'20px',marginTop:'20px'}}
 							                        labelCol={{ span: 8 }}
 							                        labelCol={{ span: 8 }}
 							                        wrapperCol={{ span: 10 }}
 							                        wrapperCol={{ span: 10 }}
-							                        label="单位LOGO" > 
+							                        label="单位LOGO" >
 							                        <PicturesWall
 							                        <PicturesWall
 														domId={'crmAll2'}
 														domId={'crmAll2'}
 							                            fileList={this.getCompanyLogoUrl}
 							                            fileList={this.getCompanyLogoUrl}
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            pictureUrl={this.state.companyLogoUrl} />
 							                            <p>建议:图片要清晰。</p>
 							                            <p>建议:图片要清晰。</p>
 							                    </FormItem>
 							                    </FormItem>
-							                </div> 
+							                </div>
 							                <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>重要资料</div>
 							                <div style={{fontSize:'18px',marginLeft:'50px',marginTop:'15px',marginBottom:'10px',color:"red",fontWeight:"bold"}}>重要资料</div>
 							               	<div className='clearfix' >
 							               	<div className='clearfix' >
-							                    <FormItem className="half-item" 
+							                    <FormItem className="half-item"
 						                            {...formItemLayout}
 						                            {...formItemLayout}
 						                           label="客户信用等级"
 						                           label="客户信用等级"
-						                           > 
-													    <Select placeholder="客户信用等级" value={this.state.creditRating}  
-												    				onChange={(e)=>{this.setState({creditRating:e})}} disabled={true}> 
+						                           >
+													    <Select placeholder="客户信用等级" value={this.state.creditRating}
+												    				onChange={(e)=>{this.setState({creditRating:e})}} disabled={true}>
 					                                     {
 					                                     {
 					                                        slcRedit.map(function (item) {
 					                                        slcRedit.map(function (item) {
 					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 					                                            return <Select.Option key={item.value} >{item.key}</Select.Option>
 					                                        })
 					                                        })
 					                                    }
 					                                    }
-					                                </Select>  
+					                                </Select>
 						                   		 </FormItem>
 						                   		 </FormItem>
 							                    <div className='clearfix'>
 							                    <div className='clearfix'>
 								                    <FormItem
 								                    <FormItem
 								                        labelCol={{ span:4 }}
 								                        labelCol={{ span:4 }}
 								                        wrapperCol={{ span: 19 }}
 								                        wrapperCol={{ span: 19 }}
 								                        label="企业核心技术" >
 								                        label="企业核心技术" >
-								                            <Input type="textarea" rows={3} value={this.state.coreTechnology} 
+								                            <Input type="textarea" rows={3} value={this.state.coreTechnology}
 														onChange={(e,pre) => { this.setState({ coreTechnology: e.target.value })}} disabled={true}/>
 														onChange={(e,pre) => { this.setState({ coreTechnology: e.target.value })}} disabled={true}/>
 								                    </FormItem>
 								                    </FormItem>
 							                    </div>
 							                    </div>
@@ -1248,15 +1292,15 @@ const IntentionCustomer = Form.create()(React.createClass({
 								                        labelCol={{ span:4 }}
 								                        labelCol={{ span:4 }}
 								                        wrapperCol={{ span: 19 }}
 								                        wrapperCol={{ span: 19 }}
 								                        label="高企合作情况" >
 								                        label="高企合作情况" >
-								                            <Input type="textarea" rows={3} value={this.state.cooperationSituation} 
+								                            <Input type="textarea" rows={3} value={this.state.cooperationSituation}
 														onChange={(e,pre) => { this.setState({ cooperationSituation: e.target.value })}} disabled={true}/>
 														onChange={(e,pre) => { this.setState({ cooperationSituation: e.target.value })}} disabled={true}/>
 								                    </FormItem>
 								                    </FormItem>
 							                    </div>
 							                    </div>
 						                    </div>
 						                    </div>
-					                    </div>		                	
+					                    </div>
 								    </Spin>
 								    </Spin>
-								</Form>		
-								
+								</Form>
+
 					       </div>
 					       </div>
 					    </TabPane>
 					    </TabPane>
 					    <TabPane tab="知识产权列表" key="1">
 					    <TabPane tab="知识产权列表" key="1">
@@ -1285,20 +1329,20 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                </Spin>
 			                </Spin>
 					    </TabPane>
 					    </TabPane>
 					</Tabs>
 					</Tabs>
-                </Modal> 
+                </Modal>
                 <TechAchievementDesc
                 <TechAchievementDesc
 	                data={this.state.RowData}
 	                data={this.state.RowData}
 	                detailApiUrl={this.props['data-detailApiUrl']}
 	                detailApiUrl={this.props['data-detailApiUrl']}
 	                achievementCategoryOption={this.state.achievementCategoryOption}
 	                achievementCategoryOption={this.state.achievementCategoryOption}
 	                showDesc={this.state.showDesc}
 	                showDesc={this.state.showDesc}
 	                uid={this.state.uid}
 	                uid={this.state.uid}
-	                closeDesc={this.closeDesc} 
+	                closeDesc={this.closeDesc}
 	                loadDatas={this.loadDatas}
 	                loadDatas={this.loadDatas}
 	                />
 	                />
-                	
+
           </div >
           </div >
-          
+
 		);
 		);
 	}
 	}
 }));
 }));
-export default IntentionCustomer;
+export default IntentionCustomer;

+ 27 - 3
js/component/manageCenter/project/summary/highTechConfig.jsx

@@ -53,6 +53,11 @@ const highTechColumns =[
         key: "pname"
         key: "pname"
     },
     },
     {
     {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
         title: "负责部门",
         title: "负责部门",
         dataIndex: "techDepName",
         dataIndex: "techDepName",
         key: "techDepName"
         key: "techDepName"
@@ -190,6 +195,11 @@ const doubleSoft = [
         key: "pname"
         key: "pname"
     },
     },
     {
     {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
         title: "负责部门",
         title: "负责部门",
         dataIndex: "techDepName",
         dataIndex: "techDepName",
         key: "techDepName"
         key: "techDepName"
@@ -202,7 +212,10 @@ const doubleSoft = [
     {
     {
         title: "下证时间",
         title: "下证时间",
         dataIndex: "licenceTime",
         dataIndex: "licenceTime",
-        key: "licenceTime"
+        key: "licenceTime",
+        render:(value)=>(
+            <div style={{width:'80px'}}>{value}</div>
+        )
     },
     },
     {
     {
         title: "项目金额",
         title: "项目金额",
@@ -332,7 +345,10 @@ const softWriting = [
     {
     {
         title: "下证时间",
         title: "下证时间",
         dataIndex: "licenceTime",
         dataIndex: "licenceTime",
-        key: "licenceTime"
+        key: "licenceTime",
+        render:(value)=>(
+            <div style={{width:'80px'}}>{value}</div>
+        )
     },
     },
     {
     {
         title: "证书编号",
         title: "证书编号",
@@ -494,7 +510,10 @@ const patent =[
     {
     {
         title: "下证时间",
         title: "下证时间",
         dataIndex: "licenceTime",
         dataIndex: "licenceTime",
-        key: "licenceTime"
+        key: "licenceTime",
+        render:(value)=>(
+            <div style={{width:'80px'}}>{value}</div>
+        )
     },
     },
     {
     {
         title: "项目金额",
         title: "项目金额",
@@ -598,6 +617,11 @@ const currency = [
         key: "pname"
         key: "pname"
     },
     },
     {
     {
+        title: "数量",
+        dataIndex: "commodityQuantity",
+        key: "commodityQuantity"
+    },
+    {
         title: "负责部门",
         title: "负责部门",
         dataIndex: "techDepName",
         dataIndex: "techDepName",
         key: "techDepName"
         key: "techDepName"

+ 44 - 31
js/component/manageCenter/project/summary/projecCount.jsx

@@ -44,6 +44,10 @@ class ProjecCount extends Component{
             },
             },
             dataSource: [],
             dataSource: [],
 
 
+            taberReleaseDate: [],
+            taberProjectType: '',
+            taberCommodityName: '',
+
             releaseDate:[],
             releaseDate:[],
             searchOrderNo: '',
             searchOrderNo: '',
             searchContractNo: '',
             searchContractNo: '',
@@ -93,7 +97,11 @@ class ProjecCount extends Component{
     loadData(pageNo) {
     loadData(pageNo) {
         this.setState({
         this.setState({
             page: pageNo,
             page: pageNo,
-            loading: true
+            loading: true,
+
+            taberReleaseDate:this.state.releaseDate,
+            taberProjectType:this.state.projectType,
+            taberCommodityName:this.state.commodityName,
         });
         });
         $.ajax({
         $.ajax({
             method: "get",
             method: "get",
@@ -192,6 +200,10 @@ class ProjecCount extends Component{
             commodityName: '',
             commodityName: '',
             kid:'',
             kid:'',
             status: 0,
             status: 0,
+
+            taberReleaseDate:[],
+            taberProjectType:'',
+            taberCommodityName:'',
         },()=>{
         },()=>{
             this.loadData();
             this.loadData();
         })
         })
@@ -510,7 +522,7 @@ class ProjecCount extends Component{
                             <Button type="primary" onClick={()=>{
                             <Button type="primary" onClick={()=>{
                                 if(this.state.commodityName.length === 0){
                                 if(this.state.commodityName.length === 0){
                                     this.setState({
                                     this.setState({
-                                        kid: ''
+                                        kid: '',
                                     },()=>{
                                     },()=>{
                                         this.loadData();
                                         this.loadData();
                                     })
                                     })
@@ -586,7 +598,7 @@ class ProjecCount extends Component{
                                                 this.state.projectType === 5 ? 1 :
                                                 this.state.projectType === 5 ? 1 :
                                                     this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus).length > 0 ?
                                                     this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus).length > 0 ?
                                                         (this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus)[0].cname === '高新' ? 1 : 0) : 0,
                                                         (this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus)[0].cname === '高新' ? 1 : 0) : 0,
-                            screen: this.state.screen,//筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
+                            screen: this.state.screen,//筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
                         }}
                         }}
                         introduce={()=>(
                         introduce={()=>(
                             <div className="user-search" style={{
                             <div className="user-search" style={{
@@ -594,48 +606,49 @@ class ProjecCount extends Component{
                                 marginLeft:'10px',
                                 marginLeft:'10px',
                                 marginRight:'10px'
                                 marginRight:'10px'
                             }}>
                             }}>
-                                {this.state.commodityName ? <span style={{display: "inline-block",marginBottom:'10px'}}>
-                                    <span>项目名称:</span>
-                                    <span  style={{ width: 100,marginLeft:'10px' }}>{this.state.commodityName}</span>
+                                {this.state.taberProvince ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>派单省份:</span>
+                                    <span style={{ width: 100,marginLeft:'10px' }}>{getNewDiccityArr(this.state.taberProvince)}</span>
                                 </span> : null}
                                 </span> : null}
-                                {this.state.projectStatus ? <span style={{display:"inline-block"}}>
-                                    <span style={{marginRight:'20px',marginBottom:'10px'}}>项目类别 :</span>
-                                    <span style={{ width: 100,marginRight:'20px',marginBottom:'10px' }}>
+                                {this.state.taberProjectStatus ? <span style={{display:"inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>项目类别 :</span>
+                                    <span style={{ width: 100,marginLeft:'10px' }}>
                                         {
                                         {
-                                            this.state.contactsOptionData.filter((v)=>v.id === this.state.projectStatus)[0].cname
+                                            this.state.contactsOptionData.filter((v)=>v.id === this.state.taberProjectStatus)[0].cname
                                         }
                                         }
                                     </span>
                                     </span>
                                 </span> : null}
                                 </span> : null}
-                                {typeof this.state.projectType === 'number'?<span style={{display:"inline-block"}}>
-                                    <span style={{marginRight:'10px',marginBottom:'10px'}}>项目分类 :</span>
-                                    <span style={{ width: 100,marginRight:'20px',marginBottom:'10px' }}>
+                                {this.state.taberdepId ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>负责部门:</span>
+                                    <span style={{ width: 200,marginLeft:'10px' }}>
                                         {
                                         {
-                                            this.state.projectType === 0 ? '通用' :
-                                                this.state.projectType === 1 ? '专利' :
-                                                    this.state.projectType === 2 ? '软著' :
-                                                        this.state.projectType === 3 ? '审计' :
-                                                            this.state.projectType === 4 ? '双软':
-                                                                this.state.projectType === 5 ? '高新' :
-                                                                    this.state.projectType === 6 ? '商标' : ''
+                                            this.state.departmentArr.filter((v)=>v.id === this.state.taberdepId)[0].name
                                         }
                                         }
                                     </span>
                                     </span>
                                 </span> : null}
                                 </span> : null}
-                                {this.state.province ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
-                                    <span>派单省份:</span>
-                                    <span style={{ width: 100,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}>{getNewDiccityArr(this.state.province)}</span>
+
+                                {this.state.taberCommodityName ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>项目名称:</span>
+                                    <span  style={{ width: 100,marginLeft:'10px' }}>{this.state.taberCommodityName}</span>
                                 </span> : null}
                                 </span> : null}
-                                {this.state.depId ? <span style={{display: "inline-block",marginRight:'20px',marginBottom:'10px'}}>
-                                <span>负责部门:</span>
-                                    <span style={{ width: 200,marginRight:'10px',marginLeft:'10px',marginBottom:'10px' }}>
+                                {typeof this.state.taberProjectType === 'number'?<span style={{display:"inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>项目分类 :</span>
+                                    <span style={{ width: 100,marginRight:'10px' }}>
                                         {
                                         {
-                                            this.state.departmentArr.filter((v)=>v.id === this.state.depId)[0].name
+                                            this.state.taberProjectType === 0 ? '通用' :
+                                                this.state.taberProjectType === 1 ? '专利' :
+                                                    this.state.taberProjectType === 2 ? '软著' :
+                                                        this.state.taberProjectType === 3 ? '审计' :
+                                                            this.state.taberProjectType === 4 ? '双软':
+                                                                this.state.taberProjectType === 5 ? '高新' :
+                                                                    this.state.taberProjectType === 6 ? '商标' : ''
                                         }
                                         }
                                     </span>
                                     </span>
                                 </span> : null}
                                 </span> : null}
-                                {this.state.releaseDate.length > 0 ? <span style={{display:"inline-block"}}>
-                                <span style={{marginRight:'10px',marginBottom:'10px'}}>派单时间 :</span>
-                                    <span style={{marginRight:'10px',marginBottom:'10px'}}>
-                                        {this.state.releaseDate[0]+'~'+this.state.releaseDate[1]}
+                                {this.state.taberReleaseDate.length > 0 ? <span style={{display:"inline-block",marginRight:'20px',marginBottom:'10px'}}>
+                                    <span>派单时间 :</span>
+                                    <span style={{ width: 100,marginRight:'10px' }}>
+                                        {this.state.taberReleaseDate[0]+'~'+this.state.taberReleaseDate[1]}
                                     </span>
                                     </span>
                                 </span> : null}
                                 </span> : null}
                             </div>
                             </div>

+ 9 - 9
js/component/manageCenter/project/summary/projecCountConfig.jsx

@@ -178,8 +178,8 @@ const invention =(fn)=> [
     },
     },
     {
     {
         title: "授权数",
         title: "授权数",
-        dataIndex: "certificatesCount",
-        key: "certificatesCount",
+        dataIndex: "authorizeCount",
+        key: "authorizeCount",
         className: 'projectTable',
         className: 'projectTable',
         onCellClick :(record, event)=>{
         onCellClick :(record, event)=>{
             event.stopPropagation();
             event.stopPropagation();
@@ -283,8 +283,8 @@ const utilityModel =(fn)=> [
     },
     },
     {
     {
         title: "授权数",
         title: "授权数",
-        dataIndex: "certificatesCount",
-        key: "certificatesCount",
+        dataIndex: "authorizeCount",
+        key: "authorizeCount",
         className: 'projectTable',
         className: 'projectTable',
         onCellClick :(record, event)=>{
         onCellClick :(record, event)=>{
             event.stopPropagation();
             event.stopPropagation();
@@ -542,14 +542,14 @@ const currency =(fn)=> [
         }
         }
     },
     },
     {
     {
-        title: "公示/立项数",
-        dataIndex: "setUpCount",
-        key: "setUpCount",
+        title: "公示数",
+        dataIndex: "publicityCount",
+        key: "publicityCount",
         className: 'projectTable',
         className: 'projectTable',
         onCellClick :(record, event)=>{
         onCellClick :(record, event)=>{
             event.stopPropagation();
             event.stopPropagation();
-            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请
-            fn(record,3);
+            //筛选项 0库存 1派单 2完成 3立项 4抽查 5未通过 6受理 7完结 8授权 9驳回 10下证 11申请 12公示数
+            fn(record,12);
         }
         }
     },
     },
     {
     {

+ 39 - 37
js/component/manageCenter/project/task/myTask.jsx

@@ -3748,39 +3748,6 @@ const Task = React.createClass({
                       {/*  </Radio.Group>*/}
                       {/*  </Radio.Group>*/}
                       {/*</FormItem>*/}
                       {/*</FormItem>*/}
                     </div>
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                    {this.state.bpType === 2 ? <div className="clearfix">
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="加急天数"
-                      >
-                        <Radio.Group
-                            value={this.state.urgentDay}
-                            onChange={(e) => {
-                              this.setState({ urgentDay: e.target.value })
-                            }}
-                        >
-                          <Radio value={1}>是</Radio>
-                          <Radio value={0}>否</Radio>
-                        </Radio.Group>
-                      </FormItem>
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="有无材料"
-                      >
-                        <Radio.Group
-                            value={this.state.ifMaterial}
-                            onChange={(e) => {
-                              this.setState({ ifMaterial: e.target.value })
-                            }}
-                        >
-                          <Radio value={1}>是</Radio>
-                          <Radio value={0}>否</Radio>
-                        </Radio.Group>
-                      </FormItem>
-                    </div> : null}
                     <div className="clearfix">
                     <div className="clearfix">
                       {/*<FormItem*/}
                       {/*<FormItem*/}
                       {/*  className="half-item"*/}
                       {/*  className="half-item"*/}
@@ -4471,6 +4438,7 @@ const Task = React.createClass({
                           type="textarea"
                           type="textarea"
                           placeholder="请输入项目说明"
                           placeholder="请输入项目说明"
                           rows={4}
                           rows={4}
+                          disabled
                           value={this.state.taskComment}
                           value={this.state.taskComment}
                           onChange={(e) => {
                           onChange={(e) => {
                             if(this.state.taskCommentData){
                             if(this.state.taskCommentData){
@@ -5526,6 +5494,39 @@ const Task = React.createClass({
                 {/*  </Radio.Group>*/}
                 {/*  </Radio.Group>*/}
                 {/*</FormItem>*/}
                 {/*</FormItem>*/}
               </div>
               </div>
+              {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+              {this.state.bpType === 2 ? <div className="clearfix">
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="加急天数"
+                >
+                  <Radio.Group
+                      value={this.state.urgentDay}
+                      onChange={(e) => {
+                        this.setState({ urgentDay: e.target.value })
+                      }}
+                  >
+                    <Radio value={1}>是</Radio>
+                    <Radio value={0}>否</Radio>
+                  </Radio.Group>
+                </FormItem>
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="有无材料"
+                >
+                  <Radio.Group
+                      value={this.state.ifMaterial}
+                      onChange={(e) => {
+                        this.setState({ ifMaterial: e.target.value })
+                      }}
+                  >
+                    <Radio value={1}>是</Radio>
+                    <Radio value={0}>否</Radio>
+                  </Radio.Group>
+                </FormItem>
+              </div> : null}
               <div className="clearfix">
               <div className="clearfix">
                 <div style={{
                 <div style={{
                   paddingLeft: '8%',
                   paddingLeft: '8%',
@@ -5848,6 +5849,7 @@ const Task = React.createClass({
                     type="textarea"
                     type="textarea"
                     placeholder="请输入项目说明"
                     placeholder="请输入项目说明"
                     rows={4}
                     rows={4}
+                    disabled
                     value={this.state.taskComment}
                     value={this.state.taskComment}
                     onChange={(e) => {
                     onChange={(e) => {
                       if(this.state.taskCommentData){
                       if(this.state.taskCommentData){
@@ -6543,7 +6545,7 @@ const Task = React.createClass({
           </Tabs>
           </Tabs>
           </div>
           </div>
         </Modal> : <div/>}
         </Modal> : <div/>}
-        <Modal
+        {this.state.visibleA ? <Modal
           width="800px"
           width="800px"
           visible={this.state.visibleA}
           visible={this.state.visibleA}
           onCancel={this.visitCancelA}
           onCancel={this.visitCancelA}
@@ -6562,8 +6564,8 @@ const Task = React.createClass({
               />
               />
             </Spin>
             </Spin>
           </div>
           </div>
-        </Modal>
-        <Modal
+        </Modal> : null}
+        {this.state.timeVisible ? <Modal
           title="工时记录"
           title="工时记录"
           visible={this.state.timeVisible}
           visible={this.state.timeVisible}
           onCancel={this.timeClose}
           onCancel={this.timeClose}
@@ -6583,7 +6585,7 @@ const Task = React.createClass({
               累计工时(小时):{this.state.recordHour}
               累计工时(小时):{this.state.recordHour}
             </p>
             </p>
           </Spin>
           </Spin>
-        </Modal>
+        </Modal> :null}
         {this.state.ThirdListVisible ? <NewSupplier
         {this.state.ThirdListVisible ? <NewSupplier
             patentNameType={this.state.patentNameType}
             patentNameType={this.state.patentNameType}
             ThirdId={this.state.ThirdId}
             ThirdId={this.state.ThirdId}

+ 23 - 23
js/component/manageCenter/project/task/myTaskCount.jsx

@@ -1335,29 +1335,6 @@ const MyTaskCount = Form.create()(
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*</FormItem>*/}
                     {/*</FormItem>*/}
                   </div>
                   </div>
-                  {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                  {this.state.bpType === 2 ? <div className="clearfix">
-                    <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="加急天数"
-                    >
-                      {
-                        this.state.urgentDay === 1 ? '是' :
-                            this.state.urgentDay === 0 ? '否' : ''
-                      }
-                    </FormItem>
-                    <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="有无材料"
-                    >
-                      {
-                        this.state.ifMaterial === 1 ? '是':
-                            this.state.ifMaterial === 0 ? '否': ''
-                      }
-                    </FormItem>
-                  </div> : null}
                   <div className="clearfix">
                   <div className="clearfix">
                     <div style={{
                     <div style={{
                       paddingLeft: '8%',
                       paddingLeft: '8%',
@@ -1910,6 +1887,29 @@ const MyTaskCount = Form.create()(
               {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
               {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
               {/*</FormItem>*/}
               {/*</FormItem>*/}
             </div>
             </div>
+            {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+            {this.state.bpType === 2 ? <div className="clearfix">
+              <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="加急天数"
+              >
+                {
+                  this.state.urgentDay === 1 ? '是' :
+                      this.state.urgentDay === 0 ? '否' : ''
+                }
+              </FormItem>
+              <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="有无材料"
+              >
+                {
+                  this.state.ifMaterial === 1 ? '是':
+                      this.state.ifMaterial === 0 ? '否': ''
+                }
+              </FormItem>
+            </div> : null}
             <div className="clearfix">
             <div className="clearfix">
               <div style={{
               <div style={{
                 paddingLeft: '8%',
                 paddingLeft: '8%',

+ 35 - 33
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -3498,39 +3498,6 @@ const MyTaskOutsource = React.createClass({
                       {/*  </Radio.Group>*/}
                       {/*  </Radio.Group>*/}
                       {/*</FormItem>*/}
                       {/*</FormItem>*/}
                     </div>
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                    {this.state.bpType === 2 ? <div className="clearfix">
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="加急天数"
-                      >
-                        <Radio.Group
-                            value={this.state.urgentDay}
-                            onChange={(e) => {
-                              this.setState({ urgentDay: e.target.value })
-                            }}
-                        >
-                          <Radio value={1}>是</Radio>
-                          <Radio value={0}>否</Radio>
-                        </Radio.Group>
-                      </FormItem>
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="有无材料"
-                      >
-                        <Radio.Group
-                            value={this.state.ifMaterial}
-                            onChange={(e) => {
-                              this.setState({ ifMaterial: e.target.value })
-                            }}
-                        >
-                          <Radio value={1}>是</Radio>
-                          <Radio value={0}>否</Radio>
-                        </Radio.Group>
-                      </FormItem>
-                    </div> : null}
                     <div className="clearfix">
                     <div className="clearfix">
                       <div style={{
                       <div style={{
                         paddingLeft: '8%',
                         paddingLeft: '8%',
@@ -4189,6 +4156,7 @@ const MyTaskOutsource = React.createClass({
                           type="textarea"
                           type="textarea"
                           placeholder="请输入项目说明"
                           placeholder="请输入项目说明"
                           rows={4}
                           rows={4}
+                          disabled
                           value={this.state.taskComment}
                           value={this.state.taskComment}
                           onChange={(e) => {
                           onChange={(e) => {
                             let len = this.state.taskCommentData.length;
                             let len = this.state.taskCommentData.length;
@@ -5072,6 +5040,39 @@ const MyTaskOutsource = React.createClass({
                 {/*  </Radio.Group>*/}
                 {/*  </Radio.Group>*/}
                 {/*</FormItem>*/}
                 {/*</FormItem>*/}
               </div>
               </div>
+              {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+              {this.state.bpType === 2 ? <div className="clearfix">
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="加急天数"
+                >
+                  <Radio.Group
+                      value={this.state.urgentDay}
+                      onChange={(e) => {
+                        this.setState({ urgentDay: e.target.value })
+                      }}
+                  >
+                    <Radio value={1}>是</Radio>
+                    <Radio value={0}>否</Radio>
+                  </Radio.Group>
+                </FormItem>
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="有无材料"
+                >
+                  <Radio.Group
+                      value={this.state.ifMaterial}
+                      onChange={(e) => {
+                        this.setState({ ifMaterial: e.target.value })
+                      }}
+                  >
+                    <Radio value={1}>是</Radio>
+                    <Radio value={0}>否</Radio>
+                  </Radio.Group>
+                </FormItem>
+              </div> : null}
               <div className="clearfix">
               <div className="clearfix">
                 <div style={{
                 <div style={{
                   paddingLeft: '8%',
                   paddingLeft: '8%',
@@ -5343,6 +5344,7 @@ const MyTaskOutsource = React.createClass({
                     type="textarea"
                     type="textarea"
                     placeholder="请输入项目说明"
                     placeholder="请输入项目说明"
                     rows={4}
                     rows={4}
+                    disabled
                     value={this.state.taskComment}
                     value={this.state.taskComment}
                     onChange={(e) => {
                     onChange={(e) => {
                       let len = this.state.taskCommentData.length;
                       let len = this.state.taskCommentData.length;

+ 23 - 23
js/component/manageCenter/project/task/taskCount.jsx

@@ -1360,29 +1360,6 @@ const IntentionCustomer = Form.create()(
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                     {/*</FormItem>*/}
                     {/*</FormItem>*/}
                   </div>
                   </div>
-                  {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                  {this.state.bpType === 2 ? <div className="clearfix">
-                    <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="加急天数"
-                    >
-                      {
-                        this.state.urgentDay === 1 ? '是' :
-                            this.state.urgentDay === 0 ? '否' : ''
-                      }
-                    </FormItem>
-                    <FormItem
-                        className="half-item"
-                        {...formItemLayout}
-                        label="有无材料"
-                    >
-                      {
-                        this.state.ifMaterial === 1 ? '是':
-                            this.state.ifMaterial === 0 ? '否': ''
-                      }
-                    </FormItem>
-                  </div> : null}
                   <div className="clearfix">
                   <div className="clearfix">
                     <div style={{
                     <div style={{
                       paddingLeft: '8%',
                       paddingLeft: '8%',
@@ -2019,6 +1996,29 @@ const IntentionCustomer = Form.create()(
               {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
               {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
               {/*</FormItem>*/}
               {/*</FormItem>*/}
             </div>
             </div>
+            {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+            {this.state.bpType === 2 ? <div className="clearfix">
+              <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="加急天数"
+              >
+                {
+                  this.state.urgentDay === 1 ? '是' :
+                      this.state.urgentDay === 0 ? '否' : ''
+                }
+              </FormItem>
+              <FormItem
+                  className="half-item"
+                  {...formItemLayout}
+                  label="有无材料"
+              >
+                {
+                  this.state.ifMaterial === 1 ? '是':
+                      this.state.ifMaterial === 0 ? '否': ''
+                }
+              </FormItem>
+            </div> : null}
             <div className="clearfix">
             <div className="clearfix">
               <div style={{
               <div style={{
                 paddingLeft: '8%',
                 paddingLeft: '8%',

+ 23 - 23
js/component/manageCenter/project/task/taskQuery.jsx

@@ -1273,29 +1273,6 @@ const Task = React.createClass({
                       {/*  </span>*/}
                       {/*  </span>*/}
                       {/*</FormItem>*/}
                       {/*</FormItem>*/}
                     </div>
                     </div>
-                    {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
-                    {this.state.bpType === 2 ? <div className="clearfix">
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="加急天数"
-                      >
-                        {
-                          this.state.urgentDay === 1 ? '是' :
-                              this.state.urgentDay === 0 ? '否' : ''
-                        }
-                      </FormItem>
-                      <FormItem
-                          className="half-item"
-                          {...formItemLayout}
-                          label="有无材料"
-                      >
-                        {
-                          this.state.ifMaterial === 1 ? '是':
-                              this.state.ifMaterial === 0 ? '否': ''
-                        }
-                      </FormItem>
-                    </div> : null}
                     <div className="clearfix">
                     <div className="clearfix">
                       <div style={{
                       <div style={{
                         paddingLeft: '8%',
                         paddingLeft: '8%',
@@ -1984,6 +1961,29 @@ const Task = React.createClass({
                 {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                 {/*  <span>{utils.getChargeback(this.state.taskRefund)}</span>*/}
                 {/*</FormItem>*/}
                 {/*</FormItem>*/}
               </div>
               </div>
+              {/*软著显示  bpType: 0 正常 1专利 2软著 3审计 4双软 5高新 6商标*/}
+              {this.state.bpType === 2 ? <div className="clearfix">
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="加急天数"
+                >
+                  {
+                    this.state.urgentDay === 1 ? '是' :
+                        this.state.urgentDay === 0 ? '否' : ''
+                  }
+                </FormItem>
+                <FormItem
+                    className="half-item"
+                    {...formItemLayout}
+                    label="有无材料"
+                >
+                  {
+                    this.state.ifMaterial === 1 ? '是':
+                        this.state.ifMaterial === 0 ? '否': ''
+                  }
+                </FormItem>
+              </div> : null}
               <div className="clearfix">
               <div className="clearfix">
                 <div style={{
                 <div style={{
                   paddingLeft: '8%',
                   paddingLeft: '8%',