处理超级后台产品管理页面优化

src/main/webapp/resources/js/admin/app.js

@@ -282,19 +282,19 @@
             controllerUrl : 'app/controllers/product/productManageDetailCtrl'
         })).state('merchant_products', angularAMD.route({
             // 商家产品数汇总
-            url: '/merchantProducts/:date',
+            url: '/merchantProducts?startDate&endDate',
             templateUrl : 'static/view/admin/product/merchantProducts.html',
             controller : 'merchantProductsCtrl',
             controllerUrl : 'app/controllers/product/merchantProductsCtrl'
         })).state('brand_products', angularAMD.route({
             // 品牌产品数汇总
-            url: '/brandProductsCount/:date',
+            url: '/brandProductsCount?startDate&endDate',
             templateUrl : 'static/view/admin/product/brandProductsCount.html',
             controller : 'brandProductsCountCtrl',
             controllerUrl : 'app/controllers/product/brandProductsCountCtrl'
         })).state('category_number', angularAMD.route({
             // 品类产品数汇总
-            url: '/categoryNumber/:date',
+            url: '/categoryNumber?startDate&endDate',
             templateUrl : 'static/view/admin/product/categoryNumber.html',
             controller : 'categoryNumberCtrl',
             controllerUrl : 'app/controllers/product/categoryNumberCtrl'

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

@@ -0,0 +1,30 @@
+define(['app/app'], function(app) {
+    app.register.controller('brandProductsCountCtrl', ['$scope', 'ngTableParams', 'BaseService','Goods', 'toaster', '$stateParams',
+        function($scope, ngTableParams, BaseService, Goods, toaster, $stateParams) {
+            $scope.startFormatDate = $stateParams.startDate;
+            $scope.endFormatDate = $stateParams.endDate;
+
+            $scope.tableParams = new ngTableParams({
+                page: 1,
+                count: 10
+            }, {
+                total: 0,
+                getData: function ($defer, params) {
+                    var param = BaseService.parseParams(params.url());
+                    params.startDate = $stateParams.startDate;
+                    params.endDate = $stateParams.endDate;
+                    Goods.loadUploadProductDetail(param, function(data) {
+                        params.total(data.totalElements);
+                        $defer.resolve(data.content);
+                    }, function (res) {
+                        toaster.pop('error', '获取上传产品详情列表失败！')
+                    })
+                }
+            });
+
+            // 导出
+            $scope.exportXls = function () {
+                window.location.href = 'store-service/export?startTime='+ $scope.startFormatDate + '&endTime=' + $scope.endFormatDate
+            }
+        }])
+})

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

@@ -0,0 +1,30 @@
+define(['app/app'], function(app) {
+    app.register.controller('categoryNumberCtrl', ['$scope', 'ngTableParams', 'BaseService','Goods', 'toaster', '$stateParams',
+        function($scope, ngTableParams, BaseService, Goods, toaster, $stateParams) {
+            $scope.startFormatDate = $stateParams.startDate;
+            $scope.endFormatDate = $stateParams.endDate;
+
+            $scope.tableParams = new ngTableParams({
+                page: 1,
+                count: 10
+            }, {
+                total: 0,
+                getData: function ($defer, params) {
+                    var param = BaseService.parseParams(params.url());
+                    params.startDate = $stateParams.startDate;
+                    params.endDate = $stateParams.endDate;
+                    Goods.loadUploadProductDetail(param, function(data) {
+                        params.total(data.totalElements);
+                        $defer.resolve(data.content);
+                    }, function (res) {
+                        toaster.pop('error', '获取上传产品详情列表失败！')
+                    })
+                }
+            });
+
+            // 导出
+            $scope.exportXls = function () {
+                window.location.href = 'store-service/export?startTime='+ $scope.startFormatDate + '&endTime=' + $scope.endFormatDate
+            }
+        }])
+})

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

@@ -0,0 +1,30 @@
+define(['app/app'], function(app) {
+    app.register.controller('merchantProductsCtrl', ['$scope', 'ngTableParams', 'BaseService','Goods', 'toaster', '$stateParams',
+        function($scope, ngTableParams, BaseService, Goods, toaster, $stateParams) {
+            $scope.startFormatDate = $stateParams.startDate;
+            $scope.endFormatDate = $stateParams.endDate;
+
+            $scope.tableParams = new ngTableParams({
+                page: 1,
+                count: 10
+            }, {
+                total: 0,
+                getData: function ($defer, params) {
+                    var param = BaseService.parseParams(params.url());
+                    params.startDate = $stateParams.startDate;
+                    params.endDate = $stateParams.endDate;
+                    Goods.loadUploadProductDetail(param, function(data) {
+                        params.total(data.totalElements);
+                        $defer.resolve(data.content);
+                    }, function (res) {
+                        toaster.pop('error', '获取上传产品详情列表失败！')
+                     })
+                }
+            });
+
+            // 导出
+            $scope.exportXls = function () {
+                window.location.href = 'store-service/export?startTime='+ $scope.startFormatDate + '&endTime=' + $scope.endFormatDate
+            }
+        }])
+})

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

@@ -59,6 +59,8 @@ define(['app/app'], function(app) {
                     $scope.endDate = endDate;
                 }
             }
+            $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+            $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
             if (val != 'autoMonth') {
                 initTitleInfo();
             } else {

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

@@ -0,0 +1,46 @@
+<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}})
+        </div>
+        <div class="box-content">
+            <!-- ng-tableStart -->
+            <div class="fullscreen" style="padding: 10px;">
+                <div class="row">
+                    <div class="col-xs-2">
+                        共<span class="badge" ng-bind="tableParams.total()"></span>条
+                    </div>
+                    <div class="col-sm-9 text-right">
+                        <div class="btn" role="button">
+                            <a ng-click="exportXls()">导出Excel</a>
+                        </div>
+                        <div class="btn" role="button">
+                            <a href="javascript:history.go(-1)">返回上页</a>
+                        </div>
+                    </div>
+                </div>
+                <table ng-table="tableParams" class="table table-bordered table-striped" style="margin-top: 10px;">
+                    <thead>
+                    <tr>
+                        <th class="text-center" width="80">序号</th>
+                        <th class="text-center">企业名称</th>
+                        <th class="text-center" width="200">产品数(条)</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="en in $data">
+                        <td class="text-center" ng-bind="$index + 1"></td>
+                        <td class="text-center" ng-bind="en.storeName"></td>
+                        <td class="text-center" ng-bind="en.count"></td>
+                    </tr>
+                    <tr ng-if="$data.length == 0">
+                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <a id="bottom"></a>
+            <!-- ng-tableEnd -->
+        </div>
+    </div>
+</div>

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

@@ -0,0 +1,59 @@
+<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}})
+        </div>
+        <div class="box-content">
+            <!-- ng-tableStart -->
+            <div class="fullscreen" style="padding: 10px;">
+                <div class="row">
+                    <div class="col-xs-2">
+                        共<span class="badge" ng-bind="tableParams.total()"></span>条
+                    </div>
+                    <div class="col-sm-9 text-right">
+                        <div class="btn" role="button">
+                            <a ng-click="exportXls()">导出Excel</a>
+                        </div>
+                        <div class="btn" role="button">
+                            <a href="javascript:history.go(-1)">返回上页</a>
+                        </div>
+                    </div>
+                    <!--<div class="col-sm-4">-->
+                    <!--<div class="input-group">-->
+                    <!--<input placeholder="企业名称或UU号进行搜索" class="form-control"-->
+                    <!--ng-model="keyword"  ng-search="onSearch()" size="16" type="text">-->
+                    <!--<span class="input-group-btn">-->
+                    <!--<button class="btn btn-primary" type="button" ng-click="onSearch()">搜索</button>-->
+                    <!--</span>-->
+                    <!--</div>-->
+                    <!--</div>-->
+                </div>
+                <table ng-table="tableParams" class="table table-bordered table-striped" style="margin-top: 10px;">
+                    <thead>
+                    <tr>
+                        <th class="text-center" width="80">序号</th>
+                        <th class="text-center" width="250">一级类目</th>
+                        <th class="text-center" width="250">二级类目</th>
+                        <th class="text-center" width="250">三级类目</th>
+                        <th class="text-center" width="250">产品数(条)</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="en in $data">
+                        <td class="text-center" ng-bind="$index + 1"></td>
+                        <td class="text-center" ng-bind="en.storeName"></td>
+                        <td class="text-center" ng-bind="en.enuu"></td>
+                        <td class="text-center" ng-bind="en.agreeName"></td>
+                        <td class="text-center" ng-bind="en.count"></td>
+                    </tr>
+                    <tr ng-if="$data.length == 0">
+                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <a id="bottom"></a>
+            <!-- ng-tableEnd -->
+        </div>
+    </div><!--/span-->
+</div>

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

