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

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

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

@@ -48,6 +48,9 @@ define(['app/app'], function (app) {
           }
           $scope.condition.$open = false
           $scope.apCheckCondition.$open = false
+          if (state != 'active') {
+              $scope.changeDateZone(1)
+          }
       };
       $scope.changeDateZone = function (zone) {
           $scope.condition.dateZone = zone;
@@ -92,7 +95,7 @@ define(['app/app'], function (app) {
 
                   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/view/usercenter/b2b/fa/arCheck.html

@@ -561,8 +561,8 @@
     <tr class="header">
       <th width="230">对账期间</th>
       <th width="180">对账总额</th>
-      <th width="180">明细条目</th>
-      <th width="100">商品总数</th>
+      <th width="180">对账人</th>
+      <!--<th width="100">商品总数</th>-->
       <!--<th width="100">对账结果</th>-->
       <!--<th width="100">操作</th>-->
     </tr>
@@ -571,7 +571,7 @@
 
     <tbody ng-if="$data.length === 0">
     <tr>
-      <td colspan="5">
+      <td colspan="3">
         <div id="empty">
           <div class="left_img">
             <a><img src="static/img/all/empty-cart.png"></a>
@@ -586,7 +586,7 @@
     </tbody>
     <tbody ng-repeat="check in $data">
     <tr class="order-bd order-hdt">
-      <td colspan="4" style="text-align: left">
+      <td colspan="3" style="text-align: left">
 
         <span class="text-num text-bold" title="录单时间">日期：{{::check.apDate | date:'MM月dd日 HH:mm'}}</span>&nbsp;&nbsp;&nbsp;
         <span><img src="static/img/user/images/shop_home.png" style="margin-right: 5px">{{::check.vendorName}}</span>
@@ -612,16 +612,19 @@
           <span class="text-number">{{::check.currency}}</span><br>
         </p>
       </td>
-      <td class="first info" colspan="1">
-        <p>
-          <strong class="text-num">{{::check.items.length}}</strong> 条<br>
-        </p>
-      </td>
-      <td class="first info" colspan="1">
-        <p>
-          <strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>
-        </p>
+      <td style="text-align: center">
+        {{::check.recorder}}
       </td>
+      <!--<td class="first info" colspan="1">-->
+        <!--<p>-->
+          <!--<strong class="text-num">{{::check.items.length}}</strong> 条<br>-->
+        <!--</p>-->
+      <!--</td>-->
+      <!--<td class="first info" colspan="1">-->
+        <!--<p>-->
+          <!--<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i><br>-->
+        <!--</p>-->
+      <!--</td>-->
       <!--<td class="status" colspan="2">-->
         <!--<div ng-if="check.status == 200" class="text-center text-muted f14"><br>还未开始对账！</div>-->
         <!--<div ng-if="check.status == 201 && check.items.length == check.agree" class="text-center text-muted f14">-->

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

@@ -530,17 +530,17 @@
     <div class="radio-block date-radio" ng-show="active !== 'all'" style="width: 33%">
       时间：
       <label class="com-check-radio">
-        <input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" checked>
+        <input type="radio" id="oneMonth" name="date" ng-click="changeDateZone(1);condition.$open=false" ng-checked="condition.dateZone == '1'" ng-model="condition.dateZone">
         <label for="oneMonth"></label>
         30天
       </label>
       <label class="com-check-radio">
-        <input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false">
+        <input type="radio" id="threeMonth" name="date" ng-click="changeDateZone(3);condition.$open=false" ng-checked="condition.dateZone == '3'" ng-model="condition.dateZone">
         <label for="threeMonth"></label>
         90天
       </label>
       <label class="com-check-radio">
-        <input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false">
+        <input type="radio" id="sixMonth" name="date" ng-click="changeDateZone(6);condition.$open=false" ng-checked="condition.dateZone == '6'" ng-model="condition.dateZone">
         <label for="sixMonth"></label>
         180天
       </label>
@@ -611,10 +611,14 @@
         </div>
       </div>
       <div class="sreach-input fr">
-        <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" ng-show="active !== 'all'"/>
-          <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)" ng-show="active !== 'all'">搜索</a>
-          <input type="search" placeholder="客户名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)" ng-show="active === 'all' && !showNotCheck"/>
-          <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)" ng-show="active === 'all' && !showNotCheck">搜索</a>
+          <span  ng-show="active !== 'all'">
+            <input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+            <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)" >搜索</a>
+          </span>
+          <span  ng-show="active === 'all' && !showNotCheck">
+            <input type="search" placeholder="客户名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+            <a class="seek" href="javascript:void(0)" ng-click="onSearch(keyword)">搜索</a>
+          </span>
       </div>
     </div>
   </div>
@@ -626,15 +630,15 @@
           <tr class="header">
             <th width="230">对账期间</th>
             <th width="180">对账总额</th>
-            <th width="180">明细条目</th>
-            <th width="100">商品总数</th>
+            <th width="180">对账人</th>
+            <!--<th width="100">商品总数</th>-->
             <th width="100">对账结果</th>
             <th width="100">操作</th>
           </tr>
         </thead>
         <tbody ng-show="active !== 'all'" ng-repeat="check in $data">
           <tr class="order-bd order-hdt">
-            <td colspan="6" style="text-align: left">
+            <td colspan="5" style="text-align: left">
               <a href="javascript:void(0)" ng-if="!isUnread(check.id)" class="circle-icon">
                 已读
               </a>
@@ -662,16 +666,19 @@
               <span ng-if="!isUser" class="text-number">{{::check.currency}}</span>
             </p>
           </td>
-          <td>
-            <p>
-              <strong class="text-num">{{::check.items.length}}</strong> 条<br>
-            </p>
-          </td>
-          <td>
-            <p>
-              <strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>
-            </p>
+          <td style="text-align: center">
+              对账人:{{::check.recorder}}
           </td>
+          <!--<td>-->
+            <!--<p>-->
+              <!--<strong class="text-num">{{::check.items.length}}</strong> 条<br>-->
+            <!--</p>-->
+          <!--</td>-->
+          <!--<td>-->
+            <!--<p>-->
+              <!--<strong class="text-num">{{getTotalProd(check) | number}}</strong> <i class="fa fa-cubes"></i>-->
+            <!--</p>-->
+          <!--</td>-->
           <td class="status">
             <!--<div ng-if="check.checkStatus == '未对账'" class="text-center text-muted f14"><br>未对账！</div>-->
             <div></div>
@@ -730,7 +737,7 @@
 
         <tbody ng-if="active !== 'all' && tableParams.total() == 0">
         <tr>
-          <td colspan="6">
+          <td colspan="5">
             <div id="empty">
               <div class="left_img">
                 <a><img src="static/img/all/empty-cart.png"></a>
@@ -738,14 +745,14 @@
               </div>
               <div class="right_link">
                 <p ng-if="active != 'all'">暂无对账信息！</p>
-                <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>
           </td>
         </tr>
         </tbody>
-        <tbody ng-if="active === 'all' && ALLList.length === 0">
+        <tbody ng-if="active === 'all' && !ALLList || ALLList.length == 0">
           <tr>
             <td colspan="4">
               <div class="empty">
@@ -755,7 +762,7 @@
                 </div>
                 <div class="right_link">
                   <p ng-if="active != 'all'">暂无对账信息！</p>
-                  <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>