在售产品页调整

src/main/java/com/uas/platform/b2c/prod/commodity/service/impl/GoodsServiceImpl.java

@@ -2867,6 +2867,7 @@ public class GoodsServiceImpl implements GoodsService {
         }
         recommendProductService.deleteProductsWhenSellerUpdateReserve(storeId, set);
         map.put("total", goodsList.size());
+        map.put("success", goodsList.size() - fail);
         map.put("fail", fail);
         return map;
     }

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

@@ -307,6 +307,54 @@ define([ 'app/app' ], function(app) {
             });
         };
 
+        // 全选
+        $scope.chooseAllItem = function () {
+            $scope.chooseAll = !$scope.chooseAll;
+            angular.forEach($scope.currenctGoods, function (goods) {
+                goods.isChoosed = $scope.chooseAll;
+            });
+            if (!$scope.chooseAll) {
+                $scope.chooseAllPage = false;
+            }
+        };
+
+        $scope.turnAllPage = function () {
+            if ($scope.chooseAll) {
+                $scope.chooseAllPage = true;
+            }
+        };
+
+        $scope.cancelAllPage = function () {
+            $scope.chooseAllPage = false;
+            $scope.chooseAll = false;
+            angular.forEach($scope.currenctGoods, function (goods) {
+                goods.isChoosed = false;
+            });
+        };
+
+        // 检查是否全选
+        var checkChoosedAll = function () {
+            $scope.chooseAll = true;
+            angular.forEach($scope.currenctGoods, function (goods) {
+                if (!goods.isChoosed) {
+                    $scope.chooseAll = false;
+                }
+            });
+            if (!$scope.chooseAll) {
+                $scope.chooseAllPage = false;
+            }
+        };
+
+        // 单选
+        $scope.chooseOne = function (goods) {
+            if (typeof goods.isChoosed == 'undefined' || !goods.isChoosed) {
+                goods.isChoosed = true;
+            } else {
+                goods.isChoosed = false;
+            }
+            checkChoosedAll();
+        };
+
         //获取选中之后的信息
         var getChooseBatch = function () {
             $scope.choosedBatch = [];
@@ -332,14 +380,30 @@ define([ 'app/app' ], function(app) {
          */
         $scope.batchDelete = function () {
             if ($scope.chooseAllPage) {
-
+                Goods.deleteGoodsByEnUU({}, {}, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '删除成功');
+                        $scope.isSoldOut = false;
+                        loadDataReload();
+                    } else {
+                        toaster.pop('error', data.message);
+                    }
+                })
             } else {
                 getChooseInfo();
                 if (!$scope.choosedIds || $scope.choosedIds.length == 0) {
                     toaster.pop("info", "您尚未选中任何产品");
                     return ;
                 }
-
+                Goods.deleteGoodsByIdList({}, $scope.choosedIds, function (data) {
+                    if (data.success) {
+                        toaster.pop('success', '删除成功');
+                        $scope.isSoldOut = false;
+                        loadDataReload();
+                    } else {
+                        toaster.pop('error', data.message);
+                    }
+                })
             }
         };
 

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

@@ -774,11 +774,11 @@
         color: #333;
         right: 0;
         display: none;
-        height: 57px;
+        height: 82px;
         line-height: 26px;
         text-align: center;
         background: #fff;
-        bottom: -57px;
+        bottom: -82px;
         width: 98px;
         z-index: 10;
         border: 1px solid #e4e5e5;
@@ -829,9 +829,10 @@
                 <div class="operate-btn more-operate">
                     <span>更多操作</span>
                     <span class="expander">
-							<span ng-click="download()">导出选中</span>
-							<span ng-click="deleteBatch()" name="delete-material">删除选中</span>
-						</span>
+                        <span ng-click="download()">导出选中</span>
+                        <span ng-click="deleteBatch()" name="delete-material">删除选中</span>
+                        <span ng-click="deleteBatch()" name="delete-material">下架选中</span>
+                    </span>
                 </div>
                 <form style="display: none;" id="down-load-goods" method="get">
                     <input type="hidden" name="ids" ng-value="localInfo.ids">
