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

src/main/webapp/WEB-INF/views/normal/adminWithNav.html

@@ -165,12 +165,12 @@
 			<li class="nav-node"><a href="#audit/bankinfo"><i class="fa fa-bank"></i><span> 银行账户信息</span></a></li>
 			<li class="nav-node"><a href="#audit/realAuth"><i class="glyphicon glyphicon-user"></i><span> 实名认证审核</span></a></li>
 			<li class="nav-header">维护</li>
+			<li class="nav-node"><a href="#/manage"><i
+					class="fa fa-flag"></i><span> 产品管理</span></a></li>
 			<li class="nav-node"><a href="#/brand/map"><i
 					class="fa fa-flag"></i><span> 品牌映射维护</span></a></li>
 			<li class="nav-node"><a href="#/store/company"><i
 					class="fa fa-flag"></i><span> 寄售管理</span></a></li>
-			<li class="nav-node"><a href="#/manage"><i
-					class="fa fa-flag"></i><span> 产品管理</span></a></li>
 			<li class="nav-node"><a href="#brandmaintenance"><i
 					class="fa fa-bullhorn"></i><span> 品牌维护</span></a></li>
 			<li class="nav-node"><a href="#/store/list"><i

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

@@ -280,6 +280,24 @@
             templateUrl : 'static/view/admin/product/productManageDetail.html',
             controller : 'productManageDetailCtrl',
             controllerUrl : 'app/controllers/product/productManageDetailCtrl'
