|
@@ -1,6 +1,7 @@
|
|
import React from 'react';
|
|
import React from 'react';
|
|
-import { Icon, Button, Input, Select, Spin, Table, Switch, DatePicker, message, Upload, Modal } from 'antd';
|
|
|
|
-import { patentTypeList, patentStateList, provinceArr } from '../../../dataDic.js';
|
|
|
|
|
|
+import { Icon, Button, Input, Select, Spin, Table, Switch, DatePicker, message, Upload, Modal, Cascader } from 'antd';
|
|
|
|
+import { patentTypeList, patentStateList } from '../../../dataDic.js';
|
|
|
|
+import { provinceSelect, getProvince } from '../../../NewDicProvinceList';
|
|
import { getTime, getPatentState, beforeUploadFile, companySearch, getSearchUrl, getPatentType } from '../../../tools.js';
|
|
import { getTime, getPatentState, beforeUploadFile, companySearch, getSearchUrl, getPatentType } from '../../../tools.js';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import $ from 'jquery/src/ajax';
|
|
import $ from 'jquery/src/ajax';
|
|
@@ -26,7 +27,7 @@ const Patent = React.createClass({
|
|
serialNumber: this.state.number || null,
|
|
serialNumber: this.state.number || null,
|
|
patentNumber: this.state.patentNumber || null,
|
|
patentNumber: this.state.patentNumber || null,
|
|
patentName: this.state.patentName || null,
|
|
patentName: this.state.patentName || null,
|
|
- locationProvince: this.state.province || null,
|
|
|
|
|
|
+ locationProvince: this.state.province ? this.state.province[0] : null,
|
|
uid: this.state.unitId || null,
|
|
uid: this.state.unitId || null,
|
|
contractId: this.state.contractId,
|
|
contractId: this.state.contractId,
|
|
patentCatagory: this.state.patentType || null,
|
|
patentCatagory: this.state.patentType || null,
|
|
@@ -47,7 +48,7 @@ const Patent = React.createClass({
|
|
id: thisdata.id,
|
|
id: thisdata.id,
|
|
oid: thisdata.oid,
|
|
oid: thisdata.oid,
|
|
uid: thisdata.uid,
|
|
uid: thisdata.uid,
|
|
- contractNumber:thisdata.contractNumber,
|
|
|
|
|
|
+ contractNumber: thisdata.contractNumber,
|
|
number: thisdata.serialNumber || '',
|
|
number: thisdata.serialNumber || '',
|
|
patentNumber: thisdata.patentNumber || '',
|
|
patentNumber: thisdata.patentNumber || '',
|
|
unitName: thisdata.unitName || '',
|
|
unitName: thisdata.unitName || '',
|
|
@@ -73,7 +74,7 @@ const Patent = React.createClass({
|
|
endTime: thisdata.authorizedDate,
|
|
endTime: thisdata.authorizedDate,
|
|
orgCode: thisdata.orgCode,
|
|
orgCode: thisdata.orgCode,
|
|
province: thisdata.locationProvince,
|
|
province: thisdata.locationProvince,
|
|
- companyAddress: thisdata.locationProvince || thisdata.locationCity || thisdata.locationArea ? thisdata.locationProvince + '/' + thisdata.locationCity + '/' + thisdata.locationArea : '',
|
|
|
|
|
|
+ companyAddress: getProvince(thisdata.locationProvince, thisdata.locationCity, thisdata.locationArea),
|
|
companyContacts: thisdata.contacts, //联系人
|
|
companyContacts: thisdata.contacts, //联系人
|
|
firstInventorName: thisdata.firstInventorName,
|
|
firstInventorName: thisdata.firstInventorName,
|
|
firstInventorNationality: thisdata.firstInventorNationality, //国籍
|
|
firstInventorNationality: thisdata.firstInventorNationality, //国籍
|
|
@@ -210,7 +211,6 @@ const Patent = React.createClass({
|
|
patentTypeOption: [],
|
|
patentTypeOption: [],
|
|
patentStateOption: [],
|
|
patentStateOption: [],
|
|
companyOption: [],
|
|
companyOption: [],
|
|
- provinceOption: [],
|
|
|
|
searchMore: true,
|
|
searchMore: true,
|
|
data: [],
|
|
data: [],
|
|
loading: false,
|
|
loading: false,
|
|
@@ -250,6 +250,7 @@ const Patent = React.createClass({
|
|
title: '省份',
|
|
title: '省份',
|
|
dataIndex: 'province',
|
|
dataIndex: 'province',
|
|
key: 'province',
|
|
key: 'province',
|
|
|
|
+ render: text => { return getProvince(text) }
|
|
}, {
|
|
}, {
|
|
title: '公司名称',
|
|
title: '公司名称',
|
|
dataIndex: 'unitName',
|
|
dataIndex: 'unitName',
|
|
@@ -307,11 +308,6 @@ const Patent = React.createClass({
|
|
<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
|
|
<Select.Option value={item.value} key={item.key}>{item.key}</Select.Option>
|
|
)
|
|
)
|
|
});
|
|
});
|
|
- provinceArr.map(function (item) {
|
|
|
|
- _me.state.provinceOption.push(
|
|
|
|
- <Select.Option value={item} key={item}>{item}</Select.Option>
|
|
|
|
- )
|
|
|
|
- });
|
|
|
|
if (window.location.search) {
|
|
if (window.location.search) {
|
|
let theObj = getSearchUrl(window.location.search);
|
|
let theObj = getSearchUrl(window.location.search);
|
|
if (theObj.rid) {
|
|
if (theObj.rid) {
|
|
@@ -367,7 +363,7 @@ const Patent = React.createClass({
|
|
"?" + "serialNumber" + "=" + this.state.number +
|
|
"?" + "serialNumber" + "=" + this.state.number +
|
|
"&" + "patentNumber" + "=" + this.state.patentNumber +
|
|
"&" + "patentNumber" + "=" + this.state.patentNumber +
|
|
"&" + "patentName" + "=" + this.state.patentName +
|
|
"&" + "patentName" + "=" + this.state.patentName +
|
|
- "&" + "locationProvince" + "=" + this.state.locationProvince +
|
|
|
|
|
|
+ "&" + "locationProvince" + "=" + this.state.province +
|
|
"&" + "uid" + "=" + this.state.unitId +
|
|
"&" + "uid" + "=" + this.state.unitId +
|
|
"&" + "uid" + "=" + this.state.contractId +
|
|
"&" + "uid" + "=" + this.state.contractId +
|
|
"&" + "patentCatagory" + "=" + this.state.patentCatagory +
|
|
"&" + "patentCatagory" + "=" + this.state.patentCatagory +
|
|
@@ -571,14 +567,13 @@ const Patent = React.createClass({
|
|
value={[this.state.acceptTime[0] ? moment(this.state.acceptTime[0]) : null,
|
|
value={[this.state.acceptTime[0] ? moment(this.state.acceptTime[0]) : null,
|
|
this.state.acceptTime[1] ? moment(this.state.acceptTime[1]) : null]}
|
|
this.state.acceptTime[1] ? moment(this.state.acceptTime[1]) : null]}
|
|
onChange={(date, dateString) => { this.setState({ acceptTime: dateString }) }} />
|
|
onChange={(date, dateString) => { this.setState({ acceptTime: dateString }) }} />
|
|
- <Select placeholder="选择省份"
|
|
|
|
|
|
+ <Cascader placeholder="选择省份"
|
|
|
|
+ style={{ width: 100, marginTop: "-4px" }}
|
|
|
|
+ value={this.state.province}
|
|
|
|
+ options={provinceSelect()}
|
|
showSearch
|
|
showSearch
|
|
filterOption={companySearch}
|
|
filterOption={companySearch}
|
|
- style={{ width: 100 }}
|
|
|
|
- value={this.state.province}
|
|
|
|
- onChange={(e) => { this.setState({ province: e }); }}>
|
|
|
|
- {this.state.provinceOption}
|
|
|
|
- </Select>
|
|
|
|
|
|
+ onChange={(e) => { this.setState({ province: e }) }} />
|
|
<Select placeholder="选择公司"
|
|
<Select placeholder="选择公司"
|
|
style={{ width: 200 }}
|
|
style={{ width: 200 }}
|
|
showSearch
|
|
showSearch
|