|
|
@@ -9654,16 +9654,18 @@ 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.replace(/-/g,'/'))
|
|
|
+ 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()
|
|
|
- console.log(_fromDate)
|
|
|
- console.log(_endDate)
|
|
|
+
|
|
|
pageParams.searchFilter.fromDate = _fromDate
|
|
|
pageParams.searchFilter.endDate = _endDate
|
|
|
FaApCheck.vendor(BaseService.parseParams(pageParams), function (page) {
|
|
|
@@ -10257,8 +10259,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
};
|
|
|
$scope.addMouth = function(val) {
|
|
|
var _sp = new Date()
|
|
|
- // var _time = new Date($scope.thisMouth)
|
|
|
- var _time = new Date($scope.thisMouth.replace(/-/g,'/'))
|
|
|
+ var _time1 = $scope.thisMouth + '-01'
|
|
|
+ _time1 = _time1.replace(/-/g, '/')
|
|
|
+ var _time = new Date(_time1)
|
|
|
+
|
|
|
_time.setMonth(_time.getMonth() + val)
|
|
|
_time.setDate(1)
|
|
|
_time.setMonth(_time.getMonth() + 1)
|
|
|
@@ -10270,13 +10274,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
$scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
|
|
|
$scope.apCheckCondition.$open = false
|
|
|
- $scope.searchOrder()
|
|
|
+ // $scope.searchOrder()
|
|
|
}
|
|
|
|
|
|
$scope.addMouthOut = function(val) {
|
|
|
var _sp = new Date()
|
|
|
// var _time = new Date($scope.thisMouthOut)
|
|
|
- var _time = new Date($scope.thisMouthOut.replace(/-/g,'/'))
|
|
|
+ var _time1 = $scope.thisMouthOut + '-01'
|
|
|
+ _time1 = _time1.replace(/-/g, '/')
|
|
|
+ var _time = new Date(_time1)
|
|
|
+ // var _time = new Date($scope.thisMouthOut.replace(/-/g,'/'))
|
|
|
_time.setMonth(_time.getMonth() + val)
|
|
|
_time.setDate(1)
|
|
|
_time.setMonth(_time.getMonth() + 1)
|
|
|
@@ -10287,8 +10294,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.MouthOutShow = true
|
|
|
}
|
|
|
$scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
|
|
|
- $scope.tableParams.page(1);
|
|
|
- $scope.tableParams.reload();
|
|
|
+ // $scope.tableParams.page(1);
|
|
|
+ // $scope.tableParams.reload();
|
|
|
}
|
|
|
|
|
|
$scope.hideshowNotCheck = function() {
|
|
|
@@ -10297,6 +10304,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
|
|
|
$scope.$watch('thisMouthOut', function(newVal, oldVal) {
|
|
|
var _fromDate = new Date()
|
|
|
+
|
|
|
var _d = new Date(_fromDate)
|
|
|
// var _d = new Date(_fromDate.replace(/-/g,'/'))
|
|
|
_d.setDate(1)
|
|
|
@@ -10311,7 +10319,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
if (newVal !== oldVal) {
|
|
|
// var _d = new Date(newVal)
|
|
|
- var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
+ var _newVal = newVal.replace(/-/g,'/')
|
|
|
+ var _d = new Date(_newVal)
|
|
|
_d.setDate(1)
|
|
|
_d.setMonth(_d.getMonth() + 1)
|
|
|
_d.setDate(_d.getDate() - 1)
|
|
|
@@ -10341,7 +10350,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
if (newVal !== oldVal) {
|
|
|
// var _d = new Date(newVal)
|
|
|
- var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
+ var _newVal = newVal.replace(/-/g,'/')
|
|
|
+ var _d = new Date(_newVal)
|
|
|
_d.setDate(1)
|
|
|
_d.setMonth(_d.getMonth() + 1)
|
|
|
_d.setDate(_d.getDate() - 1)
|
|
|
@@ -10484,11 +10494,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
pageParams.keyword = $scope.keyword
|
|
|
var _fromDate = $scope.thisMouthOut + '-01 00:00:00'
|
|
|
// var _d = new Date(_fromDate)
|
|
|
- var _d = new Date(_fromDate.replace(/-/g,'/'))
|
|
|
+ _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
|
|
|
@@ -11090,7 +11103,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.addMouth = function(val) {
|
|
|
var _sp = new Date()
|
|
|
// var _time = new Date($scope.thisMouth)
|
|
|
- var _time = new Date($scope.thisMouth.replace(/-/g,'/'))
|
|
|
+ var _time = $scope.thisMouth + '-01'
|
|
|
+ _time = _time.replace(/-/g,'/')
|
|
|
+ _time = new Date(_time)
|
|
|
_time.setMonth(_time.getMonth() + val)
|
|
|
_time.setDate(1)
|
|
|
_time.setMonth(_time.getMonth() + 1)
|
|
|
@@ -11102,13 +11117,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
$scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
|
|
|
$scope.apCheckCondition.$open = false
|
|
|
- $scope.searchOrder()
|
|
|
+ // $scope.searchOrder()
|
|
|
}
|
|
|
|
|
|
$scope.addMouthOut = function(val) {
|
|
|
var _sp = new Date()
|
|
|
+ var _time = $scope.thisMouthOut + '-01'
|
|
|
+ _time = _time.replace(/-/g,'/')
|
|
|
+ _time = new Date(_time)
|
|
|
// var _time = new Date($scope.thisMouthOut)
|
|
|
- var _time = new Date($scope.thisMouthOut.replace(/-/g,'/'))
|
|
|
+ // var _time = new Date($scope.thisMouthOut.replace(/-/g,'/'))
|
|
|
_time.setMonth(_time.getMonth() + val)
|
|
|
_time.setDate(1)
|
|
|
_time.setMonth(_time.getMonth() + 1)
|
|
|
@@ -11119,8 +11137,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.MouthOutShow = true
|
|
|
}
|
|
|
$scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
|
|
|
- $scope.tableParams.page(1);
|
|
|
- $scope.tableParams.reload();
|
|
|
+ // $scope.tableParams.page(1);
|
|
|
+ // $scope.tableParams.reload();
|
|
|
}
|
|
|
|
|
|
$scope.hideshowNotCheck = function() {
|
|
|
@@ -11143,7 +11161,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
if (newVal !== oldVal) {
|
|
|
// var _d = new Date(newVal)
|
|
|
- var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
+ var _d = newVal + '-01'
|
|
|
+ _d = _d.replace(/-/g,'/')
|
|
|
+ _d = new Date(_d)
|
|
|
+ // var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
_d.setDate(1)
|
|
|
_d.setMonth(_d.getMonth() + 1)
|
|
|
_d.setDate(_d.getDate() - 1)
|
|
|
@@ -11173,7 +11194,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
}
|
|
|
if (newVal !== oldVal) {
|
|
|
// var _d = new Date(newVal)
|
|
|
- var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
+ var _d = newVal + '-01'
|
|
|
+ _d = _d.replace(/-/g,'/')
|
|
|
+ _d = new Date(_d)
|
|
|
+ // var _d = new Date(newVal.replace(/-/g,'/'))
|
|
|
_d.setDate(1)
|
|
|
_d.setMonth(_d.getMonth() + 1)
|
|
|
_d.setDate(_d.getDate() - 1)
|