专利新增 转让

js/component/common/projectOperation/index.jsx

@@ -83,7 +83,7 @@ class ProjectOperation extends Component{
             return false;
         }
         if (this.state.displayFees==='block') {
-            if (this.state.patentType === "") {
+            if (this.state.patentType === "" && !this.state.patentTransfer) {
                 message.warning("请选择专利类型！");
                 return false;
             }
@@ -134,7 +134,7 @@ class ProjectOperation extends Component{
             main: this.state.main, //是否为主要项目
             officialCost: this.state.displayFees==='block' ? this.state.officialCost : '', //是否有官费
             costReduction: this.state.displayFees==='block' ? ((this.state.patentType === 0 || this.state.patentType === 2) ? (this.state.officialCost === 1 ? this.state.costReduction : 0) : 0) : '', //是否有费减
-            patentType: this.state.displayFees==='block' ? this.state.patentType : '', // 专利类型
+            patentType: this.state.displayFees==='block' && !this.state.patentTransfer ? this.state.patentType : undefined, // 专利类型
         }
         if(this.state.addProjectType === 5){
             infor.declarationBatch = this.state.declarationBatch || 1//申报批次
@@ -267,7 +267,7 @@ class ProjectOperation extends Component{
 
     //上级主管输入框失去焦点是判断客户是否存在
     selectAuto(value) {
-        let kid = [];
+        let kid = {};
         let fwList = this.state.customerArr;
         fwList.map(function (item) {
             if (value == item.bname) {
@@ -277,6 +277,7 @@ class ProjectOperation extends Component{
         if (kid.type == "1") {
             this.setState({
                 displayFees: "block",
+                patentTransfer: kid.patentTransfer,
             });
         } else {
             this.setState({
@@ -377,7 +378,7 @@ class ProjectOperation extends Component{
                                 />}
                                 <span className="mandatory">*</span>
                             </FormItem>
-                            <FormItem
+                            {!this.state.patentTransfer && <FormItem
                                 className="half-item"
                                 labelCol={{ span: 4 }}
                                 wrapperCol={{ span: 14 }}
@@ -409,7 +410,7 @@ class ProjectOperation extends Component{
                                 <span style={{ color: "red", marginLeft: "8px" }}>
                                     *
                                 </span>
-                            </FormItem>
+                            </FormItem>}
                             <FormItem
                                 className="half-item"
                                 labelCol={{ span: 3 }}

js/component/manageCenter/components/checkProject/index.jsx

@@ -971,7 +971,7 @@ class CheckProject extends Component {
                         padding:'0px 0px 10px 20px'
                       }}>
                         <div>
-                          专利类型:<span style={{marginLeft:'15px'}}>{this.props.patentType === 0 ? '专利申请/变更/转让' : '专利买卖'}</span>
+                          专利类型:<span style={{marginLeft:'15px'}}>{this.props.patentType === 0 ? '专利申请/变更' : '专利转让'}</span>
                         </div>
                         <div style={{paddingLeft:'100px'}}>
                           专利名称:<span style={{marginLeft:'15px'}}>

js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx

@@ -83,7 +83,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
                         name: values.name,
                         contacts:values.content,
                         contactMobile:values.telnum,
-                        // societyTag:values.societyTagt,
+                        societyTag:'0',                       //社会属性默认为 社会企业
                         //source:values.customerSource,
                         province:(values.ProvinceCity)[0],//省
 						city:(values.ProvinceCity)[1],//市

js/component/manageCenter/project/task/myTask.jsx

@@ -284,10 +284,7 @@ const Task = React.createClass({
                     dataIndex: 'taskName',
                     key: 'taskName',
                     fixed: 'left',
-                    width: 100,
-                    render: (text) => {
-                        return text && text.length > 8 ? text.substr(0, 8) + '…' : text
-                    },
+                    width: 150,
                 },
                 {
                     title: '项目数量',
@@ -1674,6 +1671,15 @@ const Task = React.createClass({
                         patentTypeName: thisdata.patentTypeName,
                         patentTypeId: thisdata.patentType,//官费专利类型
                     })
+                    if(thisdata.patentTransfer){
+                        this.setState({
+                            patentType: 1
+                        })
+                    }else{
+                        this.setState({
+                            patentType: 0
+                        })
+                    }
                 }
             }.bind(this),
         }).always(
@@ -2264,10 +2270,10 @@ const Task = React.createClass({
         //0正常 1专利 2软著 3审计
         if (this.state.projectType === 1) {
             //专利
-            if (this.state.patentType === -1) {
-                message.warning('请选择专利类型')
-                return
-            }
+            // if (this.state.patentType === -1) {
+            //     message.warning('请选择专利类型')
+            //     return
+            // }
             if (this.state.patentNameType === -1) {
                 message.warning('请选择专利类型名称')
                 return
@@ -2803,7 +2809,7 @@ const Task = React.createClass({
 
                     if ((type === 0 || type === 1 ) && lv && arr.length > 0) {
                         this.setState({
-                            patentType: type === 0 ? 0 : 1,    //0专利申请 1专利买卖
+                            patentType: type === 0 ? 0 : 1,    //0专利申请 1专利转让
                             patentNameType: patentNameType,                         //0实用新型 1发明专利 2外观专利 3 其他
                         })
                     }
@@ -4652,23 +4658,13 @@ const Task = React.createClass({
                                                     labelCol={{span: 4}}
                                                     wrapperCol={{span: 14}}
                                                     label={
-                                                        <span><strong style={{color: '#f00'}}>*</strong>专利类型</span>
+                                                        <span>专利类型</span>
                                                     }
                                                 >
-                                                    <Radio.Group
-                                                        disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
-                                                        value={this.state.patentType}
-                                                        onChange={(e) => {
-                                                            this.detectDeletion(0,()=>{
-                                                                this.setState({patentType: e.target.value}, () => {
-                                                                    this.projectTypeTabContent(this.state.projectType);
-                                                                })
-                                                            });
-                                                        }}
-                                                    >
-                                                        <Radio value={0}>专利申请/变更/转让</Radio>
-                                                        <Radio value={1}>专利买卖</Radio>
-                                                    </Radio.Group>
+                                                    {
+                                                        this.state.patentType === 0 ? '专利申请/变更' :
+                                                            this.state.patentType === 1 ? '专利转让' : ''
+                                                    }
                                                 </FormItem>
                                             </div>
                                             <div
@@ -5310,19 +5306,19 @@ const Task = React.createClass({
                         <Tabs
                             tabBarExtraContent={
                                 <div style={{fontWeight: 'bold', paddingRight: '15px'}}>
-                  <span>
-                    项目名称:
-                  <span style={{color: '#F00', paddingRight: '5px'}}>{this.state.taskName}</span>
-                  </span>
-                                    <span style={{marginLeft: '15px'}}>
-                    项目编号:
-                  <span style={{color: '#F00', paddingRight: '5px'}}>
-                    {this.state.id}
-                      {
-                          this.state.splitStatus === 2 ? '(' + this.state.splitSuper + '-' + this.state.splitId + ')' : ''
-                      }
-                  </span>
-                  </span>
+                                      <span>
+                                        项目名称:
+                                      <span style={{color: '#F00', paddingRight: '5px'}}>{this.state.taskName}</span>
+                                      </span>
+                                                        <span style={{marginLeft: '15px'}}>
+                                        项目编号:
+                                      <span style={{color: '#F00', paddingRight: '5px'}}>
+                                        {this.state.id}
+                                          {
+                                              this.state.splitStatus === 2 ? '(' + this.state.splitSuper + '-' + this.state.splitId + ')' : ''
+                                          }
+                                      </span>
+                                      </span>
                                     <OrderItemStatus deleteSign={this.state.deleteSign}/>
                                 </div>
                             }
@@ -5976,23 +5972,13 @@ const Task = React.createClass({
                                                     labelCol={{span: 4}}
                                                     wrapperCol={{span: 14}}
                                                     label={
-                                                        <span><strong style={{color: '#f00'}}>*</strong>专利类型</span>
+                                                        <span>专利类型</span>
                                                     }
                                                 >
-                                                    <Radio.Group
-                                                        disabled={this.state.payNodeLoading || this.state.thirdInfoLoading}
-                                                        value={this.state.patentType}
-                                                        onChange={(e) => {
-                                                            this.detectDeletion(0,()=>{
-                                                                this.setState({patentType: e.target.value}, () => {
-                                                                    this.projectTypeTabContent(this.state.projectType);
-                                                                })
-                                                            });
-                                                        }}
-                                                    >
-                                                        <Radio value={0}>专利申请/变更/转让</Radio>
-                                                        <Radio value={1}>专利买卖</Radio>
-                                                    </Radio.Group>
+                                                    {
+                                                        this.state.patentType === 0 ? '专利申请/变更' :
+                                                            this.state.patentType === 1 ? '专利转让' : ''
+                                                    }
                                                 </FormItem>
                                             </div>
                                             <div

js/component/manageCenter/set/business/businessProject.jsx

@@ -1,16 +1,14 @@
 import React from 'react';
-import ReactDom from 'react-dom';
-import ajax from 'jquery/src/ajax/xhr.js';
 import $ from 'jquery/src/ajax';
-import moment from 'moment';
 import '../content.less';
-import { citySelect,provinceList,areaSelect,provinceSelect} from '../../../NewDicProvinceListAll';
-import { Form,Radio, Icon, Button, Input,Tabs, Select, Spin, Table, Switch, message, DatePicker, Modal, Upload,Popconfirm,TimePicker,Cascader } from 'antd';
-import {categoryState,industry,conditionOrganization,gameState} from '../../../dataDic.js';
+import { citySelect,areaSelect,provinceSelect} from '../../../NewDicProvinceListAll';
+import { Form,Radio, Icon, Button, Input,Tabs, Select, Spin, Table, Switch, message, DatePicker, Modal,Popconfirm,Cascader } from 'antd';
+import {conditionOrganization,gameState} from '../../../dataDic.js';
 import {getCategoryState,getGameState,splitUrl,getprovince} from '../../../tools.js';
 import ImgList from "../../../common/imgList";
 import {ChooseList} from "../../order/orderNew/chooseList";
 const TabPane = Tabs.TabPane;
+const RadioGroup = Radio.Group;
 //图片组件
 const PicturesWall = React.createClass({
     getInitialState() {
@@ -513,6 +511,7 @@ const BusinessProject=Form.create()(React.createClass({
 		            	activityFlag:this.state.editActivityFlag,//活动生效标识
 		            	memberPrice:this.state.editMemberPrice,//项目ID
 						status:this.state.editStatus,//项目状态
+                        patentTransfer: this.state.typeStatus == 1 ? this.state.patentTransfer : undefined,
 						type: this.state.typeStatus,//项目分类
 		            	country:isCountry,//是否全国
 		            	province:pro?pro:'',//省
@@ -622,7 +621,8 @@ const BusinessProject=Form.create()(React.createClass({
                          editOffset: thisdata.offset,//最低折扣
                          editMemberPrice: thisdata.memberPrice,//会员价
                          editActivityFlag:thisdata.activityFlag,//活动生效标识
-						 editStatus:thisdata.status,//品类状态
+                         editStatus:thisdata.status,//品类状态
+                         patentTransfer: thisdata.patentTransfer ? 1 : 0,
 						 typeStr: str,
 						 typeStatus: thisdata.type,
                          editCreateId:thisdata.createName,//创建人
@@ -669,6 +669,7 @@ const BusinessProject=Form.create()(React.createClass({
                   editMemberPrice: thisdata.memberPrice, //会员价
                   editActivityFlag: thisdata.activityFlag, //活动生效标识
                   editStatus: thisdata.status, //品类状态
+                  patentTransfer: thisdata.patentTransfer ? 1 : 0,
                   typeStr: str,
                   typeStatus: thisdata.type,
                   editCreateId: thisdata.createName, //创建人
@@ -2212,6 +2213,27 @@ const BusinessProject=Form.create()(React.createClass({
                                 <Select.Option key={6}>商标</Select.Option>
                               </Select>
                             </FormItem>
+                            {this.state.typeStatus == 1 && <FormItem
+                              className="half-item"
+                              labelCol={{ span: 4 }}
+                              wrapperCol={{ span: 12 }}
+                              label=""
+                            />}
+                            {this.state.typeStatus == 1 && <FormItem
+                              className="half-item"
+                              labelCol={{ span: 4 }}
+                              wrapperCol={{ span: 12 }}
+                              label="是否是转让"
+                            >
+                                <RadioGroup value={this.state.patentTransfer} onChange={(e)=>{
+                                    this.setState({
+                                        patentTransfer:e.target.value
+                                    })
+                                }}>
+                                    <Radio value={0}>否</Radio>
+                                    <Radio value={1}>是</Radio>
+                                </RadioGroup>
+                            </FormItem>}
                             <FormItem
                               className="half-item"
                               labelCol={{ span: 4 }}

js/component/project.jsx

@@ -278,6 +278,15 @@ const project = React.createClass({
             orderTaskOfficialCost: thisdata.officialCost,    //官费 0无 1有
             sort: thisdata.sort,
           })
+          if(thisdata.patentTransfer){
+            this.setState({
+              patentType: 1
+            })
+          }else{
+            this.setState({
+              patentType: 0
+            })
+          }
         }
       }.bind(this),
     }).always(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "afanti",
-  "version": "1.1.94",
+  "version": "1.1.95",
   "description": "",
   "main": "index.js",
   "scripts": {