1、新增应收应付页面，对账记录接口

2、调整数据多次请求的问题

src/main/webapp/resources/js/usercenter/controllers/b2b/fa/arCheck.js

@@ -251,10 +251,10 @@
           $scope.setActive = function (state) {
               if ($scope.active != state) {
                   $scope.active = state;
-                  if ($scope.tableParams.page() == 1)
-                      $scope.tableParams.reload();
-                  else
-                      $scope.tableParams.page(1);
+                  // if ($scope.tableParams.page() == 1)
+                      // $scope.tableParams.reload();
+                  // else
+                  //     $scope.tableParams.page(1);
                   $scope.showNotCheck = false
               }
               $scope.condition.$open = false
@@ -360,7 +360,8 @@
                           if (page) {
                               params.total(page.totalElement);
                               $scope.data = $defer.resolve(page.content);
-
+                              $scope.infoCommon = page
+                              $scope.infoCommon.all = page.content.length
                               $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的条件
                           }
                       }, function (response) {

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

@@ -40,10 +40,10 @@ define(['app/app'], function (app) {
       $scope.setActive = function (state) {
           if ($scope.active != state) {
               $scope.active = state;
-              if ($scope.tableParams.page() == 1)
-                  $scope.tableParams.reload();
-              else
-                  $scope.tableParams.page(1);
+              // if ($scope.tableParams.page() == 1)
+              //     $scope.tableParams.reload();
+              // else
+              //     $scope.tableParams.page(1);
               $scope.showNotCheck = false
           }
           $scope.condition.$open = false

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

@@ -506,15 +506,36 @@
     <ul class="fl">
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
-      <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
-        <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
-      </li>
+      <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">-->
+        <!--<a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</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>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
       <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
       <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
       <!--</a>-->
       <!--</li>-->
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
+        <div class="btn-group btn-group-sm"  style="float: right;
+    font-size: 14px;
+    cursor: pointer;
+    text-align: right;
+    height: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #5078cb;
+    border: 1px solid #5078cb;
+    margin-top: 6px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+          <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+        </div>
+      </li>
+      <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+        <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;"  ng-click="setActive('all')">
+          <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+        </div>
+      </li>
 
     </ul>
   </div>
@@ -994,6 +1015,7 @@
             <th width="70">采购单</th>
             <th width="60">发货单</th>
             <th width="60">验收单</th>
+            <th width="70">物料编号</th>
             <th width="70">物料名称</th>
             <th width="70">规格型号</th>
             <th width="55">发货数量</th>
@@ -1021,6 +1043,9 @@
             <td width="70">{{::check.ordercode}}</td>
             <td width="60">{{::check.sendcode}}</td>
             <td width="60">{{::check.inoutno}}</td>
+            <td width="70" title="{{check.prodcode}}">
+              <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>
+            </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>
             </td>

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

@@ -506,15 +506,35 @@
     <ul class="fl">
       <li class="active"><a  href="javascript:void(0)">B2B</a></li>
       <li><a ui-sref="pay_center" href="javascript:void(0)">优软商城</a></li>
-      <li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">
-        <a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
-      </li>
+      <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px"  ng-hide="active === 'all'">-->
+        <!--<a href="#" style="min-width: 80px" ng-click="exportXls()" target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</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>
       <!--<li class="down-purchase" style="margin-right: 0;min-width: 80px" ng-hide="showNotCheck">-->
         <!--<a class="text-simple append" style="min-width: 80px" ui-sref="fa_apCheckList" title="新增对账单">-->
           <!--<i class="fa fa-plus-square fa-fw"></i>新增对账单-->
         <!--</a>-->
       <!--</li>-->
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active === 'all'">
+            <div class="btn-group btn-group-sm"  style="    float: right;
+    font-size: 14px;
+    cursor: pointer;
+    text-align: right;
+    height: 28px;
+    line-height: 27px;
+    margin-right: 20px;
+    color: #5078cb;
+    border: 1px solid #5078cb;
+    margin-top: 6px;
+    padding: 0 5px;"  ng-click="setActive()">查看对账记录
+                <!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+            </div>
+        </li>
+        <li style="float: right;font-size: 14px;cursor: pointer;" ng-show="active !== 'all'">
+            <div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;"  ng-click="setActive('all')">
+                <img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+            </div>
+        </li>
 
     </ul>
   </div>
@@ -993,6 +1013,7 @@
                   <th width="70">采购单</th>
                   <th width="60">发货单</th>
                   <th width="60">验收单</th>
+                  <th width="70">物料编号</th>
                   <th width="70">物料名称</th>
                   <th width="70">规格型号</th>
                   <!--<th width="60">发货单</th>-->
@@ -1025,6 +1046,9 @@
                   <td width="70">{{::check.ordercode}}</td>
                   <td width="60">{{::check.sendcode}}</td>
                   <td width="60">{{::check.inoutno}}</td>
+                  <td width="70" title="{{check.prodcode}}">
+                      <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodcode}}</div>
+                  </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>
                   </td>