|
@@ -10397,6 +10397,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.thisMouthOut = oldVal
|
|
$scope.thisMouthOut = oldVal
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+ if (newVal === null) {
|
|
|
|
|
+ newVal = oldVal
|
|
|
|
|
+ $scope.thisMouthOut = oldVal
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ if (oldVal === null) {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
if (newVal !== oldVal) {
|
|
if (newVal !== oldVal) {
|
|
|
var _newVal = newVal.replace(/-/g,'/')
|
|
var _newVal = newVal.replace(/-/g,'/')
|
|
|
var _d = new Date(_newVal)
|
|
var _d = new Date(_newVal)
|
|
@@ -10427,6 +10435,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.thisMouth = oldVal
|
|
$scope.thisMouth = oldVal
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+ if (newVal === null) {
|
|
|
|
|
+ newVal = oldVal
|
|
|
|
|
+ $scope.thisMouthOut = oldVal
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ if (oldVal === null) {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
if (newVal !== oldVal) {
|
|
if (newVal !== oldVal) {
|
|
|
var _newVal = newVal.replace(/-/g,'/')
|
|
var _newVal = newVal.replace(/-/g,'/')
|
|
|
var _d = new Date(_newVal)
|
|
var _d = new Date(_newVal)
|
|
@@ -11324,6 +11340,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.thisMouthOut = oldVal
|
|
$scope.thisMouthOut = oldVal
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+ if (newVal === null) {
|
|
|
|
|
+ newVal = oldVal
|
|
|
|
|
+ $scope.thisMouthOut = oldVal
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ if (oldVal === null) {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
if (newVal !== oldVal) {
|
|
if (newVal !== oldVal) {
|
|
|
// var _d = new Date(newVal)
|
|
// var _d = new Date(newVal)
|
|
|
var _d = newVal + '-01'
|
|
var _d = newVal + '-01'
|
|
@@ -11357,6 +11381,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
$scope.thisMouth = oldVal
|
|
$scope.thisMouth = oldVal
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
|
|
+ if (newVal === null) {
|
|
|
|
|
+ newVal = oldVal
|
|
|
|
|
+ $scope.thisMouthOut = oldVal
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
|
|
+ if (oldVal === null) {
|
|
|
|
|
+ return false
|
|
|
|
|
+ }
|
|
|
if (newVal !== oldVal) {
|
|
if (newVal !== oldVal) {
|
|
|
var _d = newVal + '-01'
|
|
var _d = newVal + '-01'
|
|
|
_d = _d.replace(/-/g,'/')
|
|
_d = _d.replace(/-/g,'/')
|