dengzhiguo 5 anos atrás
pai
commit
ca81787958

BIN
image/logo.png


+ 9 - 0
js/component/dataDic.js

@@ -2443,6 +2443,15 @@ module.exports = {
 	        value: "0",
 	        key: "项目待提交"
 	    },{
+	        value: "10",
+	        key: "项目进度10%"
+	    },{
+	        value: "11",
+	        key: "项目进度30%"
+	    },{
+	        value: "12",
+	        key: "项目进度70%"
+	    },{
 	        value: "1",
 	        key: "项目已提交"
 	    },{

+ 4 - 3
js/component/login/login.less

@@ -14,8 +14,9 @@
             width: 960px;
             margin: 0 auto;
             .logo {
-                width: 200px;
-                padding-top: 60px;
+                width: 150px;
+                height: 100px;
+				margin-right: 30px;
                 float: left;
                 border-right: 1px solid #eee;
                 position: relative;
@@ -24,7 +25,7 @@
                     position: absolute;
                     top: 0;
                     left: 0;
-                    height: 60px;
+                    height: 100px;
                 }
             }
             .erweima{

+ 661 - 0
js/component/manageCenter/customer/NEW/crm/patentPayment.jsx

@@ -0,0 +1,661 @@
+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 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 ,slcRedit,dataGrade,cityArr,patentTypeList} from '@/dataDic.js';
+import { getSocialAttribute, beforeUploadFile,splitUrl ,getSlcRedit,getDataGrade,getAchievementCategory,getTechAuditStatus,getboutique,getPatentType,getcityArr,getPatentTypeva} from '@/tools.js';
+import './customer.less';
+const Option = AutoComplete.Option;
+//图片组件
+const PicturesWall = React.createClass({
+    getInitialState() {
+        return {
+            previewVisible: false,
+            previewImage: '',
+            fileList: this.props.pictureUrl,
+        }
+    },
+    getDefaultProps(){
+    	return{
+    		changeClick:this.modifyChange
+    	}
+    },
+    handleCancel() {
+        this.setState({ previewVisible: false })
+    },
+    handlePreview(file) {
+        this.setState({
+            previewImage: file.url || file.thumbUrl,
+            previewVisible: true,
+        });
+    },
+    handleChange(info) {
+        let fileList = info.fileList;
+        this.setState({ fileList });
+        this.props.fileList(fileList);
+    },
+    componentWillReceiveProps(nextProps) {
+        this.state.fileList = nextProps.pictureUrl; 
+    },
+    render() {
+        const { previewVisible, previewImage, fileList } = this.state;
+        const uploadButton = (
+            <div>
+                <Icon type="plus" />
+                <div className="ant-upload-text">点击上传</div>
+            </div>
+        );
+        return (
+            <div style={{display:"inline-block"}}>
+                <Upload
+                	beforeUpload={beforeUploadFile}
+                    action={globalConfig.context + "/api/admin/patentNew/uploadFile"}
+                    data={{ 'sign': '' }}
+                    listType="picture-card"
+                    fileList={fileList}
+                    onPreview={this.handlePreview}
+                    onChange={this.handleChange} >
+                    {fileList.length >= 18 ? null : uploadButton}
+                </Upload>
+                <Modal maskClosable={false} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+                    <img alt="example" style={{ width: '100%' }} src={previewImage} />
+                </Modal>
+            </div>
+        );
+    }
+});
+const PatentPayment = Form.create()(React.createClass({
+	loadData(pageNo){
+		this.setState({
+			loading: true
+		}),
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + '/api/admin/patentNew/selectPatentNew',
+			data: {
+				pageNo: pageNo || 1,
+				pageSize: this.state.pagination.pageSize,
+			},
+			success:function (data) {
+				let theArr = [];
+				if(!data.data) {
+					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({
+							id:thisdata.id,
+							province:thisdata.province,
+							status:thisdata.status,
+							patentNo:thisdata.patentNo,
+							name:thisdata.name,
+							type:thisdata.type,
+							applyDates:thisdata.applyDates,
+							authorizationDates:thisdata.authorizationDates,
+							patentAmount:thisdata.patentAmount,
+							applicant:thisdata.applicant,
+							contactMobile:thisdata.contactMobile,
+							email:thisdata.email,
+							certificateUrl:thisdata.certificateUrl,
+						});
+					};
+					this.state.pagination.current = data.data.pageNo;
+					this.state.pagination.total = data.data.totalCount;
+				};
+				if(!data.data.list.length) {
+					this.state.pagination.current = 0
+					this.state.pagination.total = 0
+				}
+				this.setState({
+					pageNo: pageNo,
+					dataSource: theArr,
+					pagination: this.state.pagination,
+				});
+			}.bind(this)
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
+	getInitialState(){
+		return {
+			loading:false,
+			visible:false,
+			orgCodeUrl:[],
+			fileList:[],
+			pagination: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.loadData(page);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
+			dataSource:[],
+			columns:[{
+				title: '专利号',
+				dataIndex: 'patentNo',
+				key: 'patentNo'
+			},{
+				title: '专利名称',
+				dataIndex: 'name',
+				key: 'name'
+			},{
+				title: '专利类型',
+				dataIndex: 'type',
+				key: 'type',
+				render:text=>{
+					return getPatentType(text)
+				}
+			},{
+				title: '申请日期',
+				dataIndex: 'applyDates',
+				key: 'applyDates'
+			},{
+				title: '授权日期',
+				dataIndex: 'authorizationDates',
+				key: 'authorizationDates'
+			},{
+				title: '费用',
+				dataIndex: 'patentAmount',
+				key: 'patentAmount'
+			},{
+				title: '申请人',
+				dataIndex: 'applicant',
+				key: 'applicant'
+			},{
+				title: '联系电话',
+				dataIndex: 'contactMobile',
+				key: 'contactMobile'
+			},{
+				title: '电子邮箱',
+				dataIndex: 'email',
+				key: 'email'
+			},{
+				title: '状态',
+				dataIndex: 'status',
+				key: 'status',
+				render:text=>{
+					if (text === 1) {
+						return '已提醒'
+					}else{
+						return '待提醒'
+					}
+				}
+			}]
+		}
+	},
+	componentWillMount(){
+		this.loadData()
+		let data=localStorage.getItem('newData');
+		if(data!='{}'&&data){
+			var newData = JSON.parse(data);
+			this.tableRowClick(newData);
+		};
+	},
+	new(){
+		this.reset();
+		this.setState({
+			visible:true
+		})
+	},
+	visitCancel(){
+		this.state.fileList = [];
+		this.setState({
+			visible:false
+		})
+	},
+	onSure(){
+		let theorgCodeUrl = [];
+		if (this.state.orgCodeUrl.length) {
+		    let picArr = [];
+		    this.state.orgCodeUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+		    });
+		    theorgCodeUrl = picArr.join(",");
+		};
+		console.log(typeof theorgCodeUrl)
+		if (!this.state.patentNo) {
+			message.warning('专利号不能为空')
+			return
+		}
+		if (!this.state.patentName) {
+			message.warning('专利名称不能为空')
+			return
+		}
+		if(typeof theorgCodeUrl !== 'string'){
+	        message.warning('未上传图片');
+	        return 
+	    }
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/admin/patentNew/addPatentNew' ,
+			data: {
+				patentNo:this.state.patentNo,
+				name:this.state.patentName,
+				type:this.state.patentType,
+				applyDates:this.state.appDate,
+				authorizationDates:this.state.authDate,
+				applicant:this.state.proposer,
+				province:this.state.province,
+				contactMobile:this.state.contactPhone,
+				email:this.state.email,
+				certificateUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+			}
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('保存成功!');
+				this.onCal()
+				this.loadData()
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	tableRowClick(record,index){
+		this.state.RowData = record
+		this.setState({
+			avisible:true,
+			patentNo:record.patentNo,
+			patentName:record.name,
+			province:record.province,
+			status:record.status,
+			patentType:record.type,
+			appDate:record.applyDates,
+			authDate:record.authorizationDates,
+			proposer:record.applicant,
+			contactPhone:record.contactMobile,
+			email:record.email,
+			certificateUrl:record.certificateUrl,
+			orgCodeUrl: record.certificateUrl ? splitUrl(record.certificateUrl, ',', globalConfig.avatarHost + '/upload') : [],
+		})
+		localStorage.setItem('newData','{}');
+	},
+	xiugai(record){
+		let theorgCodeUrl = [];
+		if (this.state.orgCodeUrl.length) {
+		    let picArr = [];
+		    this.state.orgCodeUrl.map(function (item) {
+				if ( item.response && item.response.data && item.response.data.length ){
+					picArr.push(item.response.data);
+				}
+		    });
+		    theorgCodeUrl = picArr.join(",");
+		};
+		if (!this.state.patentNo) {
+			message.warning('专利号不能为空')
+			return
+		}
+		if (!this.state.patentName) {
+			message.warning('专利名称不能为空')
+			return
+		}
+		if(typeof theorgCodeUrl !== 'string'){
+		    message.warning('未上传图片');
+		    return 
+		}
+		$.ajax({
+			method: "POST",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context +'/api/admin/patentNew/updatePatentNew' ,
+			data: {
+				id:record.id,
+				patentNo:this.state.patentNo,
+				name:this.state.patentName,
+				type:this.state.patentType,
+				applyDates:this.state.appDate,
+				authorizationDates:this.state.authDate,
+				applicant:this.state.proposer,
+				province:this.state.province,
+				contactMobile:this.state.contactPhone,
+				email:this.state.email,
+				status:this.state.status,
+				certificateUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+			},
+			success: function (data) {
+			}.bind(this),
+		}).done(function(data) {
+			this.setState({
+				loading: false
+			});
+			if(!data.error.length) {
+				message.success('修改成功!');
+				this.avisitCancel()
+				this.loadData(this.state.pageNo)
+			} else {
+				message.warning(data.error[0].message);
+			}
+		}.bind(this));
+	},
+	
+	baocunxiugai(){
+		this.xiugai(this.state.RowData)
+	},
+	
+	avisitCancel(){
+		this.setState({
+			avisible:false
+		})
+	},
+	reset(){
+		this.setState({
+			patentNo:'',
+			patentName:'',
+			patentType:undefined,
+			appDate:undefined,
+			authDate:undefined,
+			orgCodeUrl:'',
+			proposer:'',
+			province:undefined,
+			contactPhone:'',
+			email:''
+		})
+	},
+	onCal(){
+		this.setState({
+			visible:false
+		})
+	},
+	getOrgCodeUrl(e) {
+	    this.setState({ orgCodeUrl: e });
+	},
+	chongzhi(){
+		this.loadData()
+	},
+	
+	render(){
+		const theData = this.state.RowData || {};
+		const FormItem = Form.Item;
+		const formItemLayout = {
+			labelCol: { span: 8 },
+			wrapperCol: { span: 14 },
+		};
+		
+			
+		return(
+			<div className="user-content" >
+			    <div className="content-title">
+			    	<span style={{fontSize:'16px'}}>客户专利提醒</span>	
+			        <div className="user-search">
+						<Button type="primary" onClick={this.chongzhi} style={{marginLeft:'10px'}}>重置</Button>
+			            <Button type="primary" onClick={this.new} style={{marginRight:'10px',float:'right'}}>新建</Button>
+			            {/*<Button onClick={this.reset}>导出</Button>*/}
+			        </div>
+			        
+			        <div className="patent-table">
+			            <Spin spinning={this.state.loading}>
+			                <Table columns={this.state.columns}
+			                    dataSource={this.state.dataSource}
+			                    pagination={this.state.pagination}
+			                    onRowClick={this.tableRowClick} />
+			            </Spin>
+			        </div>
+					<Modal maskClosable={false} visible={this.state.avisible}
+						onCancel={this.avisitCancel}
+						width='800px'
+						title='修改详情'
+						footer=''
+						className="admin-desc-content">
+						<div className="clearfix">
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label={
+						    	<span>
+						    		<strong style={{ color: '#f00' }}>*</strong>专利号
+						    	</span> 
+						    } >  
+						    {<Input placeholder="请输入专利号" value={this.state.patentNo}
+						        	onChange={(e)=>{this.setState({patentNo:e.target.value})}} style={{width:'240px'}} />}
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label={
+						    	<span>
+						    		<strong style={{ color: '#f00' }}>*</strong>专利名称
+						    	</span> 
+						    } >  
+						    {<Input placeholder="请输入专利名称" value={this.state.patentName}
+						        	onChange={(e)=>{this.setState({patentName:e.target.value})}} style={{width:'240px'}} />}
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="专利类型" >  
+						    {<Select placeholder="请选择专利类型"
+						        style={{ width:'240px'}}
+						        value={getPatentType(this.state.patentType)}
+						        onChange={(e)=>{this.setState({patentType:e})}}>
+						            {
+						                patentTypeList.map(function (item) {
+						                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+						                })
+						            }
+						    </Select>}
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="申请日期" >  
+						    <DatePicker 
+						    	style={{marginTop:"2px",width: '240px',height:"32px" }}
+						        showTime
+						        format="YYYY-MM-DD" 
+						        onOk={(e)=>{}}
+						        value={this.state.appDate ? moment(this.state.appDate) : null}
+						        onChange={(data, dataString) => { this.setState({ appDate: dataString }); }} />
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="授权日期" >  
+						    <DatePicker 
+						    	style={{marginTop:"2px",width: '240px',height:"32px" }}
+						        showTime
+						        format="YYYY-MM-DD"
+						        onOk={(e)=>{}}
+						        value={this.state.authDate ? moment(this.state.authDate) : null}
+						        onChange={(data, dataString) => { this.setState({ authDate: dataString }); }} />
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="费用" >  
+						    <span>{theData.patentAmount}</span>
+						</FormItem>
+						<div className="clearfix">
+						<FormItem
+						    labelCol={{ span: 4 }}
+						    wrapperCol={{ span: 18 }}
+						    label={
+						    	<span>
+									<strong style={{ color: '#f00' }}>*</strong>合同扫描件
+								</span> 
+						    }
+						    >
+							
+						    <PicturesWall
+						        fileList={this.getOrgCodeUrl}
+						        pictureUrl={this.state.orgCodeUrl} />
+						        <p>图片建议:要清晰。</p>
+						</FormItem>
+						</div>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="申请人" >  
+						    {<Input placeholder="请输入申请人/公司" value={this.state.proposer}
+						        	onChange={(e)=>{this.setState({proposer:e.target.value})}} style={{width:'240px'}} />}
+						</FormItem>
+						<FormItem className="half-item"
+						        {...formItemLayout}
+						        label="省份" >
+								<Select placeholder="请选择省份"
+								    style={{ width:'240px'}}
+								    value={getcityArr(this.state.province)}
+								    onChange={(e)=>{this.setState({province:e})}}>
+								        {
+								            cityArr.map(function (item) {
+								                 return <Select.Option key={item.value} >{item.key}</Select.Option>
+								            })
+								        }
+								</Select>							 
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="联系电话" >  
+						    {<Input placeholder="请输入联系手机" value={this.state.contactPhone}
+						        	onChange={(e)=>{this.setState({contactPhone:e.target.value})}} style={{width:'240px'}} />}
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label="电子邮箱" >  
+						    {<Input placeholder="请输入电子邮箱" value={this.state.email}
+						        	onChange={(e)=>{this.setState({email:e.target.value})}} style={{width:'240px'}} />}
+						</FormItem>
+						<FormItem className="half-item"
+						    {...formItemLayout}
+						    label={'状态'} >  
+						    <span>{this.state.status?'已提醒':'待提醒'}</span>
+						</FormItem>
+						</div>
+						<div style={{overflow:'hidden'}}>
+							<Button style={{float:'right'}} onClick={this.avisitCancel}>取消</Button>
+							<Button type="primary" style={{float:'right',marginRight:'10px'}} onClick={this.baocunxiugai}>保存</Button>
+						</div>
+					</Modal>
+					
+						<Modal maskClosable={false} visible={this.state.visible}
+			            onOk={this.visitOk} onCancel={this.visitCancel}
+			            width='1000px'
+			            title='专利资料'
+			            footer=''
+			            className="admin-desc-content">
+						<div className="clearfix">
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="专利号" >                             
+							        {<Input placeholder="请输入专利号" value={this.state.patentNo}
+							            	onChange={(e)=>{this.setState({patentNo:e.target.value})}} style={{width:'240px'}} />}
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="专利名称" >                             
+							        {<Input placeholder="请输入专利名称" value={this.state.patentName}
+							            	onChange={(e)=>{this.setState({patentName:e.target.value})}} style={{width:'240px'}} />}
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="申请日期" >                             
+							        <DatePicker 
+							        	style={{marginTop:"2px",width: '240px',height:"32px" }}
+							            showTime
+							            format="YYYY-MM-DD"
+							            onOk={(e)=>{}}
+							            value={this.state.appDate ? moment(this.state.appDate) : null}
+							            onChange={(data, dataString) => { this.setState({ appDate: dataString }); }} />
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="专利类型" >                             
+							        {<Select placeholder="请选择专利类型"
+									    style={{ width:'240px'}}
+									    value={this.state.patentType}
+									    onChange={(e)=>{this.setState({patentType:e})}}>
+									        {
+								                patentTypeList.map(function (item) {
+								                    return <Select.Option key={item.value} >{item.key}</Select.Option>
+								                })
+								            }
+									</Select>}
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="授权日期" >                             
+							        <DatePicker 
+							        	style={{marginTop:"2px",width: '240px',height:"32px" }}
+							            showTime
+							            format="YYYY-MM-DD"
+							            onOk={(e)=>{}}
+							            value={this.state.authDate ? moment(this.state.authDate) : null}
+							            onChange={(data, dataString) => { this.setState({ authDate: dataString }); }} />
+							</FormItem>
+							<div className="clearfix">
+								<FormItem
+								    labelCol={{ span: 4 }}
+								    wrapperCol={{ span: 18 }}
+								    label={
+								    	<span>
+											<strong style={{ color: '#f00' }}>*</strong>合同扫描件
+										</span> 
+								    }
+								    >
+									
+								    <PicturesWall
+								        fileList={this.getOrgCodeUrl}
+								        pictureUrl={this.state.orgCodeUrl} />
+								        <p>图片建议:要清晰。</p>
+								</FormItem>
+							</div>
+							<div>
+								<span style={{marginLeft:'50px',fontSize:'20px'}}>申请人资料</span>
+							</div>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="申请人/公司" >                             
+							        {<Input placeholder="请输入申请人/公司" value={this.state.proposer}
+							            	onChange={(e)=>{this.setState({proposer:e.target.value})}} style={{width:'240px'}} />}
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="省份" >
+									<Select placeholder="请选择省份"
+									    style={{ width:'240px'}}
+									    value={this.state.province}
+									    onChange={(e)=>{this.setState({province:e})}}>
+									        {
+									            cityArr.map(function (item) {
+									                 return <Select.Option key={item.value} >{item.key}</Select.Option>
+									            })
+									        }
+									</Select>							 
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="联系手机" >                             
+							        {<Input placeholder="请输入联系手机" value={this.state.contactPhone}
+							            	onChange={(e)=>{this.setState({contactPhone:e.target.value})}} style={{width:'240px'}} />}
+							</FormItem>
+							<FormItem className="half-item"
+							        {...formItemLayout}
+							        label="电子邮箱" >                             
+							        {<Input placeholder="请输入电子邮箱" value={this.state.email}
+							            	onChange={(e)=>{this.setState({email:e.target.value})}} style={{width:'240px'}} />}
+							</FormItem>
+						</div>
+						<div style={{overflow:'hidden'}}>
+							<Button style={{float:'right'}} onClick={this.onCal}>取消</Button>
+							<Button type="primary" style={{float:'right',marginRight:'10px'}} onClick={this.onSure}>保存</Button>
+						</div>
+						</Modal>
+			    </div >
+			</div>
+		)
+	}
+}))
+export default PatentPayment;
+

