Browse Source

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@412 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

administrator 11 years ago
parent
commit
06df4a5b18

+ 6 - 0
src/main/webapp/resources/js/index/app.js

@@ -314,7 +314,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			total : 0, 
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
+				$scope.loading = true;
 				PurcOrderItem.get(parseParams(params.url()), function(page){
+					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
@@ -376,7 +378,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			total : 0, 
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
+				$scope.loading = true;
 				PurcChange.get(parseParams(params.url()), function(page){
+					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
 						$defer.resolve(page.content);
@@ -419,7 +423,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			total : 0, 
 			counts: [5, 10, 25, 50],
 			getData : function($defer, params) {
+				$scope.loading = true;
 				PurcInquiry.get(parseParams(params.url()), function(page){
+					$scope.loading = false;
 					if(page) {
 						params.total(page.totalElements);
 						$defer.resolve(page.content);

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/change.html

@@ -108,7 +108,7 @@
 }
 </style>
 <div ng-controller="SaleChangeCtrl" class="block">
-	<div class="loading in">
+	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -108,7 +108,7 @@
 }
 </style>
 <div ng-controller="SaleInquiryCtrl" class="block">
-	<div class="loading in">
+	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">

+ 1 - 1
src/main/webapp/resources/tpl/index/sale/order.html

@@ -108,7 +108,7 @@
 }
 </style>
 <div ng-controller="SaleOrderCtrl" class="block">
-	<div class="loading in">
+	<div class="loading in" ng-class="{'in': loading}">
 		<i></i>
 	</div>
 	<div class="condition block">