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

src/main/webapp/resources/js/index/app.js

@@ -9700,6 +9700,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                                 }
                             })
                             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);
@@ -9985,6 +9993,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         })
                         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;
@@ -10592,6 +10608,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             })
                             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);
@@ -10888,6 +10911,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             })
                             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/tpl/index/fa/apCheck.html

@@ -315,11 +315,12 @@
 			<table class="order-table block order-table2" ng-table="tableParams" width="100%" style="table-layout:fixed">
 				<thead>
 					<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>
@@ -347,6 +348,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>
@@ -359,7 +367,7 @@
 				</tbody>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="6">
+					<td colspan="7">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -501,6 +509,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;">
@@ -512,17 +531,19 @@
 							</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.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+							<div ng-if="dataInfo.apCheckAmounts.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/tpl/index/fa/arCheck.html

@@ -292,11 +292,12 @@
 			<table class="order-table block order-table2" ng-table="tableParams" width="100%" style="table-layout:fixed">
 				<thead>
 				<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>
@@ -324,6 +325,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>
@@ -336,7 +344,7 @@
 				</tbody>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="6">
+					<td colspan="7">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -426,6 +434,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;">
@@ -437,18 +457,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.apCheckAmounts.length > 0" ng-repeat="count in dataInfo.apCheckAmounts">
 								<span>{{count.currency}}：{{count.amount | number:2}}</span>
 							</div>
-							<div ng-if="dataInfo.thisMonthTodoCount.length === 0">
+							<div ng-if="dataInfo.apCheckAmounts.length === 0">
 								0
 							</div>
 						</label>
 					</div>
 
+
 					<div style="text-align: left;margin-top: 20px">
 						<label>应付总额：</label>
 						<label style="text-align:left;vertical-align: top;">