HW 4 years ago
parent
commit
482d85c428

+ 3 - 0
css/base.less

@@ -549,3 +549,6 @@ body {
 .ant-select-lg .ant-select-selection__rendered{
   line-height: 21px !important;
 }
+.half-item{
+  min-height: 30px !important;
+}

+ 18 - 9
js/component/manageCenter/customer/NEW/crm/crm.jsx

@@ -2316,9 +2316,10 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="年份">
                   <Select
+					size='default'
                     placeholder="年份"
                     value={this.state.year}
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     onChange={e => {
                       this.setState({ year: e });
                     }}
@@ -2336,8 +2337,9 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="营销收入">
                   <Input
+					size='default'
                     placeholder="营销收入"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.salesAmount}
                     onChange={e => {
                       this.setState({ salesAmount: e.target.value });
@@ -2349,8 +2351,9 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="总资产">
                   <Input
+					size='default'
                     placeholder="总资产"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.assets}
                     onChange={e => {
                       this.setState({ assets: e.target.value });
@@ -2362,8 +2365,9 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="固定资产">
                   <Input
+					size='default'
                     placeholder="总资产"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.fixedAssets}
                     onChange={e => {
                       this.setState({ fixedAssets: e.target.value });
@@ -2375,8 +2379,9 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="研发费用">
                   <Input
+					size='default'
                     placeholder="研发费用"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.researchAmount}
                     onChange={e => {
                       this.setState({ researchAmount: e.target.value });
@@ -2415,9 +2420,10 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="年份">
                   <Select
+					size='default'
                     placeholder="年份"
                     value={this.state.year}
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     onChange={e => {
                       this.setState({ year: e });
                     }}
@@ -2435,8 +2441,9 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="项目名称">
                   <Input
+					size='default'
                     placeholder="项目名称"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.projectName}
                     onChange={e => {
                       this.setState({ projectName: e.target.value });
@@ -2447,9 +2454,10 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="项目状态">
                   <Select
+					size='default'
                     placeholder="项目状态"
                     value={this.state.status}
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     onChange={e => {
                       this.setState({ status: e });
                     }}
@@ -2467,10 +2475,11 @@ const IntentionCustomer = Form.create()(React.createClass({
               <div className="clearfix">
                 <FormItem {...formItemLayoutc} label="备注">
                   <Input
+					size='default'
                     type="textarea"
                     rows={3}
                     placeholder="备注"
-                    style={{ width: "90%" }}
+                    style={{ width: "90%",marginBottom:'5px' }}
                     value={this.state.remark}
                     onChange={e => {
                       this.setState({ remark: e.target.value });

+ 5 - 5
js/component/manageCenter/customer/NEW/intentionCustomer/addIntention.jsx

@@ -120,7 +120,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 	                                rules: [{ required: true, message: '此项为必填项!' }],
 	                                initialValue: this.state.name
 	                            })(
-	                                <Input placeholder="公司名称" />
+	                                <Input size='default' style={{marginBottom:"5px"}} placeholder="公司名称" />
 	                                )}
 		                    </FormItem>
 	                    </div>
@@ -133,7 +133,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                                rules: [{ required: true, message: '此项为必填项!' }],
 		                                initialValue: this.state.ProvinceCity
 	                                })(
-								   <Cascader options={areaSelect()}   placeholder="选择城市"  />
+								   <Cascader size='default' style={{marginBottom:"5px"}} options={areaSelect()}   placeholder="选择城市"  />
 	                            )}
 		                    </FormItem>
 	                    </div>
@@ -145,7 +145,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                                rules: [{ required: true, message: '此项为必填项!' }],
 		                                initialValue: this.state.content
 	                                })(
-	                                    <Input placeholder="联系人" />
+	                                    <Input size='default' style={{marginBottom:"5px"}} placeholder="联系人" />
 	                                )}
 		                    </FormItem>
 	                    </div>
@@ -157,7 +157,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                                rules: [{ required: true, message: '此项为必填项!' }],
 		                                initialValue: this.state.telnum
 	                                })(
-	                               		<Input placeholder="联系电话" />
+	                               		<Input size='default' style={{marginBottom:"5px"}} placeholder="联系电话" />
 	                                )}
 		                    </FormItem>
 	                    </div>
