B2B客户采购订单各类数量获取，自定义时间筛选方法调整

src/main/webapp/resources/js/common/b2bServices.js

@@ -61,6 +61,25 @@ define([ 'angular', 'common/utils', 'big'], function(angular, utils) {
                 } else {
                     return null;
                 }
+            },
+
+            /**
+             * 将date转成time
+             *
+             * @param date
+             * @returns {string}
+             */
+            formatDateTime: function (date) {
+                var y = date.getFullYear();
+                var m = date.getMonth() + 1;
+                m = m < 10 ? ('0' + m) : m;
+                var d = date.getDate();
+                d = d < 10 ? ('0' + d) : d;
+                var h = date.getHours();
+                var minute = date.getMinutes();
+                var sec = date.getSeconds();
+                minute = minute < 10 ? ('0' + minute) : minute;
+                return y + '-' + m + '-' + d+' '+h+':'+minute+':'+sec;
             }
         };
     }).factory('B2bCommerce', ['$resource', function($resource) {

src/main/webapp/resources/js/vendor/controllers/b2b/saleOrderCtrl.js

@@ -214,8 +214,9 @@ define(['app/app'], function (app) {
                 };
 
                 $scope.parseDate = function (dateStr) {
-                    if (dateStr)
+                    if (dateStr) {
                         return Date.parse(dateStr, 'yyyy-MM-dd');
+                    }
                     return new Date();
                 };
 
@@ -457,4 +458,21 @@ define(['app/app'], function (app) {
             }
         }
     }]);
+
+    /**
+     * 获取B2B快照
+     */
+    app.register.controller('SnapShotCtrl', ['$scope', 'B2bCommerce', '$http', function($scope, B2bCommerce, $http) {
+
+        /**
+         *  先获取B2B访问路径再进行下一步操作
+         */
+        B2bCommerce.accessUrl({}, function (data) {
+            var b2bUrl = data.url;
+            var snapShotUrl = b2bUrl + '/snapshot/todo';
+            $http.get(snapShotUrl).success(function (data) {
+                $scope.snapShot = data;
+            });
+        });
+    }]);
 });

src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -193,13 +193,13 @@
 			</ul>
 		</div>
 		<div class="oder01" style="margin-bottom: 0px">
-			<ul>
-				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !counts['all']}" ng-bind="counts['all'] || 0"></em>)</a></li>
-				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复(<em ng-class="{'color-black': !counts['tobeconfirmed']}" ng-bind="counts['tobeconfirmed'] || 0"></em>)</a></li>
-				<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待回复(<em ng-class="{'color-black': !counts['comfirmed']}" ng-bind="counts['comfirmed'] || 0"></em>)</a></li>
-				<li ng-class="{'active': active=='received'}" ng-click="setActive('received')"><a>已收货(<em ng-class="{'color-black': !counts['inbound']}" ng-bind="counts['inbound'] || 0"></em>)</a></li>
-				<li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待交货(<em ng-class="{'color-black': !counts['tobepaid']}" ng-bind="counts['tobepaid'] || 0"></em>)</a></li>
-				<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已结案(<em ng-class="{'color-black': !counts['completed']}" ng-bind="counts['completed'] || 0"></em>)</a></li>
+			<ul ng-controller="SnapShotCtrl">
+				<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 全部(<em ng-class="{'color-black': !snapShot.saleOrderAll }" ng-bind="snapShot.saleOrderAll || 0"></em>)</a></li>
+				<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已回复(<em ng-class="{'color-black': !snapShot.saleOrderDone }" ng-bind="snapShot.saleOrderDone || 0"></em>)</a></li>
+				<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待回复(<em ng-class="{'color-black': !snapShot.saleOrderAll }" ng-bind="snapShot.saleOrderAll || 0"></em>)</a></li>
+				<li ng-class="{'active': active=='received'}" ng-click="setActive('received')"><a>已收货(<em ng-class="{'color-black': !snapShot.saleOrderReceived }" ng-bind="snapShot.saleOrderReceived || 0"></em>)</a></li>
+				<li ng-class="{'active': active=='waiting'}" ng-click="setActive('waiting')"><a>待交货(<em ng-class="{'color-black': !snapShot.saleOrderWaiting }" ng-bind="snapShot.saleOrderWaiting || 0"></em>)</a></li>
+				<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已结案(<em ng-class="{'color-black': !snapShot.saleOrderEnd }" ng-bind="snapShot.saleOrderEnd || 0"></em>)</a></li>
 			</ul>
 		</div>
 		<!--搜索时间筛选-->
@@ -232,34 +232,34 @@
 			<div class="sreach fr">
 				<div ng-show="autoMonth" class="date fl">
 					<div class="data-input">
-						<input type="text" ng-model="startDate"
+						<input type="text" ng-model="condition.dateFrom"
 							   class="form-control select-adder" placeholder="起始时间"
 							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.startDateOpen"
-							   max-date="endDate" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openDatePicker($event, condition, 'startDateOpen',1)"
+							   is-open="condition.$fromOpened"
+							   max-date="condition.dateTo" current-text="今天" clear-text="清除" close-text="关闭"
+							   ng-click="openFilterDatePicker($event, condition, '$fromOpened')"
+							   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')"
 							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							   ng-change="vaildDate(true)"
 						/>
-						<button class="open" ng-click="openDatePicker($event, condition, 'startDateOpen')"></button>
+						<button class="open" ng-click="openFilterDatePicker($event, condition, '$fromOpened')"></button>
 					</div>
 
 					<em>–</em>
 					<div class="data-input">
-						<input type="text" ng-model="endDate"
+						<input type="text" ng-model="condition.dateTo"
 							   class="form-control select-adder" placeholder="结束时间"
 							   datepicker-popup="yyyy-MM-dd"
-							   is-open="condition.endDateOpen"
-							   min-date="startDate" current-text="今天" clear-text="清除" close-text="关闭"
-							   ng-click="openDatePicker($event, condition, 'endDateOpen',2)"
+							   is-open="condition.$toOpened"
+							   min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
+							   ng-click="openFilterDatePicker($event, condition, '$toOpened')"
+                               ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
 							   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							   ng-change="changeEndDate()"
 						/>
-						<button class="open" ng-click="openDatePicker($event, condition, 'endDateOpen')"></button>
+						<button class="open" ng-click="openFilterDatePicker($event, condition, '$toOpened')"></button>
 					</div>
 				</div>
 				<div class="sreach-input fr">
-					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="search()"/>
+					<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch()"/>
 					<a class="seek" href="javascript:void(0)" ng-click="onSearch()">搜索</a>
 				</div>
 			</div>