fix：调整应付对账 新增自定义时间选项

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

@@ -9612,23 +9612,25 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.setActive = function (state) {
             if ($scope.active != state) {
                 $scope.active = state;
-                if ($scope.tableParams.page() == 1)
-                    $scope.tableParams.reload();
-                else
-                    $scope.tableParams.page(1);
+                // if ($scope.tableParams.page() == 1)
+                //     $scope.tableParams.reload();
+                // else
+                //     $scope.tableParams.page(1);
                 $scope.showNotCheck = false
             }
             $scope.condition.$open = false
             $scope.apCheckCondition.$open = false
-            if (state != 'active') {
-                $scope.changeDateZone(1)
-            }
+            // if (state != 'active') {
+            //     $scope.changeDateZone(1)
+            // }
         };
-        $scope.changeDateZone = function (zone) {
+        $scope.changeDateZone = function (zone, flg) {
+
             $scope.condition.dateZone = zone;
             $scope.dateZoneText = zone == 1 ? '最近一个月' : (zone == 3 ? '最近三个月' : (zone == 6 ? '最近六个月' : '自定义'));
             $scope.condition.$dateZoneOpen = false;
             getDateCondition(zone, $scope.condition);
+            if (flg) return
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
@@ -9654,19 +9656,24 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 pageParams.keyword = $scope.keyword;
                 if ($scope.active === 'all') {
                     pageParams.keyword = $scope.keyword
-                    var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
-                    _fromDate = _fromDate.replace(/-/g,'/')
-                    var _d  = new Date(_fromDate)
-                    _d.setDate(1)
-                    _d.setMonth(_d.getMonth() + 1)
-                    _d.setDate(_d.getDate() - 1)
-                    var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
-                    _endDate = _endDate.replace(/-/g, '/')
-                    _endDate = new Date(_endDate).getTime()
-                    // _fromDate = _fromDate.replace(/-/g, '/')
-                    _fromDate = new Date(_fromDate).getTime()
-                    pageParams.searchFilter.fromDate =  _fromDate
-                    pageParams.searchFilter.endDate = _endDate
+                    if (!$scope.condition.$open) {
+                        var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
+                        _fromDate = _fromDate.replace(/-/g, '/')
+                        var _d = new Date(_fromDate)
+                        _d.setDate(1)
+                        _d.setMonth(_d.getMonth() + 1)
+                        _d.setDate(_d.getDate() - 1)
+                        var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                        _endDate = _endDate.replace(/-/g, '/')
+                        _endDate = new Date(_endDate).getTime()
+                        // _fromDate = _fromDate.replace(/-/g, '/')
+                        _fromDate = new Date(_fromDate).getTime()
+                        pageParams.searchFilter.fromDate = _fromDate
+                        pageParams.searchFilter.endDate = _endDate
+                    } else {
+                        // pageParams.searchFilter.fromDate = _fromDate
+                        // pageParams.searchFilter.endDate = _endDate
+                    }
                     FaApCheck.vendor(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         page.content && page.content.forEach(function(list) {
@@ -9879,6 +9886,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.showNotCheck = true
             $scope.vendorUU = item.vendorEnterprise.uu
             $scope.thisMouth = $scope.thisMouthOut
+            $scope.condition.$open = false
             this.searchOrder()
         }
 
@@ -10370,9 +10378,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.hideshowNotCheck = function() {
             $scope.showNotCheck = false
+            $scope.condition.$open2 = false
         }
 
         $scope.$watch('thisMouthOut', function(newVal, oldVal) {
+            $scope.condition.$open = false
             var _fromDate = new Date()
 
             var _d = new Date(_fromDate)
@@ -10518,23 +10528,24 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.setActive = function (state) {
             if ($scope.active != state) {
                 $scope.active = state;
-                if ($scope.tableParams.page() == 1)
-                    $scope.tableParams.reload();
-                else
-                    $scope.tableParams.page(1);
-                $scope.showNotCheck = false
+                // if ($scope.tableParams.page() == 1)
+                //     $scope.tableParams.reload();
+                // else
+                //     $scope.tableParams.page(1);
+                // $scope.showNotCheck = false
             }
             $scope.condition.$open = false
             $scope.apCheckCondition.$open = false
-            if (state != 'active') {
-                $scope.changeDateZone(1)
-            }
+            // if (state != 'active') {
+            //     $scope.changeDateZone(1)
+            // }
         };
-        $scope.changeDateZone = function (zone) {
+        $scope.changeDateZone = function (zone, flg) {
             $scope.condition.dateZone = zone;
             $scope.dateZoneText = zone == 1 ? '最近一个月' : (zone == 3 ? '最近三个月' : (zone == 6 ? '最近六个月' : '自定义'));
             $scope.condition.$dateZoneOpen = false;
             getDateCondition(zone, $scope.condition);
+            if (flg) return
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
@@ -10560,20 +10571,22 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 pageParams.keyword = $scope.keyword;
                 if ($scope.active === 'all') {
                     pageParams.keyword = $scope.keyword
-                    var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
-                    // var _d = new Date(_fromDate)
-                    _fromDate = _fromDate.replace(/-/g,'/')
-                    var _d  = new Date(_fromDate)
-                    _d.setDate(1)
-                    _d.setMonth(_d.getMonth() + 1)
-                    _d.setDate(_d.getDate() - 1)
-                    var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
-                    _endDate = _endDate.replace(/-/g,'/')
-                    _fromDate = _fromDate.replace(/-/g,'/')
-                    _endDate = new Date(_endDate).getTime()
-                    _fromDate = new Date(_fromDate).getTime()
-                    pageParams.searchFilter.fromDate =  _fromDate
-                    pageParams.searchFilter.endDate = _endDate
+                    if (!$scope.condition.$open) {
+                        var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
+                        // var _d = new Date(_fromDate)
+                        _fromDate = _fromDate.replace(/-/g, '/')
+                        var _d = new Date(_fromDate)
+                        _d.setDate(1)
+                        _d.setMonth(_d.getMonth() + 1)
+                        _d.setDate(_d.getDate() - 1)
+                        var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                        _endDate = _endDate.replace(/-/g, '/')
+                        _fromDate = _fromDate.replace(/-/g, '/')
+                        _endDate = new Date(_endDate).getTime()
+                        _fromDate = new Date(_fromDate).getTime()
+                        pageParams.searchFilter.fromDate = _fromDate
+                        pageParams.searchFilter.endDate = _endDate
+                    }
                     FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         page.content && page.content.forEach(function(list) {
@@ -10787,6 +10800,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.suuorname = item.myEnterprise.enName
             $scope.customerUU = item.myEnterprise.uu
             $scope.thisMouth = $scope.thisMouthOut
+            $scope.condition.$open = false
             this.searchOrder()
         }
 
@@ -11207,11 +11221,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.apCheck.endDate = _d.getTime()
             }
 
-            //获取筛选时间的开始时间为对账的开始时间
-            $scope.apCheck.beginDate = $scope.fromDate;
-
-            //获取筛选的截止时间为对账的截止时间
-            $scope.apCheck.endDate = $scope.endDate;
+            // //获取筛选时间的开始时间为对账的开始时间
+            // $scope.apCheck.beginDate = $scope.fromDate;
+            //
+            // //获取筛选的截止时间为对账的截止时间
+            // $scope.apCheck.endDate = $scope.endDate;
 
 
             //保存生成的应收对账单
@@ -11292,9 +11306,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.hideshowNotCheck = function() {
             $scope.showNotCheck = false
+            $scope.condition.$open2 = false
         }
 
         $scope.$watch('thisMouthOut', function(newVal, oldVal) {
+            $scope.condition.$open = false
             var _fromDate = new Date()
             var _d = new Date(_fromDate)
             // var _d  = new Date(_fromDate.replace(/-/g,'/'))

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -164,7 +164,7 @@
     color: #fff;
     border: 1px solid #fff;
     margin-top: 3px;
-    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+    padding: 0 5px;"  ng-click="setActive();changeDateZone(1, true);condition.$open=false">查看对账记录
 				<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 			</div>
 		</div>
@@ -270,6 +270,44 @@
 							line-height: 32px;
 							cursor: pointer;
 							vertical-align: middle;"><img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
+						<a ng-click="condition.$open=!condition.$open;changeDateZone(1)" title="自定义" ng-class="{'active':condition.dateZone=='-1'}" style="margin-left: 10px" >自定义</a>
+						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
+							<form class="form-inline">
+								<div class="form-group ">
+									<label>日期：</label>
+									<div class="form-group input-group input-group-xs input-trigger">
+										<input type="text" ng-model="condition.dateFrom"
+											   class="form-control" placeholder="从"
+											   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+											   ng-required="true" max-date = "condition.dateTo"
+											   current-text="今天" clear-text="清除" close-text="关闭"
+											   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+											   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
+										<span class="input-group-btn">
+											<button type="button" class="btn btn-default"
+													ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
+												<i class="fa fa-calendar"></i>
+											</button>
+										</span>
+									</div>
+									<div class="form-group input-group input-group-xs input-trigger">
+										<input type="text" ng-model="condition.dateTo"
+											   class="form-control" placeholder="到"
+											   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+											   ng-required="true" min-date = "condition.dateFrom"
+											   current-text="今天" clear-text="清除" close-text="关闭"
+											   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+											   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
+										<span class="input-group-btn">
+											<button type="button" class="btn btn-default"
+													ng-click="openFilterDatePicker($event, condition, '$toOpened')">
+												<i class="fa fa-calendar"></i>
+											</button>
+										</span>
+									</div>
+								</div>
+							</form>
+						</div>
 					</div>
 					<div class="col-xs-6" style="float: right;">
 						<div class="search">
@@ -285,7 +323,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="more-list more" ng-class="{'open': condition.$open}">
+				<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active !== 'all'">
 					<form class="form-inline">
 						<div class="form-group ">
 							<label>日期：</label>
@@ -654,10 +692,10 @@
 			</div>
 			<div class="form-group form-group-sm form-group-inline">
 				<div class="col-sm-12 text-right">
-					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span
-							ng-bind="condition.$open ? '收起筛选条件' : '更多筛选条件'"></span><i
+					<a ng-click="condition.$open2=!condition.$open2" class="text-simple"><span
+							ng-bind="condition.$open2 ? '收起筛选条件' : '更多筛选条件'"></span><i
 							class="fa fa-fw"
-							ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+							ng-class="{'fa-angle-up': condition.$open2, 'fa-angle-down': !condition.$open2}"></i></a>
 					<div class="btn-group btn-group-sm">
 						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
 						<a class="btn btn-default" ng-click="createApCheck(check.$selected)" ng-disabled="!data || data.length==0"><i class="fa fa-check-circle-o fa-fw btn-icon-left"></i>确认</a>
@@ -666,7 +704,7 @@
 				</div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
-				 ng-show="condition.$open">
+				 ng-show="condition.$open2">
 				<!--<label class="col-sm-2 control-label">应付供应商：</label>-->
 				<!--<div class="col-sm-4">-->
 					<!--<div class="form-group form-group-sm has-feedback">-->
@@ -696,7 +734,7 @@
                 </div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
-				 ng-show="condition.$open">
+				 ng-show="condition.$open2">
 				<label class="col-sm-2 control-label">物料名称：</label>
 				<div class="col-sm-4">
 					<div class="form-group form-group-sm has-feedback">

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -165,7 +165,7 @@
     color: #fff;
     border: 1px solid #fff;
     margin-top: 3px;
-    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+    padding: 0 5px;"  ng-click="setActive();changeDateZone(1, true);condition.$open=false">查看对账记录
 				<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 			</div>
 		</div>
@@ -248,6 +248,44 @@
 							line-height: 32px;
 							cursor: pointer;
 							vertical-align: middle;"><img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
+						<a ng-click="condition.$open=!condition.$open;changeDateZone(1)" title="自定义" ng-class="{'active':condition.dateZone=='-1'}"  style="margin-left: 10px" >自定义</a>
+						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
+							<form class="form-inline">
+								<div class="form-group ">
+									<label>日期：</label>
+									<div class="form-group input-group input-group-xs input-trigger">
+										<input type="text" ng-model="condition.dateFrom"
+											   class="form-control" placeholder="从"
+											   datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
+											   ng-required="true" max-date = "condition.dateTo"
+											   current-text="今天" clear-text="清除" close-text="关闭"
+											   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+											   ng-focus="openFilterDatePicker($event, condition, '$fromOpened')">
+										<span class="input-group-btn">
+											<button type="button" class="btn btn-default"
+													ng-click="openFilterDatePicker($event, condition, '$fromOpened')">
+												<i class="fa fa-calendar"></i>
+											</button>
+										</span>
+									</div>
+									<div class="form-group input-group input-group-xs input-trigger">
+										<input type="text" ng-model="condition.dateTo"
+											   class="form-control" placeholder="到"
+											   datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
+											   ng-required="true" min-date = "condition.dateFrom"
+											   current-text="今天" clear-text="清除" close-text="关闭"
+											   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+											   ng-focus="openFilterDatePicker($event, condition, '$toOpened')">
+										<span class="input-group-btn">
+											<button type="button" class="btn btn-default"
+													ng-click="openFilterDatePicker($event, condition, '$toOpened')">
+												<i class="fa fa-calendar"></i>
+											</button>
+										</span>
+									</div>
+								</div>
+							</form>
+						</div>
 					</div>
 					<div class="col-xs-6" style="float: right;">
 						<div class="search">
@@ -263,7 +301,7 @@
 						</div>
 					</div>
 				</div>
-				<div class="more-list more" ng-class="{'open': condition.$open}">
+				<div class="more-list more" ng-class="{'open': condition.$open}"  ng-if="active !== 'all'">
 					<form class="form-inline">
 						<div class="form-group ">
 							<label>日期：</label>
@@ -582,10 +620,10 @@
 			</div>
 			<div class="form-group form-group-sm form-group-inline">
 				<div class="col-sm-12 text-right">
-					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span
-							ng-bind="condition.$open ? '收起筛选条件' : '更多筛选条件'"></span><i
+					<a ng-click="condition.$open2=!condition.$open2" class="text-simple"><span
+							ng-bind="condition.$open2 ? '收起筛选条件' : '更多筛选条件'"></span><i
 							class="fa fa-fw"
-							ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+							ng-class="{'fa-angle-up': condition.$open2, 'fa-angle-down': !condition.$open2}"></i></a>
 					<div class="btn-group btn-group-sm">
 						<a class="btn btn-default" ng-click="searchOrder()" title="筛选"><i class="fa fa-search fa-fw btn-icon-left"></i>筛选</a>
                         <a class="btn btn-default" ng-click="exportApcheckList()" title="导出Excel" ng-disabled="!data || data.length==0"><i class="fa fa-file-text fa-fw btn-icon-left"></i>导出</a>
@@ -593,7 +631,7 @@
 				</div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
-				 ng-show="condition.$open">
+				 ng-show="condition.$open2">
 				<label class="col-sm-2 control-label">送货工厂：</label>
 				<div class="col-sm-4">
 					<div class="form-group form-group-sm has-feedback">
@@ -614,7 +652,7 @@
 				</div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline"
-				 ng-show="condition.$open">
+				 ng-show="condition.$open2">
 				<label class="col-sm-2 control-label">物料名称：</label>
 				<div class="col-sm-4">
 					<div class="form-group form-group-sm has-feedback">