dengzhiguo 6 years ago
parent
commit
5d9fe4790f

+ 11 - 0
js/component/manageCenter/achievement/content.jsx

@@ -53,6 +53,17 @@ class Content extends Component {
                     });
                 });
                 break;
+            //四川
+            case 'siChuan':
+                require.ensure([], () => {
+                    const SiChuan = require('./sichuan/sichuan').default;
+                    this.setState({
+                        component: SiChuan,
+                        listApiUrl: '/api/admin/achievement/myList',
+                        detailApiUrl: '/api/admin/achievement/orgDetail'
+                    });
+                });
+                break;
             //查询
             case 'techAchievementQuery':
                 require.ensure([], () => {

+ 32 - 0
js/component/manageCenter/achievement/sichuan/sichuan.css

@@ -0,0 +1,32 @@
+
+.patent-addNew button {
+    float: right;
+}
+.user-search{
+    margin-bottom: 15px;
+}
+.searchInp {
+    width: 120px;
+    margin-right: 10px;
+}
+.interval{
+    margin-left: 10px;
+}
+.half-item{
+    width: 50%;
+    float: left;
+}
+.ant-form-item{
+    margin-bottom: 0
+}
+#demand-form{
+    padding-left:70px;
+}
+.clearfix{
+    clear: both;
+}
+.title{
+    display: inline-block;
+    font-size: 20px;
+    margin-bottom: 10px;
+}

+ 579 - 0
js/component/manageCenter/achievement/sichuan/sichuan.jsx

@@ -0,0 +1,579 @@
+import React from 'react';
+import {
+	Icon,
+	Button,
+	Input,
+	Select,
+	Spin,
+	Checkbox,
+	Cascader,
+	Table,
+	Form,
+	Switch,
+	message,
+	DatePicker,
+	Modal,
+	Row,
+	Col,
+	InputNumber,
+	notification
+} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+//import axios from 'axios';
+import 'antd/dist/antd.css';
+const FormItem = Form.Item;
+import './sichuan.css';
+const { TextArea } = Input;
+
+class Achievement extends React.Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			loading:false,
+			publishPages: [],
+			visible: false,
+			pagination: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.loadData(page);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
+			columns: [
+				{
+					title: '成果编号',
+					dataIndex: 'serialNumber',
+					key: 'serialNumber'
+				},
+				{
+					title: '成果名称',
+					dataIndex: 'name',
+					key: 'name'
+				},
+				{
+					title: '关键字',
+					dataIndex: 'keyword',
+					key: 'keyword'
+				},
+				{
+					title: '行业领域',
+					dataIndex: 'auditStatus',
+					key: 'auditStatus'
+				},
+				{
+					title: '企业名称',
+					dataIndex: 'createTime',
+					key: 'createTime'
+				},
+				{
+					title: '拟对接单位',
+					dataIndex: 'releaseDate',
+					key: 'releaseDate'
+				},
+				{
+					title: '成果状态',
+					dataIndex: 'releaseDate1',
+					key: 'releaseDate1'
+				},
+				{
+					title: '操作',
+					dataIndex: 'caozuo',
+					key: 'caozuo',
+					render: (text, recard) => {
+						return (
+							<div className="btnRight">
+								<Button
+									style={{ marginRight: 10 }}
+									type="primary"
+									onClick={this.tableRowClick.bind(this)}
+								>
+									修改
+								</Button>
+								<Button
+									type="danger"
+									onClick={(e) => {
+										this.delectRow(recard);
+									}}
+								>
+									删除
+								</Button>
+							</div>
+						);
+					}
+				}
+			]
+		};
+	}
+	loadData(pageNo) {
+		this.setState({
+			page: pageNo,
+			// loading: true
+		});
+//		axios.get('api/list',{
+//			params:{
+//				page:pageNo||1,
+//				pageSize:10
+//			}
+//		})
+//		.then(function(res) {
+//			let theArr = [];
+//              if (!data.data || !data.data.list) {
+//                  if (data.error && data.error.length) {
+//                      message.warning(data.error[0].message);
+//                  };
+//              } else {
+//                  for (let i = 0; i < data.data.list.length; i++) {
+//                      let thisdata = data.data.list[i];
+//                      theArr.push({
+//                          key: i,
+//                          id: thisdata.id,
+//                          serialNumber: thisdata.serialNumber,
+//                          name: thisdata.name,
+//                          category:thisdata.category,
+//                          fieldA:thisdata.thisdata,
+//                          fieldB:thisdata.fieldB,
+//                      });
+//                  };
+//              }
+//              this.state.pagination.current = data.data.pageNo;
+//              this.state.pagination.total = data.data.totalCount;
+//              if(data.data&&data.data.list&&!data.data.list.length){
+//					this.state.pagination.current=0
+//					this.state.pagination.total=0
+//				}
+//              this.setState({
+//					loading:false,
+//                  dataSource: theArr,
+//                  pagination: this.state.pagination
+//              });
+//		})
+//		.catch(function(error) {
+//			console.log(error);
+//		});
+	}
+	//消息提示
+	message(mess) {
+		notification.open({
+			message: '提示',
+			description: mess,
+			placement: 'bottomRight'
+		});
+	}
+	//删除
+	delectRow(recard) {
+		this.setState({
+			loading: true
+		});
+//		axios({
+//			method:'get',
+//			url:'api/sdas',
+//			}).then(function(res) {
+//				this.success('success');
+//				this.setState({
+//					loading: false
+//				});
+//			})
+//			.catch(function(error) {
+//				console.log(error);
+//			});
+	}
+	details(recard){
+		this.state({
+			loading:true
+		})
+	}
+	add() {
+		this.setState({
+			uid: '',
+			visible: true,
+			addState: true,
+			name: '',
+			introduce: '',
+			industry: '',
+			summary: '',
+			ownerName: '',
+			reserveButtMode: '',
+			patentNumber: '',
+			transferPrice: '',
+			telephone: '',
+			cname: ''
+		});
+	}
+	search() {
+		this.loadData(1);
+	}
+	reset() {
+		this.state.nameSearch = '';
+		this.state.keyword = '';
+		this.loadData(1);
+	}
+	tableRowClick(record, index) {
+		this.state.RowData = record;
+		this.setState({
+			visible: true,
+			addState: false,
+			uid: record.id
+		});
+		this.details(record)
+	}
+	handleOk() {
+		this.handleSubmit();
+	}
+	handleCancel() {
+		this.setState({
+			visible: false
+		});
+	}
+	handleSubmit() {
+		if (!this.state.name || !this.state.introduce) {
+			this.message('请填写带*项');
+			return false;
+		}
+		this.setState({
+			loading: true
+		});
+		let api = this.state.addState ? '/api/achievements' : '/api/update';
+//		axios
+//			.post(api, {
+//				id: this.state.uid,
+//				achievementDTO: {
+//					name: this.state.name,
+//					type: this.state.type,
+//					industry: this.state.industry,
+//					summary: this.state.summary,
+//					introduce: this.state.introduce,
+//					ownerName: this.state.ownerName,
+//					reserveButtMode: this.state.reserveButtMode,
+//					patentNumber: this.state.patentNumber,
+//					transferPrice: this.state.transferPrice
+//				},
+//				publisherDTO: {
+//					name: this.state.name,
+//					telephone: this.state.telephone
+//				}
+//			})
+//			.then(function(res) {
+//				console.log(res);
+//				this.message('success');
+//				this.setState({
+//					loading: false,
+//					visible: false
+//				});
+//				this.loadData(1);
+//			})
+//			.catch(function(error) {
+//				console.log(error);
+//			});
+	}
+	componentWillMount() {
+		this.loadData(1);
+	}
+	render() {
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			}
+		};
+		const formItemLayout = {
+			labelCol: { span: 6 },
+			wrapperCol: { span: 12 }
+		};
+		this.state.dataSource = [ { id: 212, key: 1, name: 'liting' }, { key: 2, name: 'YouXi' } ];
+		return (
+			<div className="user-content">
+				<div className="content-title">
+					<span className="title">我的科技成果</span>
+					<div className="patent-addNew">
+						<Button type="primary" onClick={this.add.bind(this)}>
+							发布成果<Icon type="plus" />
+						</Button>
+					</div>
+				</div>
+				<div className="user-search">
+					<Input
+						placeholder="成果名称"
+						value={this.state.name}
+						className="searchInp"
+						onChange={(e) => {
+							this.setState({ name: e.target.value });
+						}}
+						style={{ width: 120 }}
+					/>
+					<Input
+						placeholder="关键字"
+						value={this.state.keyword}
+						onChange={(e) => {
+							this.setState({ keyword: e.target.value });
+						}}
+						style={{ width: 120 }}
+					/>
+					<Button type="primary" onClick={this.search.bind(this)} className="interval">
+						搜索
+					</Button>
+					<Button onClick={this.reset.bind(this)} className="interval">
+						重置
+					</Button>
+				</div>
+				<div className="patent-table">
+					<Spin spinning={this.state.loading}>
+						<Table
+							columns={this.state.columns}
+							dataSource={this.state.dataSource}
+							rowSelection={rowSelection}
+							pagination={this.state.pagination}
+						/>
+					</Spin>
+				</div>
+				<Modal
+					title={this.state.addState ? '新建成果' : '查看成果'}
+					visible={this.state.visible}
+					width="900px"
+					onOk={this.handleOk.bind(this)}
+					onCancel={this.handleCancel.bind(this)}
+					okText="保存"
+					cancelText="取消"
+				>
+					<Form layout="horizontal" id="demand-form">
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								{!this.state.addState ? (
+									<FormItem className="half-item" {...formItemLayout} label="成果编号">
+										<span />
+									</FormItem>
+								) : (
+									''
+								)}
+								<FormItem className="half-item" {...formItemLayout} label="专利编号">
+									<Input
+										placeholder="专利编号"
+										value={this.state.patentNumber}
+										onChange={(e) => {
+											this.setState({ patentNumber: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									className="half-item"
+									{...formItemLayout}
+									label={
+										<span>
+											<strong style={{ color: '#f00' }}>*</strong>成果名称
+										</span>
+									}
+								>
+									<Input
+										placeholder="成果名称."
+										value={this.state.name}
+										onChange={(e) => {
+											this.setState({ name: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="行业领域">
+									<Select
+										defaultValue={this.state.industry}
+										onChange={(e) => {
+											this.setState({ industry: e });
+										}}
+										placeholder="请选择"
+									>
+										<Select.Option value="0">先进制造与自动化</Select.Option>
+										<Select.Option value="1">电子信息技术</Select.Option>
+										<Select.Option value="2">新材料技术</Select.Option>
+										<Select.Option value="3">生物与新药</Select.Option>
+										<Select.Option value="4">资源与新环境</Select.Option>
+										<Select.Option value="5">新能源</Select.Option>
+									</Select>
+								</FormItem>
+
+								<FormItem className="half-item" {...formItemLayout} label="所有权人">
+									<Input
+										placeholder="所有权人"
+										value={this.state.ownerName}
+										onChange={(e) => {
+											this.setState({ ownerName: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="项目负责人">
+									<Input
+										placeholder="项目负责人"
+										value={this.state.cname}
+										onChange={(e) => {
+											this.setState({ cname: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="联系电话">
+									<Input
+										placeholder="联系电话"
+										value={this.state.telephone}
+										onChange={(e) => {
+											this.setState({ telephone: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<div className="clearfix">
+									<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="技术简称">
+										<TextArea
+											autosize={{ minRows: 4, maxRows: 10 }}
+											placeholder="输入技术简称"
+											value={this.state.summary}
+											onChange={(e) => {
+												this.setState({ summary: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem
+										labelCol={{ span: 3 }}
+										wrapperCol={{ span: 18 }}
+										label={
+											<span>
+												<strong style={{ color: '#f00' }}>*</strong>技术成果内容
+											</span>
+										}
+										style={{ margin: '10px 0px' }}
+									>
+										<TextArea
+											autosize={{ minRows: 4, maxRows: 10 }}
+											placeholder="输入技术成果内容"
+											value={this.state.introduce}
+											onChange={(e) => {
+												this.setState({ introduce: e.target.value });
+											}}
+										/>
+									</FormItem>
+								</div>
+								<Row>
+									<Col span={8} style={{ fontSize: 18 }}>
+										技术成果企业情况
+									</Col>
+								</Row>
+								<div className="clearfix">
+									<FormItem
+										className="half-item"
+										{...formItemLayout}
+										label={
+											<span>
+												<strong style={{ color: '#f00' }}>*</strong>企业名称
+											</span>
+										}
+									>
+										<Input
+											placeholder="企业名称."
+											value={this.state.cname}
+											onChange={(e) => {
+												this.setState({ cname: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="科技主管部门">
+										<Input
+											placeholder="科技主管部门."
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="单位性质">
+										<Select
+											defaultValue={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e });
+											}}
+											placeholder="请选择"
+										>
+											<Select.Option value="0">国家行政企业</Select.Option>
+											<Select.Option value="1">公私合作企业</Select.Option>
+											<Select.Option value="2">中外合资企业</Select.Option>
+											<Select.Option value="3">社会组织机构</Select.Option>
+											<Select.Option value="4">国际组织机构</Select.Option>
+											<Select.Option value="5">外资企业</Select.Option>
+											<Select.Option value="6">私营企业</Select.Option>
+											<Select.Option value="7">集体企业</Select.Option>
+											<Select.Option value="8">国防军事企业</Select.Option>
+										</Select>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="企业特征">
+										<Input
+											placeholder="企业特征"
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="邮政编码">
+										<Input
+											placeholder="邮政编码"
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<div className="clearfix">
+										<FormItem className="half-item" {...formItemLayout} label="法定代表人">
+											<Input
+												placeholder="法定代表人"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="电话">
+											<Input
+												placeholder="电话"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="企业网址">
+											<Input
+												placeholder="企业网址"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="E-Mail">
+											<Input
+												placeholder="E-Mail"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="企业简介">
+											<TextArea autosize={{ minRows: 4, maxRows: 10 }} placeholder="输入企业简介" />
+										</FormItem>
+									</div>
+								</div>
+							</div>
+						</Spin>
+					</Form>
+				</Modal>
+			</div>
+		);
+	}
+}
+
+export default Achievement;

+ 6 - 6
js/component/manageCenter/customer/NEW/intentionCustomer/intentionCustomer.jsx

@@ -470,7 +470,7 @@ const IntentionCustomer = Form.create()(React.createClass({
 		return(
 			<div className="user-content" >
                 <div className="content-title">                  
-                    <span>{!intentionState?'我的单位意向客户':'我的个人意向客户'}</span>
+                    <span>{!intentionState?'私有单位客户':'私有专家客户'}</span>
                 </div>
                 <div className="user-search">                    
                     <Input placeholder="客户名称"
@@ -486,6 +486,10 @@ const IntentionCustomer = Form.create()(React.createClass({
 	                     <Cascader options={citySelect()}  value={this.state.addressSearch} placeholder="选择城市"
     						onChange={(e,pre) => { this.setState({ addressSearch: e }) }} />	                 
                     </span>
+                    <RangePicker
+	                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
+	                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
+	                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />    
                     <Button type="primary" onClick={this.search}>搜索</Button>
                     <Button onClick={this.reset}>重置</Button>                      
                     {/*<Button onClick={() => { window.open(globalConfig.context + '/api/admin/customer/downloadTemplate?type=1') }}>下载批量导入模板</Button>
@@ -542,11 +546,7 @@ const IntentionCustomer = Form.create()(React.createClass({
                     <Button type="primary" className="addButton" onClick={this.addClick}>新增客户<Icon type="plus" /></Button> 
                     <div className='clearfix' style={{marginTop:'5px'}}>
 	                  <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>                    			                  
-			                <RangePicker
-		                        value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
-		                        this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-		                        onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />    
-			            </div>  
+			               </div>  
 		            </div>
                 </div>                                               
                 <div className="patent-table">

+ 2 - 0
js/component/manageCenter/customer/NEW/signCustomer/followDetail.jsx

@@ -79,6 +79,7 @@ const FollowDetail = React.createClass({
 			}).done(function(data) {
 				if(!data.error.length) {
 					message.success('签单成功');
+					this.props.loadData();
 					this.setState({
 						loading: false,
 					});
@@ -289,6 +290,7 @@ const FollowDetail = React.createClass({
 				message.success('保存成功!');
 				this.props.closeDesc(false,true);
 				this.visitCancel();
+				this.props.loadData();
 			} else {
 				message.warning(data.error[0].message);
 			}

+ 1 - 0
js/component/manageCenter/customer/NEW/signCustomer/signCustomer.jsx

@@ -377,6 +377,7 @@ const IntentionCustomer = Form.create()(React.createClass({
     				followData={this.state.followData}
     				visitModul={this.state.visitModul}
     				closeDesc={this.closeDesc}
+    				loadData={this.loadData}
     			/>
     			<IntentionDetail 
     				detailApi={this.props.detailApi}

+ 11 - 0
js/component/manageCenter/demand/content.jsx

@@ -64,6 +64,17 @@ class Content extends Component {
                     });
                 });
                 break;
+             //四川
+            case 'siChuan':
+                require.ensure([], () => {
+                    const SiChuan = require('./sichuan/sichuan').default;
+                    this.setState({
+                        component: SiChuan,
+                        listApiUrl: '/api/admin/achievement/myList',
+                        detailApiUrl: '/api/admin/achievement/orgDetail'
+                    });
+                });
+                break;
 //          case 'userTechDemand':
 //              require.ensure([], () => {
 //                  const TechDemand = require('./techDemand').default;

+ 32 - 0
js/component/manageCenter/demand/sichuan/sichuan.css

@@ -0,0 +1,32 @@
+
+.patent-addNew button {
+    float: right;
+}
+.user-search{
+    margin-bottom: 15px;
+}
+.searchInp {
+    width: 120px;
+    margin-right: 10px;
+}
+.interval{
+    margin-left: 10px;
+}
+.half-item{
+    width: 50%;
+    float: left;
+}
+.ant-form-item{
+    margin-bottom: 0
+}
+#demand-form{
+    padding-left:70px;
+}
+.clearfix{
+    clear: both;
+}
+.title{
+    display: inline-block;
+    font-size: 20px;
+    margin-bottom: 10px;
+}

+ 579 - 0
js/component/manageCenter/demand/sichuan/sichuan.jsx

@@ -0,0 +1,579 @@
+import React from 'react';
+import {
+	Icon,
+	Button,
+	Input,
+	Select,
+	Spin,
+	Checkbox,
+	Cascader,
+	Table,
+	Form,
+	Switch,
+	message,
+	DatePicker,
+	Modal,
+	Row,
+	Col,
+	InputNumber,
+	notification
+} from 'antd';
+import ajax from 'jquery/src/ajax/xhr.js';
+import $ from 'jquery/src/ajax';
+//import axios from 'axios';
+import 'antd/dist/antd.css';
+const FormItem = Form.Item;
+import './sichuan.css';
+const { TextArea } = Input;
+
+class Achievement extends React.Component {
+	constructor(props) {
+		super(props);
+		this.state = {
+			loading:false,
+			publishPages: [],
+			visible: false,
+			pagination: {
+				defaultCurrent: 1,
+				defaultPageSize: 10,
+				showQuickJumper: true,
+				pageSize: 10,
+				onChange: function(page) {
+					this.loadData(page);
+				}.bind(this),
+				showTotal: function(total) {
+					return '共' + total + '条数据';
+				}
+			},
+			columns: [
+				{
+					title: '成果编号',
+					dataIndex: 'serialNumber',
+					key: 'serialNumber'
+				},
+				{
+					title: '成果名称',
+					dataIndex: 'name',
+					key: 'name'
+				},
+				{
+					title: '关键字',
+					dataIndex: 'keyword',
+					key: 'keyword'
+				},
+				{
+					title: '行业领域',
+					dataIndex: 'auditStatus',
+					key: 'auditStatus'
+				},
+				{
+					title: '企业名称',
+					dataIndex: 'createTime',
+					key: 'createTime'
+				},
+				{
+					title: '拟对接单位',
+					dataIndex: 'releaseDate',
+					key: 'releaseDate'
+				},
+				{
+					title: '成果状态',
+					dataIndex: 'releaseDate1',
+					key: 'releaseDate1'
+				},
+				{
+					title: '操作',
+					dataIndex: 'caozuo',
+					key: 'caozuo',
+					render: (text, recard) => {
+						return (
+							<div className="btnRight">
+								<Button
+									style={{ marginRight: 10 }}
+									type="primary"
+									onClick={this.tableRowClick.bind(this)}
+								>
+									修改
+								</Button>
+								<Button
+									type="danger"
+									onClick={(e) => {
+										this.delectRow(recard);
+									}}
+								>
+									删除
+								</Button>
+							</div>
+						);
+					}
+				}
+			]
+		};
+	}
+	loadData(pageNo) {
+		this.setState({
+			page: pageNo,
+			// loading: true
+		});
+//		axios.get('api/list',{
+//			params:{
+//				page:pageNo||1,
+//				pageSize:10
+//			}
+//		})
+//		.then(function(res) {
+//			let theArr = [];
+//              if (!data.data || !data.data.list) {
+//                  if (data.error && data.error.length) {
+//                      message.warning(data.error[0].message);
+//                  };
+//              } else {
+//                  for (let i = 0; i < data.data.list.length; i++) {
+//                      let thisdata = data.data.list[i];
+//                      theArr.push({
+//                          key: i,
+//                          id: thisdata.id,
+//                          serialNumber: thisdata.serialNumber,
+//                          name: thisdata.name,
+//                          category:thisdata.category,
+//                          fieldA:thisdata.thisdata,
+//                          fieldB:thisdata.fieldB,
+//                      });
+//                  };
+//              }
+//              this.state.pagination.current = data.data.pageNo;
+//              this.state.pagination.total = data.data.totalCount;
+//              if(data.data&&data.data.list&&!data.data.list.length){
+//					this.state.pagination.current=0
+//					this.state.pagination.total=0
+//				}
+//              this.setState({
+//					loading:false,
+//                  dataSource: theArr,
+//                  pagination: this.state.pagination
+//              });
+//		})
+//		.catch(function(error) {
+//			console.log(error);
+//		});
+	}
+	//消息提示
+	message(mess) {
+		notification.open({
+			message: '提示',
+			description: mess,
+			placement: 'bottomRight'
+		});
+	}
+	//删除
+	delectRow(recard) {
+		this.setState({
+			loading: true
+		});
+//		axios({
+//			method:'get',
+//			url:'api/sdas',
+//			}).then(function(res) {
+//				this.success('success');
+//				this.setState({
+//					loading: false
+//				});
+//			})
+//			.catch(function(error) {
+//				console.log(error);
+//			});
+	}
+	details(recard){
+		this.state({
+			loading:true
+		})
+	}
+	add() {
+		this.setState({
+			uid: '',
+			visible: true,
+			addState: true,
+			name: '',
+			introduce: '',
+			industry: '',
+			summary: '',
+			ownerName: '',
+			reserveButtMode: '',
+			patentNumber: '',
+			transferPrice: '',
+			telephone: '',
+			cname: ''
+		});
+	}
+	search() {
+		this.loadData(1);
+	}
+	reset() {
+		this.state.nameSearch = '';
+		this.state.keyword = '';
+		this.loadData(1);
+	}
+	tableRowClick(record, index) {
+		this.state.RowData = record;
+		this.setState({
+			visible: true,
+			addState: false,
+			uid: record.id
+		});
+		this.details(record)
+	}
+	handleOk() {
+		this.handleSubmit();
+	}
+	handleCancel() {
+		this.setState({
+			visible: false
+		});
+	}
+	handleSubmit() {
+		if (!this.state.name || !this.state.introduce) {
+			this.message('请填写带*项');
+			return false;
+		}
+		this.setState({
+			loading: true
+		});
+		let api = this.state.addState ? '/api/achievements' : '/api/update';
+//		axios
+//			.post(api, {
+//				id: this.state.uid,
+//				achievementDTO: {
+//					name: this.state.name,
+//					type: this.state.type,
+//					industry: this.state.industry,
+//					summary: this.state.summary,
+//					introduce: this.state.introduce,
+//					ownerName: this.state.ownerName,
+//					reserveButtMode: this.state.reserveButtMode,
+//					patentNumber: this.state.patentNumber,
+//					transferPrice: this.state.transferPrice
+//				},
+//				publisherDTO: {
+//					name: this.state.name,
+//					telephone: this.state.telephone
+//				}
+//			})
+//			.then(function(res) {
+//				console.log(res);
+//				this.message('success');
+//				this.setState({
+//					loading: false,
+//					visible: false
+//				});
+//				this.loadData(1);
+//			})
+//			.catch(function(error) {
+//				console.log(error);
+//			});
+	}
+	componentWillMount() {
+		this.loadData(1);
+	}
+	render() {
+		const rowSelection = {
+			selectedRowKeys: this.state.selectedRowKeys,
+			onChange: (selectedRowKeys, selectedRows) => {
+				this.setState({
+					selectedRows: selectedRows.slice(-1),
+					selectedRowKeys: selectedRowKeys.slice(-1)
+				});
+			}
+		};
+		const formItemLayout = {
+			labelCol: { span: 6 },
+			wrapperCol: { span: 12 }
+		};
+		this.state.dataSource = [ { id: 212, key: 1, name: 'liting' }, { key: 2, name: 'YouXi' } ];
+		return (
+			<div className="user-content">
+				<div className="content-title">
+					<span className="title">我的科技成果</span>
+					<div className="patent-addNew">
+						<Button type="primary" onClick={this.add.bind(this)}>
+							发布成果<Icon type="plus" />
+						</Button>
+					</div>
+				</div>
+				<div className="user-search">
+					<Input
+						placeholder="成果名称"
+						value={this.state.name}
+						className="searchInp"
+						onChange={(e) => {
+							this.setState({ name: e.target.value });
+						}}
+						style={{ width: 120 }}
+					/>
+					<Input
+						placeholder="关键字"
+						value={this.state.keyword}
+						onChange={(e) => {
+							this.setState({ keyword: e.target.value });
+						}}
+						style={{ width: 120 }}
+					/>
+					<Button type="primary" onClick={this.search.bind(this)} className="interval">
+						搜索
+					</Button>
+					<Button onClick={this.reset.bind(this)} className="interval">
+						重置
+					</Button>
+				</div>
+				<div className="patent-table">
+					<Spin spinning={this.state.loading}>
+						<Table
+							columns={this.state.columns}
+							dataSource={this.state.dataSource}
+							rowSelection={rowSelection}
+							pagination={this.state.pagination}
+						/>
+					</Spin>
+				</div>
+				<Modal
+					title={this.state.addState ? '新建成果' : '查看成果'}
+					visible={this.state.visible}
+					width="900px"
+					onOk={this.handleOk.bind(this)}
+					onCancel={this.handleCancel.bind(this)}
+					okText="保存"
+					cancelText="取消"
+				>
+					<Form layout="horizontal" id="demand-form">
+						<Spin spinning={this.state.loading}>
+							<div className="clearfix">
+								{!this.state.addState ? (
+									<FormItem className="half-item" {...formItemLayout} label="成果编号">
+										<span />
+									</FormItem>
+								) : (
+									''
+								)}
+								<FormItem className="half-item" {...formItemLayout} label="专利编号">
+									<Input
+										placeholder="专利编号"
+										value={this.state.patentNumber}
+										onChange={(e) => {
+											this.setState({ patentNumber: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									className="half-item"
+									{...formItemLayout}
+									label={
+										<span>
+											<strong style={{ color: '#f00' }}>*</strong>成果名称
+										</span>
+									}
+								>
+									<Input
+										placeholder="成果名称."
+										value={this.state.name}
+										onChange={(e) => {
+											this.setState({ name: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="行业领域">
+									<Select
+										defaultValue={this.state.industry}
+										onChange={(e) => {
+											this.setState({ industry: e });
+										}}
+										placeholder="请选择"
+									>
+										<Select.Option value="0">先进制造与自动化</Select.Option>
+										<Select.Option value="1">电子信息技术</Select.Option>
+										<Select.Option value="2">新材料技术</Select.Option>
+										<Select.Option value="3">生物与新药</Select.Option>
+										<Select.Option value="4">资源与新环境</Select.Option>
+										<Select.Option value="5">新能源</Select.Option>
+									</Select>
+								</FormItem>
+
+								<FormItem className="half-item" {...formItemLayout} label="所有权人">
+									<Input
+										placeholder="所有权人"
+										value={this.state.ownerName}
+										onChange={(e) => {
+											this.setState({ ownerName: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="项目负责人">
+									<Input
+										placeholder="项目负责人"
+										value={this.state.cname}
+										onChange={(e) => {
+											this.setState({ cname: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem className="half-item" {...formItemLayout} label="联系电话">
+									<Input
+										placeholder="联系电话"
+										value={this.state.telephone}
+										onChange={(e) => {
+											this.setState({ telephone: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<div className="clearfix">
+									<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="技术简称">
+										<TextArea
+											autosize={{ minRows: 4, maxRows: 10 }}
+											placeholder="输入技术简称"
+											value={this.state.summary}
+											onChange={(e) => {
+												this.setState({ summary: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem
+										labelCol={{ span: 3 }}
+										wrapperCol={{ span: 18 }}
+										label={
+											<span>
+												<strong style={{ color: '#f00' }}>*</strong>技术成果内容
+											</span>
+										}
+										style={{ margin: '10px 0px' }}
+									>
+										<TextArea
+											autosize={{ minRows: 4, maxRows: 10 }}
+											placeholder="输入技术成果内容"
+											value={this.state.introduce}
+											onChange={(e) => {
+												this.setState({ introduce: e.target.value });
+											}}
+										/>
+									</FormItem>
+								</div>
+								<Row>
+									<Col span={8} style={{ fontSize: 18 }}>
+										技术成果企业情况
+									</Col>
+								</Row>
+								<div className="clearfix">
+									<FormItem
+										className="half-item"
+										{...formItemLayout}
+										label={
+											<span>
+												<strong style={{ color: '#f00' }}>*</strong>企业名称
+											</span>
+										}
+									>
+										<Input
+											placeholder="企业名称."
+											value={this.state.cname}
+											onChange={(e) => {
+												this.setState({ cname: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="科技主管部门">
+										<Input
+											placeholder="科技主管部门."
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="单位性质">
+										<Select
+											defaultValue={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e });
+											}}
+											placeholder="请选择"
+										>
+											<Select.Option value="0">国家行政企业</Select.Option>
+											<Select.Option value="1">公私合作企业</Select.Option>
+											<Select.Option value="2">中外合资企业</Select.Option>
+											<Select.Option value="3">社会组织机构</Select.Option>
+											<Select.Option value="4">国际组织机构</Select.Option>
+											<Select.Option value="5">外资企业</Select.Option>
+											<Select.Option value="6">私营企业</Select.Option>
+											<Select.Option value="7">集体企业</Select.Option>
+											<Select.Option value="8">国防军事企业</Select.Option>
+										</Select>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="企业特征">
+										<Input
+											placeholder="企业特征"
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<FormItem className="half-item" {...formItemLayout} label="邮政编码">
+										<Input
+											placeholder="邮政编码"
+											value={this.state.name}
+											onChange={(e) => {
+												this.setState({ name: e.target.value });
+											}}
+										/>
+									</FormItem>
+									<div className="clearfix">
+										<FormItem className="half-item" {...formItemLayout} label="法定代表人">
+											<Input
+												placeholder="法定代表人"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="电话">
+											<Input
+												placeholder="电话"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="企业网址">
+											<Input
+												placeholder="企业网址"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+										<FormItem className="half-item" {...formItemLayout} label="E-Mail">
+											<Input
+												placeholder="E-Mail"
+												value={this.state.name}
+												onChange={(e) => {
+													this.setState({ name: e.target.value });
+												}}
+											/>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="企业简介">
+											<TextArea autosize={{ minRows: 4, maxRows: 10 }} placeholder="输入企业简介" />
+										</FormItem>
+									</div>
+								</div>
+							</div>
+						</Spin>
+					</Form>
+				</Modal>
+			</div>
+		);
+	}
+}
+
+export default Achievement;

+ 12 - 1
js/component/manageCenter/order/myOrder/servicesOrder/addService.jsx

@@ -697,6 +697,16 @@ const NewService = Form.create()(React.createClass({
 			message.warning("请选择签单时间!");
 			return false;
 		};
+		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(",");
+        };
 		this.setState({
 			loading: true
 		});
@@ -712,7 +722,8 @@ const NewService = Form.create()(React.createClass({
 				approval:this.state.approval,
 				orderRemarks:this.state.orderRemarks,
 				contractNo:this.state.contractNo,
-				signTime:this.state.selTime
+				signTime:this.state.selTime,
+				contractPictureUrl:theorgCodeUrl.length?theorgCodeUrl:'',
 			}
 		}).done(function(data) {
 			this.setState({

+ 7 - 1
js/component/manageCenter/set/userManagementS/user.jsx

@@ -61,7 +61,8 @@ const User = Form.create()(React.createClass({
 							departmentName: thisdata.departmentName, //部门名称
 							departmentId: thisdata.departmentId, //部门id
 							roles:thisdata.roles[0],
-							rolesId:thisdata.rolesId
+							rolesId:thisdata.rolesId,
+							lastLoginTime:thisdata.lastLoginTime,
 						});
 					};
 					this.state.pagination.current = data.data.pageNo ? data.data.pageNo : '0';
@@ -233,6 +234,11 @@ const User = Form.create()(React.createClass({
 					title: '状态',
 					dataIndex: 'status',
 					key: 'status',
+				},
+				{
+					title: '最后登录时间',
+					dataIndex: 'lastLoginTime',
+					key: 'lastLoginTime',
 				}
 			],
 			column: [{