文件上传未选择时不显示加载状态

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

src/main/webapp/resources/js/index/app.js

@@ -10237,6 +10237,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.loading = false;
 					toaster.pop('info', '提示', '当前文件不存在，请重新选择');
 				}
+			} else {
+				 $scope.loading = false;
 			}
 		};
 		
@@ -16747,7 +16749,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 		// 通过excel批量上传物料
 		$scope.upload = function() {
 		    $scope.loading = true;
-			var file = $scope.myFiles[0];
 			if($scope.myFiles) {
 				var file = $scope.myFiles[0];
 				if(file.name) {
@@ -16777,6 +16778,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.loading = false;
 					toaster.pop('info', '提示', '当前文件不存在，请重新选择');
 				}
+			} else {
+				$scope.loading = false;
 			}
 		};
 		

src/main/webapp/resources/tpl/index/purc/uploadByBatch.html

@@ -295,15 +295,9 @@ table.table.table-striped  thead {
 </style>
 <!-- block start -->
 <div class="block">
-<<<<<<< .mine
-	<div class="loading in" ng-class="{'in': loading}">
-		<i></i>
-	</div>
-=======
 	<div class="loading" ng-class="{'in': loading}">
 		<i></i>
 	</div>
->>>>>>> .r9416
 	<div class="headerline">
 		<div class="index"></div>
 		<div class="content f16 text-bold">第一步、下载Excel模板</div>