|
@@ -1,7 +1,8 @@
|
|
import React from 'react';
|
|
import React from 'react';
|
|
-import { Icon, Modal, message, Spin, Steps, Input, Select, Upload, DatePicker, Button } from 'antd';
|
|
|
|
|
|
+import { Icon, Modal, message, Spin, Steps, Input, Select, Upload, DatePicker, Button, Table } from 'antd';
|
|
import './comprehensive.less';
|
|
import './comprehensive.less';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
|
|
+import moment from 'moment';
|
|
import $ from 'jquery/src/ajax';
|
|
import $ from 'jquery/src/ajax';
|
|
import { patentTypeList, patentFieldList, patentStateList } from '../../../dataDic.js';
|
|
import { patentTypeList, patentFieldList, patentStateList } from '../../../dataDic.js';
|
|
import { getBase64, beforeUpload, getPatentState, getTime, newDownloadFile } from '../../../tools.js';
|
|
import { getBase64, beforeUpload, getPatentState, getTime, newDownloadFile } from '../../../tools.js';
|
|
@@ -54,7 +55,29 @@ const PatentDesc = React.createClass({
|
|
patentFieldOption: [],
|
|
patentFieldOption: [],
|
|
patentStateOption: [],
|
|
patentStateOption: [],
|
|
adminOption: [],
|
|
adminOption: [],
|
|
- patentProcessList: []
|
|
|
|
|
|
+ stateTable: [],
|
|
|
|
+ stateColumns: [{
|
|
|
|
+ title: '申请状态',
|
|
|
|
+ dataIndex: 'status',
|
|
|
|
+ key: 'status',
|
|
|
|
+ render: (text) => { return getPatentState(text) }
|
|
|
|
+ }, {
|
|
|
|
+ title: '处理时间',
|
|
|
|
+ dataIndex: 'recordTimeFormattedDate',
|
|
|
|
+ key: 'recordTimeFormattedDate',
|
|
|
|
+ }, {
|
|
|
|
+ title: '负责人',
|
|
|
|
+ dataIndex: 'principal',
|
|
|
|
+ key: 'principal',
|
|
|
|
+ }, {
|
|
|
|
+ title: '操作人',
|
|
|
|
+ dataIndex: 'operator',
|
|
|
|
+ key: 'operator',
|
|
|
|
+ }, {
|
|
|
|
+ title: '备注',
|
|
|
|
+ dataIndex: 'comment',
|
|
|
|
+ key: 'comment',
|
|
|
|
+ }]
|
|
};
|
|
};
|
|
},
|
|
},
|
|
loadData() {
|
|
loadData() {
|
|
@@ -162,7 +185,8 @@ const PatentDesc = React.createClass({
|
|
"pState": this.props.data.patentState,
|
|
"pState": this.props.data.patentState,
|
|
"state": this.state.patentStateAdd,
|
|
"state": this.state.patentStateAdd,
|
|
"recordTimeFormattedDate": this.state.recordTime,
|
|
"recordTimeFormattedDate": this.state.recordTime,
|
|
- "principal": this.state.adminName
|
|
|
|
|
|
+ "principal": this.state.adminName,
|
|
|
|
+ "comment": this.state.comment
|
|
}
|
|
}
|
|
}).done(function (data) {
|
|
}).done(function (data) {
|
|
if (!data.error.length) {
|
|
if (!data.error.length) {
|
|
@@ -192,11 +216,11 @@ const PatentDesc = React.createClass({
|
|
this.getOption();
|
|
this.getOption();
|
|
},
|
|
},
|
|
componentWillReceiveProps(nextProps) {
|
|
componentWillReceiveProps(nextProps) {
|
|
- this.state.patentStateAdd = '';
|
|
|
|
- this.state.adminName = '';
|
|
|
|
- this.state.recordTime = '';
|
|
|
|
|
|
+ this.state.patentStateAdd = undefined;
|
|
|
|
+ this.state.adminName = undefined;
|
|
|
|
+ this.state.recordTime = undefined;
|
|
|
|
+ this.state.comment = undefined;
|
|
this.state.adminOption = [];
|
|
this.state.adminOption = [];
|
|
- this.state.patentProcessList = [];
|
|
|
|
if (nextProps.data && !this.state.visible && nextProps.showDesc) {
|
|
if (nextProps.data && !this.state.visible && nextProps.showDesc) {
|
|
this.state.xid = nextProps.data.pid;
|
|
this.state.xid = nextProps.data.pid;
|
|
this.state.patentDes = nextProps.data.patentDes;
|
|
this.state.patentDes = nextProps.data.patentDes;
|
|
@@ -330,22 +354,32 @@ const PatentDesc = React.createClass({
|
|
<Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid}/>
|
|
<Avatar urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid}/>
|
|
</div>
|
|
</div>
|
|
<div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
|
|
<div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
|
|
- <div>
|
|
|
|
|
|
+ <div className="clearfix">
|
|
<p>专利状态流转记录:</p>
|
|
<p>专利状态流转记录:</p>
|
|
- {this.state.patentProcessList}
|
|
|
|
|
|
+ <Table
|
|
|
|
+ style={{ margin: '10px 0' }}
|
|
|
|
+ pagination={false}
|
|
|
|
+ dataSource={this.state.stateTable}
|
|
|
|
+ columns={this.state.stateColumns} />
|
|
<div className="widthThird">
|
|
<div className="widthThird">
|
|
<span>状态流转:</span>
|
|
<span>状态流转:</span>
|
|
- <Select value={this.state.patentStateAdd} style={{ width: 150 }} onChange={(e) => { this.setState({ patentStateAdd: e }); } }>{this.state.patentStateOption}</Select>
|
|
|
|
|
|
+ <Select placeholder='请选择状态' value={this.state.patentStateAdd} style={{ width: 150 }} onChange={(e) => { this.setState({ patentStateAdd: e }); } }>{this.state.patentStateOption}</Select>
|
|
</div>
|
|
</div>
|
|
<p className="widthThird">
|
|
<p className="widthThird">
|
|
<span>处理时间:</span>
|
|
<span>处理时间:</span>
|
|
- <DatePicker defaultValue={null} onChange={(data,dataString)=>{this.state.recordTime = dataString}}/>
|
|
|
|
|
|
+ <DatePicker
|
|
|
|
+ value={this.state.recordTime ? moment(this.state.recordTime) : undefined}
|
|
|
|
+ onChange={(data,dataString)=>{this.setState({recordTime : dataString});}}/>
|
|
</p>
|
|
</p>
|
|
<div className="widthThird">
|
|
<div className="widthThird">
|
|
<span>负责人:</span>
|
|
<span>负责人:</span>
|
|
- <Select value={this.state.adminName} style={{ width: 150 }} onChange={(e) => { this.setState({ adminName: e }); } }>{this.state.adminOption}</Select>
|
|
|
|
|
|
+ <Select placeholder='请填写负责人' value={this.state.adminName} style={{ width: 150 }} onChange={(e) => { this.setState({ adminName: e }); } }>{this.state.adminOption}</Select>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
+ <div>
|
|
|
|
+ <span>备注:</span>
|
|
|
|
+ <Input value={this.state.comment} placeholder='请填写备注' style={{ width: 400 }} onChange={(e)=>{this.setState({comment : e.target.value});}}/>
|
|
|
|
+ </div>
|
|
</Modal>
|
|
</Modal>
|
|
</Spin>
|
|
</Spin>
|
|
</div>
|
|
</div>
|