|
@@ -32,7 +32,7 @@ class Avatar extends React.Component {
|
|
|
this.setState({ fileList: info.fileList.slice(-1) });
|
|
|
}
|
|
|
componentWillReceiveProps(nextProps) {
|
|
|
- if ( !this.props.visible && nextProps.visible) {
|
|
|
+ if (!this.props.visible && nextProps.visible) {
|
|
|
this.state.fileList = [];
|
|
|
};
|
|
|
}
|
|
@@ -107,7 +107,12 @@ const PatentDesc = React.createClass({
|
|
|
crossDomain: false,
|
|
|
url: globalConfig.context + "/api/admin/patent/lastYearTax",
|
|
|
data: { "uid": uid || this.props.data.uid, "sign": "last_year_ratepay" }
|
|
|
- })).done((data1, data2, data3) => {
|
|
|
+ }), $.ajax({
|
|
|
+ method: "get",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + "/api/admin/patent/getAuthor"
|
|
|
+ })).done((data1, data2, data3, data4) => {
|
|
|
let _me = this;
|
|
|
if (!data1[0].data) {
|
|
|
if (data1[0].error.length) {
|
|
@@ -127,6 +132,7 @@ const PatentDesc = React.createClass({
|
|
|
this.state.patentState = data1[0].data.patentState;
|
|
|
this.state.patentField = data1[0].data.patentField;
|
|
|
this.state.contacts = data1[0].data.contacts;
|
|
|
+ this.state.author = data1[0].data.author;
|
|
|
this.state.uid = data1[0].data.uid;
|
|
|
this.state.id = data1[0].data.id;
|
|
|
};
|
|
@@ -156,6 +162,21 @@ const PatentDesc = React.createClass({
|
|
|
} else {
|
|
|
this.state.lastYearTaxReportId = data3[0].data.id
|
|
|
};
|
|
|
+ let theArr = [];
|
|
|
+ if (!data4[0].data) {
|
|
|
+ if (data4[0].error.length) {
|
|
|
+ message.warning(data4[0].error[0].message);
|
|
|
+ };
|
|
|
+ } else {
|
|
|
+ for (var item in data4[0].data) {
|
|
|
+ theArr.push(
|
|
|
+ <Select.Option value={item} key={item}>{data4[0].data[item]}</Select.Option>
|
|
|
+ )
|
|
|
+ };
|
|
|
+ this.setState({
|
|
|
+ authorOption: theArr
|
|
|
+ });
|
|
|
+ };
|
|
|
}).always(function () {
|
|
|
this.setState({
|
|
|
loading: false
|
|
@@ -239,7 +260,8 @@ const PatentDesc = React.createClass({
|
|
|
"state": this.state.patentStateAdd,
|
|
|
"recordTimeFormattedDate": this.state.recordTime,
|
|
|
"principal": this.state.adminName,
|
|
|
- "comment": this.state.comment
|
|
|
+ "comment": this.state.comment,
|
|
|
+ "author": this.state.author
|
|
|
}
|
|
|
}).done(function (data) {
|
|
|
if (data.error && !data.error.length) {
|
|
@@ -313,10 +335,6 @@ const PatentDesc = React.createClass({
|
|
|
className="patent-desc-content">
|
|
|
<div>
|
|
|
<p className="widthHalf"><span>公司名称:</span>{theData.unitName}</p>
|
|
|
- <p className="widthHalf"><span>公司组织机构代码:</span>{theData.orgCode}</p>
|
|
|
- </div>
|
|
|
- <div>
|
|
|
- <p className="widthHalf"><span>公司地址:</span>{theData.postalAddress}</p>
|
|
|
<div className="widthHalf">
|
|
|
<span>联系人:</span>
|
|
|
<Select placeholder="选择联系人"
|
|
@@ -500,6 +518,15 @@ const PatentDesc = React.createClass({
|
|
|
<Avatar visible={this.state.visible} urlData={this.getPatentCertificateUrl} name='patent_certificate' uid={theData.uid} id={theData.id} />
|
|
|
</div>
|
|
|
<div className="avatar-text"><span>专利稿件上传</span><span>授权通知书上传</span><span>专利证书上传</span></div>
|
|
|
+ <div className="widthHalf">
|
|
|
+ <span>撰写人:</span>
|
|
|
+ <Select
|
|
|
+ style={{ width: 150 }}
|
|
|
+ value={this.state.author}
|
|
|
+ onChange={(e) => { this.setState({ author: e }); }} >
|
|
|
+ {this.state.authorOption}
|
|
|
+ </Select>
|
|
|
+ </div>
|
|
|
</Modal>
|
|
|
</Spin>
|
|
|
</div>
|