Browse Source

fix:调整应付对账自定义按钮功能,修复月历选择的问题

shenjunjie 7 years ago
parent
commit
4ac6ae74bb

+ 32 - 0
src/main/webapp/resources/js/index/app.js

@@ -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,'/')

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -270,7 +270,7 @@
 							line-height: 32px;
 							line-height: 32px;
 							cursor: pointer;
 							cursor: pointer;
 							vertical-align: middle;"><img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
 							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>
+						<a ng-click="condition.$open=!condition.$open;changeDateZone(1)" title="自定义" ng-class="{'active':condition.dateZone=='-1'}" style="margin-left: 10px;display: inline-block;padding: 7px 12px;background: #3f84f6;color: #fff" >自定义</a>
 						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
 						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
 							<form class="form-inline">
 							<form class="form-inline">
 								<div class="form-group ">
 								<div class="form-group ">

+ 1 - 1
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -248,7 +248,7 @@
 							line-height: 32px;
 							line-height: 32px;
 							cursor: pointer;
 							cursor: pointer;
 							vertical-align: middle;"><img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
 							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>
+						<a ng-click="condition.$open=!condition.$open;changeDateZone(1)" title="自定义" ng-class="{'active':condition.dateZone=='-1'}" style="margin-left: 10px;display: inline-block;padding: 7px 12px;background: #3f84f6;color: #fff" >自定义</a>
 						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
 						<div class="more-list more" ng-class="{'open': condition.$open}" ng-if="active === 'all'">
 							<form class="form-inline">
 							<form class="form-inline">
 								<div class="form-group ">
 								<div class="form-group ">