|  | @@ -89,7 +89,8 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  				data: {
 |  |  				data: {
 | 
												
													
														
															|  |  					pageNo: pageNo || 1,
 |  |  					pageNo: pageNo || 1,
 | 
												
													
														
															|  |  					pageSize: this.state.pagination.pageSize,
 |  |  					pageSize: this.state.pagination.pageSize,
 | 
												
													
														
															|  | -					secondId: this.state.cid,
 |  | 
 | 
												
													
														
															|  | 
 |  | +					topId: this.state.typeSearch[0]? this.state.typeSearch[0]:'',
 | 
												
													
														
															|  | 
 |  | +					secondId:this.state.typeSearch[1]?this.state.typeSearch[1]:'',
 | 
												
													
														
															|  |  					name: this.state.nameSearch,
 |  |  					name: this.state.nameSearch,
 | 
												
													
														
															|  |  					privateProject: 0
 |  |  					privateProject: 0
 | 
												
													
														
															|  |  				},
 |  |  				},
 | 
												
											
												
													
														
															|  | @@ -162,6 +163,7 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  				selectedRowKeys: [],
 |  |  				selectedRowKeys: [],
 | 
												
													
														
															|  |  				selectedRows: [],
 |  |  				selectedRows: [],
 | 
												
													
														
															|  |  				loading: false,
 |  |  				loading: false,
 | 
												
													
														
															|  | 
 |  | +				typeSearch:[],
 | 
												
													
														
															|  |  				orgCodeUrl: [],
 |  |  				orgCodeUrl: [],
 | 
												
													
														
															|  |  				companyLogoUrl: [],
 |  |  				companyLogoUrl: [],
 | 
												
													
														
															|  |  				pagination: {
 |  |  				pagination: {
 | 
												
											
												
													
														
															|  | @@ -316,40 +318,36 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  				method: 'get',
 |  |  				method: 'get',
 | 
												
													
														
															|  |  				dataType: 'json',
 |  |  				dataType: 'json',
 | 
												
													
														
															|  |  				crossDomain: false,
 |  |  				crossDomain: false,
 | 
												
													
														
															|  | -				url: globalConfig.context + '/api/user/jtBusiness/category/list',
 |  | 
 | 
												
													
														
															|  | 
 |  | +				url: globalConfig.context + '/portal/service/jtBusiness/getCategoryList',
 | 
												
													
														
															|  |  				data: {
 |  |  				data: {
 | 
												
													
														
															|  | -					pageNo: 1,
 |  | 
 | 
												
													
														
															|  | -					pageSize: 999
 |  | 
 | 
												
													
														
															|  | 
 |  | +					
 | 
												
													
														
															|  |  				},
 |  |  				},
 | 
												
													
														
															|  |  				success: function(data) {
 |  |  				success: function(data) {
 | 
												
													
														
															|  | -					let theArr = [],
 |  | 
 | 
												
													
														
															|  | -						firstData = [];
 |  | 
 | 
												
													
														
															|  | -					if (!data.data || !data.data.list) {
 |  | 
 | 
												
													
														
															|  | 
 |  | +					let theArr = [],thisdata=data.data;
 | 
												
													
														
															|  | 
 |  | +					
 | 
												
													
														
															|  | 
 |  | +					if (!data.data) {
 | 
												
													
														
															|  |  						if (data.error && data.error.length) {
 |  |  						if (data.error && data.error.length) {
 | 
												
													
														
															|  |  							message.warning(data.error[0].message);
 |  |  							message.warning(data.error[0].message);
 | 
												
													
														
															|  |  						}
 |  |  						}
 | 
												
													
														
															|  |  					} else {
 |  |  					} else {
 | 
												
													
														
															|  | -						for (let i = 0; i < data.data.list.length; i++) {
 |  | 
 | 
												
													
														
															|  | -							let thisdata = data.data.list[i];
 |  | 
 | 
												
													
														
															|  | 
 |  | +						thisdata.map((item,index) => {
 | 
												
													
														
															|  |  							theArr.push({
 |  |  							theArr.push({
 | 
												
													
														
															|  | -								key: i,
 |  | 
 | 
												
													
														
															|  | -								id: thisdata.id,
 |  | 
 | 
												
													
														
															|  | -								name: thisdata.name,
 |  | 
 | 
												
													
														
															|  | -								superName: thisdata.superName //上级品类
 |  | 
 | 
												
													
														
															|  | -							});
 |  | 
 | 
												
													
														
															|  | -							if (thisdata.layer == '2') {
 |  | 
 | 
												
													
														
															|  | -								firstData.push({
 |  | 
 | 
												
													
														
															|  | -									key: i,
 |  | 
 | 
												
													
														
															|  | -									id: thisdata.id,
 |  | 
 | 
												
													
														
															|  | -									name: thisdata.name,
 |  | 
 | 
												
													
														
															|  | -									superName: thisdata.superName //上级品类
 |  | 
 | 
												
													
														
															|  | -								});
 |  | 
 | 
												
													
														
															|  | 
 |  | +								'value':item.topLevelId,
 | 
												
													
														
															|  | 
 |  | +								'label':item.topLevel,
 | 
												
													
														
															|  | 
 |  | +								'children':[]
 | 
												
													
														
															|  | 
 |  | +							})
 | 
												
													
														
															|  | 
 |  | +							if (item.children) {
 | 
												
													
														
															|  | 
 |  | +								item.children.map(atem => {
 | 
												
													
														
															|  | 
 |  | +									(theArr[index].children).push({
 | 
												
													
														
															|  | 
 |  | +										'value':atem.id,
 | 
												
													
														
															|  | 
 |  | +										'label':atem.name
 | 
												
													
														
															|  | 
 |  | +									})
 | 
												
													
														
															|  | 
 |  | +								})
 | 
												
													
														
															|  |  							}
 |  |  							}
 | 
												
													
														
															|  | -						}
 |  | 
 | 
												
													
														
															|  | 
 |  | +						})
 | 
												
													
														
															|  |  					}
 |  |  					}
 | 
												
													
														
															|  |  					this.setState({
 |  |  					this.setState({
 | 
												
													
														
															|  |  						categoryList: theArr,
 |  |  						categoryList: theArr,
 | 
												
													
														
															|  | -						firstData: firstData
 |  | 
 | 
												
													
														
															|  |  					});
 |  |  					});
 | 
												
													
														
															|  |  					this.loadData();
 |  |  					this.loadData();
 | 
												
													
														
															|  |  				}.bind(this)
 |  |  				}.bind(this)
 | 
												
											
												
													
														
															|  | @@ -435,8 +433,8 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  				message.warning('项目名称在16个字以内');
 |  |  				message.warning('项目名称在16个字以内');
 | 
												
													
														
															|  |  				return false;
 |  |  				return false;
 | 
												
													
														
															|  |  			};
 |  |  			};
 | 
												
													
														
															|  | -			if (!this.state.addCid) {
 |  | 
 | 
												
													
														
															|  | -				message.warning('请选择项目品类');
 |  | 
 | 
												
													
														
															|  | 
 |  | +			if (!this.state.addCid||!this.state.addCid[1]) {
 | 
												
													
														
															|  | 
 |  | +				message.warning('请选择项目二级品类');
 | 
												
													
														
															|  |  				return false;
 |  |  				return false;
 | 
												
													
														
															|  |  			}
 |  |  			}
 | 
												
													
														
															|  |  			this.setState({
 |  |  			this.setState({
 | 
												
											
												
													
														
															|  | @@ -450,7 +448,7 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  				url: globalConfig.context + '/api/user/jtBusiness/project/apply',
 |  |  				url: globalConfig.context + '/api/user/jtBusiness/project/apply',
 | 
												
													
														
															|  |  				data: {
 |  |  				data: {
 | 
												
													
														
															|  |  					name: this.state.categoryName, //项目名称
 |  |  					name: this.state.categoryName, //项目名称
 | 
												
													
														
															|  | -					categoryId: this.state.addCid,
 |  | 
 | 
												
													
														
															|  | 
 |  | +					categoryId: this.state.addCid[1],
 | 
												
													
														
															|  |  					isHot: this.state.isHot,
 |  |  					isHot: this.state.isHot,
 | 
												
													
														
															|  |  					province: this.state.ProvinceCity ? this.state.ProvinceCity[0] : '', //是否全国
 |  |  					province: this.state.ProvinceCity ? this.state.ProvinceCity[0] : '', //是否全国
 | 
												
													
														
															|  |  					city: this.state.ProvinceCity ? this.state.ProvinceCity[1] : ''
 |  |  					city: this.state.ProvinceCity ? this.state.ProvinceCity[1] : ''
 | 
												
											
												
													
														
															|  | @@ -529,6 +527,7 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  		reset() {
 |  |  		reset() {
 | 
												
													
														
															|  |  			this.state.nameSearch = ''; //项目名称清零
 |  |  			this.state.nameSearch = ''; //项目名称清零
 | 
												
													
														
															|  |  			this.state.cid = undefined; //品类名称清零
 |  |  			this.state.cid = undefined; //品类名称清零
 | 
												
													
														
															|  | 
 |  | +			this.typeSearch=undefined;
 | 
												
													
														
															|  |  			this.state.ressSearch = undefined; //省市区清零
 |  |  			this.state.ressSearch = undefined; //省市区清零
 | 
												
													
														
															|  |  			this.state.activityFlag = undefined; //活动生效清零
 |  |  			this.state.activityFlag = undefined; //活动生效清零
 | 
												
													
														
															|  |  			this.state.status = undefined; //项目状态清零
 |  |  			this.state.status = undefined; //项目状态清零
 | 
												
											
												
													
														
															|  | @@ -564,8 +563,6 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  			};
 |  |  			};
 | 
												
													
														
															|  |  			const hasSelected = this.state.selectedRowKeys.length > 0;
 |  |  			const hasSelected = this.state.selectedRowKeys.length > 0;
 | 
												
													
														
															|  |  			const { RangePicker } = DatePicker;
 |  |  			const { RangePicker } = DatePicker;
 | 
												
													
														
															|  | -			const categoryList = this.state.categoryList || [];
 |  | 
 | 
												
													
														
															|  | -			const firstData = this.state.firstData || [];
 |  | 
 | 
												
													
														
															|  |  			return (
 |  |  			return (
 | 
												
													
														
															|  |  				<div className="user-content">
 |  |  				<div className="user-content">
 | 
												
													
														
															|  |  					<div className="content-title">
 |  |  					<div className="content-title">
 | 
												
											
												
													
														
															|  | @@ -586,19 +583,10 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  									this.setState({ nameSearch: e.target.value });
 |  |  									this.setState({ nameSearch: e.target.value });
 | 
												
													
														
															|  |  								}}
 |  |  								}}
 | 
												
													
														
															|  |  							/>
 |  |  							/>
 | 
												
													
														
															|  | -							<Select
 |  | 
 | 
												
													
														
															|  | -								placeholder="业务品类"
 |  | 
 | 
												
													
														
															|  | -								style={{ width: '200px', marginRight: '10px' }}
 |  | 
 | 
												
													
														
															|  | -								value={this.state.cid}
 |  | 
 | 
												
													
														
															|  | -								onChange={(e) => {
 |  | 
 | 
												
													
														
															|  | -									this.setState({ cid: e });
 |  | 
 | 
												
													
														
															|  | -								}}
 |  | 
 | 
												
													
														
															|  | -								notFoundContent="未获取到上级品类列表"
 |  | 
 | 
												
													
														
															|  | -							>
 |  | 
 | 
												
													
														
															|  | -								{firstData.map(function(item) {
 |  | 
 | 
												
													
														
															|  | -									return <Select.Option key={item.id}>{item.name}</Select.Option>;
 |  | 
 | 
												
													
														
															|  | -								})}
 |  | 
 | 
												
													
														
															|  | -							</Select>
 |  | 
 | 
												
													
														
															|  | 
 |  | +							<Cascader placeholder='业务项目品类' 
 | 
												
													
														
															|  | 
 |  | +								options={this.state.categoryList} 
 | 
												
													
														
															|  | 
 |  | +								style={{width:200,marginRight:10}} 
 | 
												
													
														
															|  | 
 |  | +								value={this.state.typeSearch} onChange={(e)=>{this.setState({typeSearch:e})}}/>
 | 
												
													
														
															|  |  							<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
 |  |  							<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
 | 
												
													
														
															|  |  								搜索
 |  |  								搜索
 | 
												
													
														
															|  |  							</Button>
 |  |  							</Button>
 | 
												
											
												
													
														
															|  | @@ -636,7 +624,7 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  							data={this.state.RowData}
 |  |  							data={this.state.RowData}
 | 
												
													
														
															|  |  							showDesc={this.state.showDesc}
 |  |  							showDesc={this.state.showDesc}
 | 
												
													
														
															|  |  							closeDesc={this.closeDesc}
 |  |  							closeDesc={this.closeDesc}
 | 
												
													
														
															|  | -							firstData={this.state.firstData}
 |  | 
 | 
												
													
														
															|  | 
 |  | +							categoryList={this.state.categoryList}
 | 
												
													
														
															|  |  						/>
 |  |  						/>
 | 
												
													
														
															|  |  						<div className="patent-desc">
 |  |  						<div className="patent-desc">
 | 
												
													
														
															|  |  							<Modal
 |  |  							<Modal
 | 
												
											
												
													
														
															|  | @@ -669,20 +657,11 @@ const BusinessProject = Form.create()(
 | 
												
													
														
															|  |  										</div>
 |  |  										</div>
 | 
												
													
														
															|  |  										<div className="clearfix">
 |  |  										<div className="clearfix">
 | 
												
													
														
															|  |  											<FormItem labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} label="业务品类">
 |  |  											<FormItem labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} label="业务品类">
 | 
												
													
														
															|  | -												<Select
 |  | 
 | 
												
													
														
															|  | -													placeholder="请选择业务品类"
 |  | 
 | 
												
													
														
															|  | -													value={this.state.addCid}
 |  | 
 | 
												
													
														
															|  | -													onChange={(e) => {
 |  | 
 | 
												
													
														
															|  | -														this.setState({ addCid: e });
 |  | 
 | 
												
													
														
															|  | -													}}
 |  | 
 | 
												
													
														
															|  | -													notFoundContent="未获取到业务品类列表"
 |  | 
 | 
												
													
														
															|  | 
 |  | +												<Cascader placeholder='业务项目品类' 
 | 
												
													
														
															|  | 
 |  | +													options={this.state.categoryList} 
 | 
												
													
														
															|  | 
 |  | +													value={this.state.addCid} 
 | 
												
													
														
															|  |  													style={{ width: '94%' }}
 |  |  													style={{ width: '94%' }}
 | 
												
													
														
															|  | -													required="required"
 |  | 
 | 
												
													
														
															|  | -												>
 |  | 
 | 
												
													
														
															|  | -													{firstData.map(function(item) {
 |  | 
 | 
												
													
														
															|  | -														return <Select.Option key={item.id}>{item.name}</Select.Option>;
 |  | 
 | 
												
													
														
															|  | -													})}
 |  | 
 | 
												
													
														
															|  | -												</Select>
 |  | 
 | 
												
													
														
															|  | 
 |  | +													onChange={(e)=>{this.setState({addCid:e})}}/>
 | 
												
													
														
															|  |  												<span className="mandatory" style={{ color: 'red', marginLeft: '5px' }}>
 |  |  												<span className="mandatory" style={{ color: 'red', marginLeft: '5px' }}>
 | 
												
													
														
															|  |  													*
 |  |  													*
 | 
												
													
														
															|  |  												</span>
 |  |  												</span>
 |