|
|
@@ -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 }}
|
