|
@@ -43,45 +43,53 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
{
|
|
{
|
|
title: '专利名称',
|
|
title: '专利名称',
|
|
dataIndex: 'patentName',
|
|
dataIndex: 'patentName',
|
|
- key: 'patentName'
|
|
|
|
|
|
+ key: 'patentName',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '专利编号',
|
|
title: '专利编号',
|
|
dataIndex: 'patentNumber',
|
|
dataIndex: 'patentNumber',
|
|
- key: 'patentNumber'
|
|
|
|
|
|
+ key: 'patentNumber',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '专利状态',
|
|
title: '专利状态',
|
|
dataIndex: 'patentState',
|
|
dataIndex: 'patentState',
|
|
- key: 'patentName',
|
|
|
|
|
|
+ key: 'patentState',
|
|
render: text => { return getPatentState(text) },
|
|
render: text => { return getPatentState(text) },
|
|
|
|
+ width: 120
|
|
}, {
|
|
}, {
|
|
title: '专利类型',
|
|
title: '专利类型',
|
|
- dataIndex: 'patentType',
|
|
|
|
- key: 'patentType',
|
|
|
|
|
|
+ dataIndex: 'patentCatagory',
|
|
|
|
+ key: 'patentCatagory',
|
|
render: text => { return getPatentType(text) },
|
|
render: text => { return getPatentType(text) },
|
|
|
|
+ width: 160
|
|
}, {
|
|
}, {
|
|
title: '当前操作人',
|
|
title: '当前操作人',
|
|
- dataIndex: 'techPrincipal',
|
|
|
|
- key: 'techPrincipal'
|
|
|
|
|
|
+ dataIndex: 'principal',
|
|
|
|
+ key: 'principal',
|
|
|
|
+ width: 200
|
|
}
|
|
}
|
|
],
|
|
],
|
|
copyrightColumns: [
|
|
copyrightColumns: [
|
|
{
|
|
{
|
|
title: '软著名称',
|
|
title: '软著名称',
|
|
dataIndex: 'copyrightName',
|
|
dataIndex: 'copyrightName',
|
|
- key: 'copyrightName'
|
|
|
|
|
|
+ key: 'copyrightName',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '软著编号',
|
|
title: '软著编号',
|
|
- dataIndex: 'copyrightNumber',
|
|
|
|
- key: 'copyrightNumber'
|
|
|
|
|
|
+ dataIndex: 'serialNumber',
|
|
|
|
+ key: 'serialNumber',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '软著状态',
|
|
title: '软著状态',
|
|
- dataIndex: 'copyrightState',
|
|
|
|
- key: 'copyrightName',
|
|
|
|
- render: (text) => { return getCopyrightState(text) }
|
|
|
|
|
|
+ dataIndex: 'status',
|
|
|
|
+ key: 'status',
|
|
|
|
+ render: (text) => { return getCopyrightState(text) },
|
|
|
|
+ width: 120
|
|
}, {
|
|
}, {
|
|
title: '加急天数',
|
|
title: '加急天数',
|
|
- dataIndex: 'copyrightType',
|
|
|
|
- key: 'copyrightType',
|
|
|
|
|
|
+ dataIndex: 'inUrgent',
|
|
|
|
+ key: 'inUrgent',
|
|
render: (text) => {
|
|
render: (text) => {
|
|
switch (text) {
|
|
switch (text) {
|
|
case 0:
|
|
case 0:
|
|
@@ -103,55 +111,65 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
case 35:
|
|
case 35:
|
|
return '31-35个工作日';
|
|
return '31-35个工作日';
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ width: 220
|
|
}, {
|
|
}, {
|
|
title: '当前操作人',
|
|
title: '当前操作人',
|
|
- dataIndex: 'techPrincipal',
|
|
|
|
- key: 'techPrincipal'
|
|
|
|
|
|
+ dataIndex: 'principal',
|
|
|
|
+ key: 'principal'
|
|
}
|
|
}
|
|
],
|
|
],
|
|
highTechColumns: [
|
|
highTechColumns: [
|
|
{
|
|
{
|
|
title: '申请年份',
|
|
title: '申请年份',
|
|
- dataIndex: 'highTechYear',
|
|
|
|
- key: 'highTechYear'
|
|
|
|
|
|
+ dataIndex: 'year',
|
|
|
|
+ key: 'year',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '申请状态',
|
|
title: '申请状态',
|
|
- dataIndex: 'highTechState',
|
|
|
|
- key: 'highTechName',
|
|
|
|
- render: (text) => { return gethighTechState(text) }
|
|
|
|
|
|
+ dataIndex: 'state',
|
|
|
|
+ key: 'state',
|
|
|
|
+ render: (text) => { return gethighTechState(text) },
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '证书编号',
|
|
title: '证书编号',
|
|
- dataIndex: 'highTechType',
|
|
|
|
- key: 'highTechType',
|
|
|
|
|
|
+ dataIndex: 'certificateNumber',
|
|
|
|
+ key: 'certificateNumber',
|
|
|
|
+ width: 260
|
|
}, {
|
|
}, {
|
|
title: '当前操作人',
|
|
title: '当前操作人',
|
|
dataIndex: 'techPrincipal',
|
|
dataIndex: 'techPrincipal',
|
|
- key: 'techPrincipal'
|
|
|
|
|
|
+ key: 'techPrincipal',
|
|
|
|
+ width: 200
|
|
}
|
|
}
|
|
],
|
|
],
|
|
techProjectColumns: [
|
|
techProjectColumns: [
|
|
{
|
|
{
|
|
title: '项目名称',
|
|
title: '项目名称',
|
|
- dataIndex: 'techProjectName',
|
|
|
|
- key: 'techProjectName'
|
|
|
|
|
|
+ dataIndex: 'projectName',
|
|
|
|
+ key: 'projectName',
|
|
|
|
+ width: 260
|
|
}, {
|
|
}, {
|
|
title: '项目类型',
|
|
title: '项目类型',
|
|
- dataIndex: 'techProjectCatagory',
|
|
|
|
- key: 'techProjectCatagory'
|
|
|
|
|
|
+ dataIndex: 'projectCatagory',
|
|
|
|
+ key: 'projectCatagory',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '项目状态',
|
|
title: '项目状态',
|
|
- dataIndex: 'techProjectState',
|
|
|
|
- key: 'techProjectState',
|
|
|
|
- render: text => { return getTechnologyState(text) }
|
|
|
|
|
|
+ dataIndex: 'state',
|
|
|
|
+ key: 'state',
|
|
|
|
+ render: text => { return getTechnologyState(text) },
|
|
|
|
+ width: 120
|
|
}, {
|
|
}, {
|
|
title: '技术领域',
|
|
title: '技术领域',
|
|
- dataIndex: 'techProjectField',
|
|
|
|
- key: 'techProjectField'
|
|
|
|
|
|
+ dataIndex: 'techField',
|
|
|
|
+ key: 'techField',
|
|
|
|
+ width: 200
|
|
}, {
|
|
}, {
|
|
title: '当前操作人',
|
|
title: '当前操作人',
|
|
- dataIndex: 'techPrincipal',
|
|
|
|
- key: 'techPrincipal'
|
|
|
|
|
|
+ dataIndex: 'principle',
|
|
|
|
+ key: 'principle',
|
|
|
|
+ width: 200
|
|
}
|
|
}
|
|
]
|
|
]
|
|
};
|
|
};
|
|
@@ -159,6 +177,7 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
componentWillMount() {
|
|
componentWillMount() {
|
|
this.loadData();
|
|
this.loadData();
|
|
this.getContactsList();
|
|
this.getContactsList();
|
|
|
|
+ this.loadColumnsData();
|
|
},
|
|
},
|
|
getContactsList(uid) {
|
|
getContactsList(uid) {
|
|
$.ajax({
|
|
$.ajax({
|
|
@@ -191,9 +210,9 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
cache: false,
|
|
cache: false,
|
|
- url: globalConfig.context + "/api/admin/contract/logs",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/log",
|
|
data: {
|
|
data: {
|
|
- id: id || this.props.data.id
|
|
|
|
|
|
+ cid: id || this.props.data.id
|
|
}
|
|
}
|
|
}), $.ajax({
|
|
}), $.ajax({
|
|
method: "get",
|
|
method: "get",
|
|
@@ -239,7 +258,7 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
});
|
|
});
|
|
}.bind(this));
|
|
}.bind(this));
|
|
},
|
|
},
|
|
- loadColumnsData() {
|
|
|
|
|
|
+ loadColumnsData(id) {
|
|
this.setState({
|
|
this.setState({
|
|
loading: true
|
|
loading: true
|
|
});
|
|
});
|
|
@@ -248,29 +267,126 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
cache: false,
|
|
cache: false,
|
|
- url: globalConfig.context + "/api/admin/contract/logs",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/techProject",
|
|
data: {
|
|
data: {
|
|
- id: id || this.props.data.id
|
|
|
|
|
|
+ contractId: id || this.props.data.id
|
|
}
|
|
}
|
|
}), $.ajax({
|
|
}), $.ajax({
|
|
method: "get",
|
|
method: "get",
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
cache: false,
|
|
cache: false,
|
|
- url: globalConfig.context + "/api/admin/getContacts",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/cognizance",
|
|
data: {
|
|
data: {
|
|
- uid: uid || this.props.data.uid
|
|
|
|
|
|
+ contractId: id || this.props.data.id
|
|
}
|
|
}
|
|
}), $.ajax({
|
|
}), $.ajax({
|
|
method: "get",
|
|
method: "get",
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
cache: false,
|
|
cache: false,
|
|
- url: globalConfig.context + "/api/admin/contract/detail",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/copyright",
|
|
data: {
|
|
data: {
|
|
- id: id || this.props.data.id
|
|
|
|
|
|
+ contractId: id || this.props.data.id
|
|
|
|
+ }
|
|
|
|
+ }), $.ajax({
|
|
|
|
+ method: "get",
|
|
|
|
+ dataType: "json",
|
|
|
|
+ crossDomain: false,
|
|
|
|
+ cache: false,
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/patent",
|
|
|
|
+ data: {
|
|
|
|
+ contractId: id || this.props.data.id
|
|
}
|
|
}
|
|
- })).done(() => {
|
|
|
|
|
|
+ })).done((data1, data2, data3, data4) => {
|
|
|
|
+ let patentArr = [], techProjectArr = [], cognizanceArr = [], copyrightArr = [];
|
|
|
|
+ if (!data1[0].data) {
|
|
|
|
+ if (data1[0].error && data1[0].error.length) {
|
|
|
|
+ message.warning(data1[0].error[0].message)
|
|
|
|
+ };
|
|
|
|
+ } else {
|
|
|
|
+ data1[0].data.map(function (item, i) {
|
|
|
|
+ techProjectArr.push({
|
|
|
|
+ "key": i,
|
|
|
|
+ "id": item.id, //科技项目ID
|
|
|
|
+ "uid": item.uid, //用户ID
|
|
|
|
+ "contractId": item.contractId, //合同ID
|
|
|
|
+ "projectName": item.projectName, //项目名称
|
|
|
|
+ "projectCatagory": item.projectCatagory, //项目类型
|
|
|
|
+ "state": item.state, //状态
|
|
|
|
+ "techField": item.techField, //领域
|
|
|
|
+ "principle": item.principle, //当前负责人(技术员)
|
|
|
|
+ "tableType": "techProject"
|
|
|
|
+ });
|
|
|
|
+ });
|
|
|
|
+ };
|
|
|
|
+ if (!data2[0].data) {
|
|
|
|
+ if (data2[0].error && data2[0].error.length) {
|
|
|
|
+ message.warning(data2[0].error[0].message)
|
|
|
|
+ };
|
|
|
|
+ } else {
|
|
|
|
+ data2[0].data.map(function (item, i) {
|
|
|
|
+ cognizanceArr.push({
|
|
|
|
+ "key": i,
|
|
|
|
+ "id": item.id, //科技项目ID
|
|
|
|
+ "uid": item.uid, //用户ID
|
|
|
|
+ "contractId": item.contractId, //合同ID
|
|
|
|
+ "year": item.year,
|
|
|
|
+ "serialNumber": item.serialNumber,
|
|
|
|
+ "state": item.state, //状态
|
|
|
|
+ "certificateNumber": item.certificateNumber,
|
|
|
|
+ "techPrincipal": item.techPrincipal, //当前负责人(技术员)
|
|
|
|
+ "tableType": "cognizance"
|
|
|
|
+ });
|
|
|
|
+ });
|
|
|
|
+ };
|
|
|
|
+ if (!data3[0].data) {
|
|
|
|
+ if (data3[0].error && data3[0].error.length) {
|
|
|
|
+ message.warning(data3[0].error[0].message)
|
|
|
|
+ };
|
|
|
|
+ } else {
|
|
|
|
+ data3[0].data.map(function (item, i) {
|
|
|
|
+ copyrightArr.push({
|
|
|
|
+ "key": i,
|
|
|
|
+ "id": item.id, //科技项目ID
|
|
|
|
+ "uid": item.uid, //用户ID
|
|
|
|
+ "contractId": item.contractId, //合同ID
|
|
|
|
+ "copyrightName": item.copyrightName, //项目名称
|
|
|
|
+ "serialNumber": item.serialNumber,
|
|
|
|
+ "state": item.state, //状态
|
|
|
|
+ "inUrgent": item.inUrgent, //加急天数
|
|
|
|
+ "principal": item.principal, //当前负责人(技术员)
|
|
|
|
+ "tableType": "copyright"
|
|
|
|
+ });
|
|
|
|
+ });
|
|
|
|
+ };
|
|
|
|
+ if (!data4[0].data) {
|
|
|
|
+ if (data4[0].error && data4[0].error.length) {
|
|
|
|
+ message.warning(data4[0].error[0].message)
|
|
|
|
+ };
|
|
|
|
+ } else {
|
|
|
|
+ data4[0].data.map(function (item, i) {
|
|
|
|
+ patentArr.push({
|
|
|
|
+ "key": i,
|
|
|
|
+ "id": item.id, //科技项目ID
|
|
|
|
+ "uid": item.uid, //用户ID
|
|
|
|
+ "contractId": item.contractId, //合同ID
|
|
|
|
+ "patentName": item.patentName, //项目名称
|
|
|
|
+ "patentNumber": item.patentNumber, //专利号
|
|
|
|
+ "serialNumber": item.serialNumber, //编号
|
|
|
|
+ "patentState": item.patentState, //状态
|
|
|
|
+ "patentCatagory": item.patentCatagory, //专利类别
|
|
|
|
+ "principal": item.principal, //当前负责人(技术员)
|
|
|
|
+ "tableType": "patent"
|
|
|
|
+ });
|
|
|
|
+ });
|
|
|
|
+ };
|
|
|
|
+ this.setState({
|
|
|
|
+ patentTableData: patentArr,
|
|
|
|
+ copyrightTableData: copyrightArr,
|
|
|
|
+ highTechTableData: cognizanceArr,
|
|
|
|
+ techProjectTableData: techProjectArr
|
|
|
|
+ });
|
|
}).always(function () {
|
|
}).always(function () {
|
|
this.setState({
|
|
this.setState({
|
|
loading: false
|
|
loading: false
|
|
@@ -281,7 +397,25 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
|
|
|
|
},
|
|
},
|
|
foundPatent() {
|
|
foundPatent() {
|
|
-
|
|
|
|
|
|
+ $.ajax({
|
|
|
|
+ method: "post",
|
|
|
|
+ dataType: "json",
|
|
|
|
+ crossDomain: false,
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/createPatent",
|
|
|
|
+ data: {
|
|
|
|
+ id: this.props.data.id
|
|
|
|
+ },
|
|
|
|
+ success: function (data) {
|
|
|
|
+ if (!data.data) {
|
|
|
|
+ if (data.error && data.error.length) {
|
|
|
|
+ message.warning(data.error[0].message);
|
|
|
|
+ return;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+ this.loadData();
|
|
|
|
+ this.loadColumnsData();
|
|
|
|
+ }.bind(this),
|
|
|
|
+ });
|
|
},
|
|
},
|
|
foundCopyright() {
|
|
foundCopyright() {
|
|
|
|
|
|
@@ -292,6 +426,7 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
componentWillReceiveProps(nextProps) {
|
|
componentWillReceiveProps(nextProps) {
|
|
if (!this.props.visible && nextProps.visible) {
|
|
if (!this.props.visible && nextProps.visible) {
|
|
this.loadData(nextProps.data.id);
|
|
this.loadData(nextProps.data.id);
|
|
|
|
+ this.loadColumnsData(nextProps.data.id);
|
|
this.getContactsList(nextProps.data.uid);
|
|
this.getContactsList(nextProps.data.uid);
|
|
};
|
|
};
|
|
},
|
|
},
|
|
@@ -310,20 +445,12 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
method: "POST",
|
|
method: "POST",
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
- url: globalConfig.context + "/api/admin/copyright/modify",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/contract/circulation",
|
|
data: {
|
|
data: {
|
|
- "id": this.props.data.id,
|
|
|
|
- "contact": values.contact, // 联系人, 1,2,3
|
|
|
|
- //"copyrightInfo": values.copyrightInfo, // 软著简介,size 0-255
|
|
|
|
- "copyrightName": values.copyrightName, // 软著名称, size 0-60
|
|
|
|
- "copyrightNumber": values.copyrightNumber,
|
|
|
|
- "outsource": values.outsource, // 外包公司, size 0-60
|
|
|
|
- //"workIssue": values.workIssue, // 派单信息, size 0-128
|
|
|
|
- "inUrgent": values.inUrgent, // 加急天数,
|
|
|
|
- "status": values.status, // 状态
|
|
|
|
- "comment": values.comment, // 备注 size 0-128
|
|
|
|
- "recordTime": values.recordTime ? values.recordTime.format("YYYY-MM-DD HH:mm:ss") : undefined, // 状态修改时间 yyyy-MM-dd HH:mm:ss
|
|
|
|
- "principal": values.principal // 负责人id
|
|
|
|
|
|
+ "cid": this.props.data.id,
|
|
|
|
+ "comment": values.comment,
|
|
|
|
+ "status": values.status,
|
|
|
|
+ "principals": values.principals //流转分发人
|
|
}
|
|
}
|
|
}).done(function (data) {
|
|
}).done(function (data) {
|
|
if (!data.error.length) {
|
|
if (!data.error.length) {
|
|
@@ -339,6 +466,22 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
}
|
|
}
|
|
});
|
|
});
|
|
},
|
|
},
|
|
|
|
+ tableRowClick(record, index) {
|
|
|
|
+ switch (record.tableType) {
|
|
|
|
+ case 'patent':
|
|
|
|
+ window.open(globalConfig.context + "/admin/servicesManage/patent.html?contractId=" + record.contractId + "#comprehensive");
|
|
|
|
+ break;
|
|
|
|
+ case 'copyright':
|
|
|
|
+ window.open(globalConfig.context + "/admin/servicesManage/copyright.html?contractId=" + record.contractId + "#copyright");
|
|
|
|
+ break;
|
|
|
|
+ case 'cognizance':
|
|
|
|
+ window.open(globalConfig.context + "/admin/servicesManage/highTech.html?contractId=" + record.contractId + "#highTechApply");
|
|
|
|
+ break;
|
|
|
|
+ case 'techProject':
|
|
|
|
+ window.open(globalConfig.context + "/admin/servicesManage/technology.html?contractId=" + record.contractId + "#applyManage");
|
|
|
|
+ break;
|
|
|
|
+ };
|
|
|
|
+ },
|
|
render() {
|
|
render() {
|
|
const FormItem = Form.Item;
|
|
const FormItem = Form.Item;
|
|
const { getFieldDecorator } = this.props.form;
|
|
const { getFieldDecorator } = this.props.form;
|
|
@@ -375,11 +518,7 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
<FormItem className="half-item"
|
|
<FormItem className="half-item"
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="联系人" >
|
|
label="联系人" >
|
|
- {(() => {
|
|
|
|
- if (this.state.contactsList && theData.contacts) {
|
|
|
|
- debugger
|
|
|
|
- }
|
|
|
|
- })()}
|
|
|
|
|
|
+ <span>{this.state.contactsList ? this.state.contactsList[theData.contacts] : ''}</span>
|
|
</FormItem>
|
|
</FormItem>
|
|
</div>
|
|
</div>
|
|
<p style={{ fontSize: '14px', color: '#333' }}>状态流转记录: </p>
|
|
<p style={{ fontSize: '14px', color: '#333' }}>状态流转记录: </p>
|
|
@@ -412,7 +551,7 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
{...formItemLayout}
|
|
{...formItemLayout}
|
|
label="负责人"
|
|
label="负责人"
|
|
>
|
|
>
|
|
- {getFieldDecorator('principal')(
|
|
|
|
|
|
+ {getFieldDecorator('principals')(
|
|
<Select
|
|
<Select
|
|
showSearch
|
|
showSearch
|
|
style={{ width: 200 }}
|
|
style={{ width: 200 }}
|
|
@@ -439,10 +578,10 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
})(
|
|
})(
|
|
<span>{theData.cognizanceYear} 年</span>
|
|
<span>{theData.cognizanceYear} 年</span>
|
|
)}
|
|
)}
|
|
- {theData.cognizanceStatus == 1 ? <Button onClick={this.foundHighTech}>创建申请</Button> : <span></span>}
|
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
+ {theData.cognizanceStatus == 0 ? <Button onClick={this.foundHighTech}>创建申请</Button> : <span></span>}
|
|
</div>
|
|
</div>
|
|
- <Table size="small" scroll={{ y: 500 }}
|
|
|
|
|
|
+ <Table className="contract-Table" size="small" scroll={{ y: 500 }}
|
|
columns={this.state.highTechColumns}
|
|
columns={this.state.highTechColumns}
|
|
dataSource={this.state.highTechTableData}
|
|
dataSource={this.state.highTechTableData}
|
|
pagination={false}
|
|
pagination={false}
|
|
@@ -456,10 +595,10 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
})(
|
|
})(
|
|
<span>{theData.patentNum} 条</span>
|
|
<span>{theData.patentNum} 条</span>
|
|
)}
|
|
)}
|
|
- {theData.patentStatus == 1 ? <Button onClick={this.foundPatent}>创建申请</Button> : <span></span>}
|
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
+ {theData.patentStatus == 0 ? <Button onClick={this.foundPatent}>创建申请</Button> : <span></span>}
|
|
</div>
|
|
</div>
|
|
- <Table size="small" scroll={{ y: 500 }}
|
|
|
|
|
|
+ <Table className="contract-Table" size="small" scroll={{ y: 500 }}
|
|
columns={this.state.patentColumns}
|
|
columns={this.state.patentColumns}
|
|
dataSource={this.state.patentTableData}
|
|
dataSource={this.state.patentTableData}
|
|
pagination={false}
|
|
pagination={false}
|
|
@@ -473,10 +612,10 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
})(
|
|
})(
|
|
<span>{theData.copyrightNum} 条</span>
|
|
<span>{theData.copyrightNum} 条</span>
|
|
)}
|
|
)}
|
|
- {theData.copyrightStatus == 1 ? <Button onClick={this.foundCopyright}>创建申请</Button> : <span></span>}
|
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
+ {theData.copyrightStatus == 0 ? <Button onClick={this.foundCopyright}>创建申请</Button> : <span></span>}
|
|
</div>
|
|
</div>
|
|
- <Table size="small" scroll={{ y: 500 }}
|
|
|
|
|
|
+ <Table className="contract-Table" size="small" scroll={{ y: 500 }}
|
|
columns={this.state.copyrightColumns}
|
|
columns={this.state.copyrightColumns}
|
|
dataSource={this.state.copyrightTableData}
|
|
dataSource={this.state.copyrightTableData}
|
|
pagination={false}
|
|
pagination={false}
|
|
@@ -490,10 +629,10 @@ const ContractDetailForm = Form.create()(React.createClass({
|
|
})(
|
|
})(
|
|
<span>{theData.techProjectNum} 条</span>
|
|
<span>{theData.techProjectNum} 条</span>
|
|
)}
|
|
)}
|
|
- {theData.techProjectStatus == 1 ? <Button onClick={this.foundTechProject}>创建申请</Button> : <span></span>}
|
|
|
|
</FormItem>
|
|
</FormItem>
|
|
|
|
+ {theData.techProjectStatus == 0 ? <Button onClick={this.foundTechProject}>创建申请</Button> : <span></span>}
|
|
</div>
|
|
</div>
|
|
- <Table size="small" scroll={{ y: 500 }}
|
|
|
|
|
|
+ <Table className="contract-Table" size="small" scroll={{ y: 500 }}
|
|
columns={this.state.techProjectColumns}
|
|
columns={this.state.techProjectColumns}
|
|
dataSource={this.state.techProjectTableData}
|
|
dataSource={this.state.techProjectTableData}
|
|
pagination={false}
|
|
pagination={false}
|
|
@@ -545,7 +684,7 @@ const ContractDetail = React.createClass({
|
|
<Spin spinning={this.state.loading} className='spin-box'>
|
|
<Spin spinning={this.state.loading} className='spin-box'>
|
|
<Modal title="软著详情" visible={this.state.visible}
|
|
<Modal title="软著详情" visible={this.state.visible}
|
|
onOk={this.handleOk} onCancel={this.handleCancel}
|
|
onOk={this.handleOk} onCancel={this.handleCancel}
|
|
- width='800px'
|
|
|
|
|
|
+ width='1000px'
|
|
footer=''
|
|
footer=''
|
|
>
|
|
>
|
|
<ContractDetailForm
|
|
<ContractDetailForm
|