+ 13 - 0
js/component/manageCenter/customer/content.jsx

@@ -352,6 +352,19 @@ class Content extends Component {
                     });
                 });
                 break;
+			//客户资料    
+			case 'patentPayment':
+			    require.ensure([], () => {
+			        const PatentPayment = require('./NEW/crm/patentPayment').default;
+			        this.setState({
+			            component: <PatentPayment 
+			                		intentionState={0}
+			                		ApiUrl={'/api/admin/customer/listPrivateOrganizationCustomer'}
+			                		detailApi={'/api/admin/customer/findOrganizationCustomerDetail'}
+			            		/>
+			        });
+			    });
+			    break;
             /*签单客户*/ 
             //个人签单客户
             case 'personalSign':

+ 7 - 1
js/component/manageCenter/financialManage/distribute/paiDan.jsx

@@ -52,7 +52,8 @@ const PaiDan = React.createClass({
                             sellerName:thisdata.sellerName,
                             createTime:thisdata.createTime?new Date(thisdata.createTime).toLocaleString():'',
                             signTime:thisdata.signTime,
-							contractNo:thisdata.contractNo
+							contractNo:thisdata.contractNo,
+							departmentName:thisdata.departmentName
                         });
                     };
                 }
@@ -125,6 +126,11 @@ const PaiDan = React.createClass({
                     key: 'processStatus',
                     render: text => { return getProcessStatus(text)}
                 },
+				{
+				    title: '订单部门',
+				    dataIndex: 'departmentName',
+				    key: 'departmentName',
+				},
                 {
                     title: '订单总金额(万)',
                     dataIndex: 'signTotalAmount',

+ 1 - 1
js/component/manageCenter/financialManage/distribute/receivable.jsx

@@ -164,7 +164,7 @@ const Receivable=React.createClass({
                                     <FormItem className="half-item" {...formItemLayout} label={<span><strong style={{color:'#f00'}}>*</strong>财务流水时间</span>}>
                                         <DatePicker 
                                             showTime
-                                            format="YYYY-MM-DD HH:mm:ss"
+                                            format="YYYY-MM-DD"
                                             onOk={(e)=>{console.log(e)}}
                                             value={this.state.financialPayTimes ? moment(this.state.financialPayTimes) : null}
                                             onChange={(data, dataString) => { this.setState({ financialPayTimes: dataString }); }} />

+ 6 - 0
js/component/manageCenter/financialManage/distribute/shouKuang.jsx

@@ -97,6 +97,7 @@ const ShouKuang = React.createClass({
                             buyerName:thisdata.buyerName,
                             contractNo:thisdata.contractNo,
                             createTime:thisdata.createTime,
+							departmentName:thisdata.departmentName
                         });
                     };
                 }
@@ -176,6 +177,11 @@ const ShouKuang = React.createClass({
 					render: text => {return getProcessStatus(text)}
 				},
 				{
+					title: '订单部门',
+					dataIndex: 'departmentName',
+					key: 'departmentName',
+				},
+				{
 					title: '特批状态',
 					dataIndex: 'approval',
 					key: 'approval',

+ 6 - 2
js/component/manageCenter/financialManage/flowWater/departWater.jsx

@@ -86,11 +86,11 @@ const MyWater = React.createClass({
 		                    payerName:thisdata.payerName,
 		                    transactionSubject:thisdata.transactionSubject,
 		                    transactionChannel:thisdata.transactionChannel,
-                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleString():'',
+                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleDateString():'',
                             financialPayNo:thisdata.financialPayNo,
 		                    createrName:thisdata.createrName,
 		                    saleName:thisdata.saleName,
-		                    
+		                    createTimes:thisdata.createTimes
                         });
                     };
                 }
@@ -179,6 +179,10 @@ const MyWater = React.createClass({
                     title: '流水创建人',
                     dataIndex: 'createrName',
                     key: 'createrName'
+                },{
+                    title: '创建时间',
+                    dataIndex: 'createTimes',
+                    key: 'createTimes'
                 }
             ],
             dataSource: [],

+ 7 - 2
js/component/manageCenter/financialManage/flowWater/myWater.jsx

@@ -86,10 +86,11 @@ const MyWater = React.createClass({
 		                    payerName:thisdata.payerName,
 		                    transactionSubject:thisdata.transactionSubject,
 		                    transactionChannel:thisdata.transactionChannel,
-                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleString():'',
+                            financialPayTimes:thisdata.financialPayTimes?(new Date(thisdata.financialPayTimes)).toLocaleDateString():'',
                             financialPayNo:thisdata.financialPayNo,
 		                    createrName:thisdata.createrName,
 		                    saleName:thisdata.saleName,
+							createTimes:thisdata.createTimes,
                         });
                     };
                 }
