|
@@ -44,6 +44,8 @@ import { getProjectName } from "../../../tools";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
import OrderItemStatus from "../../../common/orderItemStatus";
|
|
import OrderCoor from "./changeComponent/orderCoor";
|
|
import OrderCoor from "./changeComponent/orderCoor";
|
|
import ContentUrl from "./contentUrl";
|
|
import ContentUrl from "./contentUrl";
|
|
|
|
+import Property from '../../../common/orderDetail/property' // 知识产权情况
|
|
|
|
+
|
|
//图片组件
|
|
//图片组件
|
|
const PicturesWall = React.createClass({
|
|
const PicturesWall = React.createClass({
|
|
getInitialState() {
|
|
getInitialState() {
|
|
@@ -236,7 +238,7 @@ const outsourcingPro = Form.create()(
|
|
render: (text) => {
|
|
render: (text) => {
|
|
return (
|
|
return (
|
|
<Tooltip title={text}>
|
|
<Tooltip title={text}>
|
|
- <div
|
|
|
|
|
|
+ <div
|
|
// style={{
|
|
// style={{
|
|
// maxWidth: '150px',
|
|
// maxWidth: '150px',
|
|
// overflow: 'hidden',
|
|
// overflow: 'hidden',
|
|
@@ -647,6 +649,8 @@ const outsourcingPro = Form.create()(
|
|
depName: thisdata.depName,
|
|
depName: thisdata.depName,
|
|
outsource: thisdata.outsource == 0 ? "否" : "是",
|
|
outsource: thisdata.outsource == 0 ? "否" : "是",
|
|
deleteSign: thisdata.deleteSign,
|
|
deleteSign: thisdata.deleteSign,
|
|
|
|
+
|
|
|
|
+ patentStatus: thisdata.patentStatus, //知识产权情况
|
|
});
|
|
});
|
|
}
|
|
}
|
|
}.bind(this),
|
|
}.bind(this),
|
|
@@ -2028,7 +2032,14 @@ const outsourcingPro = Form.create()(
|
|
domId={"outContents"}
|
|
domId={"outContents"}
|
|
contentUrl={this.state.contentUrl}
|
|
contentUrl={this.state.contentUrl}
|
|
imgId={"outContentsImg"}
|
|
imgId={"outContentsImg"}
|
|
|
|
+ labelCol={4}
|
|
/>
|
|
/>
|
|
|
|
+ {/* 知识产权情况 */}
|
|
|
|
+ <Property
|
|
|
|
+ patentStatus={this.state.patentStatus}
|
|
|
|
+ labelCol={4}
|
|
|
|
+ />
|
|
|
|
+
|
|
<div className="clearfix">
|
|
<div className="clearfix">
|
|
<FormItem
|
|
<FormItem
|
|
className="half-item"
|
|
className="half-item"
|