1、修改应收对账页面展示问题

2、修改应付对账页面展示问题

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

@@ -9663,6 +9663,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
             $scope.condition.$open = false
             $scope.apCheckCondition.$open = false
+            if (state != 'active') {
+                $scope.changeDateZone(1)
+            }
         };
         $scope.changeDateZone = function (zone) {
             $scope.condition.dateZone = zone;
@@ -9706,7 +9709,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     pageParams.searchFilter.endDate = _endDate
                     FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
-                        page.content.forEach(function(list) {
+                        page.content && page.content.forEach(function(list) {
                             var _l = []
                             list.thisMonthCount && list.thisMonthCount.forEach(function(count) {
                                 if (count.amount > 0) {

src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -334,6 +334,22 @@
 					<td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
 				</tr>
 				</tbody>
+				<tbody ng-if="!ALLList || ALLList.length == 0">
+				<tr>
+					<td colspan="4">
+						<div id="empty">
+							<div class="left_img">
+								<a><img src="static/img/empty/uas_empty.png"></a>
+								<a>B2B 商务</a>
+							</div>
+							<div class="right_link">
+								<!--<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>-->
+								<!--<a ng-if="active != 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>-->
+							</div>
+						</div>
+					</td>
+				</tr>
+				</tbody>
 			</table>
 		</div>
 		<div ng-show="active !== 'all'">
@@ -342,15 +358,15 @@
 					<tr class="header">
 						<th width="150">对账期间</th>
 						<th width="180">对账总额</th>
-						<th width="180">明细条目</th>
-						<th width="180">商品总数</th>
+						<th width="180">对账人</th>
+						<!--<th width="180">商品总数</th>-->
 						<th width="100">对账结果</th>
 						<th width="100">操作</th>
 					</tr>
 				</thead>
 				<tbody ng-repeat="check in $data">
 					<tr>
-						<td class="first info" colspan="4">
+						<td class="first info" colspan="3">
 							<div class="">
 								<a href="javascript:void(0)" ng-if="!isUnread(check.id)">
 									<i class="fa fa-circle-thin"></i>
@@ -369,14 +385,18 @@
 									<strong class="text-num">{{::(isUser?'-':(check.checkAmount | number:2))}}</strong>
 									<span ng-if="!isUser" class="text-number">{{::check.currency}}</span>
 								</p>
-								<p>
-									<strong class="text-num">{{::check.items.length}}</strong> 条<br>
-								</p>
-								<p>
-									<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>
+								<p style="text-align: center;margin-left: 65px">
+									对账人:{{::check.recorder}}
 								</p>
+								<!--<p>-->
+									<!--<strong class="text-num">{{::check.items.length}}</strong> 条<br>-->
+								<!--</p>-->
+								<!--<p>-->
+									<!--<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>-->
+								<!--</p>-->
 							</div>
 						</td>
+
 						<td class="status">
 							<!--<div ng-if="check.checkStatus == '未对账'" class="text-center text-muted f14"><br>未对账！</div>-->
 							<div></div>
@@ -426,7 +446,7 @@
 								<a>B2B 商务</a>
 							</div>
 							<div class="right_link">
-								<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>
+								<!--<p ng-if="active != 'all'">您还未生成对账单，请立即新增对账！</p>-->
 								<!--<a ng-if="active != 'all'" ui-sref="fa.apCheckList"><i class="fa fa-plus-square fa-fw"></i> 新增对账单</a>-->
 							</div>
 						</div>

src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -199,14 +199,14 @@
 		<tr class="header">
 			<th width="150">对账期间</th>
 			<th width="180">对账总额</th>
-			<th width="180">明细条目</th>
-			<th width="180">商品总数</th>
+			<th width="180">对账人</th>
+			<!--<th width="180">商品总数</th>-->
 			<th width="100">对账结果</th>
 		</tr>
 		</thead>
 		<tbody ng-if="$data.length === 0">
 		<tr>
-			<td colspan="6">
+			<td colspan="4">
 				<div id="empty">
 					<div class="left_img">
 						<a><img src="static/img/empty/uas_empty.png"></a>
@@ -221,12 +221,12 @@
 		</tbody>
 		<tbody ng-repeat="check in $data">
 			<tr>
-				<td class="first info" colspan="4">
+				<td class="first info" colspan="2">
 					<div class="">
 						<span class="text-num" title="录单时间">{{::check.recordDate | date:'MM月dd日 HH:mm'}} <i class="fa fa-clock-o"></i></span>&nbsp;&nbsp;&nbsp;
 						<span><i class="fa fa-star" ng-class="{'text-default':check.status==201}"></i> {{::check.vendorName}}</span>
 						<span>单据编号：</span>
-						<span class="text-num"><a ui-sref="fa.arCheck_detail({id:check.id})" title="点击查看详情">{{::check.code}}</a></span>
+						<span class="text-num"><a ui-sref="fa.arCheck_detail({id:check.id})" title="点击查看详情" style="color: #5078cb">{{::check.code}}</a></span>
 					</div>
 					<div class="static">
 						<p class="f14 text-num">{{::check.beginDate | date:'yyyy/MM/dd'}} - {{::check.endDate | date:'yyyy/MM/dd'}}</p>
@@ -234,15 +234,18 @@
 							<strong class="text-num">{{::check.checkAmount | number:6}}</strong>
 							<span class="text-number">{{::check.currency}}</span><br>
 						</p>
-						<p>
-							<strong class="text-num">{{::check.items.length}}</strong> 条<br>
-						</p>
-						<p>
-							<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>
-						</p>
+						<!--<p>-->
+							<!--<strong class="text-num">{{::check.items.length}}</strong> 条<br>-->
+						<!--</p>-->
+						<!--<p>-->
+							<!--<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>-->
+						<!--</p>-->
 					</div>
 				</td>
-				<td class="status" colspan="1">
+				<td style="text-align: center">
+					{{::check.recorder}}
+				</td>
+				<td class="status" colspan="1" style="vertical-align: middle">
 					<span ng-bind="::check.checkStatus"></span>
 				</td>
 			</tr>