@@ -174,7 +175,11 @@ const MyWater = React.createClass({
                     title: '订单负责人',
                     dataIndex: 'saleName',
                     key: 'saleName'
-                },
+                },{
+					title: '创建时间',
+					dataIndex: 'createTimes',
+					key: 'createTimes'
+				}
             ],
             dataSource: [],
             searchTime: [,]

+ 99 - 2
js/component/manageCenter/financialManage/orderDetail/orderDetail.jsx

@@ -50,6 +50,8 @@ const OrderDetail = Form.create()(React.createClass({
                              contacts:thisdata.contacts,
                              contactsMobile:thisdata.contactsMobile,
                              cname:thisdata.cname,
+							 certificateNumber:thisdata.certificateNumber,
+							 projectStatus:thisdata.projectStatus
                         });
                     };
                    }
@@ -67,6 +69,7 @@ const OrderDetail = Form.create()(React.createClass({
     getInitialState() {
         return {
             visible: false,
+			avisible:false,
             loading: false,
             jsDate:[],
             auditStatus: 0,
@@ -96,12 +99,16 @@ const OrderDetail = Form.create()(React.createClass({
                     key: 'commodityPrice'
                 }, {
                     title: '项目状态',
-                    dataIndex: 'taskStatus',
-                    key: 'taskStatus',
+                    dataIndex: 'projectStatus',
+                    key: 'projectStatus',
                     render:text=>{
                         return getProjectStatus(text);
                     }
                 }, {
+                    title: '证书编号',
+                    dataIndex: 'certificateNumber',
+                    key: 'certificateNumber'
+                }, {
                     title: '是否主要项目',
                     dataIndex: 'main',
                     key: 'main',
@@ -117,6 +124,22 @@ const OrderDetail = Form.create()(React.createClass({
                     }
                 }
 			],
+			columnsX:[
+				{
+					title:'流程',
+					dataIndex: 'processName',
+					key: 'processName'
+				},
+				{
+					title:'操作人',
+					dataIndex: 'adminName',
+					key: 'adminName'
+				},{
+					title:'时间',
+					dataIndex: 'createDate',
+					key: 'createDate'
+				}
+			]
         };
     },
     loadData(record){
@@ -183,6 +206,61 @@ const OrderDetail = Form.create()(React.createClass({
             });
         }.bind(this));  
     },
+	
+	rizhi(){
+		this.setState({
+			loading:true
+		})
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: '/api/admin/newOrder/selectOrderLog',
+			data: {
+			  orderNo:this.props.data.orderNo
+			},
+			success: function (data) {
+				let theArr = [];
+			    let thisData = data.data;                
+			    if (!thisData.length) {
+			        if (data.error && data.error.length) {
+			            message.warning(data.error[0].message);
+			        };
+			        thisData = {};
+			    }else{
+			       for(let i = 0; i < data.data.length; i++) {
+			       	let thisdata = data.data[i];
+			       	theArr.push({
+			       		processName:thisdata.processName,		
+			       		adminName:thisdata.adminName,		
+			       		createDate:thisdata.createDate,
+			       	});
+			       };
+			    };
+				this.setState({
+					dataSourceX: theArr
+				})
+			 }.bind(this),
+			}).always(function () {
+			     this.setState({            	
+			         loading: false
+			     });
+			 }.bind(this));
+		},
+	
+	
+	getOrderLog(){
+		this.setState({
+			avisible:true
+		})
+		this.rizhi()
+	},
+	closeOrderLog(){
+		this.setState({
+			avisible:false
+		})
+	},
+	
     getPictureUrl(e) {
         this.setState({ pictureUrl: e });
     },
@@ -275,6 +353,9 @@ const OrderDetail = Form.create()(React.createClass({
                                 onCancel={() => { this.setState({ previewVisible: false }) }}>
                                 <img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
                             </Modal>
+						<Button style={{ float:"right" , marginRight:'140px' , marginTop:'20px'}}
+								onClick={this.getOrderLog}
+						>查看订单日志</Button>
                         </FormItem>
                     </div> 
                     <div className="clearfix">
@@ -313,6 +394,22 @@ const OrderDetail = Form.create()(React.createClass({
 							<span>{theData.financeMobile}</span>
 						</FormItem>
 					</div>
+					<Modal  visible={this.state.avisible}
+							className="admin-desc-content"
+							width='800px'
+							maskClosable={false}
+							title='订单日志'
+							footer={null}
+							onCancel={this.closeOrderLog}>
+							<div className="patent-table">
+							    <Spin spinning={this.state.loading}>
+							        <Table columns={this.state.columnsX}
+							            dataSource={this.state.dataSourceX}
+										pagination={false}
+							            />
+							    </Spin>
+							</div>
+					</Modal>
                     <div className="clearfix">
                         <p style={{fontSize:18,marginLeft:20}}>项目业务</p>
                         <div className="patent-table">

+ 92 - 25
js/component/manageCenter/order/orderNew/addService.jsx

@@ -107,6 +107,7 @@ const NewService = Form.create()(React.createClass({
                         });
                     };
                    }
+				this.departmentList()
                 this.setState({
                     dataSource: theArr,
                     pagination: false,
@@ -276,8 +277,6 @@ const NewService = Form.create()(React.createClass({
 					dataIndex: 'dels',
 					key: 'dels',
 					render: (text, record, index) => {
-						console.log(index);
-						console.log(this.state.contactList.length);
 						return <div>
 		                        {this.state.processStatus==0?<Popconfirm title="是否删除?" onConfirm={(e)=>{this.confirmDelet(record)}} okText="删除" cancelText="不删除">
 									    <Button style={{marginRight:'10px',color:'#ffffff',background:'#f00',border:'none'}}>删除</Button>
@@ -291,6 +290,46 @@ const NewService = Form.create()(React.createClass({
 			],
 		};
 	},
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+	
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+							depNo: item.depNo
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	//新建订单、编辑订单保存
 	handleSubmit(e) {
 		e.preventDefault();
@@ -331,15 +370,6 @@ const NewService = Form.create()(React.createClass({
 	        	return false;
 	        };
         }else{
-        	if(this.state.orderType==undefined){
-	        	message.warning('请选择订单类型');
-	        	return false;
-	        };
-        	if(!this.state.autoId){ 
-	        	message.warning('客户名称不匹配');
-	        	return false;
-        	};
-        	
         }
 		this.setState({
 			loading: true
@@ -353,7 +383,6 @@ const NewService = Form.create()(React.createClass({
 			data: !this.props.userDetaile?{
 				uid:this.state.autoId,
 				orderType:this.state.orderType,
-				contractType:this.state.contractType
 			}:{
 				orderNo: this.state.orderNo,//订单编号
 				totalAmount: this.state.totalAmount,//总金额
@@ -368,6 +397,7 @@ const NewService = Form.create()(React.createClass({
 				contractNo: this.state.contractNo,//合同编号
 				orderRemarks: this.state.orderRemarks,//订单备注
 				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
+				orderDep:this.state.organizationSearch
 			}
 		}).done(function(data) {
 			this.setState({
@@ -465,6 +495,7 @@ const NewService = Form.create()(React.createClass({
 					financeMobile:thisData.financeMobile,//财务电话
 					contractNo:thisData.contractNo,//合同编号
 					approval:thisData.approval==0?thisData.approval.toString():thisData.approval,
+					organizationSearch:thisData.orderDep
                 });
             }.bind(this),
        }).always(function () {
@@ -595,6 +626,18 @@ const NewService = Form.create()(React.createClass({
 		this.props.closeDesc(false, true);
 	},
 	handleCancel(e) {
+		if(this.state.orderType==undefined){
+			return false;
+		};
+		if(!this.state.autoId){ 
+			return false;
+		};
+		this.setState({
+			visible: false,
+		});
+		this.props.closeDesc(false);
+	},
+	handleCancelclose(e){
 		this.setState({
 			visible: false,
 		});
@@ -728,13 +771,21 @@ const NewService = Form.create()(React.createClass({
 	},
 	//客户名称自动补全
 	customerChange(e){
-		this.state.autoId='';
-		if(e.length>=2){
-			this.supervisor(e,true); 
-		}	
-		this.setState({
-			customerName:e
-		})
+		if(this.state.customType){
+			console.log(this.state.customType)
+			this.state.autoId='';
+			if(e.length>=2){
+				this.supervisor(e,true);
+			}
+			this.setState({
+				customerName:e
+			})
+		}else{
+			this.setState({
+				customerName:''
+			})
+			message.warning('客户所属类型必须指定')
+		}
 	},
 	//点击添加项目明细
 	addDetailed(){
@@ -928,7 +979,7 @@ const NewService = Form.create()(React.createClass({
 			if(!data.error.length) {
 				message.success('退单成功!');
 				this.noCancel();
-				this.handleCancel();
+				this.handleCancelclose();
 			} else {
 				message.warning(data.error[0].message);
 			}
@@ -985,6 +1036,7 @@ const NewService = Form.create()(React.createClass({
 			});
     },
 	componentWillReceiveProps(nextProps) { //props改变时触发
+		console.log(nextProps)
 		this.state.visible = nextProps.showDesc;
 		this.state.signBillVisible=nextProps.signBillVisible;
 		if(this.state.signBillVisible){
@@ -1016,6 +1068,7 @@ const NewService = Form.create()(React.createClass({
 		const categoryList=this.state.categoryArr ||[];
 		const orderDetaiel=this.state.orderList || [];
 		const dataSources=this.state.customerArr || [];
+		let departmentArr = this.state.departmentArr || [];
         const options = this.state.states?dataSources.map((group,index) =>
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     ):dataSources.map((group,index) =>
@@ -1025,9 +1078,9 @@ const NewService = Form.create()(React.createClass({
 		return(
 			<div>
             <Modal maskClosable={false} visible={this.state.visible}
-                        onOk={this.handleOk} onCancel={this.handleCancel}
-                        width={!this.props.userDetaile?'600px':'900px'}  
-                        title={!this.props.userDetaile?'创建订单':'编辑订单'}                      
+                        onOk={this.handleOk} onCancel={this.handleCancelclose}
+                        width={!this.props.userDetaile?'600px':'900px'}
+                        title={!this.props.userDetaile?'创建订单':'编辑订单'}
                         footer=''
                         className="admin-desc-content">
 			            <Form layout="horizontal" onSubmit={this.handleSubmit} id="demand-form" style={{paddingBottom:'40px'}} >
@@ -1091,7 +1144,7 @@ const NewService = Form.create()(React.createClass({
 							                </div>
 							                 <div className='addSave' style={{marginTop:'15px'}}>
 							                   <Button className="cancel" type="primary" onClick={this.handleCancel} style={{marginLeft:"150px"}} htmlType="submit">开单</Button>
-				                               <Button className="cancel" type="ghost" onClick={this.handleCancel} style={{marginLeft:"50px"}}>取消</Button>
+				                               <Button className="cancel" type="ghost" onClick={this.handleCancelclose} style={{marginLeft:"50px"}}>取消</Button>
 			                            	</div>
 						                </div>
 						                :<div className="clearfix">
@@ -1185,6 +1238,20 @@ const NewService = Form.create()(React.createClass({
 					                                            onChange={(data, dataString) => { this.setState({ signDate: dataString }); }} />
 					                                    		<span className="mandatory">*</span>
 					                                    </FormItem>
+														<FormItem className="half-item"
+														    {...formItemLayout}
+														    label="订单部门" >  
+														    <Select placeholder="请输入订单部门"
+														        style={{ width: 240 }}
+														        value={this.state.organizationSearch}
+														        onChange={(e) => { this.setState({ organizationSearch: e }) ; console.log(this.state.organizationSearch)}}>
+														        {
+														            departmentArr.map(function (item) {
+														                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+														            })
+														        }
+														    </Select>
+														</FormItem>
 					                                </div>
 					                                    :
 					                                <div className='clearfix'>
@@ -1345,7 +1412,7 @@ const NewService = Form.create()(React.createClass({
 									            <div className='addSave' style={{marginTop:'15px'}}>
 								                   <Button className="cancel" type="primary" onClick={this.handleCancels} style={{marginLeft:"200px"}} htmlType="submit">签单</Button>
 								                   <Button className="cancel" type="primary" onClick={this.handleCancelq} style={{marginLeft:"50px"}} htmlType="submit">保存</Button>
-					                               <Button className="cancel" type="ghost" onClick={this.handleCancel} style={{marginLeft:"50px"}}>取消</Button>
+					                               <Button className="cancel" type="ghost" onClick={this.handleCancelclose} style={{marginLeft:"50px"}}>取消</Button>
 				                            	</div>:""}
 					                        </div>}
 				                    </div>

+ 10 - 6
js/component/manageCenter/order/orderNew/chargeback.jsx

@@ -857,12 +857,16 @@ const IntentionCustomer = Form.create()(React.createClass({
 										</div>
 										<div className='clearfix'>
 				                			<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 16 }} label="退单申请表">
-										        <Picture
-									              fileList={(e)=>{this.setState({applicationUrl:e})}}
-									              pictureUrl={this.state.applicationUrl}
-									              visible={this.props.visible}
-									              data={{'sign':'order_refund_file',url:'/api/admin/newOrder/uploadRefundOrderFile',number:8}}
-									           />
+										        <Upload className="demandDetailShow-upload"
+										            listType="picture-card"
+										            fileList={this.state.orgCodeUrl}                               
+										            onPreview={(file) => {
+										                this.setState({
+										                    previewImage: file.url || file.thumbUrl,
+										                    previewVisible: true,
+										                });
+										            }} >
+										        </Upload>
 										    </FormItem>
 										</div>	
 					                   <div className='clearfix'>

+ 11 - 0
js/component/manageCenter/order/orderNew/examine.jsx

@@ -117,6 +117,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         salesmanName:thisdata.salesmanName,//营销员名称
 	                         financeName:thisdata.financeName,//财务名称
 	                         createDate:thisdata.createDate,//下单时间
+							 depName:thisdata.depName
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -185,6 +186,10 @@ const IntentionCustomer = Form.create()(React.createClass({
                     key: 'processStatus',
                     render:text=>{return getProcessStatus(text)}
                 }, {
+                    title: '订单部门',
+                    dataIndex: 'depName',
+                    key: 'depName',
+                },{
                     title: '签单金额(万元)',
                     dataIndex: 'totalAmount',
                     key: 'totalAmount'
@@ -350,6 +355,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     salesmanMobile:thisdata.salesmanMobile,//营销员电话
 	                     financeName:thisdata.financeName,//财务名称
 	                     financeMobile:thisdata.financeMobile,//财务电话
+						 depName:thisdata.depName
 					})
 				};
 				
@@ -711,6 +717,11 @@ const IntentionCustomer = Form.create()(React.createClass({
 			                            label="已收款项(万元)" >  
 			                            <span>{this.state.settlementAmount}</span>
 		                    		</FormItem>
+									<FormItem className="half-item"
+									    {...formItemLayout}
+									    label="订单部门" >  
+									    <span>{this.state.depName}</span>
+									</FormItem>
 				                    <div className='clearfix'>
 							        	<FormItem
 								            labelCol={{ span: 4 }}

+ 1 - 1
js/component/manageCenter/order/orderNew/press.jsx

@@ -361,7 +361,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	//关闭输入理由框
 	noCancel(){
 		this.setState({
-			noVisible:false
+			visible:false
 		})
 	},
 	//搜索

+ 58 - 0
js/component/manageCenter/order/orderNew/reject.jsx

@@ -339,6 +339,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		this.xiangqing(record.orderNo);
 		this.xiangmu(record.orderNo);
 		this.jiedian(record.orderNo);
+		this.departmentList();
 	},	
 	//点击打卡项目详情
 	tableRowClickX(record, index) {
@@ -405,6 +406,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     backDate:thisdata.backDate,//驳回时间
 	                     reason:thisdata.reason,//驳回原因
 	                     approval:thisdata.approval.toString(),//特批状态
+						 organizationSearch:thisdata.orderDep
 	                     //approval:thisdata.approval==0?thisdata.approval.toString():thisdata.approval,//特批状态
 					})
 				};
@@ -649,6 +651,47 @@ const IntentionCustomer = Form.create()(React.createClass({
 			});
 		}.bind(this));
 	},
+	departmentList() {
+		this.setState({
+			loading: true
+		});
+		$.ajax({
+			method: "get",
+			dataType: "json",
+			crossDomain: false,
+			url: globalConfig.context + "/api/admin/organization/selectSuperId",
+			data: {
+	
+			},
+			success: function(data) {
+				let thedata = data.data;
+				let theArr = [];
+				if(!thedata) {
+					if(data.error && data.error.length) {
+						message.warning(data.error[0].message);
+					};
+					thedata = {};
+				} else {
+					thedata.map(function(item, index) {
+						theArr.push({
+							key: index,
+							name: item.name,
+							id: item.id,
+							depNo: item.depNo
+						})
+					})
+				}
+				this.setState({
+					departmentArr: theArr,
+				})
+				console.log(this.state.departmentArr)
+			}.bind(this),
+		}).always(function() {
+			this.setState({
+				loading: false
+			});
+		}.bind(this));
+	},
 	//新建项目明细保存
 	nextSubmit(e) {
 		e.preventDefault();
@@ -857,6 +900,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 			},
 		};
 		const dataSources=this.state.customerArr || [];
+		let departmentArr = this.state.departmentArr || [];
 		const options = this.state.states?dataSources.map((group,index) =>
 				      <Select.Option key={group.id} value={group.name}>{group.name}</Select.Option>
 				     ):dataSources.map((group,index) =>
@@ -991,6 +1035,20 @@ const IntentionCustomer = Form.create()(React.createClass({
                                             value={this.state.signDate ? moment(this.state.signDate) : null}
                                             onChange={(data, dataString) => { this.setState({ signDate: dataString }); }} />
                                     </FormItem>
+									<FormItem className="half-item"
+									    {...formItemLayout}
+									    label="订单部门" >  
+									    <Select placeholder="请输入订单部门"
+									        style={{ width: 240 }}
+									        value={this.state.organizationSearch}
+									        onChange={(e) => { this.setState({ organizationSearch: e }) }}>
+									        {
+									            departmentArr.map(function (item) {
+									                    return <Select.Option key={item.id} >{item.name}</Select.Option>
+									            })
+									        }
+									    </Select>
+									</FormItem>
 				                    <div className='clearfix'>
 							            <FormItem
 							                labelCol={{ span: 4 }}

+ 25 - 17
js/component/manageCenter/project/task/myTask.jsx

@@ -55,6 +55,7 @@ const Task = React.createClass({
                             taskDate:thisdata.taskDate,//分配时间
                             userName:thisdata.userName,//用户名
                         	depName:thisdata.depName,//部门名称
+							
                         });
                     };
                 }
@@ -273,6 +274,7 @@ const Task = React.createClass({
 				contactMobile:this.state.contactMobile,//联系人电话
 				legalPerson:this.state.legalPerson,//法人
 				legalPersonTel:this.state.legalPersonTel,//法人电话
+				certificateNumber:this.state.certificateNumber
 			}
 		}).done(function(data) {
 			this.setState({
@@ -365,8 +367,7 @@ const Task = React.createClass({
 	                     contactMobile:thisdata.contactMobile,//联系人电话
 	                     legalPerson:thisdata.legalPerson,//法人
 	                     legalPersonTel:thisdata.legalPersonTel,//法人电话
-	                     
-	                     
+						 certificateNumber:thisdata.certificateNumber
 					})
 				};
 				
@@ -450,6 +451,7 @@ const Task = React.createClass({
                              contacts:thisdata.contacts,//联系人
                              contactsMobile:thisdata.contactsMobile,//联系人电话
                              taskStatus:thisdata.taskStatus,//是否分配
+							 certificateNumber:thisdata.certificateNumber
                         });
                     };
 				};
@@ -744,6 +746,12 @@ const Task = React.createClass({
 			                            label="财务负责人电话" >  
                         				<span>{this.state.financeMobile}</span>
 		                    		</FormItem>
+									<FormItem className="half-item"
+									    {...formItemLayout}
+									    label="证书编号" >   
+									        <Input placeholder="请输入证书编号" value={this.state.certificateNumber} style={{width:'200px'}}
+									        onChange={(e)=>{this.setState({certificateNumber:e.target.value})}} ref="commodityQuantity"/>
+									</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="客户联系人" >   
@@ -768,20 +776,6 @@ const Task = React.createClass({
 		                                    <Input placeholder="请输入法人电话" value={this.state.legalPersonTel} style={{width:'200px'}}
 		                                    onChange={(e)=>{this.setState({legalPersonTel:e.target.value})}} ref="commodityQuantity"/>
 				                    </FormItem>
-				                    <FormItem className="half-item"
-			                            {...formItemLayout}
-			                            label="任务状态" >  
-			                            <Select placeholder="选择任务状态"
-				                            style={{ width:'200px'}}
-				                            value={this.state.taskStatus}
-				                            onChange={(e)=>{this.setState({taskStatus:e})}}>
-				                            {
-			                                    taskStatus.map(function (item) {
-			                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
-			                                    })
-			                                }
-				                    	 </Select>
-		                    		</FormItem>
 		                    		<FormItem className="half-item"
 			                            {...formItemLayout}
 			                            label="项目状态" >  
@@ -796,6 +790,20 @@ const Task = React.createClass({
 			                                }
 				                    	 </Select>
 		                    		</FormItem>
+									<FormItem className="half-item"
+									    {...formItemLayout}
+									    label="任务状态" >  
+									    <Select placeholder="选择任务状态"
+									        style={{ width:'200px'}}
+									        value={this.state.taskStatus}
+									        onChange={(e)=>{this.setState({taskStatus:e})}}>
+									        {
+									            taskStatus.map(function (item) {
+									                return <Select.Option key={item.value} >{item.key}</Select.Option>
+									            })
+									        }
+										 </Select>
+									</FormItem>
 		                    		<FormItem className="half-item" {...formItemLayout} label="启动时间">
                                         <DatePicker 
                                         	style={{marginTop:"2px",width: '200px',height:"32px" }}
@@ -884,7 +892,7 @@ const Task = React.createClass({
 						            </div>
 				                    <div className='clearfix'>
 						                   <Button className="cancel" type="primary" onClick={this.tijiaoOk} style={{marginLeft:"200px",marginTop:'10px'}} htmlType="submit">保存</Button>
-			                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px"}}>取消</Button>
+			                               <Button className="cancel" type="ghost" onClick={this.visitCancel} style={{marginLeft:"50px",marginTop:'10px'}}>取消</Button>
 	                            	</div>
 				                </div>
 				            </Spin>

+ 16 - 1
js/component/manageCenter/project/task/taskCount.jsx

@@ -112,6 +112,9 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                         receiverName:thisdata.receiverName,//负责人
 	                         hours:thisdata.hours,//任务工时
 	                         depName:thisdata.depName,//派单公司
+							 contractNo:thisdata.contractNo,
+							 signTime:thisdata.signTime,
+							 creteTime:thisdata.creteTime
 						});
 					};
 				    this.state.pagination.total = data.data.totalCount;
@@ -193,7 +196,19 @@ const IntentionCustomer = Form.create()(React.createClass({
                     title: '工时',
                     dataIndex: 'hours',
                     key: 'hours'
-                }
+                }, {
+					title: '合同编号',
+					dataIndex: 'contractNo',
+					key: 'contractNo'
+				}, {
+					title: '签单日期',
+					dataIndex: 'signTime',
+					key: 'signTime'
+				}, {
+					title: '派单日期',
+					dataIndex: 'creteTime',
+					key: 'creteTime'
+				},  
 			],
 			data: [],
 			dataSource: [],

+ 12 - 0
js/component/tools.js

@@ -165,6 +165,18 @@ module.exports = {
             return theType;
         }
     },
+	getPatentTypeva: function (e) {
+	    if (e) {
+	        let theType = '';
+	        patentTypeList.map(function (item) {
+	            if (item.key == e) {
+	                theType = item.value;
+	            };
+	        });
+	        return theType;
+	    }
+	},
+	
     getPatentState: function (e) {
         if (e) {
             let theState = '';

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.0.53",
+  "version": "1.1.0",
   "description": "",
   "main": "index.js",
   "scripts": {