liting2017 6 년 전
부모
커밋
c1df6dd1c8

+ 2 - 2
js/component/administration/achievement/achievementDetaiel.jsx

@@ -10,7 +10,7 @@ import {
 	Form,
 } from 'antd';
 
-import { IndustryObject, getIndustryCategory } from '@/DicIndustryList.js';
+import {  getIndustryCategory } from '@/industryList.js';
 import {  splitUrl ,getMaturity,getAchievementType,getTransaction,getAchievementPosition,getAchievementCategory,getReleaseStateList,getInnovation} from '@/tools.js';
 const FormItem = Form.Item;
 
@@ -57,7 +57,7 @@ const DemandDetail = Form.create()(React.createClass({
 					isUrgent:thisData.isUrgent,
 					status:thisData.status,
 					isHot:thisData.isHot,
-                    pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
+                    pictureUrl: thisData.firstPicture ? splitUrl(thisData.firstPicture, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
         }).always(function () {

+ 6 - 2
js/component/administration/achievement/achievementExamine.jsx

@@ -176,13 +176,17 @@ const DemandList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.page);
         }.bind(this));
     },
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData(this.state.page);
+            if(this.state.pagination.total%10==1){
+                this.loadData((this.state.page)-1);
+            }else{
+                this.loadData(this.state.page);
+            }
         };
     },
     search() {

+ 2 - 2
js/component/administration/achievement/techAchievement.jsx

@@ -180,13 +180,13 @@ const DemandList = React.createClass({
             } else {
                 message.warning(data.error[0].message);
             };
-            this.loadData();
+            this.loadData(this.state.page);
         }.bind(this));
     },
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData();
+            this.loadData(this.state.page);
         };
     },
     search() {

+ 5 - 1
js/component/administration/demand/demandExamine.jsx

@@ -211,7 +211,11 @@ const DemandList = React.createClass({
     closeDesc(e, s) {
         this.state.showDesc = e;
         if (s) {
-            this.loadData(this.state.page);
+            if(this.state.pagination.total%10==1){
+                this.loadData((this.state.page)-1);
+            }else{
+                this.loadData(this.state.page);
+            }
         };
     },
     search() {