dengzhiguo 7 vuotta sitten
vanhempi
commit
684c63be51

+ 1 - 1
js/component/manageCenter/achievement/techAchievementDesc.jsx

@@ -1083,7 +1083,6 @@ const AchievementDetailForm = Form.create()(React.createClass({
             labelCol: { span: 8 },
             wrapperCol: { span: 14 },
         };
-        console.log(this.state.orgDisplay)
         return (
             <Form horizontal onSubmit={this.handleSubmit} id="demand-form">
                 <Spin spinning={this.state.loading}>
@@ -1685,6 +1684,7 @@ const AchievementDetail = React.createClass({
                 };
                 let _me = this, theArr = [];
                 for (var item in data.data) {
+                	
                     theArr.push(
                         <Select.Option key={item}>{data.data[item]}</Select.Option>
                     )

+ 8 - 11
js/component/manageCenter/demand/myTechDemand.jsx

@@ -121,8 +121,8 @@ const DemandList = React.createClass({
             url: globalConfig.context + '/api/admin/demand/listDemandFollow',
             data: {
             	id:demandId,
-                pageNo: pageNo || 1,
-                pageSize: this.state.matepagination.pageSize,
+                pNo: pageNo || 1,
+                pSize: this.state.matepagination.pageSize,
             },
             success: function (data) {
                 let theArr = [];
@@ -183,8 +183,8 @@ const DemandList = React.createClass({
             crossDomain: false,
             url: globalConfig.context + '/api/admin/demand/listDemandFollowDetail',
             data: {
-            	pageNo: pageNo || 1,
-                pageSize: this.state.lookpagination.pageSize,
+            	pNo: pageNo || 1,
+                pSize: this.state.lookpagination.pageSize,
             	id:rowItem.id
                },
             success: function (data) {
@@ -206,12 +206,12 @@ const DemandList = React.createClass({
                             createTimeFormattedDate: thisdata.createTimeFormattedDate,//录入时间转格式
                         });
                     };
-                    this.state.pagination.current = data.data.pageNo;
-                    this.state.pagination.total = data.data.totalCount;
+                    this.state.lookpagination.current = data.data.pageNo;
+                    this.state.lookpagination.total = data.data.totalCount;
                 };
                 this.setState({
                     lookDataSource: theArr,
-                    pagination: this.state.pagination
+                    lookpagination: this.state.lookpagination
                 });
             }.bind(this),
         }).always(function () {
@@ -261,7 +261,7 @@ const DemandList = React.createClass({
                 showQuickJumper: true,
                 pageSize: 10,
                 onChange: function (page) {
-                    this.lookLoadData(page);
+                	this.lookLoadData(page);
                 }.bind(this),
                 showTotal: function (total) {
                     return '共' + total + '条数据';
@@ -645,7 +645,6 @@ const DemandList = React.createClass({
             	id:demandId,
             },
             success: function (data) {
-            	console.log(data.data);
             	this.setState({
             		mademandId:data.data.id,//录入人
                     adminName: data.data.techBrokerId,//录入人
@@ -1345,7 +1344,6 @@ const DemandList = React.createClass({
                          <Form horizontal onSubmit={this.addhandleSubmit} id="add-form">
 			                <Spin spinning={this.state.loading}>
 			                    <div className="clearfix">
-	                			  <Spin spinning={this.state.loading}>
 	                			     <Form horizontal id="demand-form" onSubmit={this.contactSave} >
 								      <Table 
 						            	 pagination={this.state.lookpagination}
@@ -1355,7 +1353,6 @@ const DemandList = React.createClass({
 						            	 onRowClick={this.lookTableRowClick}
 						            	 />
 						            </Form> 
-								   </Spin> 
 								</div>
 			                </Spin>
 			            </Form >