dev01 1 year ago
parent
commit
0f3822161a

+ 0 - 1
js/component/common/orderDetail/property.jsx

@@ -98,7 +98,6 @@ class Property extends Component {
                   wrapperCol={{ span: 16 }}
                   label={
                     <span>
-                      <strong style={{ color: "#f00" }}>*</strong>
                       知识产权情况
                     </span>
                   }

+ 1 - 2
js/component/manageCenter/order/orderNew/changeComponent/orderDetail.js

@@ -761,9 +761,8 @@ class OrderDetail extends Component {
           imgId={"orderImg1x"}
         //  getContentUrl = {this.getContentUrl}
         />
-
         <Property
-          patentStatus={this.state.patentStatus}
+          patentStatus={data.patentStatus}
         />
 
         <div className="clearfix">

+ 8 - 1
js/component/manageCenter/project/task/taskQuery.jsx

@@ -45,6 +45,7 @@ import ProjectDetailsReadOnly from "../../../common/projectDetailsReadOnly";
 import NewEditProject from "../../../common/projectOperation/newEditProject";
 import OrderItemStatus from "../../../common/orderItemStatus";
 import EnterpriseNameChange from "../../../common/enterpriseNameChange";
+import Property from '../../../common/orderDetail/property' // 知识产权情况
 
 const Task = React.createClass({
   loadData(pageNo) {
@@ -103,7 +104,7 @@ const Task = React.createClass({
               splitStatus: thisdata.splitStatus, //是否为子项目 2是 1主项目
               splitSuper: thisdata.splitSuper,
               splitId: thisdata.splitId,
-              serviceYear:thisdata.serviceYear, //本次服务年限
+              serviceYear: thisdata.serviceYear, //本次服务年限
             });
           }
         }
@@ -619,6 +620,8 @@ const Task = React.createClass({
             postalAddress: thisdata.postalAddress, //详细地址
             outsource: thisdata.outsource,
             deleteSign: thisdata.deleteSign,
+
+            patentStatus: thisdata.patentStatus, // 知识产权情况
           });
         }
       }.bind(this),
@@ -1801,6 +1804,10 @@ const Task = React.createClass({
                       >
                         <span>{this.state.financeMobile}</span>
                       </FormItem>
+
+                      {/* 知识产权情况 */}
+                      <Property patentStatus={this.state.patentStatus} />
+
                       <FormItem
                         className="half-item"
                         {...formItemLayout}