Merge remote-tracking branch 'origin/release-201834-wangcz' into release-201834-wangcz

src/main/webapp/resources/js/admin/controllers/product/productManageCtrl.js

@@ -57,16 +57,16 @@ define(['app/app'], function(app) {
                 } else if (val == 'sixMonth') {
                     $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
                     $scope.endDate = endDate;
+                } else if (val == 'allMonth') {
+                    $scope.startDate = null;
+                    $scope.endDate = null;
                 }
             }
-            $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
-            $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
+            $scope.startFormatDate = $scope.startDate ? _formatDate($scope.startDate, 'yyyy-MM-dd') : '';
+            $scope.endFormatDate = $scope.endDate ? _formatDate($scope.endDate, 'yyyy-MM-dd') : '';
             if (val != 'autoMonth') {
                 $scope.manageTableParams.page(1);
                 $scope.manageTableParams.reload();
-            } else {
-                // $scope.startDate = '';
-                // $scope.endDate = '';
             }
         };
 
@@ -143,8 +143,16 @@ define(['app/app'], function(app) {
             counts: [],
             getData: function ($defer, params) {
                 var param = BaseService.parseParams(params.url());
-                $scope.goodsFilter.startTime = $scope.startFormatDate;
-                $scope.goodsFilter.endTime = $scope.endFormatDate;
+                if($scope.startFormatDate) {
+                    $scope.goodsFilter.startTime = $scope.startFormatDate
+                } else {
+                    delete $scope.goodsFilter.startTime
+                }
+                if($scope.endFormatDate) {
+                    $scope.goodsFilter.endTime = $scope.endFormatDate
+                } else {
+                    delete $scope.goodsFilter.endTime
+                }
                 $scope.pageParams = param;
                 Goods.loadGoodsList(param, $scope.goodsFilter, function (data) {
                     $scope.totalCount = data.totalElements;

src/main/webapp/resources/view/admin/product/brandProductsCount.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 品牌产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 品牌产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->

src/main/webapp/resources/view/admin/product/categoryNumber.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 品类产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 品类产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->

src/main/webapp/resources/view/admin/product/merchantProducts.html

@@ -1,7 +1,8 @@
 <div class="row-fluid sortable">
     <div class="box">
         <div class="box-header well" data-original-title>
-            <i class="icon-user"></i> 商家产品数 &nbsp;&nbsp; ({{startFormatDate}} --- {{endFormatDate}})
+            <i class="icon-user"></i> 商家产品数 &nbsp;&nbsp;
+            {{startFormatDate ? '(' + startFormatDate + '---' + endFormatDate + ')' : ''}}
         </div>
         <div class="box-content">
             <!-- ng-tableStart -->

src/main/webapp/resources/view/admin/product/productManage.html

@@ -19,6 +19,11 @@
                         <label for="sixMonth"></label>
                         180天
                     </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="allMonth" name="date" ng-click="setFilters('dateArea', 'allMonth')" ng-checked="dateArea == 'allMonth'">
+                        <label for="allMonth"></label>
+                        不限
+                    </label>
                     <label class="com-check-radio">
                         <input type="radio" id="autoMonth" name="date" ng-click="setFilters('dateArea', 'autoMonth')" ng-checked="dateArea == 'autoMonth'">
                         <label for="autoMonth"></label>
@@ -198,11 +203,16 @@
         </div>
         <div class="form-item">
             <span class="item-title">查看报表：</span>
-            <span>
+            <span ng-if="startFormatDate">
                 <a ng-href="#/merchantProducts?startDate={{startFormatDate}}&endDate={{endFormatDate}}">商家产品数</a>
                 <a ng-href="#/brandProductsCount?startDate={{startFormatDate}}&endDate={{endFormatDate}}">品牌产品数</a>
                 <a ng-href="#/categoryNumber?startDate={{startFormatDate}}&endDate={{endFormatDate}}">品类产品数</a>
             </span>
+            <span ng-if="!startFormatDate">
+                <a ng-href="#/merchantProducts">商家产品数</a>
+                <a ng-href="#/brandProductsCount">品牌产品数</a>
+                <a ng-href="#/categoryNumber">品类产品数</a>
+            </span>
         </div>
         <div class="form-item">
             <span class="item-title">更多操作：</span>