@@ -170,7 +170,7 @@ const AchievementDetailForm = Form.create()(React.createClass({
 		                                rules: [{ required: true, message: '此项为必填项!' }],
 		                                initialValue: this.state.societyTagt
 	                                })(
-								  <Select placeholder="客户社会属性">
+								  <Select size='default' style={{marginBottom:"5px"}} placeholder="客户社会属性">
 	                                {
 	                                    socialAttribute.map(function (item) {
 	                                        return <Select.Option key={item.value} >{item.key}</Select.Option>

+ 3 - 2
js/component/manageCenter/order/orderNew/addService.jsx

@@ -4340,8 +4340,9 @@ const NewService = Form.create()(
                       </div>
                       <FormItem {...formItemLayout} label="客户所属类型">
                         <Select
+                          size='default'
                           placeholder="请选择客户所属类型"
-                          style={{ width: "200px" }}
+                          style={{ width: "200px",marginBottom:'5px' }}
                           value={this.state.customType}
                           onChange={(e) => {
                             this.setState({ customType: e });
@@ -4363,7 +4364,7 @@ const NewService = Form.create()(
                             dropdownClassName="certain-category-search-dropdown"
                             dropdownMatchSelectWidth={false}
                             dropdownStyle={{ width: 200 }}
-                            size="large"
+                            size='default'
                             style={{ width: "200px" }}
                             dataSource={options}
                             placeholder="输入名称"

+ 10 - 6
js/component/manageCenter/set/business/businessCategory.jsx

@@ -790,7 +790,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="品类名称" >
-				                    	     <Input placeholder="品类名称" value={this.state.categoryName} style={{width:'94%'}}
+				                    	     <Input size='default' placeholder="品类名称" value={this.state.categoryName} style={{width:'94%',marginBottom:'5px'}}
 				                                onChange={(e)=>{this.setState({categoryName:e.target.value})}} required="required"/>
 				                           		<span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 					                    </FormItem>
@@ -801,8 +801,8 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级品类"
 			                               >
-			                                <Select placeholder="请选择上级品类" value={this.state.upCategory} onChange={(e)=>{this.setState({upCategory:e})}}
-				                                notFoundContent="未获取到上级品类列表" style={{width:'94%'}} required="required">
+			                                <Select size='default' placeholder="请选择上级品类" value={this.state.upCategory} onChange={(e)=>{this.setState({upCategory:e})}}
+				                                notFoundContent="未获取到上级品类列表" style={{width:'94%',marginBottom:'5px'}} required="required">
 				                                {this.state.contactsOption}
 				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
@@ -831,7 +831,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="品类名称" >
-				                                <Input placeholder="组织名称" value={this.state.editName}
+				                                <Input placeholder="组织名称" size='default' style={{marginBottom:'5px'}} value={this.state.editName}
 				                                onChange={(e)=>{this.setState({editName:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
@@ -841,7 +841,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           	label="品类状态"
 				                         >
-					                        <Select placeholder="品类状态" value={this.state.editStatus}
+					                        <Select size='default' style={{marginBottom:'5px'}} placeholder="品类状态" value={this.state.editStatus}
 				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    categoryState.map(function (item) {
@@ -857,7 +857,7 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级品类"
 			                               >
-			                               <Select placeholder="请选择上级组织" value={this.state.editSuperName} onChange={(e)=>{this.setState({editSuperName:e})}}
+			                               <Select size='default' style={{marginBottom:'5px'}} placeholder="请选择上级组织" value={this.state.editSuperName} onChange={(e)=>{this.setState({editSuperName:e})}}
 				                                notFoundContent="未获取到上级组织列表">
 				                                {this.state.contactsOption}
 				                            </Select>
@@ -869,6 +869,8 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 					                        label="业务品类图标" >
 					                        <PicturesWall
+                                                size='default'
+                                                style={{marginBottom:'5px'}}
                                                 domId={'businessCategory1'}
 					                            pictureSign="varieties_picture"
 					                            fileList={this.getOrgCodeUrl}
@@ -883,6 +885,8 @@ const BusinessCategory=Form.create()(React.createClass({
 					                        >
 					                        {/* <span>{this.state.editSort}</span> */}
                                             <Input
+                                                size='default'
+                                                style={{marginBottom:'5px'}}
                                                 value={this.state.editSort}
                                                 onChange={ (e) => {
                                                     this.setState({

+ 34 - 19
js/component/manageCenter/set/business/businessProject.jsx

@@ -1,12 +1,9 @@
 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";
@@ -1382,9 +1379,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="业务项目名称"
                         >
                           <Input
+                            size='default'
                             placeholder="业务项目名称"
                             value={this.state.categoryName}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ categoryName: e.target.value });
                             }}
@@ -1405,13 +1403,14 @@ const BusinessProject=Form.create()(React.createClass({
                           label="业务品类"
                         >
                           <Select
+                              size='default'
                             placeholder="请选择业务品类"
                             value={this.state.addCid}
                             onChange={(e) => {
                               this.setState({ addCid: e });
                             }}
                             notFoundContent="未获取到业务品类列表"
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             required="required"
                           >
                             {this.state.contactsOption}
@@ -1431,7 +1430,9 @@ const BusinessProject=Form.create()(React.createClass({
                           label="是否精品"
                         >
                           <Radio.Group
+                              size='default'
                             value={this.state.boutique}
+                              style={{marginBottom:'5px'}}
                             onChange={(e) => {
                               this.setState({ boutique: e.target.value });
                             }}
@@ -1448,10 +1449,11 @@ const BusinessProject=Form.create()(React.createClass({
                           label="省"
                         >
                           <Cascader
+                              size='default'
                             options={provinceSelect()}
                             value={this.state.ProvinceCity}
                             placeholder="选择省"
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e, pre) => {
                               this.setState({ ProvinceCity: e });
                             }}
@@ -1468,10 +1470,11 @@ const BusinessProject=Form.create()(React.createClass({
                           label="省-市"
                         >
                           <Cascader
+                              size='default'
                             options={citySelect()}
                             value={this.state.ProvinceCity}
                             placeholder="选择市"
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e, pre) => {
                               this.setState({ ProvinceCity: e });
                             }}
@@ -1488,10 +1491,11 @@ const BusinessProject=Form.create()(React.createClass({
                           label="省-市-区"
                         >
                           <Cascader
+                              size='default'
                             options={areaSelect()}
                             value={this.state.ProvinceCity}
                             placeholder="选择区"
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e, pre) => {
                               this.setState({ ProvinceCity: e });
                             }}
@@ -1546,7 +1550,7 @@ const BusinessProject=Form.create()(React.createClass({
                           wrapperCol={{ span: 12 }}
                           label="项目名称"
                         >
-                          <span style={{ width: "94%" }}>
+                          <span style={{ width: "94%",marginBottom:'5px' }}>
                             {this.state.editName}
                           </span>
                         </FormItem>
@@ -1556,9 +1560,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="规格名称"
                         >
                           <Input
+                            size='default'
                             placeholder="规格名称"
                             value={this.state.formatPname}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ formatPname: e.target.value });
                             }}
@@ -1577,9 +1582,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="市场价"
                         >
                           <Input
+                            size='default'
                             placeholder="市场价"
                             value={this.state.formatPrice}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ formatPrice: e.target.value });
                             }}
@@ -1591,9 +1597,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="活动价"
                         >
                           <Input
+                            size='default'
                             placeholder="活动价"
                             value={this.state.formatActivityPrice}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({
                                 formatActivityPrice: e.target.value,
@@ -1607,9 +1614,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="最低折扣"
                         >
                           <Input
+                            size='default'
                             placeholder="最低折扣"
                             value={this.state.formatOffset}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ formatOffset: e.target.value });
                             }}
@@ -1621,9 +1629,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="会员价"
                         >
                           <Input
+                            size='default'
                             placeholder="会员价"
                             value={this.state.formatMemberPrice}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({
                                 formatMemberPrice: e.target.value,
@@ -1637,9 +1646,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="活动生效"
                         >
                           <Select
+                            size='default'
                             placeholder="活动生效"
                             value={this.state.formatActivityFlag}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ formatActivityFlag: e });
                             }}
@@ -1659,9 +1669,10 @@ const BusinessProject=Form.create()(React.createClass({
                           label="项目状态"
                         >
                           <Select
+                            size='default'
                             placeholder="项目状态"
                             value={this.state.formatStatus}
-                            style={{ width: "94%" }}
+                            style={{ width: "94%",marginBottom:'5px' }}
                             onChange={(e) => {
                               this.setState({ formatStatus: e });
                             }}
@@ -2243,6 +2254,7 @@ const BusinessProject=Form.create()(React.createClass({
                                 type="textarea"
                                 rows={1}
                                 placeholder="业务项目服务内容"
+                                style={{marginBottom:'5px'}}
                                 value={this.state.editProjectUrl}
                                 onChange={(e) => {
                                   this.setState({
@@ -2262,6 +2274,7 @@ const BusinessProject=Form.create()(React.createClass({
                                 type="textarea"
                                 rows={4}
                                 placeholder="业务项目服务内容"
+                                style={{marginBottom:'5px'}}
                                 value={this.state.editIntroduce}
                                 onChange={(e) => {
                                   this.setState({
@@ -2280,6 +2293,7 @@ const BusinessProject=Form.create()(React.createClass({
                               <Input
                                 type="textarea"
                                 rows={4}
+                                style={{marginBottom:'5px'}}
                                 placeholder="业务项目价值及作用"
                                 value={this.state.editValueEffect}
                                 onChange={(e) => {
@@ -2299,6 +2313,7 @@ const BusinessProject=Form.create()(React.createClass({
                               <Input
                                 type="textarea"
                                 rows={4}
+                                style={{marginBottom:'5px'}}
                                 placeholder="业务项目客户基本条件"
                                 value={this.state.editClientSize}
                                 onChange={(e) => {

+ 136 - 136
js/component/manageCenter/set/business/businessQuery.jsx

@@ -35,7 +35,7 @@ const PicturesWall = React.createClass({
         this.props.fileList(fileList);
     },
     componentWillReceiveProps(nextProps) {
-        this.state.fileList = nextProps.pictureUrl; 
+        this.state.fileList = nextProps.pictureUrl;
     },
     render() {
         const { previewVisible, previewImage, fileList } = this.state;
@@ -148,7 +148,7 @@ const BusinessProject=Form.create()(React.createClass({
                             arrProvinceCity:ProvinceCity,
                         });
                     };
-             
+
                     this.state.pagination.current = data.data.pageNo;
                     this.state.pagination.total = data.data.totalCount;
                 };
@@ -333,7 +333,7 @@ const BusinessProject=Form.create()(React.createClass({
        this.selectSuperId();
     },
     //获取上级品类
-    selectSuperId() {  
+    selectSuperId() {
     	this.state.data = []
          $.ajax({
                 method: "get",
@@ -343,15 +343,15 @@ const BusinessProject=Form.create()(React.createClass({
                 data:{
                   flag:0,
                 },
-                success: function (data) { 
+                success: function (data) {
                 		let theArr = [];
 					    let thedata=data.data;
 					    if (!thedata) {
 		                    if (data.error && data.error.length) {
 		                        message.warning(data.error[0].message);
-		                    };	
-		                    thedata = {}; 
-		              };   
+		                    };
+		                    thedata = {};
+		              };
 					    var contactIds=[];
 				        	for(var i=0;i<data.data.length;i++){
 		                    let theData = data.data[i];
@@ -359,12 +359,12 @@ const BusinessProject=Form.create()(React.createClass({
 		                        <Select.Option value={i.toString()} key={theData.cname}>{theData.cname}</Select.Option>
 		                    );
 		                };
-						this.setState({	
+						this.setState({
 							SuperArr:thedata,
-		                    contactsOption: theArr, 
+		                    contactsOption: theArr,
 		                    orderStatusOptions:data.data,
 	                    });
-	                    
+
 					}.bind(this),
 				}).always(function () {
 				this.loadData(this.state.ispage);
@@ -375,7 +375,7 @@ const BusinessProject=Form.create()(React.createClass({
 	},
 	//编辑部门,保存
     edithandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	let offsetText;
     	if(this.state.editOffset){
     		if(this.state.editOffset>10||this.state.editOffset<0){
@@ -406,7 +406,7 @@ const BusinessProject=Form.create()(React.createClass({
 				});
 				thecompanyLogoUrl = picArr.join(",");
 			};
-			
+
 			if(!err) {
 				this.setState({
 					loading: true
@@ -448,25 +448,25 @@ const BusinessProject=Form.create()(React.createClass({
 		            	activityPrice:this.state.editActivityPrice,//活动价
 		            	activityFlag:this.state.editActivityFlag,//活动生效标识
 		            	memberPrice:this.state.editMemberPrice,//项目ID
-		            	status:this.state.editStatus,//项目状态 
+		            	status:this.state.editStatus,//项目状态
 		            	country:isCountry,//是否全国
 		            	province:pro?pro:'',//省
 		            	city:city?city:'',//市
 		            	district:dis?dis:'',//区
 		            	minLogo:theorgCodeUrl,
 		            	maxLogo:thecompanyLogoUrl,
-		            	introduce:this.state.editIntroduce,//项目介绍 
+		            	introduce:this.state.editIntroduce,//项目介绍
 		            	projectUrl:this.state.editProjectUrl,//项目地址
 		            	valueEffect:this.state.editValueEffect,//项目价值及作用
-		            	clientSize:this.state.editClientSize,//项目基本条件 
+		            	clientSize:this.state.editClientSize,//项目基本条件
 		            	boutique:this.state.editBoutique,
 		            }
-		        }).done(function (data) { 
+		        }).done(function (data) {
 		            this.setState({
 		                loading: false
 		            });
 		            if (!data.error.length) {
-		                message.success('保存成功!'); 
+		                message.success('保存成功!');
 		                this.edithandleCancel();
 		                this.selectSuperId();
 		            } else {
@@ -474,7 +474,7 @@ const BusinessProject=Form.create()(React.createClass({
 		            }
 		        }.bind(this));
 			}
-		}) 
+		})
     },
     //规格列表整行点击
     formatTableRowClick(record, index){
@@ -489,7 +489,7 @@ const BusinessProject=Form.create()(React.createClass({
         	formatActivityPrice:record.formatActivityPrice,//活动价
         	formatActivityFlag:record.formatActivityFlag,//活动生效标识
         	formatMemberPrice:record.formatMemberPrice,//会员价
-        	formatStatus:record.formatStatus.toString(),//项目状态 
+        	formatStatus:record.formatStatus.toString(),//项目状态
         });
     },
     //项目列表整行点击
@@ -526,7 +526,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                	ProvinceCity.push(parseInt(thisdata.city));
 	                	ProvinceCity.push(parseInt(thisdata.district));
                 	}
-                	
+
                     theArr.push({
                          editId: thisdata.id,//每一条记录的ID
                          editName:thisdata.bname,//项目名称
@@ -541,7 +541,7 @@ const BusinessProject=Form.create()(React.createClass({
                          editOffset: thisdata.offset,//最低折扣
                          editMemberPrice: thisdata.memberPrice,//会员价
                          editActivityFlag:thisdata.activityFlag,//活动生效标识
-                         editStatus:thisdata.status,//品类状态 
+                         editStatus:thisdata.status,//品类状态
                          editCreateId:thisdata.createName,//创建人
                          editTime:thisdata.createTimeFormattedDate,//创建时间
                          editIntroduce:thisdata.introduce,//服务内容
@@ -551,8 +551,8 @@ const BusinessProject=Form.create()(React.createClass({
                          editBoutique:thisdata.boutique,//是否精品
                          orgCodeUrl: thisdata.minLogo ? splitUrl(thisdata.minLogo, ',', globalConfig.avatarHost + '/upload') : [],
 						 cditCompanyLogoUrl: thisdata.maxLogo ? splitUrl(thisdata.maxLogo, ',', globalConfig.avatarHost + '/upload') : [],
-					
-                    }); 
+
+                    });
                 };
                 this.setState({
                 	 editId: thisdata.id,//每一条记录的ID
@@ -568,7 +568,7 @@ const BusinessProject=Form.create()(React.createClass({
                      editOffset: thisdata.offset,//最低折扣
                      editMemberPrice: thisdata.memberPrice,//会员价
                      editActivityFlag:thisdata.activityFlag,//活动生效标识
-                     editStatus:thisdata.status,//品类状态 
+                     editStatus:thisdata.status,//品类状态
                      editCreateId:thisdata.createName,//创建人
                      editTime:thisdata.createTimeFormattedDate,//创建时间
                      editIntroduce:thisdata.introduce,//服务内容
@@ -608,11 +608,11 @@ const BusinessProject=Form.create()(React.createClass({
     			offsetText=this.state.formatOffset;
     		}
     	}
-    	this.props.form.validateFields((err, values) => {                                 
+    	this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -626,14 +626,14 @@ const BusinessProject=Form.create()(React.createClass({
                     	activityPrice:this.state.formatActivityPrice,//活动价
                     	activityFlag:this.state.formatActivityFlag,//活动生效标识
                     	memberPrice:this.state.formatMemberPrice,//会员价
-                    	status:this.state.formatStatus,//项目状态 
+                    	status:this.state.formatStatus,//项目状态
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('修改规格成功!'); 
+                        message.success('修改规格成功!');
                         this.formatLoadData();
                         this.editformathandleCancel();
                     } else {
@@ -655,11 +655,11 @@ const BusinessProject=Form.create()(React.createClass({
     			offsetText=this.state.formatOffset;
     		}
     	}
-    	this.props.form.validateFields((err, values) => {                                 
+    	this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 $.ajax({
                     method: "post",
                     dataType: "json",
@@ -673,14 +673,14 @@ const BusinessProject=Form.create()(React.createClass({
                     	activityPrice:this.state.formatActivityPrice,//活动价
                     	activityFlag:this.state.formatActivityFlag,//活动生效标识
                     	memberPrice:this.state.formatMemberPrice,//会员价
-                    	status:this.state.formatStatus,//项目状态 
+                    	status:this.state.formatStatus,//项目状态
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('新增规格成功!'); 
+                        message.success('新增规格成功!');
                         this.formathandleCancel();
                         this.formatLoadData();
                     } else {
@@ -692,7 +692,7 @@ const BusinessProject=Form.create()(React.createClass({
     },
     //新增一个项目,保存
     addhandleSubmit(e){
-    	e.preventDefault();	
+    	e.preventDefault();
     	if(!this.state.categoryName){
     		message.warning('请输入项目名称');
     		return false;
@@ -719,11 +719,11 @@ const BusinessProject=Form.create()(React.createClass({
        		isCountry=1;
        		pro='';
        	}
-		this.props.form.validateFields((err, values) => {                                 
+		this.props.form.validateFields((err, values) => {
             if (!err) {
                 this.setState({
                     loading: true
-                }); 
+                });
                 //上级组织字典
                 let nameText=this.state.SuperArr;
                 let superText=nameText[parseInt(this.state.addCid)].id;
@@ -741,12 +741,12 @@ const BusinessProject=Form.create()(React.createClass({
                     	city:city,//市
                     	district:dis,//区
                     	}
-                }).done(function (data) { 
+                }).done(function (data) {
                     this.setState({
                         loading: false
                     });
                     if (!data.error.length) {
-                        message.success('新增项目成功!'); 
+                        message.success('新增项目成功!');
                         this.handleCancel();
                         this.selectSuperId();
                     } else {
@@ -918,18 +918,18 @@ const BusinessProject=Form.create()(React.createClass({
         this.setState({ visible: false })
     },
     edithandleCancel(e) {
-        this.setState({ 
-        	editvisible: false 
+        this.setState({
+        	editvisible: false
         });
     },
     formathandleCancel(e) {
-        this.setState({ 
-        	formatvisible: false 
+        this.setState({
+        	formatvisible: false
         });
     },
     editformathandleCancel(e) {
-        this.setState({ 
-        	editformatvisible: false 
+        this.setState({
+        	editformatvisible: false
         });
     },
     search() {
@@ -942,7 +942,7 @@ const BusinessProject=Form.create()(React.createClass({
         this.state.ressSearch= undefined;//省市区清零
         this.state.activityFlag = undefined;//活动生效清零
         this.state.status = undefined;//项目状态清零
-        this.loadData(); 
+        this.loadData();
     },
     //新增部分的清零
     addReset(){
@@ -960,7 +960,7 @@ const BusinessProject=Form.create()(React.createClass({
         this.state.formatMemberPrice = '';//会员价清零
         this.state.formatActivityFlag = undefined;//活动生效标识清零
         this.state.formatStatus= undefined;//项目状态清零
-        this.formatLoadData(); 
+        this.formatLoadData();
     },
     //详情tab切换数据处理
 	callback(e) {
@@ -968,7 +968,7 @@ const BusinessProject=Form.create()(React.createClass({
 			callnub: e,
 		})
 		if(e == 1) {
-			
+
 		}
 		if(e == 2) {
 			this.formatLoadData();
@@ -1011,7 +1011,7 @@ const BusinessProject=Form.create()(React.createClass({
        	const { getFieldDecorator } = this.props.form;
         const hasSelected = this.state.selectedRowKeys.length > 0;
         const { RangePicker } = DatePicker;
-        
+
         return (
             <div className="user-content" >
 				<div className="content-title">
@@ -1034,7 +1034,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
                         <Popconfirm title="是否停用?" onConfirm={this.blockRow} okText="是" cancelText="否">
 						     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
-	                   			 disabled={!hasSelected} 
+	                   			 disabled={!hasSelected}
 	                    		 >停用<Icon type="minus" />
 	           			     </Button>
 						</Popconfirm>
@@ -1042,15 +1042,15 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {display: 'block'}}>
 	                    	<span style={{marginRight:'10px',marginBottom:'10px'}}>
 		                     	<Cascader options={provinceSelect()} style={{marginLeft:10}}  value={this.state.ressSearch} placeholder="选择省份"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
-                    		<span style={{marginRight:'10px',marginBottom:'10px'}}>                   
+                    		<span style={{marginRight:'10px',marginBottom:'10px'}}>
 		                     	<Cascader options={citySelect()}  value={this.state.ressSearch} placeholder="选择城市"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
 	                    	<span style={{marginRight:'10px'}}>
 		                     	<Cascader options={areaSelect()}  value={this.state.ressSearch} placeholder="选择地区"
-	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />	                 
+	    						onChange={(e,pre) => { this.setState({ ressSearch: e }) }} />
                     		</span>
 		                    <Select placeholder="活动生效标识"
 		                            style={{width:'150px',marginRight:'10px',marginBottom:'10px'}}
@@ -1066,7 +1066,7 @@ const BusinessProject=Form.create()(React.createClass({
 		                            <Select.Option value="0" >正常</Select.Option>
 		                            <Select.Option value="1" >停用</Select.Option>
 		                    </Select>
-	                    </div>	
+	                    </div>
 	                </div>
 					</TabPane>
                         <TabPane tab="更改表格显示数据" key="3">
@@ -1091,16 +1091,16 @@ const BusinessProject=Form.create()(React.createClass({
 	                            dataSource={this.state.dataSource}
 	                            rowSelection={rowSelection}
 	                            pagination={this.state.pagination}
-	                            onRowClick={this.tableRowClick} 
+	                            onRowClick={this.tableRowClick}
 	                            current={this.state.aa}/>
 	                    </Spin>
 	                </div>
-	             
+
 	                 <div className="patent-desc">
 	                    <Modal maskClosable={false} visible={this.state.visible}
 	                        onOk={this.checkPatentProcess} onCancel={this.handleCancel}
 	                        width='400px'
-	                        title='新增业务项目'                       
+	                        title='新增业务项目'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.addhandleSubmit} id="demand-form">
@@ -1116,24 +1116,24 @@ const BusinessProject=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 				                    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="业务品类"
-			                               > 
+			                               >
 			                                <Select placeholder="请选择业务品类" value={this.state.addCid} onChange={(e)=>{this.setState({addCid:e})}}
 				                                notFoundContent="未获取到业务品类列表" style={{width:'94%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
 		                   		    <div className="clearfix">
-					                    <FormItem  
+					                    <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="是否精品"
-			                               > 
+			                               >
 			                               <Radio.Group value={this.state.boutique} onChange={(e) => {
 						                    this.setState({ boutique: e.target.value })
 						                    }}>
@@ -1143,33 +1143,33 @@ const BusinessProject=Form.create()(React.createClass({
 			                   		    </FormItem>
 		                   		    </div>
 	                    			<div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省"
-					                          > 
+					                          >
 					                            <Cascader options={provinceSelect()}  value={this.state.ProvinceCity} placeholder="选择省" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
 						             </div>
 						             <div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市"
-					                          > 
+					                          >
 					                            <Cascader options={citySelect()}  value={this.state.ProvinceCity} placeholder="选择市" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
 						             </div>
 						             <div className="clearfix">
-			                   		    <FormItem 
+			                   		    <FormItem
 					                           labelCol={{ span: 7 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择区" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
@@ -1183,13 +1183,13 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.formatvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.formathandleCancel}
 	                        width='400px'
-	                        title='新增项目规格'                       
+	                        title='新增项目规格'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.formathandleSubmit} id="demand-form">
 				                <Spin spinning={this.state.loading}>
 				                    <div className="clearfix">
-				                    	 <FormItem  
+				                    	 <FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="项目名称"
@@ -1212,7 +1212,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="市场价" value={this.state.formatPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="活动价"
@@ -1220,7 +1220,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatActivityPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="最低折扣"
@@ -1228,7 +1228,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatOffset:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="会员价"
@@ -1236,13 +1236,13 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatMemberPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem  
+						                 <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1250,13 +1250,13 @@ const BusinessProject=Form.create()(React.createClass({
 				                                }
 				                              </Select>
 				                   		 </FormItem>
-				                   		  <FormItem 
+				                   		  <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({formatStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1273,7 +1273,7 @@ const BusinessProject=Form.create()(React.createClass({
 	                    <Modal maskClosable={false} visible={this.state.editformatvisible}
 	                        onOk={this.checkPatentProcess} onCancel={this.editformathandleCancel}
 	                        width='400px'
-	                        title='编辑项目规格'                       
+	                        title='编辑项目规格'
 	                        footer=''
 	                        className="admin-desc-content">
 	                         <Form horizontal onSubmit={this.editformathandleSubmit} id="demand-form">
@@ -1289,7 +1289,7 @@ const BusinessProject=Form.create()(React.createClass({
 					                    </FormItem>
 				                    </div>
 		                   		     <div className="clearfix" >
-							              <FormItem  
+							              <FormItem
 						                    labelCol={{ span: 7 }}
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
@@ -1304,7 +1304,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="市场价" value={this.state.formatPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="活动价"
@@ -1312,7 +1312,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="活动价" value={this.state.formatActivityPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatActivityPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="最低折扣"
@@ -1320,7 +1320,7 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="最低折扣" value={this.state.formatOffset} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatOffset:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem 
+						                 <FormItem
 					                    	labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                         label="会员价"
@@ -1328,13 +1328,13 @@ const BusinessProject=Form.create()(React.createClass({
 			                                <Input placeholder="会员价" value={this.state.formatMemberPrice} style={{width:'94%'}}
 						    				onChange={(e)=>{this.setState({formatMemberPrice:e.target.value})}}/>
 						                 </FormItem>
-						                 <FormItem  
+						                 <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.formatActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({formatActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1342,13 +1342,13 @@ const BusinessProject=Form.create()(React.createClass({
 				                                }
 				                              </Select>
 				                   		 </FormItem>
-				                   		  <FormItem 
+				                   		  <FormItem
 					                         	labelCol={{ span: 7 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.formatStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({formatStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({formatStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1357,23 +1357,23 @@ const BusinessProject=Form.create()(React.createClass({
 				                              </Select>
 				                   		 </FormItem>
 				                   	</div>
-	                    			
+
 				                    <FormItem wrapperCol={{ span: 12, offset: 7 }}>
-				                    </FormItem> 
+				                    </FormItem>
 				                </Spin>
 				            </Form >
 	                    </Modal>
                 	 </div>
             	 <div className="patent-desc">
-                 	  <Modal	
-				      className="customeDetails"				      
+                 	  <Modal
+				      className="customeDetails"
 			          title="业务项目"
 			          width='1000px'
 			          visible={this.state.editvisible}
 			          onOk={this.edithandleCancel}
 			          onCancel={this.edithandleCancel}
 			          footer=''
-			        >				    
+			        >
 				     <Tabs defaultActiveKey="1" onChange={this.callback} activeKey={this.state.callnub}>
 					    <TabPane tab="业务项目基本资料" key="1">
 					        <Form horizontal onSubmit={this.edithandleSubmit} id="demand-form">
@@ -1391,11 +1391,11 @@ const BusinessProject=Form.create()(React.createClass({
 					                    	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="业务品类"
-			                               > 
+			                               >
 			                                <Select placeholder="请选择业务品类" value={this.state.editCname} onChange={(e)=>{this.setState({editCname:e})}}
 				                                notFoundContent="未获取到业务品类列表" style={{width:'94%'}} required="required">
 				                                {this.state.contactsOption}
-				                            </Select> 
+				                            </Select>
 				                            <span className="mandatory" style={{color:'red',marginLeft:'5px'}}>*</span>
 			                   		    </FormItem>
 		                   		    </div>
@@ -1404,34 +1404,34 @@ const BusinessProject=Form.create()(React.createClass({
 						                           labelCol={{ span: 4 }}
 						                           wrapperCol={{ span: 12 }}
 						                           label="省"
-						                          > 
+						                          >
 						                            <Cascader options={provinceSelect()}  value={this.state.ProvinceCity} placeholder="选择省" style={{width:'94%'}}
 													onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 													<span style={{color:'red',marginLeft:'5px'}}>*</span>
 								         </FormItem>
-			                   		    <FormItem className="half-item" 
+			                   		    <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市"
-					                          > 
+					                          >
 					                            <Cascader options={citySelect()}  value={this.state.ProvinceCity} placeholder="选择市" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
-			                   		    <FormItem className="half-item" 
+			                   		    <FormItem className="half-item"
 					                           labelCol={{ span: 4 }}
 					                           wrapperCol={{ span: 12 }}
 					                           label="省-市-区"
-					                          > 
+					                          >
 					                            <Cascader options={areaSelect()}  value={this.state.ProvinceCity} placeholder="选择区" style={{width:'94%'}}
 												onChange={(e,pre) => { this.setState({ ProvinceCity: e }) }} />
 												<span style={{color:'red',marginLeft:'5px'}}>*</span>
 							            </FormItem>
-							            <FormItem  className="half-item" 
+							            <FormItem  className="half-item"
 					                    	labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
 				                           label="是否精品"
-			                               > 
+			                               >
 			                               <Radio.Group value={this.state.editBoutique} onChange={(e) => {
 						                    this.setState({ editBoutique: e.target.value })
 						                    }}>
@@ -1477,9 +1477,9 @@ const BusinessProject=Form.create()(React.createClass({
 					                         	labelCol={{ span: 4 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="活动生效"
-					                         > 
+					                         >
 					                          <Select placeholder="活动生效" value={this.state.editActivityFlag} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({editActivityFlag:e})}}> 
+				                                onChange={(e)=>{this.setState({editActivityFlag:e})}}>
 				                                {
 				                                    gameState.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1491,9 +1491,9 @@ const BusinessProject=Form.create()(React.createClass({
 					                         	labelCol={{ span: 4 }}
 						                        wrapperCol={{ span: 12 }}
 					                           	label="项目状态"
-					                         > 
+					                         >
 					                          <Select placeholder="项目状态" value={this.state.editStatus} style={{width:'94%'}}
-				                                onChange={(e)=>{this.setState({editStatus:e})}}> 
+				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
 				                                        return <Select.Option key={item.value} >{item.key}</Select.Option>
@@ -1520,38 +1520,38 @@ const BusinessProject=Form.create()(React.createClass({
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="项目地址" >					                        
-					                        <Input type="textarea" rows={1} placeholder="业务项目服务内容" value={this.state.editProjectUrl}
-	                           				 	onChange={(e) => { this.setState({ editProjectUrl: e.target.value }) }}/>					                           
+					                        label="项目地址" >
+					                        <Input style={{marginBottom:'5px'}} type="textarea" rows={1} placeholder="业务项目服务内容" value={this.state.editProjectUrl}
+	                           				 	onChange={(e) => { this.setState({ editProjectUrl: e.target.value }) }}/>
 					                    </FormItem>
-					                </div> 
+					                </div>
 				                   	<div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目服务内容" >					                        
-					                        <Input type="textarea" rows={4} placeholder="业务项目服务内容" value={this.state.editIntroduce}
-	                           				 	onChange={(e) => { this.setState({ editIntroduce: e.target.value }) }}/>					                           
+					                        label="业务项目服务内容" >
+					                        <Input style={{marginBottom:'5px'}} type="textarea" rows={4} placeholder="业务项目服务内容" value={this.state.editIntroduce}
+	                           				 	onChange={(e) => { this.setState({ editIntroduce: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>   
+					                </div>
 					                <div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目价值及作用" >					                        
-					                        <Input type="textarea" rows={4} placeholder="业务项目价值及作用" value={this.state.editValueEffect}
-	                           				 	onChange={(e) => { this.setState({ editValueEffect: e.target.value }) }}/>					                           
+					                        label="业务项目价值及作用" >
+					                        <Input style={{marginBottom:'5px'}} type="textarea" rows={4} placeholder="业务项目价值及作用" value={this.state.editValueEffect}
+	                           				 	onChange={(e) => { this.setState({ editValueEffect: e.target.value }) }}/>
 					                    </FormItem>
-					                </div>   
+					                </div>
 					                <div className="clearfix">
 			                   		    <FormItem
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目客户基本条件" >					                        
-					                        <Input type="textarea" rows={4} placeholder="业务项目客户基本条件" value={this.state.editClientSize}
-	                           				 	onChange={(e) => { this.setState({ editClientSize: e.target.value }) }}/>					                           
+					                        label="业务项目客户基本条件" >
+					                        <Input style={{marginBottom:'5px'}} type="textarea" rows={4} placeholder="业务项目客户基本条件" value={this.state.editClientSize}
+	                           				 	onChange={(e) => { this.setState({ editClientSize: e.target.value }) }}/>
 					                    </FormItem>
-					                </div> 
+					                </div>
 					                <div className="clearfix pictures" style={{"marginBottom":"60px"}}>
 				                        <FormItem className="half-item"
 					                        labelCol={{ span: 8 }}
@@ -1567,7 +1567,7 @@ const BusinessProject=Form.create()(React.createClass({
 				                        <FormItem className="half-item"
 					                        labelCol={{ span: 4 }}
 					                        wrapperCol={{ span: 12 }}
-					                        label="业务项目图标" > 
+					                        label="业务项目图标" >
 					                        <PicturesWall
                                                 domId={'businessQuery2'}
 					                            pictureSign="business_project_max_picture"
@@ -1575,37 +1575,37 @@ const BusinessProject=Form.create()(React.createClass({
 					                            pictureUrl={this.state.companyLogoUrl} />
 					                            <p>图片建议:图片要清晰。(200*200)</p>
 					                    </FormItem>
-					                </div> 
+					                </div>
 				                </Spin>
-							</Form>		
+							</Form>
 						</TabPane>
 					    <TabPane tab="业务项目规格" key="2">
 					        <div className="clearfix" >
-						        
+
 								<Popconfirm title="是否停用?" onConfirm={this.blockRowSize} okText="是" cancelText="否" >
 								     <Button style={{ background: "#ea0862", border: "none", color: "#fff",marginRight:'10px' ,marginLeft:'10px',display:'none'}}
-			                   			 disabled={!hasSelected} 
+			                   			 disabled={!hasSelected}
 			                    		 >停用<Icon type="minus" />
 			           			     </Button>
-								</Popconfirm> 
+								</Popconfirm>
 						    </div>
 					       <div className="clearfix">
                 			  <Spin spinning={this.state.loading}>
                 			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
-							      <Table 
+							      <Table
 					            	 pagination={this.state.formatPagination}
-					            	 columns={this.state.ContactsLists} 
+					            	 columns={this.state.ContactsLists}
 					            	 dataSource={this.state.formatDataSource}
 					            	 rowSelection={rowSelection}
 					            	 onRowClick={this.formatTableRowClick}
 					            	 />
-					            </Form> 
-							   </Spin> 
+					            </Form>
+							   </Spin>
 							</div>
 					    </TabPane>
 					    </Tabs>
                     </Modal>
-            	 </div>	 
+            	 </div>
                </div>
             </div>
         );

+ 37 - 37
js/component/manageCenter/set/content.jsx

@@ -31,35 +31,35 @@ class Content extends Component {
     }
     getKey(key) {
         switch (key) {
-            case 'softwareConfigure':
-                require.ensure([], () => {
-                    const SoftwareConfigure = require('./projectConfigure/softwareConfigure').default;
-                    this.setState({
-                        component:<SoftwareConfigure />,
-                    });
-                });
-                break;
-            case 'officialFees':
-                require.ensure([], () => {
-                    const OfficialFees = require('./projectConfigure/officialFees').default;
-                    this.setState({
-                        component:<OfficialFees />,
-                    });
-                });
-                break;
-            case 'patentFees':
-                require.ensure([], () => {
-                    const PatentFees = require('./projectConfigure/patentFees').default;
-                    this.setState({
-                        component:<PatentFees />,
-                    });
-                });
-                break;
+            // case 'softwareConfigure':
+            //     require.ensure([], () => {
+            //         const SoftwareConfigure = require('./projectConfigure/softwareConfigure').default;
+            //         this.setState({
+            //             component:<SoftwareConfigure />,
+            //         });
+            //     });
+            //     break;
+            // case 'officialFees':
+            //     require.ensure([], () => {
+            //         const OfficialFees = require('./projectConfigure/officialFees').default;
+            //         this.setState({
+            //             component:<OfficialFees />,
+            //         });
+            //     });
+            //     break;
+            // case 'patentFees':
+            //     require.ensure([], () => {
+            //         const PatentFees = require('./projectConfigure/patentFees').default;
+            //         this.setState({
+            //             component:<PatentFees />,
+            //         });
+            //     });
+            //     break;
       	    case 'organization':
             require.ensure([], () => {
                 const Organization = require('./organization/organization').default;
                 this.setState({
-                    component:<Organization />,	                                      
+                    component:<Organization />,
                 });
       	    });
       	    break;
@@ -67,40 +67,40 @@ class Content extends Component {
             require.ensure([], () => {
                 const BusinessCategory = require('./business/businessCategory').default;
                 this.setState({
-                    component:<BusinessCategory />	    
+                    component:<BusinessCategory />
                 	});
                 });
-                break; 
+                break;
             case 'businessProject':
             require.ensure([], () => {
                 const BusinessProject = require('./business/businessProject').default;
                 this.setState({
-                    component:<BusinessProject />	    
+                    component:<BusinessProject />
                 	});
                 });
-            break; 
+            break;
             case 'businessQuery':
             require.ensure([], () => {
                 const BusinessQuery = require('./business/businessQuery').default;
                 this.setState({
-                    component:<BusinessQuery />	    
+                    component:<BusinessQuery />
                 	});
                 });
-            break; 
+            break;
             case 'user':
                 require.ensure([], () => {
                     const User = require('./userManagementS/user').default;
                     this.setState({
-                        component: <User />                      
+                        component: <User />
                     });
                 });
-                break;           
-           
+                break;
+
             case 'roles':
                 require.ensure([], () => {
 	                const Roles = require('./userManagementS/roles').default;
 	                this.setState({
-	                    component:<Roles />,	                    	                  
+	                    component:<Roles />,
 	                });
           	    });
           	    break;
@@ -108,7 +108,7 @@ class Content extends Component {
                 require.ensure([], () => {
                     const Jurisdiction = require('./userManagementS/jurisdiction').default;
                     this.setState({
-                        component: <Jurisdiction />                      
+                        component: <Jurisdiction />
                     });
                 });
                 break;
@@ -116,7 +116,7 @@ class Content extends Component {
             require.ensure([], () => {
                 const Module = require('../module').default;
                 this.setState({
-                    component:<Module />	    
+                    component:<Module />
                 	});
                 });
         };

+ 14 - 11
js/component/manageCenter/set/organization/organization.jsx

@@ -867,7 +867,7 @@ const Organization=Form.create()(React.createClass({
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="组织名称" >
-				                    	     <Input placeholder="组织名称" value={this.state.editName}
+				                    	     <Input size='default' style={{marginBottom:'5px'}} placeholder="组织名称" value={this.state.editName}
 				                                onChange={(e)=>{this.setState({editName:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
@@ -889,7 +889,7 @@ const Organization=Form.create()(React.createClass({
 											        filterOption={true}
 											        onBlur={this.blurChange}
 											        onSelect={this.selectAuto}
-											        style={{width:'95%'}}
+											        style={{width:'95%',marginBottom:'5px'}}
 											      >
 											        <Input />
 											</AutoComplete>
@@ -902,7 +902,7 @@ const Organization=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织类型"
 				                         >
-					                          <Select placeholder="组织类型" value={this.state.editType}
+					                          <Select size='default' style={{marginBottom:'5px'}} placeholder="组织类型" value={this.state.editType}
 				                                onChange={(e)=>{this.setState({editType:e})}}>
 				                                {
 				                                    patternOrganization.map(function (item) {
@@ -918,7 +918,7 @@ const Organization=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           	label="组织状态"
 				                         >
-					                          <Select placeholder="组织状态" value={this.state.editStatus}
+					                          <Select size='default' style={{marginBottom:'5px'}} placeholder="组织状态" value={this.state.editStatus}
 				                                onChange={(e)=>{this.setState({editStatus:e})}}>
 				                                {
 				                                    conditionOrganization.map(function (item) {
@@ -935,8 +935,10 @@ const Organization=Form.create()(React.createClass({
                                             label="省份"
                                         >
                                             <Select
+                                                size='default'
                                                 placeholder="请选择省份"
                                                 value={getNewDiccityArr(this.state.province)}
+                                                style={{marginBottom:'5px'}}
                                                 onChange={e => {
                                                     this.setState({ province: e });
                                                 }}
@@ -955,7 +957,8 @@ const Organization=Form.create()(React.createClass({
 					                        wrapperCol={{ span: 12 }}
 				                           label="上级组织"
 			                               >
-			                              <Select placeholder="请选择上级组织"
+			                              <Select size='default' placeholder="请选择上级组织"
+                                                  style={{marginBottom:'5px'}}
 			                              		value={this.state.editSuperId}
 			                              		onChange={(e)=>{this.setState({editSuperId:e})}}
 				                                notFoundContent="未获取到上级组织列表">
@@ -969,7 +972,7 @@ const Organization=Form.create()(React.createClass({
 					                            labelCol={{ span: 7 }}
 					                        	wrapperCol={{ span: 12 }}
 					                            label="缩写" >
-				                    	     <Input placeholder="缩写" value={this.state.abbreviation}
+				                    	     <Input size='default' style={{marginBottom:'5px'}} placeholder="缩写" value={this.state.abbreviation}
 				                                onChange={(e)=>{this.setState({abbreviation:e.target.value})}}/>
 					                    </FormItem>
 				                    </div>
@@ -991,7 +994,7 @@ const Organization=Form.create()(React.createClass({
 											        filterOption={true}
 											        onBlur={this.blurChange}
 											        onSelect={this.selectAuto2}
-											        style={{width:'95%'}}
+											        style={{width:'95%',marginBottom:'5px'}}
 											      >
 											        <Input />
 											</AutoComplete>
@@ -1004,7 +1007,7 @@ const Organization=Form.create()(React.createClass({
 						                    wrapperCol={{ span: 12 }}
 						                    label="组织编号"
 					                        >
-					                        <span>{this.state.editDepNo}</span>
+					                        <span style={{marginBottom:"5px"}}>{this.state.editDepNo}</span>
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix" >
@@ -1013,7 +1016,7 @@ const Organization=Form.create()(React.createClass({
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建人"
 					                        >
-					                        <span>{this.state.editCreateId}</span>
+					                        <span style={{marginBottom:"5px"}}>{this.state.editCreateId}</span>
 					                    </FormItem>
 					                </div>
 					                <div className="clearfix">
@@ -1022,7 +1025,7 @@ const Organization=Form.create()(React.createClass({
 						                    wrapperCol={{ span: 12 }}
 						                    label="创建时间"
 					                        >
-					                        <span>{this.state.editTime}</span>
+					                        <span style={{marginBottom:"5px"}}>{this.state.editTime}</span>
 					                    </FormItem>
 					                </div>
 		                   		    <div className="clearfix">
@@ -1030,7 +1033,7 @@ const Organization=Form.create()(React.createClass({
 					                        labelCol={{ span: 7 }}
 					                        wrapperCol={{ span: 12 }}
 					                        label="组织职能说明" >
-					                        <Input type="textarea" rows={4} placeholder="组织职能说明" value={this.state.editRemarks}
+					                        <Input type="textarea" style={{marginBottom:"5px"}} rows={4} placeholder="组织职能说明" value={this.state.editRemarks}
 	                           				 	onChange={(e) => { this.setState({ editRemarks: e.target.value }) }}/>
 					                    </FormItem>
 					                </div>

+ 0 - 230
js/component/manageCenter/set/projectConfigure/officialFees.js

@@ -1,230 +0,0 @@
-import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm, Tabs} from "antd";
-import AddOfficialFeePrice from './addOfficialFeePrice'
-import $ from "jquery/src/ajax";
-import '../content.less';
-import {ChooseList} from "../../order/orderNew/chooseList";
-
-const TabPane = Tabs.TabPane;
-
-class OfficialFees extends Component{
-    constructor(props) {
-        super(props);
-        this.state={
-            type:'',
-            dataSource: [],
-            columns: [
-                {
-                    title: '专利类型',
-                    dataIndex: 'type',
-                    key: 'type',
-                    render: (text) => {
-                        return text === 0 ? '实用新型' : text === 1 ? '外观专利' : '发明专利'
-                    }
-                },
-                {
-                    title: '全额(万元)',
-                    dataIndex: 'amount',
-                    key: 'amount',
-                },
-                {
-                    title: '减缴85%',
-                    dataIndex: 'proportion85',
-                    key: 'proportion85',
-                },
-                {
-                    title: '备注',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'id',
-                    key: 'id',
-                    render: (text) => {
-                        return <div>
-                            <Popconfirm
-                                title="是否删除?"
-                                onConfirm={() => {
-                                    this.deleteOfficialFeePrice(text);
-                                }}
-                                okText="删除"
-                                cancelText="不删除"
-                            >
-                                <Button type="danger" onClick={(e) => {
-                                    e.stopPropagation()
-                                }}>
-                                    删除
-                                </Button>
-                            </Popconfirm>
-                        </div>
-                    }
-                },
-            ],
-            addSoftVisible: false,
-            infor: {},
-        }
-        this.loadData = this.loadData.bind(this);
-        this.tableRowClick = this.tableRowClick.bind(this);
-        this.reset = this.reset.bind(this);
-        this.changeList = this.changeList.bind(this);
-    }
-
-    componentDidMount() {
-        this.loadData();
-    }
-
-    //搜索功能和初始列表加载
-    loadData() {
-        this.setState({
-            loading: true,
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/company/listOfficialFeePrice',
-            data: {
-                type:this.state.type,       //名称
-            },
-            success: function (data) {
-                if (!data.data || !data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    data.data.map((v,i)=>{v.key = i})
-                    this.setState({
-                        dataSource: data.data,
-                    });
-                };
-
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    }
-
-    tableRowClick(infor) {
-        this.setState({
-            addSoftVisible : true,
-            infor: infor
-        })
-    }
-
-    reset(){
-        this.setState({
-            type:'',       //名称
-        },()=>{
-            this.loadData();
-        })
-    }
-
-    //删除
-    deleteOfficialFeePrice(id) {
-        let _this = this;
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url:globalConfig.context + '/api/admin/company/deleteOfficialFeePrice',
-            data:{
-                id: id
-            },
-        }).done(function (data) {
-            _this.setState({
-                loading: false
-            });
-            if (!data.error.length) {
-                message.success('删除成功!');
-                _this.loadData();
-            } else {
-                message.warning(data.error[0].message);
-            }
-        }.bind(this));
-    }
-
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    }
-
-    render() {
-        return(
-            <div className="user-content" >
-                <div className="content-title">
-                    <Tabs defaultActiveKey="1" className="test">
-                        <TabPane tab="操作" key="1">
-                            <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
-                                <span style={{marginLeft: 'auto'}}>
-                                    <Button type="primary" size={'middle'} onClick={()=>{
-                                        this.setState({
-                                            addSoftVisible : true
-                                        })
-                                    }}>
-                                        增加
-                                    </Button>
-                                </span>
-                            </div>
-                        </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                    </Tabs>
-                    <div className="patent-table">
-                        <Spin spinning={this.state.loading}>
-                            <Table size="middle" columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-                                   dataSource={this.state.dataSource}
-                                   pagination={false}
-                                   onRowClick={this.tableRowClick}/>
-                        </Spin>
-                    </div>
-                </div>
-                {this.state.addSoftVisible ? <AddOfficialFeePrice
-                    infor={this.state.infor}
-                    visible={this.state.addSoftVisible}
-                    onCancel={()=>{
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {},
-                        })
-                    }}
-                    successFn={()=>{
-                        this.loadData();
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {}
-                        })
-                    }}/> : <div/>}
-            </div>
-        )
-    }
-}
-
-export default OfficialFees

+ 0 - 233
js/component/manageCenter/set/projectConfigure/patentFees.js

@@ -1,233 +0,0 @@
-//专利费用列表
-import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Modal, Popconfirm, Tabs} from "antd";
-import AddPatentPrice from './addPatentPrice'
-import $ from "jquery/src/ajax";
-import '../content.less';
-import {ChooseList} from "../../order/orderNew/chooseList";
-
-const TabPane = Tabs.TabPane;
-
-class PatentFees extends Component{
-    constructor(props) {
-        super(props);
-        this.state={
-            type:'',
-            dataSource: [],
-            columns: [
-                {
-                    title: '公司名称',
-                    dataIndex: 'companyName',
-                    key: 'companyName',
-                },
-                {
-                    title: '实用新型(万元)',
-                    dataIndex: 'utilityModel',
-                    key: 'utilityModel',
-                },
-                {
-                    title: '外观专利(万元)',
-                    dataIndex: 'appearancePatent',
-                    key: 'appearancePatent',
-                },
-                {
-                    title: '发明专利(万元)',
-                    dataIndex: 'inventionPatent',
-                    key: 'inventionPatent',
-                },
-                {
-                    title: '备注',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'id',
-                    key: 'id',
-                    render: (text) => {
-                        return <div>
-                            <Popconfirm
-                                title="是否删除?"
-                                onConfirm={() => {
-                                    this.deleteOfficialFeePrice(text);
-                                }}
-                                okText="删除"
-                                cancelText="不删除"
-                            >
-                                <Button type="danger" onClick={(e) => {
-                                    e.stopPropagation()
-                                }}>
-                                    删除
-                                </Button>
-                            </Popconfirm>
-                        </div>
-                    }
-                },
-            ],
-            addSoftVisible: false,
-            infor: {},
-        }
-        this.loadData = this.loadData.bind(this);
-        this.tableRowClick = this.tableRowClick.bind(this);
-        this.reset = this.reset.bind(this);
-        this.changeList = this.changeList.bind(this);
-    }
-
-    componentDidMount() {
-        this.loadData();
-    }
-
-    //搜索功能和初始列表加载
-    loadData() {
-        this.setState({
-            loading: true,
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/company/listPatentPrice',
-            data: {
-                type:this.state.type,       //名称
-            },
-            success: function (data) {
-                if (!data.data || !data.data) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    };
-                } else {
-                    data.data.map((v,i)=>{v.key = i})
-                    this.setState({
-                        dataSource: data.data,
-                    });
-                };
-
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    }
-
-    tableRowClick(infor) {
-        this.setState({
-            addSoftVisible : true,
-            infor: infor
-        })
-    }
-
-    reset(){
-        this.setState({
-            type:'',       //名称
-        },()=>{
-            this.loadData();
-        })
-    }
-
-    //删除
-    deleteOfficialFeePrice(id) {
-        let _this = this;
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url:globalConfig.context + '/api/admin/company/deletePatentPrice',
-            data:{
-                id: id
-            },
-        }).done(function (data) {
-            _this.setState({
-                loading: false
-            });
-            if (!data.error.length) {
-                message.success('删除成功!');
-                _this.loadData();
-            } else {
-                message.warning(data.error[0].message);
-            }
-        }.bind(this));
-    }
-
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    }
-
-    render() {
-        return(
-            <div className="user-content" >
-                <div className="content-title">
-                    <Tabs defaultActiveKey="1" className="test">
-                        <TabPane tab="搜索" key="1">
-                            <div className="user-search" style={{display:'flex',flexFlow:'row',marginBottom:'10px'}}>
-                                <span style={{marginLeft: 'auto'}}>
-                                    <Button type="primary" size={'middle'} onClick={()=>{
-                                        this.setState({
-                                            addSoftVisible : true
-                                        })
-                                    }}>
-                                        增加
-                                    </Button>
-                                </span>
-                            </div>
-                        </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                    </Tabs>
-                    <div className="patent-table">
-                        <Spin spinning={this.state.loading}>
-                            <Table size="middle" columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                            }
-                                   dataSource={this.state.dataSource}
-                                   pagination={false}
-                                   onRowClick={this.tableRowClick}/>
-                        </Spin>
-                    </div>
-                </div>
-                {this.state.addSoftVisible ? <AddPatentPrice
-                    infor={this.state.infor}
-                    visible={this.state.addSoftVisible}
-                    onCancel={()=>{
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {},
-                        })
-                    }}
-                    successFn={()=>{
-                        this.loadData();
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {}
-                        })
-                    }}/> : <div/>}
-            </div>
-        )
-    }
-}
-
-export default PatentFees

+ 0 - 323
js/component/manageCenter/set/projectConfigure/softwareConfigure.js

@@ -1,323 +0,0 @@
-import React,{Component} from 'react';
-import {Button, Input, message, Select, Spin, Table, Tag, Popconfirm, Tabs} from "antd";
-import AddSoftWritingPrice from './addSoftWritingPrice'
-import $ from "jquery/src/ajax";
-import '../content.less';
-import {ChooseList} from "../../order/orderNew/chooseList";
-
-const TabPane = Tabs.TabPane;
-
-class SoftwareConfigure extends Component{
-    constructor(props) {
-        super(props);
-        this.state={
-            companyName:'',        //公司名称
-            urgent: undefined,            //加急
-            material: undefined,          //材料
-            pagination: {
-                defaultCurrent: 1,
-                defaultPageSize: 10,
-                showQuickJumper: true,
-                pageSize: 10,
-                onChange: function (page) {
-                    this.loadData(page);
-                }.bind(this),
-                showTotal: function (total) {
-                    return '共' + total + '条数据';
-                }
-            },
-            dataSource: [],
-            columns: [
-                {
-                    title: '供应商名称',
-                    dataIndex: 'companyName',
-                    key: 'companyName',
-                },
-                {
-                    title: '材料',
-                    dataIndex: 'material',
-                    key: 'material',
-                    render: (text) => {
-                        return text === 0 ? '无材料' : '有材料'
-                    }
-                },
-                {
-                    title: '加急天数',
-                    dataIndex: 'urgent',
-                    key: 'urgent',
-                    render: (text) => {
-                        switch (text) {
-                            case 0:
-                                return '无加急';
-                            case 1:
-                                return '加急3-5个工作日';
-                            case 2:
-                                return '加急6-10个工作日';
-                            case 3:
-                                return '加急11-15个工作日';
-                            case 4:
-                                return '加急16-20个工作日';
-                            case 5:
-                                return '加急21-25个工作日';
-                            case 6:
-                                return '加急26-30个工作日';
-                        }
-                    }
-                },
-                {
-                    title: '价格万元/个',
-                    dataIndex: 'unitPrice',
-                    key: 'unitPrice',
-                },
-                {
-                    title: '备注',
-                    dataIndex: 'remarks',
-                    key: 'remarks',
-                },
-                {
-                    title: '状态',
-                    dataIndex: 'status',
-                    key: 'status',
-                    render: (text) => {
-                        return text === 0 ? <Tag color="#87d068">正常</Tag> :
-                            text === 1 ? <Tag>停用</Tag> :  <Tag color="#f50">删除</Tag>
-                    }
-                },
-                {
-                    title: '操作',
-                    dataIndex: 'id',
-                    key: 'id',
-                    render: (text) => {
-                        return <div>
-                            <Popconfirm
-                                title="是否删除?"
-                                onConfirm={() => {
-                                    this.deleteSoftWritingPrice(text);
-                                }}
-                                okText="删除"
-                                cancelText="不删除"
-                            >
-                                <Button type="danger" onClick={(e) => {
-                                    e.stopPropagation()
-                                }}>
-                                    删除
-                                </Button>
-                            </Popconfirm>
-                        </div>
-                    }
-                },
-            ],
-            addSoftVisible: false,
-            infor: {},
-            pageNo: 1,
-        }
-        this.loadData = this.loadData.bind(this);
-        this.tableRowClick = this.tableRowClick.bind(this);
-        this.reset = this.reset.bind(this);
-        this.changeList = this.changeList.bind(this);
-    }
-
-    componentDidMount() {
-        this.loadData();
-    }
-
-    //搜索功能和初始列表加载
-    loadData(pageNo) {
-        this.setState({
-            loading: true,
-        });
-        $.ajax({
-            method: "get",
-            dataType: "json",
-            crossDomain: false,
-            url: globalConfig.context + '/api/admin/company/listSoftWritingPrice',
-            data: {
-                pageNo: pageNo || 1,
-                pageSize: this.state.pagination.pageSize,
-                companyName:this.state.companyName || undefined,       //公司名称
-                urgent: this.state.urgent,    //加急
-                material: this.state.material,  //材料
-            },
-            success: function (data) {
-                if (!data.data || !data.data.list) {
-                    if (data.error && data.error.length) {
-                        message.warning(data.error[0].message);
-                    }
-                } else {
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
-                    if (data.data && data.data.list && !data.data.list.length) {
-                        this.state.pagination.current = 0;
-                        this.state.pagination.total = 0;
-                    }
-                    data.data.list.map((v,i)=>{v.key = i})
-                    this.setState({
-                        dataSource: data.data.list,
-                        pagination: this.state.pagination,
-                        pageNo: data.data.pageNo
-                    });
-                }
-
-            }.bind(this),
-        }).always(function () {
-            this.setState({
-                loading: false
-            });
-        }.bind(this));
-    }
-
-    tableRowClick(infor) {
-        this.setState({
-            addSoftVisible : true,
-            infor: infor
-        })
-    }
-
-    reset(){
-        this.setState({
-            companyName:'',       //公司名称
-            urgent: undefined,    //加急
-            material: undefined,  //材料
-        },()=>{
-            this.loadData();
-        })
-    }
-
-    //删除
-    deleteSoftWritingPrice(id) {
-        let _this = this;
-        this.setState({
-            loading: true
-        });
-        $.ajax({
-            method: "post",
-            dataType: "json",
-            crossDomain: false,
-            url:globalConfig.context + '/api/admin/company/deleteSoftWritingPrice',
-            data:{
-                id: id
-            },
-        }).done(function (data) {
-            _this.setState({
-                loading: false
-            });
-            if (!data.error.length) {
-                message.success('删除成功!');
-                _this.loadData();
-            } else {
-                message.warning(data.error[0].message);
-            }
-        }.bind(this));
-    }
-    changeList(arr) {
-        const newArr = [];
-        this.state.columns.forEach(item => {
-            arr.forEach(val => {
-                if (val === item.title) {
-                    newArr.push(item);
-                }
-            });
-        });
-        this.setState({
-            changeList: newArr
-        });
-    }
-
-    render() {
-        return(
-            <div className="user-content" >
-                <div className="content-title">
-                    <Tabs defaultActiveKey="1" className="test">
-                        <TabPane tab="搜索" key="1">
-                            <div className="user-search" style={{display:'flex',flexFlow:'row'}}>
-                                <Input placeholder="公司名称" style={{width:'150px',marginRight:'10px',marginBottom:'10px',marginLeft:10}}
-                                       value={this.state.companyName}
-                                       onChange={(e) => { this.setState({ companyName: e.target.value }); }} />
-                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                                    <div style={{marginLeft:10,marginRight:10}}>材料:</div>
-                                    <Select
-                                        placeholder="材料"
-                                        style={{ width:'200px',marginRight:'10px' }}
-                                        value={this.state.material}
-                                        onChange={(e) => {this.setState({ material: e }) }}>
-                                        <Select.Option value={0}>无</Select.Option>
-                                        <Select.Option value={1}>有</Select.Option>
-                                    </Select>
-                                </div>
-                                <div style={{display:'flex',flexFlow:'row nowrap'}}>
-                                    <div style={{marginLeft:10,marginRight:10}}>加急天数:</div>
-                                    <Select placeholder="加急天数"
-                                            style={{ width:'200px',marginRight:'10px' }}
-                                            value={this.state.urgent}
-                                            onChange={(e) => { this.setState({ urgent: e }) }}>
-                                        <Select.Option value={0}>无加急</Select.Option>
-                                        <Select.Option value={1}>加急3-5个工作日</Select.Option>
-                                        <Select.Option value={2}>加急6-10个工作日</Select.Option>
-                                        <Select.Option value={3}>加急11-15个工作日</Select.Option>
-                                        <Select.Option value={4}>加急16-20个工作日</Select.Option>
-                                        <Select.Option value={5}>加急21-25个工作日</Select.Option>
-                                        <Select.Option value={6}>加急26-30个工作日</Select.Option>
-                                    </Select>
-                                </div>
-                                <Button type="primary" onClick={()=>{
-                                    this.loadData();
-                                }} style={{marginRight:'10px'}}>搜索</Button>
-                                <Button onClick={this.reset} style={{marginRight:'10px'}}>重置</Button>
-                                <span style={{marginLeft: 'auto'}}>
-                            <Button type="primary" size={'middle'} onClick={()=>{
-                                this.setState({
-                                    addSoftVisible : true
-                                })
-                            }}>
-                                增加
-                            </Button>
-                        </span>
-                            </div>
-                        </TabPane>
-                        <TabPane tab="更改表格显示数据" key="2">
-                            <div style={{ marginLeft: 10 }}>
-                                <ChooseList
-                                    columns={this.state.columns}
-                                    changeFn={this.changeList}
-                                    changeList={this.state.changeList}
-                                    top={55}
-                                    margin={11}
-                                />
-                            </div>
-                        </TabPane>
-                    </Tabs>
-                    <div className="patent-table">
-                        <Spin spinning={this.state.loading}>
-                            <Table size="middle" columns={
-                                this.state.changeList
-                                    ? this.state.changeList
-                                    : this.state.columns
-                                    }
-                                   dataSource={this.state.dataSource}
-                                   pagination={this.state.pagination}
-                                   onRowClick={this.tableRowClick}/>
-                        </Spin>
-                    </div>
-                </div>
-                {this.state.addSoftVisible ? <AddSoftWritingPrice
-                    infor={this.state.infor}
-                    visible={this.state.addSoftVisible}
-                    onCancel={()=>{
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {},
-                        })
-                    }}
-                    successFn={()=>{
-                        this.loadData(this.state.pageNo);
-                        this.setState({
-                            addSoftVisible : false,
-                            infor: {}
-                        })
-                    }}/> : <div/>}
-            </div>
-        )
-    }
-}
-
-export default SoftwareConfigure

+ 1 - 1
js/component/manageCenter/set/userManagementS/newUser.jsx

@@ -538,7 +538,7 @@ const Newuser = Form.create()(React.createClass({
 						                        label="地区" >
 												   <Select
 						                                multiple
-						                                style={{width:'500px'}}
+						                                style={{width:'500px',marginTop:'5px',marginBottom:'5px'}}
 						                                placeholder="选择地区"
 						                                filterOption={(input, option) => { return option.props.children.indexOf(input) >= 0 }}
 						                                value={this.state.district}

+ 1 - 1
package.json

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