Merge remote-tracking branch 'origin/release-201844-wangcz' into release-201844-wangcz

src/main/webapp/resources/js/vendor/controllers/b2b/apCheck.js

@@ -471,6 +471,17 @@ define(['app/app'], function (app) {
       // 点击其中一个明细的复选框
       $scope.checkOne = function (check) {
           check.$selected = !check.$selected
+
+          $scope.Checkall()
+      };
+      $scope.stopPrevent = function(e) {
+          e = e || window.event
+          e.stopPropagation();
+          $scope.Checkall()
+          // event.preventDefault();
+          return false;
+      }
+      $scope.Checkall = function() {
           var result = true;
           angular.forEach($scope.data, function (item) {
               if (item.$selected != true) {
@@ -479,8 +490,7 @@ define(['app/app'], function (app) {
               }
           });
           $scope.checkboxes.checked = result;
-      };
-
+      }
       $scope.haveSelected = false;
 
       //生成应收对账单

src/main/webapp/resources/view/vendor/b2b/apCheck.html

@@ -522,7 +522,8 @@
       <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
       <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
-      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)</a></li>
+        <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
+      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</a></li>
         <li style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()"><img src="/static/img/vendor/images/backIcon.png" width="20"/>返回</li>
     </ul>
   </div>
@@ -603,7 +604,7 @@
                  datepicker-popup="yyyy-MM-dd"
                  is-open="condition.$toOpened"
                  min-date="condition.dateFrom" current-text="今天" clear-text="清除" close-text="关闭"
-                 ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
+                     ng-focus="openFilterDatePicker($event, condition, '$toOpened')"
                  datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                  style="width: 130px"
           />
@@ -842,7 +843,7 @@
               自定义
             </label>
           </div>
-          <div ng-hide="!apCheckCondition.$open" class="date fr" style="margin-top: 14px;">
+          <div ng-hide="!apCheckCondition.$open" class="date fr apCheckCondition" style="margin-top: 14px;">
             <div class="data-input">
               <input type="text" ng-model="apCheckCondition.dateFrom"
                      class="form-control select-adder" placeholder="起始时间"
@@ -973,7 +974,7 @@
         <table class="table table-bordered">
           <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
             <td width="36" style="text-align: center;vertical-align: middle;">
-              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected"></td>
+              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>
             <td width="70">{{::check.ordercode}}</td>
             <td width="70" title="{{check.prodtitle}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodtitle}}</div>
@@ -1135,4 +1136,8 @@
   .wui-date-editor .iconfont {
       color: #3f84f6
   }
+  .apCheckCondition ul {
+      left: auto !important;
+      right: 0;
+  }
 </style>