@@ -880,7 +881,7 @@
                     <tr>
                         <th width="60" style="padding:8px 0;">
                             <label class="check-active">
-                                <input type="checkbox" id="AllChoose"/>
+                                <input ng-disabled="currenctGoods.length == 0" type="checkbox"  ng-click="chooseAllItem()" ng-checked="chooseAll || chooseAllPage" id="AllChoose"/>
                                 <label for="AllChoose"></label>
                                 <span>全选</span>
                             </label>
@@ -911,8 +912,7 @@
                     </tbody>
                     <tbody ng-repeat="commodity in currenctGoods" ng-click="goToBatchDetail($event, commodity)" class="edit-border">
                     <!--非编辑状态自定义标签-->
-                    <tr class="define"
-                        ng-if="!commodity.edit">
+                    <tr class="define" ng-if="!commodity.edit">
                         <td colspan="10">
                             <div class="code">产品编码 : <span ng-bind="commodity.prodNum">247823589235</span></div>
                             <div class="labelling" ng-if="commodity.tag">
@@ -925,11 +925,10 @@
                             <img ng-if="commodity.uuid" src="static/img/store/common/standard.png" alt="" class="standard"/>
                         </td>
                     </tr>
-                    <tr class="edit-form"
-                        ng-if="!commodity.edit">
+                    <tr class="edit-form" ng-if="!commodity.edit">
                         <td class="middle padding0 check-input">
                             <!-- <span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label><br/></span>-->
-                            <span><input type="checkbox" id="{{$index+1}}"/><label for="{{$index+1}}"></label></span>
+                            <span><input type="checkbox" ng-checked="commodity.isChoosed"  ng-click="chooseOne(commodity)" id="{{$index+1}}"/><label for="{{$index+1}}"></label></span>
                             <!--&lt;!&ndash;非标产品标志&ndash;&gt;-->
                             <!--<img ng-if="!commodity.uuid" src="static/img/store/common/nonstandard.png" alt="" class="standard"/>-->
                             <!--&lt;!&ndash;标产品标志&ndash;&gt;-->
@@ -1030,7 +1029,7 @@
                         <td colspan="9">
                             <div class="bg-show">
                                 <div class="content-show width20">
-                                   <div> {{$index + 1}}</div>
+                                   <!--<div> {{$index + 1}}</div>-->
                                 </div>
                                 <div class="content-show width200">
                                     <div class="fl img">
@@ -1287,6 +1286,23 @@
                         <!--</td>-->
                     </tr>
                     </tbody>
+                    <tbody>
+                    <tr class="no-hover batch-tr" ng-if="(chooseAll || chooseAllPage) && currenctGoods.length != 0">
+                        <td colspan="7">
+                            <div class="batch-line" ng-if="chooseAll && !chooseAllPage">
+                                已选中当前页
+                                <em class="red" ng-bind="goodsAll.numberOfElements"></em>个产品，
+                                <a ng-click="turnAllPage()" class="blue">点击此处</a>切换选中所有页面<em class="red" ng-bind="goodsAll.totalElements"></em>个产品
+                            </div>
+                            <div class="batch-line" ng-if="chooseAllPage">
+                                已选中所有页面
+                                <em class="red" ng-bind="goodsAll.totalElements"></em>个产品，
+                                <a ng-click="cancelAllPage()" class="blue">点击此处</a>全部取消选中
+                            </div>
+                        </td>
+                    </tr>
+                    <!--<tr class="no-hover batch-tr" ng-if="chooseAll && !chooseAllPage" ng-class="{'active': $data.length > 10}">-->
+                    </tbody>
                 </table>
                 <div class="record-line text-right" ng-if="currenctGoods.length != 0">显示 {{(param.page - 1) * 10 + 1}}-
                     <span ng-bind="endNumber"></span>， 共： <span ng-bind="goodsAll.totalElements" style="color: #5078cb;"></span> 个</div>