在售产品页调整

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

@@ -288,6 +288,9 @@ define([ 'app/app' ], function(app) {
             Goods.getGoodsByPageAndStatus($scope.param, function (data) {
                 $scope.goodsAll = data;
                 $scope.currenctGoods = data.content;
+                if ($scope.currenctGoods.length == 0) {
+                    $scope.chooseAllPage = false;
+                }
                 $scope.param.currentPage = data.number;
                 if ($scope.param.currentPage == data.totalPages) {
                     $scope.endNumber = data.totalElements;
@@ -302,7 +305,13 @@ define([ 'app/app' ], function(app) {
                     }else {
                         $scope.onsale.currency = 'RMB';
                     }
-
+                    angular.forEach($scope.currenctGoods, function (goods) {
+                        if ($scope.chooseAllPage) {
+                            goods.isChoosed = true;
+                        } else {
+                            goods.isChoosed = false;
+                        }
+                    });
                 }
             });
         };
@@ -407,14 +416,7 @@ define([ 'app/app' ], function(app) {
             }
         };
 
-
-        /**
-         * 修改商品信息
-         *
-         * @param commodity		待修改商品信息
-         * @param isDischarge	是否下架商品
-         */
-        $scope.updateCommodityInfo = function () {
+        $scope.batchDown = function () {
             if ($scope.chooseAllPage) {
                 Goods.downNowEnterpriseGoods({}, {}, function(result) {
                     if (result.success) {
@@ -446,6 +448,20 @@ define([ 'app/app' ], function(app) {
             }
         };
 
+        $scope.updateCommodityInfo = function (commodity) {
+            Goods.offShelfGoodsByProvider({batchCodes : commodity.batchCode}, {}, function(map){
+                if (map.success) {
+                    toaster.pop('success', '下架成功');
+                    $scope.isSoldOut = false;
+                    loadDataReload();
+                } else {
+                    toaster.pop('error', map.message);
+                }
+            }, function(){
+                toaster.pop('error', '下架失败');
+            });
+        };
+
         /*查看大图*/
         $scope.showImg = function(imgUrl) {
             var src = imgUrl, box = $('#image-box'), modal = $('.modal-content');

src/main/webapp/resources/view/vendor/forstore/vendor_onSale.html

@@ -830,8 +830,8 @@
                     <span>更多操作</span>
                     <span class="expander">
                         <span ng-click="download()">导出选中</span>
-                        <span ng-click="deleteBatch()" name="delete-material">删除选中</span>
-                        <span ng-click="deleteBatch()" name="delete-material">下架选中</span>
+                        <span ng-click="batchDelete()" name="delete-material">删除选中</span>
+                        <span ng-click="updateCommodityInfo()">下架选中</span>
                     </span>
                 </div>
                 <form style="display: none;" id="down-load-goods" method="get">
@@ -1333,7 +1333,7 @@
     </div>
     <div class="content">
         <p><i class="fa fa-exclamation-circle"></i>确认下架？</p>
-        <div><a ng-click="cancleSoldOut()">取消</a><a ng-click="updateCommodityInfo()">确认</a></div>
+        <div><a ng-click="cancleSoldOut()">取消</a><a ng-click="updateCommodityInfo(soldOutCommodity)">确认</a></div>
     </div>
 </div>