Merge remote-tracking branch 'origin/feature-background-hulh-1212' into feature-background-hulh-1212

src/main/webapp/resources/js/vendor/controllers/forstore/vendor_materialCtrl.js

@@ -2974,9 +2974,11 @@ define([ 'app/app', 'jquery-uploadify' ], function(app) {
                     var idStr = $scope.ids.join(',');
                     Material.deleteBatch({ids : idStr}, function (data) {
                         toaster.pop('success', '删除成功');
-						$scope.deleteModal = false;
+                        $scope.deleteModal = false;
                         $modalInstance.close(data);
                     }, function (response) {
+                        $scope.deleteModal = false;
+                        $modalInstance.dismiss();
                         toaster.pop('error', response.data);
                     });
                 }