应收应付页面，新增已收总额/已付总额字段

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

@@ -341,6 +341,14 @@
                                   }
                               })
                               list.thisMonthDoneCount = _MonthDoneCountArr
+
+                              var _apCheckAmounts = []
+                              list.apCheckAmounts && list.apCheckAmounts.forEach(function(item) {
+                                  if (item.amount > 0) {
+                                      _apCheckAmounts.push(item)
+                                  }
+                              })
+                              list.apCheckAmounts = _apCheckAmounts
                           })
                           if (page) {
                               params.total(page.totalElement);
@@ -628,6 +636,14 @@
                           })
                           data.thisMonthDoneCount = _MonthDoneCountArr
 
+                          var _apCheckAmounts = []
+                          data.apCheckAmounts && data.apCheckAmounts.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _apCheckAmounts.push(item)
+                              }
+                          })
+                          data.apCheckAmounts = _apCheckAmounts
+
                           $scope.dataInfo = data
                           $scope.data = data.details;
                           $scope.checkboxes.checked = true;

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

@@ -129,6 +129,14 @@ define(['app/app'], function (app) {
                               }
                           })
                           list.thisMonthDoneCount = _MonthDoneCountArr
+
+                          var _apCheckAmounts = []
+                          list.apCheckAmounts && list.apCheckAmounts.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _apCheckAmounts.push(item)
+                              }
+                          })
+                          list.apCheckAmounts = _apCheckAmounts
                       })
                       if (page) {
                           params.total(page.totalElement);
@@ -426,6 +434,15 @@ define(['app/app'], function (app) {
                       })
                       data.thisMonthDoneCount = _MonthDoneCountArr
 
+
+                      var _apCheckAmounts = []
+                      data.apCheckAmounts && data.apCheckAmounts.forEach(function(item) {
+                          if (item.amount > 0) {
+                              _apCheckAmounts.push(item)
+                          }
+                      })
+                      data.apCheckAmounts = _apCheckAmounts
+
                       $scope.dataInfo = data
                       $scope.data = data.details;
                       $scope.checkboxes.checked = true;

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

@@ -712,11 +712,12 @@
 
         <thead ng-show="active === 'all'">
         <tr class="header">
-          <th width="200">应付供应商名称</th>
-          <th width="170">本月应付</th>
-          <th width="170">本月未对</th>
-          <th width="170">本月已对</th>
-          <th width="170">应付总额</th>
+          <th width="180">应付供应商名称</th>
+          <th width="140">本月应付</th>
+          <th width="140">本月未对</th>
+          <th width="140">本月已对</th>
+          <th width="140">本月已付</th>
+          <th width="140">应付总额</th>
           <th width="80">操作</th>
         </tr>
         </thead>
@@ -744,6 +745,13 @@
           </td>
           <td ng-if="check.thisMonthDoneCount.length === 0">-</td>
 
+          <td ng-if="check.apCheckAmounts.length > 0">
+            <div ng-repeat="count in check.apCheckAmounts">
+              <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+            </div>
+          </td>
+          <td ng-if="check.apCheckAmounts.length === 0">-</td>
+
           <td ng-if="check.totalCount.length > 0">
             <div ng-repeat="count in check.totalCount">
               <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
@@ -814,6 +822,18 @@
             </label>
           </div>
 
+          <div style="text-align: left;margin-top: 20px">
+            <label>本期间未对总额：</label>
+            <label style="text-align:left;vertical-align: top;">
+              <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+                <span>{{count.currency}}：{{count.amount | number:2}}</span>
+              </div>
+              <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+                0
+              </div>
+            </label>
+          </div>
+
           <div style="text-align: left;margin-top: 20px">
             <label>本期间已对总额：</label>
             <label style="text-align:left;vertical-align: top;">
@@ -825,18 +845,20 @@
               </div>
             </label>
           </div>
+
           <div style="text-align: left;margin-top: 20px">
-            <label>本期间未对总额：</label>
+            <label>本期间已付总额：</label>
             <label style="text-align:left;vertical-align: top;">
-              <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+              <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
                 <span>{{count.currency}}：{{count.amount | number:2}}</span>
               </div>
-              <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+              <div ng-if="dataInfo.thisMonthDoneCount.length === 0">
                 0
               </div>
             </label>
           </div>
 
+
           <div style="text-align: left;margin-top: 20px">
             <label>应付总额：</label>
             <label style="text-align:left;vertical-align: top;">

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

@@ -712,12 +712,13 @@
 
         <thead ng-show="active === 'all'">
           <tr class="header">
-            <th width="200">客户名称</th>
-              <th width="170">本月应收</th>
-              <th width="170">本月未对</th>
-              <th width="170">本月已对</th>
-              <th width="170">应收总额</th>
-            <th width="80">操作</th>
+            <th width="180">客户名称</th>
+              <th width="140">本月应收</th>
+              <th width="140">本月未对</th>
+              <th width="140">本月已对</th>
+              <th width="140">本月已收</th>
+              <th width="140">应收总额</th>
+              <th width="80">操作</th>
           </tr>
         </thead>
         <tbody ng-show="active === 'all'" ng-repeat="check in ALLList">
@@ -744,6 +745,13 @@
               </td>
               <td ng-if="check.thisMonthDoneCount.length === 0">-</td>
 
+              <td ng-if="check.apCheckAmounts.length > 0">
+                  <div ng-repeat="count in check.apCheckAmounts">
+                      <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+                  </div>
+              </td>
+              <td ng-if="check.apCheckAmounts.length === 0">-</td>
+
               <td ng-if="check.totalCount.length > 0">
                   <div ng-repeat="count in check.totalCount">
                       <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
@@ -813,6 +821,17 @@
                 </div>
             </label>
         </div>
+            <div style="text-align: left;margin-top: 20px">
+                <label>本期间未对总额：</label>
+                <label style="text-align:left;vertical-align: top;">
+                    <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+                        <span>{{count.currency}}：{{count.amount | number:2}}</span>
+                    </div>
+                    <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+                        0
+                    </div>
+                </label>
+            </div>
             <div style="text-align: left;margin-top: 20px">
                 <label>本期间已对总额：</label>
                 <label style="text-align:left;vertical-align: top;">
@@ -824,18 +843,18 @@
                     </div>
                 </label>
             </div>
+
             <div style="text-align: left;margin-top: 20px">
-                <label>本期间未对总额：</label>
+                <label>本期间已收总额：</label>
                 <label style="text-align:left;vertical-align: top;">
-                    <div ng-if="dataInfo.thisMonthTodoCount.length > 0" ng-repeat="count in dataInfo.thisMonthTodoCount">
+                    <div ng-if="dataInfo.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
                         <span>{{count.currency}}：{{count.amount | number:2}}</span>
                     </div>
-                    <div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+                    <div ng-if="dataInfo.thisMonthDoneCount.length === 0">
                         0
                     </div>
                 </label>
             </div>
-
         <div style="text-align: left;margin-top: 20px">
             <label>应收总额：</label>
             <label style="text-align:left;vertical-align: top;">