权限bug

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

@@ -3,7 +3,7 @@
  */
 define(['app/app'], function(app) {
     'use strict';
-    app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams) {
+    app.register.controller('payCenterCtrl', ['$scope', '$rootScope', 'bankInfoService', 'toaster', '$upload', 'bankTransferService', 'Purchase', '$filter', 'Loading', 'ngTableParams', 'BaseService', 'SessionService', '$stateParams', '$http', function($scope, $rootScope, bankInfoService, toaster, $upload, bankTransferService, Purchase, $filter, Loading, ngTableParams, BaseService, SessionService, $stateParams, $http) {
         $rootScope.active = 'pay_center';
 
         document.title = '结算中心-优软商城';
@@ -607,18 +607,26 @@ define(['app/app'], function(app) {
                 var str = strArray.join("&");
                 url = url + "?" + str;
             }
-            var form = $("<form>");   //定义一个form表单
-            form.attr('style', 'display:none');   //在form表单中添加查询参数
-            form.attr('target', '');
-            form.attr('method', 'POST');
-            form.attr('action', url);
-
-            $('body').append(form);  //将表单放置在web中
-            form.submit();
-
-            $scope.$$transfer.clockID = setInterval(function() {
-                getDownLoadStatus();
-            }, 500);
+            $http({
+                method: 'post',
+                dataType: 'json',
+                url: url
+            }).success(function (data) {
+                var form = $("<form>");   //定义一个form表单
+                form.attr('style', 'display:none');   //在form表单中添加查询参数
+                form.attr('target', '');
+                form.attr('method', 'POST');
+                form.attr('action', url);
+
+                $('body').append(form);  //将表单放置在web中
+                form.submit();
+
+                $scope.$$transfer.clockID = setInterval(function() {
+                    getDownLoadStatus();
+                }, 500);
+            }).error(function (response) {
+                toaster.pop('error', response);
+            });
         };
 
         var getDownLoadStatus = function () {

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

@@ -660,7 +660,7 @@ define(['app/app'], function (app) {
                 }
             });
             modalInstance.result.then(function (added) {
-                added && (getData());
+                added && getData();
             });
         };
 
@@ -745,6 +745,7 @@ define(['app/app'], function (app) {
                                     toaster.pop("success", "提示", "用户绑定成功");
                                     $modalInstance.close(true);
                                 }, function (response) {
+                                    toaster.pop('error', response.data);
                                 });
                             return true;
                         }
@@ -1824,7 +1825,7 @@ define(['app/app'], function (app) {
 //角色管理-编辑角色controller
     app.register.controller('RoleEditCtrl', ['$scope', '$modalInstance', '$timeout', 'AccountResource', 'AccountRole', 'toaster', 'role', 'BaseService', function ($scope, $modalInstance, $timeout, AccountResource, AccountRole, toaster, role, BaseService) {
         BaseService.scrollBackToTop();
-        $scope.role = role||{};
+        $scope.role = angular.copy(role || {});
         $scope.master = angular.copy($scope.role);
         var isNew = role == null;
         $scope.cancel = function () {

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

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
     'use strict';
-    app.register.controller('vendor_onSaleCtrl', ['$scope', '$rootScope', 'Goods', '$modal', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', '$q', 'StoreCms', 'NumberService', 'Enterprise', 'ByteCountService', 'DistributionRule', function ($scope, $rootScope, Goods, $modal, toaster, Loading, StoreInfo, AuthenticationService, $q, StoreCms, NumberService, Enterprise, ByteCountService, DistributionRule) {
+    app.register.controller('vendor_onSaleCtrl', ['$scope', '$rootScope', 'Goods', '$modal', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', '$q', 'StoreCms', 'NumberService', 'Enterprise', 'ByteCountService', 'DistributionRule', '$http', function ($scope, $rootScope, Goods, $modal, toaster, Loading, StoreInfo, AuthenticationService, $q, StoreCms, NumberService, Enterprise, ByteCountService, DistributionRule, $http) {
         $rootScope.active = 'vendor_material';
         $scope.keyword = '';
         $scope.tab = 'onSale';
@@ -1574,43 +1574,66 @@ define([ 'app/app' ], function(app) {
         };
 
         function downloadByJs(url, keyword, type) {
-            var form = $("<form>");   //定义一个form表单
-            form.attr('style', 'display:none');   //在form表单中添加查询参数
-            form.attr('target', '');
-            form.attr('method', 'get');
-            form.attr('action', url);
-
-            var input1 = $('<input>');
-            input1.attr('type', 'hidden');
-            input1.attr('name', 'keyword');
-            input1.attr('value', keyword);
-
-            var input2 = $('<input>');
-            input1.attr('type', 'hidden');
-            input1.attr('name', 'isSelfSupport');
-            input1.attr('value', type);
-
-            $('body').append(form);  //将表单放置在web中
-            form.append(input1);   //将查询参数控件提交到表单上
-            form.append(input2);
-            form.submit();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: url,
+                params: {
+                    keyword: keyword,
+                    isSelfSupport: type
+                }
+            }).success(function (data) {
+                var form = $("<form>");   //定义一个form表单
+                form.attr('style', 'display:none');   //在form表单中添加查询参数
+                form.attr('target', '');
+                form.attr('method', 'get');
+                form.attr('action', url);
+
+                var input1 = $('<input>');
+                input1.attr('type', 'hidden');
+                input1.attr('name', 'keyword');
+                input1.attr('value', keyword);
+
+                var input2 = $('<input>');
+                input1.attr('type', 'hidden');
+                input1.attr('name', 'isSelfSupport');
+                input1.attr('value', type);
+
+                $('body').append(form);  //将表单放置在web中
+                form.append(input1);   //将查询参数控件提交到表单上
+                form.append(input2);
+                form.submit();
+            }).error(function (response) {
+                toaster.pop('error', response);
+            });
         }
 
         function downloadSelectedByJs(url, idList) {
-            var form = $("<form>");   //定义一个form表单
-            form.attr('style', 'display:none');   //在form表单中添加查询参数
-            form.attr('target', '');
-            form.attr('method', 'get');
-            form.attr('action', url);
-
-            var input1 = $('<input>');
-            input1.attr('type', 'hidden');
-            input1.attr('name', 'ids');
-            input1.attr('value', idList);
-
-            $('body').append(form);  //将表单放置在web中
-            form.append(input1);   //将查询参数控件提交到表单上
-            form.submit();
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: url,
+                params: {
+                    ids: idList
+                }
+            }).success(function (data) {
+                var form = $("<form>");   //定义一个form表单
+                form.attr('style', 'display:none');   //在form表单中添加查询参数
+                form.attr('target', '');
+                form.attr('method', 'get');
+                form.attr('action', url);
+
+                var input1 = $('<input>');
+                input1.attr('type', 'hidden');
+                input1.attr('name', 'ids');
+                input1.attr('value', idList);
+
+                $('body').append(form);  //将表单放置在web中
+                form.append(input1);   //将查询参数控件提交到表单上
+                form.submit();
+            }).error(function (response) {
+                toaster.pop('error', response);
+            });
         }
 
         // 下载模板

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

@@ -1,6 +1,6 @@
 define([ 'app/app' ], function(app) {
     'use strict';
-    app.register.controller('vendor_undercarriageCtrl', ['$scope', '$rootScope', '$q', 'Goods', 'Enterprise', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', function ($scope, $rootScope, $q, Goods, Enterprise, toaster, Loading, StoreInfo, AuthenticationService) {
+    app.register.controller('vendor_undercarriageCtrl', ['$scope', '$rootScope', '$q', 'Goods', 'Enterprise', 'toaster', 'Loading', 'StoreInfo', 'AuthenticationService', '$http', function ($scope, $rootScope, $q, Goods, Enterprise, toaster, Loading, StoreInfo, AuthenticationService, $http) {
         $rootScope.active = 'vendor_material';
         document.title = '上下架历史-优软商城';
         $scope.tab = 'undercarriage';
@@ -304,51 +304,63 @@ define([ 'app/app' ], function(app) {
         };
 
         /**
-         * 下载当前页的订单信息
+         * 下载当前页的上下架历史信息
          */
         $scope.localInfo = {};
         $scope.downGoods = function () {
             var listId = getDownLoadGoodsHistoryId();
             if(listId.length < 1) {
-                toaster.pop('warning', '当前需要下载的订单条数为0');
+                toaster.pop('warning', '当前需要下载的上下架历史条数为0');
                 return ;
             }
             Loading.show();
             $scope.localInfo.ids = listId.join("-");
-            $scope.$apply();
-            var form = document.getElementById('down-load-goods');
-            form.action = 'trade/goods/down/upAndDown/ids';
-            form.submit();
-            var clockID = null;
-            var getDownLoadStatus = function () {
-                $.ajax({
-                    url : 'trade/goods/down/upAndDown/ids',
-                    data : {isAjax : true, ids : $scope.localInfo.ids},
-                    method : 'GET',
-                    dataType : 'json',
-                    success : function (data) {
-                        if(data.loading) {
-                            clockID = setInterval(function() {
-                                getDownLoadStatus()
-                            }, 500);
-                        }else {
-                            $scope.$apply(function () {
-                                toaster.pop('info', '数据处理完毕，正在下载文件，请稍等。');
-                                Loading.hide();
-                            });
-                            if(!clockID) {
+            $http({
+                method: 'get',
+                dataType: 'json',
+                url: 'trade/goods/down/upAndDown/ids',
+                params: {
+                    ids: $scope.localInfo.ids
+                }
+            }).success(function (data) {
+                var form = document.getElementById('down-load-goods');
+                form.action = 'trade/goods/down/upAndDown/ids';
+                form.submit();
+                var clockID = setInterval(function () {
+                    getDownLoadStatus();
+                }, 500);
+                var getDownLoadStatus = function () {
+                    $.ajax({
+                        url : 'trade/goods/down/upAndDown/ids',
+                        data : {isAjax : true, ids : $scope.localInfo.ids},
+                        method : 'GET',
+                        dataType : 'json',
+                        success : function (data) {
+                            if(data.loading) {
+                                clockID = setInterval(function() {
+                                    getDownLoadStatus()
+                                }, 500);
+                            }else {
+                                $scope.$apply(function () {
+                                    toaster.pop('info', '数据处理完毕，正在下载文件，请稍等。');
+                                    Loading.hide();
+                                });
+                                if(clockID) {
+                                    clearInterval(clockID);
+                                }
+                            }
+                        },
+                        error : function () {
+                            Loading.hide();
+                            if(clockID) {
                                 clearInterval(clockID);
                             }
                         }
-                    },
-                    error : function () {
-                        Loading.hide();
-                        if(!clockID) {
-                            clearInterval(clockID);
-                        }
-                    }
-                });
-            };
+                    });
+                };
+            }).error(function (response) {
+                toaster.pop('error', response);
+            });
         };
 
         /**