Browse Source

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

shenjunjie 7 years ago
parent
commit
1c9ed2dab8

+ 16 - 0
src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -1020,6 +1020,14 @@
                   $scope.thisMouthOut = oldVal
                   return
               }
+              if (newVal === null) {
+                  newVal = oldVal
+                  $scope.thisMouthOut = oldVal
+                  return false
+              }
+              if (oldVal === null) {
+                  return false
+              }
               if (newVal !== oldVal) {
                   // var _d = new Date(newVal)
                   var _newVal = newVal.replace(/-/g,'/')
@@ -1051,6 +1059,14 @@
                   $scope.thisMouth = oldVal
                   return
               }
+              if (newVal === null) {
+                  newVal = oldVal
+                  $scope.thisMouthOut = oldVal
+                  return false
+              }
+              if (oldVal === null) {
+                  return false
+              }
               if (newVal !== oldVal) {
                   // var _d = new Date(newVal)
                   var _newVal = newVal.replace(/-/g,'/')

+ 16 - 0
src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -833,6 +833,14 @@ define(['app/app'], function (app) {
               $scope.thisMouthOut = oldVal
               return
           }
+          if (newVal === null) {
+              newVal = oldVal
+              $scope.thisMouthOut = oldVal
+              return false
+          }
+          if (oldVal === null) {
+              return false
+          }
           if (newVal !== oldVal) {
               // var _d = new Date(newVal)
               var _d = newVal + '-01'
@@ -866,6 +874,14 @@ define(['app/app'], function (app) {
               $scope.thisMouth = oldVal
               return
           }
+          if (newVal === null) {
+              newVal = oldVal
+              $scope.thisMouthOut = oldVal
+              return false
+          }
+          if (oldVal === null) {
+              return false
+          }
           if (newVal !== oldVal) {
               // var _d = new Date(newVal)
               var _d = newVal + '-01'

+ 1 - 1
src/main/webapp/resources/view/usercenter/b2b/fa/arCheck.html

@@ -603,7 +603,7 @@
                 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="resetHandle()" title="自定义" ng-class="{'active':condition.dateZone=='-1'}"  style="margin-left: 10px" >自定义</a>
+      <a ng-click="resetHandle()" title="自定义" ng-class="{'active':condition.dateZone=='-1'}"   style="margin-left: 10px;display: inline-block;padding: 0px 12px;background: #3f84f6;color: #fff" >自定义</a>
     </div>
     <div class="sreach fr">
       <div ng-show="condition.$open" class="date fl">

+ 1 - 1
src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -607,7 +607,7 @@
                  <!--<input type="radio" id="autoMonth_man" name="date" ng-click="condition.$open=!condition.$open;changeDateZone(-1)">-->
                  <!--<label for="autoMonth_man"></label>-->
 
-         <a ng-click="resetHandle()" title="自定义" ng-class="{'active':condition.dateZone=='-1'}"  style="margin-left: 10px" >自定义</a>
+         <a ng-click="resetHandle()" title="自定义" ng-class="{'active':condition.dateZone=='-1'}"   style="margin-left: 10px;display: inline-block;padding: 0px 12px;background: #3f84f6;color: #fff"  >自定义</a>
              <!--</label>-->
          <!--</div>-->