@@ -0,0 +1,54 @@
+<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}})
+        </div>
+        <div class="box-content">
+            <!-- ng-tableStart -->
+            <div class="fullscreen" style="padding: 10px;">
+                <div class="row">
+                    <div class="col-xs-2">
+                        共<span class="badge" ng-bind="tableParams.total()"></span>条
+                    </div>
+                    <div class="col-sm-9 text-right">
+                        <div class="btn" role="button">
+                            <a ng-click="exportXls()">导出Excel</a>
+                        </div>
+                        <div class="btn" role="button">
+                            <a href="javascript:history.go(-1)">返回上页</a>
+                        </div>
+                    </div>
+                </div>
+                <table ng-table="tableParams" class="table table-bordered table-striped" style="margin-top: 10px;">
+                    <thead>
+                    <tr>
+                        <th class="text-center" width="80">序号</th>
+                        <th class="text-center" width="200">企业名称</th>
+                        <th class="text-center" width="150">企业UU号</th>
+                        <th class="text-center" width="150">开店申请日期</th>
+                        <th class="text-center" width="150">开店审核日期</th>
+                        <th class="text-center" width="150">开店审核人</th>
+                        <th class="text-center" width="200">产品数(条)</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr ng-repeat="en in $data">
+                        <td class="text-center" ng-bind="$index + 1"></td>
+                        <td class="text-center" ng-bind="en.storeName"></td>
+                        <td class="text-center" ng-bind="en.enuu"></td>
+                        <td class="text-center" ng-bind="en.applyTime | date: 'yyyy-MM-dd HH:mm'"></td>
+                        <td class="text-center" ng-bind="en.agreeTime | date: 'yyyy-MM-dd HH:mm'"></td>
+                        <td class="text-center" ng-bind="en.agreeName"></td>
+                        <td class="text-center" ng-bind="en.count"></td>
+                    </tr>
+                    <tr ng-if="$data.length == 0">
+                        <td colspan="10" class="text-center" style="line-height: 40px; font-size: 20px;"><i class="fa fa-smile-o fa-lg"></i> 暂未查询到企业信息</td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+            <a id="bottom"></a>
+            <!-- ng-tableEnd -->
+        </div>
+    </div><!--/span-->
+</div>

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

@@ -199,9 +199,9 @@
         <div class="form-item">
             <span class="item-title">查看报表：</span>
             <span>
-                <a href="">商家产品数</a>
-                <a href="">品牌产品数</a>
-                <a href="">品类产品数</a>
+                <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>
         </div>
         <div class="form-item">