+        })).state('merchant_products', angularAMD.route({
+            // 商家产品数汇总
+            url: '/merchantProducts/:date',
+            templateUrl : 'static/view/admin/product/merchantProducts.html',
+            controller : 'merchantProductsCtrl',
+            controllerUrl : 'app/controllers/product/merchantProductsCtrl'
+        })).state('brand_products', angularAMD.route({
+            // 品牌产品数汇总
+            url: '/brandProductsCount/:date',
+            templateUrl : 'static/view/admin/product/brandProductsCount.html',
+            controller : 'brandProductsCountCtrl',
+            controllerUrl : 'app/controllers/product/brandProductsCountCtrl'
+        })).state('category_number', angularAMD.route({
+            // 品类产品数汇总
+            url: '/categoryNumber/:date',
+            templateUrl : 'static/view/admin/product/categoryNumber.html',
+            controller : 'categoryNumberCtrl',
+            controllerUrl : 'app/controllers/product/categoryNumberCtrl'
         })).state('store_company_list', angularAMD.route({
 			// 寄售管理
 			url: '/store/company',

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

@@ -1,7 +1,112 @@
 define(['app/app'], function(app) {
     'use strict';
     app.register.controller('productManageCtrl', ['$scope', '$modal', 'toaster', 'ngTableParams', 'BaseService', '$http', 'Goods', 'BackgroundRecord', 'Commodity', 'GoodsModifyInfo', function($scope, $modal, toaster, ngTableParams, BaseService, $http, Goods, BackgroundRecord, Commodity, GoodsModifyInfo) {
+        $scope.dateArea = 'oneMonth';
+        var _formatDate = function (date, fmt) {
+            if (!date) {
+                return null;
+            }
+            if (typeof date === 'string') {
+                date = new Date(Date.parse(date.replace(/-/g, '/')));
+            }
+            var o = {
+                'M+': date.getMonth() + 1, // 月份
+                'd+': date.getDate(), // 日
+                'h+': date.getHours(), // 小时
+                'm+': date.getMinutes(), // 分
+                's+': date.getSeconds(), // 秒
+                'q+': Math.floor((date.getMonth() + 3) / 3), // 季度
+                'S': date.getMilliseconds() // 毫秒
+            }
+            if (/(y+)/.test(fmt)) {
+                fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+            }
+            for (var k in o) {
+                if (new RegExp('(' + k + ')').test(fmt)) {
+                    fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)));
+                }
+            }
+            return fmt;
+        };
+        var _getClearDay = function (date) {
+            return new Date(_formatDate(date, 'yyyy-MM-dd')).getTime() - 8 * 60 * 60 * 1000
+        };
+
+        var currentTime = _getClearDay(new Date());
+        $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000);
+        $scope.endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+        $scope.startFormatDate = _formatDate($scope.startDate, 'yyyy-MM-dd');
+        $scope.endFormatDate = _formatDate($scope.endDate, 'yyyy-MM-dd');
+        var addStartDate = new Date($scope.startDate.getTime() + 24 * 60 * 60 * 1000)
+        var addEndDate = new Date($scope.endDate.getTime() + 24 * 60 * 60 * 1000)
+        $scope.addStartFormatDate = _formatDate(addStartDate, 'yyyy-MM-dd');
+        $scope.addEndFormatDate = _formatDate(addEndDate, 'yyyy-MM-dd');
+
+        $scope.setFilters = function (type, val) {
+            $scope[type] = val;
+            if (type == 'dateArea') {
+                // 时间筛选
+                var currentTime = _getClearDay(new Date());
+                var endDate = new Date(currentTime + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+                if (val == 'oneMonth') {
+                    $scope.startDate = new Date(currentTime - 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else if (val == 'threeMonth') {
+                    $scope.startDate = new Date(currentTime - 3 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                } else if (val == 'sixMonth') {
+                    $scope.startDate = new Date(currentTime - 6 * 30 * 24 * 60 * 60 * 1000 - 24 * 60 * 60 * 1000);
+                    $scope.endDate = endDate;
+                }
+            }
+            if (val != 'autoMonth') {
+                initTitleInfo();
+            } else {
+                // $scope.startDate = '';
+                // $scope.endDate = '';
+            }
+        };
+
+        $scope.condition = [];
+        var start = {
+            open : false
+        };
+        var end = {
+            open : false
+        };
+        $scope.condition.push(start);
+        $scope.condition.push(end);
+        // 打开日期选择框
+        $scope.openDatePicker = function($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            openParam == 0 ? $scope.condition[1].open = false : $scope.condition[0].open = false;
+            item[openParam].open = !item[openParam].open;
+        };
 
+        $scope.onDateCondition = function (bool, date) {
+            if (bool == 1) {
+                $scope.startDate = date;
+            } else {
+                $scope.endDate = date;
+            }
+            var startTime = $scope.startDate ? $scope.startDate.getTime() : null;
+            var endTime = $scope.endDate ? $scope.endDate.getTime() : null;
+            if (startTime && endTime && startTime > endTime) {
+                if (bool == 1) {
+                    toaster.pop('info', '起始时间不能大于结束时间');
+                    $scope.startDate = null;
+                } else {
+                    toaster.pop('info', '结束时间不能小于起始时间');
+                    $scope.endDate = null;
+                }
+            }
+            if ($scope.endDate && bool == 2) {
+                $scope.endDate = new Date($scope.endDate.getFullYear(), $scope.endDate.getMonth(), $scope.endDate.getDate())
+                $scope.endDate = new Date($scope.endDate.getTime() + 23 * 60 * 60 * 1000 + 59 * 60 * 1000 + 59 * 1000);
+            }
+            initTitleInfo();
+        };
         $scope.goodsFilter = {};
         $scope.kindPojo = {};
         var initTitleInfo = function () {
@@ -161,6 +266,19 @@ define(['app/app'], function(app) {
             }
         }
 
+        // 清空数据
+        $scope.clearClick = function () {
+            for( var tmp in $scope.goodsFilter) {
+                $scope.goodsFilter[tmp] = '';
+            }
+            for( var tmp in $scope.kindPojo) {
+                $scope.kindPojo[tmp] = '';
+            }
+            $scope.goodsFilter.kindUuid = '';
+            $scope.manageTableParams.page(1);
+            $scope.manageTableParams.reload();
+        };
+
         // 搜索事件
         $scope.searchClick = function () {
             if ($scope.kindPojo && $scope.kindPojo.first) {

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

@@ -1,317 +1,378 @@
 <div id="manage">
-    <div class="container-fluid">
-        <div class="manage-form">
-            <div class="form-top">
-                <div class="form-inline">
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            型号：
-                            <input class="form-control width140" type="text" ng-model="goodsFilter.code" placeholder="型号">
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            商家：
-                            <input class="form-control width140" type="text" ng-model="goodsFilter.store" placeholder="商家ID/商家名称">
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            在售状态：
-                            <select name="" id="1" class="form-control width88" ng-model="goodsFilter.saleStatus">
-                                <option value="">全部</option>
-                                <option value="601">已上架</option>
-                                <option value="613">新品未上架</option>
-                                <option value="612">已下架</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;币种：
-                            <select id="2" class="form-control width60" ng-model="goodsFilter.currency">
-                                <option value="">全部</option>
-                                <option value="RMB">RMB</option>
-                                <option value="USD">USD</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            拆包售卖：
-                            <select name="" id="3" ng-model="goodsFilter.breakUp" class="form-control width88">
-                                <option value="">全部</option>
-                                <option value="true">可拆卖</option>
-                                <option value="false">不可拆卖</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            审核状态：
-                            <select name="" id="4" ng-model="goodsFilter.audited" class="form-control width60">
-                                <option value="">全部</option>
-                                <option value="1">已审核</option>
-                                <option value="0">未审核</option>
-                            </select>
-                        </label>
-                    </div>
+    <div class="manage-form">
+        <div class="form-item">
+            <span class="item-title">上传时间：</span>
+            <div class="screen">
+                <div class="radio-block fl">
+                    <label class="com-check-radio">
+                        <input type="radio" id="oneMonth" name="date" ng-click="setFilters('dateArea', 'oneMonth')" ng-checked="dateArea == 'oneMonth'">
+                        <label for="oneMonth"></label>
+                        30天
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="threeMonth" name="date" ng-click="setFilters('dateArea', 'threeMonth')" ng-checked="dateArea == 'threeMonth'">
+                        <label for="threeMonth"></label>
+                        90天
+                    </label>
+                    <label class="com-check-radio">
+                        <input type="radio" id="sixMonth" name="date" ng-click="setFilters('dateArea', 'sixMonth')" ng-checked="dateArea == 'sixMonth'">
+                        <label for="sixMonth"></label>
+                        180天
+                    </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>
+                        自定义
+                    </label>
                 </div>
-                <div class="form-inline">
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            物料名称：
-                        </label>
-                        <div class="mar-rt0 row checkbox">
-                            <div class="col-md-3">
-                                <select class="form-control"
-                                        ng-model="kindPojo.first"
-                                        ng-options="key as value.nameCn for (key,value) in kindInfo"
-                                        ng-change="kindPojo.second='';kindPojo.third='';"
-                                        style="opacity: 1;">
-                                    <option value="">一级类目</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3" style="margin-left: 10px;">
-                                <select class="form-control" ng-model="kindPojo.second"
-                                        ng-options="key as value.nameCn for (key,value) in kindInfo[kindPojo.first].children"
-                                        ng-change="kindPojo.third='';"
-                                        style="opacity: 1;">
-                                    <option value="">二级类目</option>
-                                </select>
-                            </div>
-                            <div class="col-md-3">
-                                <select class="form-control" ng-model="kindPojo.third" style="opacity: 1;"
-                                        ng-options="value as value.nameCn for value in kindInfo[kindPojo.first].children[kindPojo.second].children">
-                                    <option value="">三级类目</option>
-                                </select>
-                            </div>
+                <div class="sreach fr">
+                    <div  ng-show="dateArea == 'autoMonth'" class="date fl">
+                        <div class="data-input">
+                            <input id="start" type="text" ng-model="startDate" readonly="readonly"
+                                   class="form-control select-adder" placeholder="起始时间"
+                                   datepicker-popup="yyyy-MM-dd"
+                                   is-open="condition[0].open"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-click="openDatePicker($event, condition, 0,1)"
+                                   ng-change="onDateCondition(1, startDate)"/>
+                            <button class="open" ng-click="openDatePicker($event, condition, 0)"></button>
+                        </div>
+                        <strong>–</strong>
+                        <div class="data-input">
+                            <input id="end" type="text" ng-model="endDate" readonly="readonly"
+                                   class="form-control select-adder" placeholder="结束时间"
+                                   datepicker-popup="yyyy-MM-dd"
+                                   is-open="condition[1].open"
+                                   current-text="今天" clear-text="清除" close-text="关闭"
+                                   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+                                   ng-click="openDatePicker($event, condition, 1, 2)"
+                                   ng-change="onDateCondition(2, endDate)"/>
+                            <button class="open" ng-click="openDatePicker($event, condition, 1)"></button>
                         </div>
                     </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            品牌：
-                            <input type="text" placeholder="品牌中英文名称" class="form-control width140" ng-model="goodsFilter.brand">
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            在售数量：
-                            <select name="" id="6" class="form-control width88" ng-model="goodsFilter.saleNum">
-                                <option value="">全部</option>
-                                <option value="601">有货</option>
-                                <option value="602">不足起订量</option>
-                                <option value="603">无货</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            销售方式：
-                            <select name="" id="7" ng-model="goodsFilter.saleSelf" class="form-control width60">
-                                <option value="">全部</option>
-                                <option value="true">自营</option>
-                                <option value="false">寄售</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            产品类型：
-                            <select name="" id="8" ng-model="goodsFilter.standard" class="form-control width88">
-                                <option value="">全部</option>
-                                <option value="true">标准产品</option>
-                                <option value="false">非标准产品</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <label class="control-label">
-                            图片类型：
-                            <select name="" id="9" ng-model="goodsFilter.haveImg" class="form-control width88">
-                                <option value="">全部</option>
-                                <option value="true">自有图片</option>
-                                <option value="false">默认图片</option>
-                            </select>
-                        </label>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <button ng-click="searchClick()">搜索</button>
-                    </div>
-                    <div class="form-group form-group-sm">
-                        <button title="此功能没有开放">产品导出</button>
-                        <!--<button ng-click="exportClick()" >产品导出</button>-->
+                </div>
+            </div>
+        </div>
+        <div class="form-item" style="background:#f5f5f5;">
+            <span class="item-title">条件筛选：</span>
+            <span>
+                <a ng-click="clearClick()">清空条件</a>
+                <a ng-click="searchClick()">确认筛选</a>
+            </span>
+            <span style="float:right">
+                <a ng-click="moreInfo()">更多信息</a>
+            </span>
+        </div>
+        <div class="form-top">
+            <div class="form-inline">
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>物料名称：</span>
+                    </label>
+                    <div class="select-three">
+                        <select class="form-control"
+                                ng-model="kindPojo.first"
+                                ng-options="key as value.nameCn for (key,value) in kindInfo"
+                                ng-change="kindPojo.second='';kindPojo.third='';"
+                                style="opacity: 1;">
+                            <option value="">一级类目</option>
+                        </select>
+                        <select class="form-control" ng-model="kindPojo.second"
+                                ng-options="key as value.nameCn for (key,value) in kindInfo[kindPojo.first].children"
+                                ng-change="kindPojo.third='';"
+                                style="opacity: 1;">
+                            <option value="">二级类目</option>
+                        </select>
+                        <select class="form-control" ng-model="kindPojo.third" style="opacity: 1;"
+                                ng-options="value as value.nameCn for value in kindInfo[kindPojo.first].children[kindPojo.second].children">
+                            <option value="">三级类目</option>
+                        </select>
                     </div>
                 </div>
             </div>
-            <div class="form-bottom">
-                <button ng-click="batchDown()">批量下架</button>
-                <button ng-click="moreInfo()">更多信息</button>
-                <!--<label>-->
-                    <!--<input type="checkbox">合并相同产品-->
-                <!--</label>-->
-                <span style="float: right;font-size: 14px">共<span style="color: red;" ng-bind="totalCount">3424</span>个产品</span>
+            <div class="form-inline">
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>型号：</span>
+                        <input class="form-control" type="text" ng-model="goodsFilter.code" placeholder="型号">
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>商家：</span>
+                        <input class="form-control" type="text" ng-model="goodsFilter.store" placeholder="商家ID/商家名称">
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>在售状态：</span>
+                        <select name="" id="1" class="form-control" ng-model="goodsFilter.saleStatus">
+                            <option value="">全部</option>
+                            <option value="601">已上架</option>
+                            <option value="613">新品未上架</option>
+                            <option value="612">已下架</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>币种：</span>
+                        <select id="2" class="form-control" ng-model="goodsFilter.currency">
+                            <option value="">全部</option>
+                            <option value="RMB">RMB</option>
+                            <option value="USD">USD</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>拆包售卖：</span>
+                        <select name="" id="3" ng-model="goodsFilter.breakUp" class="form-control">
+                            <option value="">全部</option>
+                            <option value="true">可拆卖</option>
+                            <option value="false">不可拆卖</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>审核状态：</span>
+                        <select name="" id="4" ng-model="goodsFilter.audited" class="form-control">
+                            <option value="">全部</option>
+                            <option value="1">已审核</option>
+                            <option value="0">未审核</option>
+                        </select>
+                    </label>
+                </div>
+            </div>
+            <div class="form-inline">
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>品牌：</span>
+                        <input type="text" placeholder="品牌中英文名称" class="form-control" ng-model="goodsFilter.brand">
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>在售数量：</span>
+                        <select name="" id="6" class="form-control" ng-model="goodsFilter.saleNum">
+                            <option value="">全部</option>
+                            <option value="601">有货</option>
+                            <option value="602">不足起订量</option>
+                            <option value="603">无货</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>销售方式：</span>
+                        <select name="" id="7" ng-model="goodsFilter.saleSelf" class="form-control">
+                            <option value="">全部</option>
+                            <option value="true">自营</option>
+                            <option value="false">寄售</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>产品类型：</span>
+                        <select name="" id="8" ng-model="goodsFilter.standard" class="form-control">
+                            <option value="">全部</option>
+                            <option value="true">标准产品</option>
+                            <option value="false">非标准产品</option>
+                        </select>
+                    </label>
+                </div>
+                <div class="form-group form-group-sm">
+                    <label class="control-label">
+                        <span>图片类型：</span>
+                        <select name="" id="9" ng-model="goodsFilter.haveImg" class="form-control">
+                            <option value="">全部</option>
+                            <option value="true">自有图片</option>
+                            <option value="false">默认图片</option>
+                        </select>
+                    </label>
+                </div>
             </div>
         </div>
-        <div class="manage-table">
-           <table class="table" ng-table="manageTableParams">
-               <thead>
-               <tr>
-                   <th width="80">
-                       <label>
-                           <input id="AllChoose" type="checkbox" ng-checked="isChooseAll" ng-click="chooseAll()">全选
-                       </label>
-                   </th>
-                   <th width="120">操作</th>
-                   <th width="160" ng-if="titleInShow['商家ID']">商家ID</th>
-                   <th width="160" ng-if="titleInShow['商家名称']">商家名称</th>
-                   <th width="160">产品信息</th>
-                   <th width="160" ng-if="titleInShow['SKU编码']">SKU编码</th>
-                   <th width="160" ng-if="titleInShow['产品编号']">产品编号</th>
-                   <th width="160" ng-if="titleInShow['封装']">封装</th>
-                   <th width="160" ng-if="titleInShow['梯度']">梯度</th>
-                   <th width="160" ng-if="titleInShow['单价']">单价</th>
-                   <th width="160" ng-if="titleInShow['交期（天）']">交期（天）</th>
-                   <th width="160" ng-if="titleInShow['包装']">包装</th>
-                   <th width="160" ng-if="titleInShow['包装数量']">包装数量</th>
-                   <th width="160" ng-if="titleInShow['起订量']">起订量</th>
-                   <th width="160" ng-if="titleInShow['拆包售卖']">拆包售卖</th>
-                   <th width="160" ng-if="titleInShow['在售数量']">在售数量</th>
-                   <th width="160" ng-if="titleInShow['锁库数']">锁库数</th>
-                   <th width="160" ng-if="titleInShow['冻结数量']">冻结数量</th>
-                   <th width="160" ng-if="titleInShow['库存总数']">库存总数</th>
-                   <th width="160" ng-if="titleInShow['在售状态']">在售状态</th>
-                   <th width="160" ng-if="titleInShow['销售方式']">销售方式</th>
-                   <th width="160" ng-if="titleInShow['创建人']">创建人</th>
-                   <th width="160" ng-if="titleInShow['创建时间']">创建时间</th>
-                   <th width="160" ng-if="titleInShow['产品类型']">产品类型</th>
-                   <th width="160" ng-if="titleInShow['图片类型']">图片类型</th>
-                   <th width="160" ng-if="titleInShow['产品图片']">产品图片</th>
-               </tr>
-               </thead>
-               <tbody>
-               <tr ng-repeat="list in goodsList">
-                   <td>
-                       <input id="{{$index+1}}" type="checkbox" ng-checked="list.isChoosed" ng-click="chooseOne(list)">
-                   </td>
-                   <td>
-                       <a target="_blank" href="admin#/manage/{{list.id}}">详情</a>
-                       <a ng-if="list.audited == 0" ng-click="auditProduct(list)">审核</a>
-                       <br/>
-                       <a ng-click="journalProduct(list)" style="margin-left:-1px;">日志</a>
-                       <a ng-if="list.status == 601 || list.status == 602" ng-click="soldOutProduct([list.batchCode])">下架</a>
-                   </td>
-                   <td ng-if="titleInShow['商家ID']">
-                       <span ng-bind="list.enUU || '-'">商家ID</span>
-                   </td>
-                   <td ng-if="titleInShow['商家名称']">
-                       <span ng-bind="list.storeName || '-'">商家名称</span>
-                   </td>
-                   <td>
-                       <p>物料名称：<span ng-bind="list.kindNameCn || '-'">****</span></p>
-                       <p>型号：<span ng-bind="list.code || '-'">****</span></p>
-                       <p>品牌：<span ng-bind="list.brandNameEn || '-'">****</span></p>
-                   </td>
-                   <td ng-if="titleInShow['SKU编码']">
-                       <span ng-bind="list.batchCode || '-'">SKU编码</span>
-                   </td>
-                   <td ng-if="titleInShow['产品编号']">
-                       <span ng-bind="list.prodNum || '-'">产品编号</span>
-                   </td>
-                   <td ng-if="titleInShow['封装']">
-                       <span ng-bind="list.encapsulation || '-'">封装</span>
-                   </td>
-                   <td ng-if="titleInShow['梯度']">
-                      <div ng-repeat="qty in list.prices">
+        <div class="form-item">
+            <span class="item-title">查看报表：</span>
+            <span>
+                <a href="">商家产品数</a>
+                <a href="">品牌产品数</a>
+                <a href="">品类产品数</a>
+            </span>
+        </div>
+        <div class="form-item">
+            <span class="item-title">更多操作：</span>
+            <span>
+                <a ng-click="batchDown()">批量下架</a>
+                <a title="此功能没有开放">产品导出</a>
+                <!--<a ng-click="exportClick()">产品导出</a>-->
+            </span>
+            <span style="float: right;font-size: 14px">共<span style="color: red;" ng-bind="totalCount">3424</span>个产品</span>
+        </div>
+    </div>
+    <div class="manage-table">
+        <table class="table" ng-table="manageTableParams">
+            <thead>
+            <tr>
+                <th width="80">
+                    <label>
+                        <input id="AllChoose" type="checkbox" ng-checked="isChooseAll" ng-click="chooseAll()">全选
+                    </label>
+                </th>
+                <th width="120">操作</th>
+                <th width="160" ng-if="titleInShow['商家ID']">商家ID</th>
+                <th width="160" ng-if="titleInShow['商家名称']">商家名称</th>
+                <th width="160">产品信息</th>
+                <th width="160" ng-if="titleInShow['SKU编码']">SKU编码</th>
+                <th width="160" ng-if="titleInShow['产品编号']">产品编号</th>
+                <th width="160" ng-if="titleInShow['封装']">封装</th>
+                <th width="160" ng-if="titleInShow['梯度']">梯度</th>
+                <th width="160" ng-if="titleInShow['单价']">单价</th>
+                <th width="160" ng-if="titleInShow['交期（天）']">交期（天）</th>
+                <th width="160" ng-if="titleInShow['包装']">包装</th>
+                <th width="160" ng-if="titleInShow['包装数量']">包装数量</th>
+                <th width="160" ng-if="titleInShow['起订量']">起订量</th>
+                <th width="160" ng-if="titleInShow['拆包售卖']">拆包售卖</th>
+                <th width="160" ng-if="titleInShow['在售数量']">在售数量</th>
+                <th width="160" ng-if="titleInShow['锁库数']">锁库数</th>
+                <th width="160" ng-if="titleInShow['冻结数量']">冻结数量</th>
+                <th width="160" ng-if="titleInShow['库存总数']">库存总数</th>
+                <th width="160" ng-if="titleInShow['在售状态']">在售状态</th>
+                <th width="160" ng-if="titleInShow['销售方式']">销售方式</th>
+                <th width="160" ng-if="titleInShow['创建人']">创建人</th>
+                <th width="160" ng-if="titleInShow['创建时间']">创建时间</th>
+                <th width="160" ng-if="titleInShow['产品类型']">产品类型</th>
+                <th width="160" ng-if="titleInShow['图片类型']">图片类型</th>
+                <th width="160" ng-if="titleInShow['产品图片']">产品图片</th>
+            </tr>
+            </thead>
+            <tbody>
+            <tr ng-repeat="list in goodsList">
+                <td>
+                    <input id="{{$index+1}}" type="checkbox" ng-checked="list.isChoosed" ng-click="chooseOne(list)">
+                </td>
+                <td>
+                    <a target="_blank" href="admin#/manage/{{list.id}}">详情</a>
+                    <a ng-if="list.audited == 0" ng-click="auditProduct(list)">审核</a>
+                    <br/>
+                    <a ng-click="journalProduct(list)" style="margin-left:-1px;">日志</a>
+                    <a ng-if="list.status == 601 || list.status == 602" ng-click="soldOutProduct([list.batchCode])">下架</a>
+                </td>
+                <td ng-if="titleInShow['商家ID']">
+                    <span ng-bind="list.enUU || '-'">商家ID</span>
+                </td>
+                <td ng-if="titleInShow['商家名称']">
+                    <span ng-bind="list.storeName || '-'">商家名称</span>
+                </td>
+                <td>
+                    <p>物料名称：<span ng-bind="list.kindNameCn || '-'">****</span></p>
+                    <p>型号：<span ng-bind="list.code || '-'">****</span></p>
+                    <p>品牌：<span ng-bind="list.brandNameEn || '-'">****</span></p>
+                </td>
+                <td ng-if="titleInShow['SKU编码']">
+                    <span ng-bind="list.batchCode || '-'">SKU编码</span>
+                </td>
+                <td ng-if="titleInShow['产品编号']">
+                    <span ng-bind="list.prodNum || '-'">产品编号</span>
+                </td>
+                <td ng-if="titleInShow['封装']">
+                    <span ng-bind="list.encapsulation || '-'">封装</span>
+                </td>
+                <td ng-if="titleInShow['梯度']">
+                    <div ng-repeat="qty in list.prices">
                           <span ng-if="!$last">
                               <span ng-bind="qty.start"></span>-<span ng-bind="qty.end"></span>
                           </span>
-                          <span ng-if="$last">
+                        <span ng-if="$last">
                               <span ng-bind="qty.start"></span>以上
                           </span>
-                      </div>
-                   </td>
-                   <td ng-if="titleInShow['单价']">
-                      <div ng-repeat="price in list.prices">
-                          <span ng-bind="list.currencyName == 'RMB' ? '￥' : '$'"></span>
-                          <span ng-bind="list.currencyName == 'RMB' ? price.rMBPrice : price.uSDPrice"></span>
-                      </div>
-                   </td>
-                   <td ng-if="titleInShow['交期（天）']">
-                       <div ng-if="list.b2cMinDelivery != list.b2cMaxDelivery">
-                           <span ng-bind="list.b2cMinDelivery || '-'">交期（天）</span>-
-                           <span ng-bind="list.b2cMaxDelivery || '-'">交期（天）</span>
-                       </div>
-                       <span ng-if="list.b2cMinDelivery == list.b2cMaxDelivery" ng-bind="list.b2cMinDelivery || '-'">交期（天）</span>
-                   </td>
-                   <td ng-if="titleInShow['包装']">
-                       <span ng-bind="list.packaging || '-'">包装</span>
-                   </td>
-                   <td ng-if="titleInShow['包装数量']">
-                       <span ng-bind="list.minPackQty || '-'">包装</span>
-                   </td>
-                   <td ng-if="titleInShow['起订量']">
-                       <span ng-bind="list.minBuyQty || '-'">起订量</span>
-                   </td>
-                   <td ng-if="titleInShow['拆包售卖']">
-                       <span ng-if="list.breakUp">可拆卖</span>
-                       <span ng-if="!list.breakUp">不可拆卖</span>
-                   </td>
-                   <td ng-if="titleInShow['在售数量']">
-                       <span ng-bind="list.reserve">在售数量</span>
-                   </td>
-                   <td ng-if="titleInShow['锁库数']">
-                       <span ng-bind="'-'">锁库数</span>
-                   </td>
-                   <td ng-if="titleInShow['冻结数量']">
-                       <span ng-bind="list.frozen">冻结数量</span>
-                   </td>
-                   <td ng-if="titleInShow['库存总数']">
-                       <span ng-bind="list.reserve + list.frozen">库存总数</span>
-                   </td>
-                   <td ng-if="titleInShow['在售状态']">
-                       <span ng-bind="saleStatus[list.status] || '-'">在售状态</span>
-                   </td>
-                   <td ng-if="titleInShow['销售方式']">
-                       <span ng-bind="list.selfSale || '-'">销售方式</span>
-                   </td>
-                   <td ng-if="titleInShow['创建人']">
-                       <span ng-bind="list.publisherName || '-'">创建人</span>
-                   </td>
-                   <td ng-if="titleInShow['创建时间']">
-                       <span ng-bind="list.createdDate | date: 'yyyy-MM-dd HH:mm:ss' || '-'">创建时间</span>
-                   </td>
-                   <td ng-if="titleInShow['产品类型']">
-                       <span ng-if="list.uuid">标准</span>
-                       <span ng-if="!list.uuid">非标</span>
-                   </td>
-                   <td ng-if="titleInShow['图片类型']">
-                       <span ng-if="list.img">自有图片</span>
-                       <span ng-if="!list.img">默认图片</span>
-                   </td>
-                   <td ng-if="titleInShow['产品图片']">
-                       <img ng-src="{{list.img || 'static/img/store/common/default.png'}}" ng-click="showImg(list.img)" alt="产品图片">
-                   </td>
-               </tr>
-               </tbody>
-           </table>
-       </div>
+                    </div>
+                </td>
+                <td ng-if="titleInShow['单价']">
+                    <div ng-repeat="price in list.prices">
+                        <span ng-bind="list.currencyName == 'RMB' ? '￥' : '$'"></span>
+                        <span ng-bind="list.currencyName == 'RMB' ? price.rMBPrice : price.uSDPrice"></span>
+                    </div>
+                </td>
+                <td ng-if="titleInShow['交期（天）']">
+                    <div ng-if="list.b2cMinDelivery != list.b2cMaxDelivery">
+                        <span ng-bind="list.b2cMinDelivery || '-'">交期（天）</span>-
+                        <span ng-bind="list.b2cMaxDelivery || '-'">交期（天）</span>
+                    </div>
+                    <span ng-if="list.b2cMinDelivery == list.b2cMaxDelivery" ng-bind="list.b2cMinDelivery || '-'">交期（天）</span>
+                </td>
+                <td ng-if="titleInShow['包装']">
+                    <span ng-bind="list.packaging || '-'">包装</span>
+                </td>
+                <td ng-if="titleInShow['包装数量']">
+                    <span ng-bind="list.minPackQty || '-'">包装</span>
+                </td>
+                <td ng-if="titleInShow['起订量']">
+                    <span ng-bind="list.minBuyQty || '-'">起订量</span>
+                </td>
+                <td ng-if="titleInShow['拆包售卖']">
+                    <span ng-if="list.breakUp">可拆卖</span>
+                    <span ng-if="!list.breakUp">不可拆卖</span>
+                </td>
+                <td ng-if="titleInShow['在售数量']">
+                    <span ng-bind="list.reserve">在售数量</span>
+                </td>
+                <td ng-if="titleInShow['锁库数']">
+                    <span ng-bind="'-'">锁库数</span>
+                </td>
+                <td ng-if="titleInShow['冻结数量']">
+                    <span ng-bind="list.frozen">冻结数量</span>
+                </td>
+                <td ng-if="titleInShow['库存总数']">
+                    <span ng-bind="list.reserve + list.frozen">库存总数</span>
+                </td>
+                <td ng-if="titleInShow['在售状态']">
+                    <span ng-bind="saleStatus[list.status] || '-'">在售状态</span>
+                </td>
+                <td ng-if="titleInShow['销售方式']">
+                    <span ng-bind="list.selfSale || '-'">销售方式</span>
+                </td>
+                <td ng-if="titleInShow['创建人']">
+                    <span ng-bind="list.publisherName || '-'">创建人</span>
+                </td>
+                <td ng-if="titleInShow['创建时间']">
+                    <span ng-bind="list.createdDate | date: 'yyyy-MM-dd HH:mm:ss' || '-'">创建时间</span>
+                </td>
+                <td ng-if="titleInShow['产品类型']">
+                    <span ng-if="list.uuid">标准</span>
+                    <span ng-if="!list.uuid">非标</span>
+                </td>
+                <td ng-if="titleInShow['图片类型']">
+                    <span ng-if="list.img">自有图片</span>
+                    <span ng-if="!list.img">默认图片</span>
+                </td>
+                <td ng-if="titleInShow['产品图片']">
+                    <img ng-src="{{list.img || 'static/img/store/common/default.png'}}" ng-click="showImg(list.img)" alt="产品图片">
+                </td>
+            </tr>
+            </tbody>
+        </table>
     </div>
 </div>
 <style>
+    .ng-table-pager {
+        position: absolute;
+        right: 0;
+        margin-top: 20px;
+    }
     #manage input[type=checkbox]{
         position:relative;
         top:3px;
         left:-3px;
     }
 
-    .manage-form{
-        height:158px;
-        background: #fff;
-        border-radius:5px;
-    }
     .manage-form .form-top{
         padding-top:15px;
+        border:1px solid #f5f5f5;
     }
     .manage-form .form-top .form-inline{
         display: inline-block;
@@ -320,109 +381,48 @@
     }
     .manage-form .form-top .form-group{
         display: inline-block;
-        margin:0 18px;
+        margin:0 5px;
         vertical-align: middle;
     }
+
     .manage-form .form-top label{
         text-align: right;
         font-size: 14px;
         color:#666;
     }
 
-    .manage-form .form-top ul.tree{
-        position:absolute;
-        top:-4px;
-        left:46px;
-        z-index:100;
-        display:inline-block;
-        min-width:140px;
-        max-height: 473px;
-        overflow-y: auto;
-        line-height: 23px;
-        padding:0 5px;
-        margin:0;
-        color: #555555;
-        vertical-align: middle;
-        background-color: #ffffff;
-        border: 1px solid #cccccc;
-        border-radius: 4px;
-        -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-        box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-        -webkit-transition: border-color ease-in-out .15s,-webkit-box-shadow ease-in-out .15s;
-        -o-transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-        transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
-    }
-
-    .manage-form .form-top ul.tree li{
-        text-align: left;
-    }
-    .manage-form .form-top ul.tree li .icon-left {
-        position:absolute;
-        top:3px;
-        right:0px;
-        display:inline-block;
-        width:20px;
-        height:20px;
-        background: url("static/img/icon/opa-icons-color16.png") no-repeat -63px 1px;
-    }
-
-    .manage-form .form-top ul.tree li .icon-down {
-        position:absolute;
-        top:3px;
-        right:0px;
+    .manage-form .form-top label span{
         display:inline-block;
-        width:20px;
-        height:20px;
-        background: url("static/img/icon/opa-icons-color16.png") no-repeat -30px 1px;
-    }
-    .manage-form .form-top ul.tree li span{
-        color:#555;
-        font-size: 12px;
-        font-weight: normal;
+        width:80px;
+        font-weight:bold;
+        color:#2fa4e7;
     }
 
-    .manage-form .form-top label input{
+    .manage-form .form-top label input, .manage-form .form-top label select{
         display: inline-block;
+        width:110px;
         height:25px;
+        line-height: 25px;
         padding:0 2px;
         margin:0;
     }
-    .manage-form .form-top label select{
+    .manage-form .form-top .select-three {
+        display: inline-block;
+        margin:0;
+    }
+    .manage-form .form-top .select-three select{
         display: inline-block;
+        min-width:140px;
         height:25px;
         line-height: 25px;
         padding:0 2px;
         margin:0;
     }
-    .manage-form .form-top label .width180{
-        padding:0 2px;
-        width:180px;
-    }
-    .manage-form .form-top label .width140{
-        padding:0 2px;
-        width:140px;
-    }
-    .manage-form .form-top label .width88{
-        width:88px;
-    }
-    .manage-form .form-top label .width60{
-        width:60px;
-    }
-    .manage-form .form-bottom{
-        margin-top:32px;
-    }
-    .manage-form  button{
-        border-radius:3px;
-        border:none;
-        line-height: 25px;
-        padding:0 15px;
-        font-size: 14px;
-        color:#fff;
-        background: #49afea;
-    }
-    .manage-form .form-bottom button{
-        margin:0 18px;
+
+    .manage-table{
+        overflow-y: auto;
     }
+
     .manage-table table{
         table-layout: fixed;
         font-size: 14px;
@@ -517,78 +517,90 @@
         cursor:pointer;
         color:#fff;
     }
-
-    /* 树结构样式  */
-
-    [treecontrol] ul {
-        list-style: none;
-    }
-
-    [treecontrol] li {
-        position: relative;
-        padding: 0 0 0 20px;
-        line-height: 20px;
-    }
-
-    [treecontrol] li.tree-expanded i.tree-leaf-head, [treecontrol] li.tree-collapsed i.tree-leaf-head {display:none;}
-    [treecontrol] li.tree-expanded i.tree-branch-head, [treecontrol] li.tree-collapsed i.tree-branch-head {display:inline;}
-    [treecontrol] li.tree-leaf i.tree-branch-head {display:none;}
-    [treecontrol] li.tree-leaf i.tree-leaf-head {display:inline;}
-
-    [treecontrol] li i {
-        cursor: pointer;
+</style>
+<style>
+    .fr{
+        float:right;
     }
-
-    [treecontrol] li .tree-label {
-        cursor: pointer;
-        display: inline;
+    .fl{
+        float:left;
     }
-
-    [treecontrol].tree-boot > ul > li {
+    /*搜索时间筛选 start*/
+    .manage-form .form-item .screen {
+        display: inline-block;
         padding: 0;
+        vertical-align: middle;
     }
-
-    [treecontrol].tree-boot li > .tree-label {
-        display: block;
-        padding: 3px 0;
-        border-radius: 4px;
-    }
-
-    [treecontrol].tree-boot i.tree-branch-head,
-    [treecontrol].tree-boot i.tree-leaf-head {
-        float: left;
-        height: 16px;
-        margin: 5px;
+    .manage-form .com-check-radio{
+        font-size: 14px;
+        font-weight: normal;
+        line-height: 32px;
+        margin-right: 10px;
+        cursor:pointer;
     }
-
-    [treecontrol].tree-boot li.tree-expanded i.tree-branch-head {
-        padding: 1px 10px;
-        background: url("static/img/icon/opa-icons-color16.png") no-repeat -63px 1px;
+    .manage-form .screen .sreach .date{
+        margin:0 20px;
     }
-
-    [treecontrol].tree-boot li.tree-collapsed i.tree-branch-head {
-        padding: 1px 10px;
-        background: url("static/img/icon/opa-icons-color16.png") no-repeat -30px 1px;
+    .manage-form .screen .sreach .date input{
+        width: 117px;
+        text-align: left;
+        border: 1px solid #5078cb;
     }
-
-    [treecontrol].tree-boot li.tree-leaf i.tree-leaf-head {
-        padding: 1px 5px;
+    .manage-form .screen .sreach .date input:hover{
+        cursor: pointer;
     }
-
-    [treecontrol].tree-boot .tree-label.tree-selected,
-    [treecontrol].tree-boot .tree-label.tree-selected:hover{
-        background-color: #38a8e8;
+    .manage-form .screen .sreach .date strong{
+        float: left;
+        line-height: 32px;
+        color: #999;
+        margin: 0 5px;
     }
-
-    [treecontrol].tree-boot .tree-label:hover{
-        background-color: #38a8e8;
+    .manage-form .data-input{
+        float: left;
+        position: relative;
     }
-    [treecontrol].tree-boot .tree-label:hover span{
+    .manage-form .data-input button.open{
+        position: absolute;
+        right: 1px;
+        top: 1px;
+        width: 20px;
+        height: 30px;
+        background: url('static/img/user/images/xiala.png') right no-repeat #fff !important;
+        background-position-x: 100% !important;
+        border: none;
+    }
+    .manage-form .screen .sreach .date input.form-control{
+        padding: 6px 6px;
+        border-radius: 2px;
+        height:32px;
+    }
+    .manage-form .screen .radio-block {
+        width: auto;
+    }
+    .manage-form .form-item{
+        font-size:14px;
+        vertical-align: top;
+        line-height:40px;
+    }
+    .manage-form .form-item span{}
+    .manage-form .form-item span a{
+        display:inline-block;
+        text-decoration:none;
+        height:26px;
+        line-height:26px;
+        color:#2fa4e7;
+        border:1px solid #2fa4e7;
+        border-radius:4px;
+        padding:0 10px;
+        margin:0 10px;
+    }
+    .manage-form .form-item span a:hover{
+        cursor:pointer;
+        background: #2fa4e7;
         color:#fff;
     }
-
-    #toast-container {
-        top: auto;
-        bottom: 40px;
+    .manage-form .form-item .item-title{
+        margin-left:5px;
+        font-weight:bold;
     }
 </style>