dengzhiguo 6 years ago
parent
commit
ba7634821d

+ 13 - 7
js/component/manageCenter/achievement/sichuan/sichuan.jsx

@@ -258,7 +258,13 @@ class Achievement extends React.Component {
 		this.setState({
 			loading: true
 		});
-		console.log(this.state.addState);
+		if(!this.state.name){
+			 message.warning("技术简称必须填写");
+			 this.setState({
+				loading: false
+			});
+			 return;
+		}
 		$.ajax({
             method: "POST",
             dataType: "json",
@@ -421,12 +427,12 @@ class Achievement extends React.Component {
 										}}
 										placeholder="请选择行业领域"
 									>
-										<Select.Option value="0">先进制造与自动化</Select.Option>
-										<Select.Option value="1">电子信息技术</Select.Option>
-										<Select.Option value="2">新材料技术</Select.Option>
-										<Select.Option value="3">生物与新药</Select.Option>
-										<Select.Option value="4">资源与新环境</Select.Option>
-										<Select.Option value="5">新能源</Select.Option>
+										<Select.Option value="1">先进制造与自动化</Select.Option>
+										<Select.Option value="2">电子信息技术</Select.Option>
+										<Select.Option value="3">新材料技术</Select.Option>
+										<Select.Option value="4">生物与新药</Select.Option>
+										<Select.Option value="5">资源与新环境</Select.Option>
+										<Select.Option value="6">新能源</Select.Option>
 									</Select>
 								</FormItem>
 								<FormItem className="half-item" {...formItemLayout} label="专利编号">

+ 26 - 10
js/component/manageCenter/demand/sichuan/sichuan.jsx

@@ -42,8 +42,9 @@ class Achievement extends React.Component {
             data: {
                 pageNo: pageNo || 1,
                 pageSize: this.state.pagination.pageSize,
-                name:this.state.seachName,//需求名称
                 type:0,
+                orgName:this.state.seachName,//企业名称
+                name:this.state.seachNames,//需求名称
                 reserveButtUnit:this.state.seachReserveButtUnit,//对接单位
                 
             },
@@ -198,7 +199,8 @@ class Achievement extends React.Component {
 		this.loadData(1);
 	}
 	reset() {
-		this.state.name = '';
+		this.state.seachName = '';
+		this.state.seachNames = '';
 		this.state.reserveButtUnit = '';
 		this.loadData(1);
 	}
@@ -219,7 +221,6 @@ class Achievement extends React.Component {
             }
         }).done(function (data) {
             if (!data.error.length) {
-            	console.log(data.data);
                let thisData=data.data;
                let ProvinceCityArr = [];
                let ProvinceS =thisData.province? parseInt(thisData.province):""; //省
@@ -268,7 +269,13 @@ class Achievement extends React.Component {
 		this.setState({
 			loading: true
 		});
-		console.log(this.state.addState);
+		if(!this.state.name){
+			 message.warning("需求名称必须填写");
+			 this.setState({
+				loading: false
+			});
+			 return;
+		}
 		$.ajax({
             method: "POST",
             dataType: "json",
@@ -364,6 +371,15 @@ class Achievement extends React.Component {
 				<div className="user-search">
 					<Input
 						placeholder="需求名称"
+						value={this.state.seachNames}
+						className="searchInp"
+						onChange={(e) => {
+							this.setState({ seachNames: e.target.value });
+						}}
+						style={{ width: 120 }}
+					/>
+					<Input
+						placeholder="企业名称"
 						value={this.state.seachName}
 						className="searchInp"
 						onChange={(e) => {
@@ -435,12 +451,12 @@ class Achievement extends React.Component {
 											}}
 											placeholder="请选择"
 										>
-											<Select.Option value="0">先进制造与自动化</Select.Option>
-											<Select.Option value="1">电子信息技术</Select.Option>
-											<Select.Option value="2">新材料技术</Select.Option>
-											<Select.Option value="3">生物与新药</Select.Option>
-											<Select.Option value="4">资源与新环境</Select.Option>
-											<Select.Option value="5">新能源</Select.Option>
+											<Select.Option value="1">先进制造与自动化</Select.Option>
+											<Select.Option value="2">电子信息技术</Select.Option>
+											<Select.Option value="3">新材料技术</Select.Option>
+											<Select.Option value="4">生物与新药</Select.Option>
+											<Select.Option value="5">资源与新环境</Select.Option>
+											<Select.Option value="6">新能源</Select.Option>
 										</Select>
 									</FormItem>
 								

+ 7 - 0
js/component/manageCenter/demand/sichuan/sichuanman.jsx

@@ -265,6 +265,13 @@ class Achievement extends React.Component {
 		this.setState({
 			loading: true
 		});
+		if(!this.state.Pname){
+			 message.warning("企业名称必须填写");
+			 this.setState({
+				loading: false
+			});
+			 return;
+		}
 		$.ajax({
             method: "POST",
             dataType: "json",