dev01 před 1 rokem
rodič
revize
f41ed57cdb

+ 3 - 3
js/component/common/orderDetail/property.jsx

@@ -45,7 +45,7 @@ class Property extends Component {
 
 
   render() {
-    const { isCreat = false, isProperty, patentStatus } = this.props
+    const { isCreat = false, isProperty, patentStatus, labelCol = 5, wrapperCol = 16 } = this.props
     return (
       <div>
         {
@@ -94,8 +94,8 @@ class Property extends Component {
             <div className="clearfix">
               <div className="clearfix">
                 <FormItem
-                  labelCol={{ span: 5 }}
-                  wrapperCol={{ span: 16 }}
+                  labelCol={{ span: labelCol }}
+                  wrapperCol={{ span: wrapperCol }}
                   label={
                     <span>
                       知识产权情况

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

@@ -761,6 +761,7 @@ class OrderDetail extends Component {
           imgId={"orderImg1x"}
         //  getContentUrl = {this.getContentUrl}
         />
+        
         <Property
           patentStatus={data.patentStatus}
         />

+ 3 - 3
js/component/manageCenter/order/orderNew/contentUrl.jsx

@@ -58,13 +58,13 @@ class contentUrl extends Component {
     });
   }
   render() {
-    const { contentUrl = [] } = this.props
+    const { contentUrl = [], labelCol = 5, wrapperCol = 19 } = this.props
     const FormItem = Form.Item;
     return (
       <div class="clearfix">
         <FormItem
-          labelCol={{ span: 5 }}
-          wrapperCol={{ span: 19 }}
+          labelCol={{ span: labelCol }}
+          wrapperCol={{ span: wrapperCol }}
           label={
             <span>
               <strong style={{ color: "#f00" }}>*</strong>

+ 12 - 1
js/component/manageCenter/order/orderNew/outsourcingPro.jsx

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

+ 10 - 0
js/component/manageCenter/project/task/myTask.jsx

@@ -62,6 +62,7 @@ import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import PatentCheck from '../../../common/patentCheck';
 import PaymentRecord from "../../../common/initiateOrder/paymentRecord";
 import Cascaders from "../../../common/cascaders";
+import Property from '../../../common/orderDetail/property' // 知识产权情况
 
 const confirm = Modal.confirm
 const FormItem = Form.Item
@@ -1820,6 +1821,8 @@ const Task = React.createClass({
             ProvinceCity: ProvinceCityArr[0] === null ? [] : ProvinceCityArr,
             postalAddress: thisdata.postalAddress, //详细地址
             deleteSign: thisdata.deleteSign,
+
+            patentStatus: thisdata.patentStatus, // 知识产权情况
           })
         }
       }.bind(this),
@@ -4373,6 +4376,13 @@ const Task = React.createClass({
                         >
                           <span>{this.state.financeMobile}</span>
                         </FormItem>
+
+                        {/* 知识产权情况 */}
+                        <Property
+                          patentStatus={this.state.patentStatus}
+                          labelCol={4}
+                        />
+
                         <FormItem
                           className="half-item"
                           {...formItemLayout}

+ 10 - 0
js/component/manageCenter/project/task/myTaskOutsource.jsx

@@ -60,6 +60,7 @@ import EnterpriseNameChange from "../../../common/enterpriseNameChange";
 import PatentCheck from "../../../common/patentCheck";
 import ProjectOperation from "../../../common/projectOperation";
 import Cascaders from "../../../common/cascaders";
+import Property from '../../../common/orderDetail/property' // 知识产权情况
 
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -1222,6 +1223,8 @@ const MyTaskOutsource = React.createClass({
             ProvinceCity: ProvinceCityArr[0] === null ? [] : ProvinceCityArr,
             postalAddress: thisdata.postalAddress, //详细地址
             deleteSign: thisdata.deleteSign,
+
+            patentStatus: thisdata.patentStatus, // 知识产权情况
           });
         }
       }.bind(this),
@@ -3732,6 +3735,13 @@ const MyTaskOutsource = React.createClass({
                         >
                           <span>{this.state.financeMobile}</span>
                         </FormItem>
+
+                        {/* 知识产权情况 */}
+                        <Property
+                          patentStatus={this.state.patentStatus}
+                          labelCol={4}
+                        />
+
                         <FormItem
                           className="half-item"
                           {...formItemLayout}