1、应收对账，前后端对接，新增本月已对总额，本月未对总额

2、应收对账，前后端对接，新增本月已对总额，本月未对总额
3、调整【采购单】、【发货单】、【验收单】位于前面

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

@@ -210,6 +210,7 @@
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户
           $rootScope.active = 'buyer_pay_center';
+
           BaseService.scrollBackToTop();
           // 获取当前用户是否为普通用户
           CurrentRole.isUser({}, {}, function (data) {
@@ -271,6 +272,7 @@
               $scope.tableParams.reload();
           };
 
+          $scope.ALLList = []
           //获取应收对账单全部
           $scope.tableParams = new ngTableParams({
               page: 1,
@@ -323,12 +325,28 @@
                                   }
                               })
                               list.totalCount = _k
+
+                              var _MonthTodoCountArr = []
+                              list.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                                  if (item.amount > 0) {
+                                      _MonthTodoCountArr.push(item)
+                                  }
+                              })
+                              list.thisMonthTodoCount = _MonthTodoCountArr
+
+                              var _MonthDoneCountArr = []
+                              list.thisMonthDoneCount && list.thisMonthDoneCount.forEach(function(item) {
+                                  if (item.amount > 0) {
+                                      _MonthDoneCountArr.push(item)
+                                  }
+                              })
+                              list.thisMonthDoneCount = _MonthDoneCountArr
                           })
                           if (page) {
                               params.total(page.totalElement);
                               $defer.resolve(page.content);
                           }
-                          $scope.ALLList = page.content
+                          $scope.ALLList = page.content || []
                           $scope.totalCount = page.totalElement;
                       }, function (response) {
                           $scope.loading = false;
@@ -493,6 +511,7 @@
               $scope.chooseItem = item;
               $scope.showNotCheck = true
               $scope.vendorUU = item.vendorEnterprise.uu
+              $scope.thisMouth = $scope.thisMouthOut
               this.searchOrder()
           }
 
@@ -577,19 +596,36 @@
                               item.$selected = true;
                           });
                           var _mouthArr = []
-                          data.thisMonthCount.forEach(function(item) {
+                          data.thisMonthCount && data.thisMonthCount.forEach(function(item) {
                               if (item.amount > 0) {
                                   _mouthArr.push(item)
                               }
                           })
                           data.thisMonthCount = _mouthArr
                           var _totalArr = []
-                          data.totalCount.forEach(function(item) {
+                          data.totalCount && data.totalCount.forEach(function(item) {
                               if (item.amount > 0) {
                                   _totalArr.push(item)
                               }
                           })
                           data.totalCount = _totalArr
+
+                          var _MonthTodoCountArr = []
+                          data.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthTodoCountArr.push(item)
+                              }
+                          })
+                          data.thisMonthTodoCount = _MonthTodoCountArr
+
+                          var _MonthDoneCountArr = []
+                          data.thisMonthDoneCount && data.thisMonthDoneCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthDoneCountArr.push(item)
+                              }
+                          })
+                          data.thisMonthDoneCount = _MonthDoneCountArr
+
                           $scope.dataInfo = data
                           $scope.data = data.details;
                           $scope.checkboxes.checked = true;
@@ -667,12 +703,12 @@
           $scope.getTotalMoney = function () {
               $scope.totalMoney = 0;
               angular.forEach($scope.data, function (check) {
-                  if (check.$selected) {
+                  // if (check.$selected) {
                       var price = DecimalNumber.accMul((check.thischeckqty || 0), (check.orderprice || 0));
                       $scope.totalMoney += Math.round(price * 100) / 100;
-                  } else {
-                      $scope.totalMoney += 0;
-                  }
+                  // } else {
+                  //     $scope.totalMoney += 0;
+                  // }
               });
 
           }

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

@@ -4,6 +4,7 @@ define(['app/app'], function (app) {
   app.register.controller('PurchaseApCheckCtrl', ['$rootScope', '$scope', 'B2bFaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'B2bReportService', 'Symbol', 'B2bCurrentRole',  'B2bDecimalNumber', '$filter', '$state',function ($rootScope, $scope, FaApCheck, BaseService, ngTableParams, toaster, ReportService, Symbol, CurrentRole, DecimalNumber, $filter, $state) {
       BaseService.scrollBackToTop();
       // 获取当前用户是否为普通用户
+      $rootScope.active = 'vendor_pay_center'
       CurrentRole.isUser({}, {}, function (data) {
           $scope.isUser = data.isUser;
       });
@@ -112,6 +113,22 @@ define(['app/app'], function (app) {
                               }
                           })
                           list.totalCount = _k
+
+                          var _MonthTodoCountArr = []
+                          list.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthTodoCountArr.push(item)
+                              }
+                          })
+                          list.thisMonthTodoCount = _MonthTodoCountArr
+
+                          var _MonthDoneCountArr = []
+                          list.thisMonthDoneCount && list.thisMonthDoneCount.forEach(function(item) {
+                              if (item.amount > 0) {
+                                  _MonthDoneCountArr.push(item)
+                              }
+                          })
+                          list.thisMonthDoneCount = _MonthDoneCountArr
                       })
                       if (page) {
                           params.total(page.totalElement);
@@ -283,6 +300,7 @@ define(['app/app'], function (app) {
           $scope.showNotCheck = true
           $scope.suuorname = item.myEnterprise.enName
           $scope.customerUU = item.myEnterprise.uu
+          $scope.thisMouth = $scope.thisMouthOut
           this.searchOrder()
       }
 
@@ -376,19 +394,36 @@ define(['app/app'], function (app) {
                           item.$selected = true;
                       });
                       var _mouthArr = []
-                      data.thisMonthCount.forEach(function(item) {
+                      data.thisMonthCount && data.thisMonthCount.forEach(function(item) {
                           if (item.amount > 0) {
                               _mouthArr.push(item)
                           }
                       })
                       data.thisMonthCount = _mouthArr
                       var _totalArr = []
-                      data.totalCount.forEach(function(item) {
+                      data.totalCount && data.totalCount.forEach(function(item) {
                           if (item.amount > 0) {
                               _totalArr.push(item)
                           }
                       })
                       data.totalCount = _totalArr
+
+                      var _MonthTodoCountArr = []
+                      data.thisMonthTodoCount && list.thisMonthTodoCount.forEach(function(item) {
+                          if (item.amount > 0) {
+                              _MonthTodoCountArr.push(item)
+                          }
+                      })
+                      data.thisMonthTodoCount = _MonthTodoCountArr
+
+                      var _MonthDoneCountArr = []
+                      data.thisMonthDoneCount && data.thisMonthDoneCount.forEach(function(item) {
+                          if (item.amount > 0) {
+                              _MonthDoneCountArr.push(item)
+                          }
+                      })
+                      data.thisMonthDoneCount = _MonthDoneCountArr
+
                       $scope.dataInfo = data
                       $scope.data = data.details;
                       $scope.checkboxes.checked = true;
@@ -450,8 +485,10 @@ define(['app/app'], function (app) {
           // var dateFrom = $scope.condition.dateFrom;
           // var dateTo = $scope.condition.dateTo;
           angular.forEach($scope.filteredData, function (item) {
-              // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
-              item.$selected = $scope.checkboxes.checked;
+              if (item.haveChecked !== 1) {
+                  // if ((item.pidate >= dateFrom || dateFrom == '') && (item.pidate < dateTo || dateTo == '')) {
+                  item.$selected = $scope.checkboxes.checked;
+              }
               // }
           });
           $scope.getTotalMoney();
@@ -461,18 +498,21 @@ define(['app/app'], function (app) {
       $scope.getTotalMoney = function () {
           $scope.totalMoney = 0;
           angular.forEach($scope.data, function (check) {
-              if (check.$selected) {
+              // if (check.$selected) {
                   var price = DecimalNumber.accMul((check.thischeckqty || 0), (check.orderprice || 0));
                   $scope.totalMoney += Math.round(price * 100) / 100;
-              } else {
-                  $scope.totalMoney += 0;
-              }
+              // } else {
+              //     $scope.totalMoney += 0;
+              // }
           });
 
       }
 
       // 点击其中一个明细的复选框
       $scope.checkOne = function (check) {
+          if (check.haveChecked === 1) {
+              return
+          }
           check.$selected = !check.$selected
           $scope.Checkall()
       };
@@ -561,7 +601,7 @@ define(['app/app'], function (app) {
 
               //此次对账后新的已转数
               $scope.newYCheckQty = 0;
-              if (check.$selected == true) {
+              if (check.$selected == true  && !check.haveChecked) {
                   $scope.apCheck.custName = check.custname;
                   $scope.apCheck.enUu = check.enuu;
                   $scope.apCheck.checkAmount += (check.thischeckqty || 0) * (check.orderprice || 0);

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

@@ -509,6 +509,7 @@
       <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>新增对账单-->
@@ -517,16 +518,16 @@
 
     </ul>
   </div>
-  <div class="com_tab tab_top" style="margin-bottom: 0px">
-    <ul>
-      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
+  <!--<div class="com_tab tab_top" style="margin-bottom: 0px">-->
+    <!--<ul>-->
+      <!--<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>-->
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
+      <!--<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>-->
       <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
       <!--<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</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>
-    </ul>
-  </div>
+      <!--<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>-->
+    <!--</ul>-->
+  <!--</div>-->
   <div class="screen check-filter" ng-show="!showNotCheck">
     <div class="radio-block date-radio" ng-show="active !== 'all'" style="width: 33%">
       时间：
@@ -711,10 +712,12 @@
 
         <thead ng-show="active === 'all'">
         <tr class="header">
-          <th width="313">应付供应商名称</th>
-          <th width="250">本月应付</th>
-          <th width="250">应付总额</th>
-          <th width="160">操作</th>
+          <th width="200">应付供应商名称</th>
+          <th width="170">本月应付</th>
+          <th width="170">本月未对</th>
+          <th width="170">本月已对</th>
+          <th width="170">应付总额</th>
+          <th width="80">操作</th>
         </tr>
         </thead>
         <tbody ng-show="active === 'all'" ng-repeat="check in ALLList">
@@ -726,13 +729,28 @@
             </div>
           </td>
           <td ng-if="check.thisMonthCount.length === 0">-</td>
+
+          <td ng-if="check.thisMonthTodoCount.length > 0">
+            <div ng-repeat="count in check.thisMonthTodoCount">
+              <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+            </div>
+          </td>
+          <td ng-if="check.thisMonthTodoCount.length === 0">-</td>
+
+          <td ng-if="check.thisMonthDoneCount.length > 0">
+            <div ng-repeat="count in check.thisMonthDoneCount">
+              <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+            </div>
+          </td>
+          <td ng-if="check.thisMonthDoneCount.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>
             </div>
           </td>
           <td ng-if="check.totalCount.length === 0">-</td>
-          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
+          <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
         </tr>
         </tbody>
 
@@ -755,7 +773,7 @@
         </tbody>
         <tbody ng-if="active === 'all' && (ALLList !== undefined && ALLList.length == 0)">
         <tr>
-          <td colspan="4">
+          <td colspan="6">
             <div class="empty">
               <div class="left_img">
                 <a><img src="static/img/all/empty-cart.png"></a>
@@ -795,6 +813,30 @@
               </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.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
+                <span>{{count.currency}}：{{count.amount | number:2}}</span>
+              </div>
+              <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;">
+              <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;">
@@ -950,15 +992,18 @@
             <!--<th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>-->
             <!--<th width="70">客户<br>名称</th>-->
             <th width="70">采购单</th>
+            <th width="60">发货单</th>
+            <th width="60">验收单</th>
             <th width="70">物料名称</th>
             <th width="70">规格型号</th>
-            <th width="60">发货单</th>
             <th width="55">发货数量</th>
-            <th width="60">验收单</th>
             <th width="100">验收数量</th>
             <th width="40">单价</th>
             <th width="40">税率</th>
             <th width="70">小计</th>
+            <th width="100">
+              对账人<br />/日期
+            </th>
             <!--<th width="35">序号</th>-->
             <!--<th width="60">类型</th>-->
             <!--<th width="60">单据<br>日期</th>-->
@@ -973,37 +1018,28 @@
       <div class="table-body-wrap">
         <table class="table table-bordered">
           <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-            <!--<td width="36" style="text-align: center;vertical-align: middle;">-->
-              <!--<input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>-->
             <td width="70">{{::check.ordercode}}</td>
+            <td width="60">{{::check.sendcode}}</td>
+            <td width="60">{{::check.inoutno}}</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>
             <td width="70" title="{{check.prodspec}}">
               <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-            <td width="60">{{::check.sendcode}}</td>
+
             <td width="55">{{::check.qty}}</td>
-            <td width="60">{{::check.inoutno}}</td>
+
             <td width="100">{{::check.thischeckqty}}</td>
             <td width="40">{{::check.orderprice}}</td>
             <td width="40" align="center">{{::check.taxrate}}</td>
             <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-            <!--<td width="70" title="{{check.custname}}"><div-->
-            <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
-            <!--<td width="35" align="center">{{::check.detno}}</td>-->
-            <!--<td width="60">{{::check.piclass}}</td>-->
-            <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
-            <!--<td width="90" title="{{check.receivename}}">-->
-            <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
-            <!--</td>-->
-            <!--<td width="65">{{::check.prodcode}}</td>-->
-            <!--<td width="65">{{::check.factory}}</td>-->
-            <!--<td width="30">{{::check.currency}}</td>-->
-            <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
-
+            <td width="100">
+              <div>{{::check.recorder || '-'}}</div>
+              <div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+            </td>
           </tr>
           <tr ng-if="!data || data.length==0">
-            <td colspan="10">
+            <td colspan="11">
               <div class="empty-block">
                 <i class="fa fa-exclamation-circle"></i>
                 <p class="text-muted">没有对账数据，请先筛选</p>

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -681,7 +681,7 @@
 				</div>
 			</div>
 			<div class="sreach-input fr">
-				<input type="search" placeholder="单据编号/客户名称/物料名称" class="form-control" ng-model="keyword" ng-search="onSearch(keyword)"/>
+				<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>
 			</div>
 		</div>

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

@@ -509,6 +509,7 @@
       <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>新增对账单-->
@@ -517,16 +518,16 @@
 
     </ul>
   </div>
-  <div class="com_tab tab_top" style="margin-bottom: 0px">
-    <ul>
-      <li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>
+  <!--<div class="com_tab tab_top" style="margin-bottom: 0px">-->
+    <!--<ul>-->
+      <!--<li ng-class="{'active': active=='all'}" ng-click="setActive('all')"><a> 未对账</a></li>-->
       <!--<li ng-class="{'active': active=='todo'}" ng-click="setActive('todo')"><a>待确认(<em ng-class="{'color-black': !unread.replied }" ng-bind="unread.replied || 0"></em>)</a></li>-->
-      <li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>
+      <!--<li ng-class="{'active': active=='done'}" ng-click="setActive('done')"><a>已对账</a></li>-->
         <!--(<em ng-class="{'color-black': !unread.cancelled }" ng-bind="unread.cancelled || 0"></em>)-->
-      <li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</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>
-    </ul>
-  </div>
+      <!--<li ng-class="{'active': active=='end'}" ng-click="setActive('end')"><a>已作废</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>-->
+    <!--</ul>-->
+  <!--</div>-->
   <div class="screen check-filter" ng-show="!showNotCheck">
     <div class="radio-block date-radio" ng-show="active !== 'all'" style="width: 33%">
       时间：
@@ -711,14 +712,16 @@
 
         <thead ng-show="active === 'all'">
           <tr class="header">
-            <th width="313">客户名称</th>
-            <th width="250">本月应收</th>
-            <th width="250">应收总额</th>
-            <th width="160">操作</th>
+            <th width="200">客户名称</th>
+              <th width="170">本月应收</th>
+              <th width="170">本月未对</th>
+              <th width="170">本月已对</th>
+              <th width="170">应收总额</th>
+            <th width="80">操作</th>
           </tr>
         </thead>
         <tbody ng-show="active === 'all'" ng-repeat="check in ALLList">
-          <tr >
+          <tr>
             <td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
               <td ng-if="check.thisMonthCount.length > 0">
                   <div ng-repeat="count in check.thisMonthCount">
@@ -726,13 +729,28 @@
                   </div>
               </td>
               <td ng-if="check.thisMonthCount.length === 0">-</td>
+
+              <td ng-if="check.thisMonthTodoCount.length > 0">
+                  <div ng-repeat="count in check.thisMonthTodoCount">
+                      <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+                  </div>
+              </td>
+              <td ng-if="check.thisMonthTodoCount.length === 0">-</td>
+
+              <td ng-if="check.thisMonthDoneCount.length > 0">
+                  <div ng-repeat="count in check.thisMonthDoneCount">
+                      <span ng-if="count.amount > 0">{{count.currency}}：{{count.amount | number:2}}</span>
+                  </div>
+              </td>
+              <td ng-if="check.thisMonthDoneCount.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>
                   </div>
               </td>
               <td ng-if="check.totalCount.length === 0">-</td>
-            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">对账详情</td>
+            <td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">明细</td>
           </tr>
         </tbody>
 
@@ -755,7 +773,7 @@
         </tbody>
         <tbody ng-if="active === 'all' && (ALLList !== undefined && ALLList.length == 0)">
           <tr>
-            <td colspan="4">
+            <td colspan="6">
               <div class="empty">
                 <div class="left_img">
                   <a><img src="static/img/all/empty-cart.png"></a>
@@ -795,6 +813,29 @@
                 </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.thisMonthDoneCount.length > 0" ng-repeat="count in dataInfo.thisMonthDoneCount">
+                        <span>{{count.currency}}：{{count.amount | number:2}}</span>
+                    </div>
+                    <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;">
+                    <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;">
@@ -945,72 +986,87 @@
     <!-- 标签scroll-table用于表头滚动 -->
     <div class="table-wrap" id="order-detail-list" scroll-table>
       <div class="table-header-wrap">
-        <table class="table table-bordered">
-          <tr>
-            <th width="36" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
-            <!--<th width="70">客户<br>名称</th>-->
-            <th width="70">采购单</th>
-            <th width="70">物料名称</th>
-            <th width="70">规格型号</th>
-            <th width="60">发货单</th>
-            <th width="55">发货数量</th>
-            <th width="60">验收单</th>
-            <th width="100">验收数量</th>
-            <th width="40">单价</th>
-            <th width="40">税率</th>
-            <th width="70">小计</th>
-            <!--<th width="35">序号</th>-->
-            <!--<th width="60">类型</th>-->
-            <!--<th width="60">单据<br>日期</th>-->
-            <!--<th width="90">应付<br>供应商</th>-->
-            <!--<th width="65">客户<br>料号</th>-->
-            <!--<th width="65">送货<br>工厂</th>-->
-            <!--<th width="30">币别</th>-->
-            <!--<th width="60">金额</th>-->
-          </tr>
-        </table>
+          <table class="table table-bordered">
+              <tr>
+                  <th width="55" style="vertical-align: middle;"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+                  <!--<th width="70">客户<br>名称</th>-->
+                  <th width="70">采购单</th>
+                  <th width="60">发货单</th>
+                  <th width="60">验收单</th>
+                  <th width="70">物料名称</th>
+                  <th width="70">规格型号</th>
+                  <!--<th width="60">发货单</th>-->
+                  <th width="55">发货数量</th>
+                  <th width="80">验收数量</th>
+                  <th width="40">单价</th>
+                  <th width="40">税率</th>
+                  <th width="70">小计</th>
+                  <th width="110">
+                      对账人<br />/日期
+                  </th>
+                  <!--<th width="35">序号</th>-->
+                  <!--<th width="60">类型</th>-->
+                  <!--<th width="60">单据<br>日期</th>-->
+                  <!--<th width="90">应付<br>供应商</th>-->
+                  <!--<th width="65">客户<br>料号</th>-->
+                  <!--<th width="65">送货<br>工厂</th>-->
+                  <!--<th width="30">币别</th>-->
+                  <!--<th width="60">金额</th>-->
+              </tr>
+          </table>
       </div>
       <div class="table-body-wrap">
-        <table class="table table-bordered">
-          <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
-            <td width="36" style="text-align: center;vertical-align: middle;">
-              <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)"></td>
-            <td width="70">{{::check.ordercode}}</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>
-            <td width="70" title="{{check.prodspec}}">
-              <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
-            <td width="60">{{::check.sendcode}}</td>
-            <td width="55">{{::check.qty}}</td>
-            <td width="60">{{::check.inoutno}}</td>
-            <td width="100">{{::check.thischeckqty}}</td>
-            <td width="40">{{::check.orderprice}}</td>
-            <td width="40" align="center">{{::check.taxrate}}</td>
-            <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
-            <!--<td width="70" title="{{check.custname}}"><div-->
-                    <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
-            <!--<td width="35" align="center">{{::check.detno}}</td>-->
-            <!--<td width="60">{{::check.piclass}}</td>-->
-            <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
-            <!--<td width="90" title="{{check.receivename}}">-->
-              <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
-            <!--</td>-->
-            <!--<td width="65">{{::check.prodcode}}</td>-->
-            <!--<td width="65">{{::check.factory}}</td>-->
-            <!--<td width="30">{{::check.currency}}</td>-->
-            <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
+          <table class="table table-bordered">
+              <tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
+                  <td width="55" style="text-align: center;vertical-align: middle;">
+                      <input ng-model="check.$selected" name="checkbox" type="checkbox" ng-checked="check.$selected" ng-click="stopPrevent($event)" ng-if="check.haveChecked !== 1">
+                      <span ng-if="check.haveChecked === 1">已对账</span>
+                  </td>
+                  <td width="70">{{::check.ordercode}}</td>
+                  <td width="60">{{::check.sendcode}}</td>
+                  <td width="60">{{::check.inoutno}}</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>
+                  <td width="70" title="{{check.prodspec}}">
+                      <div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.prodspec}}</div></td>
 
-          </tr>
-          <tr ng-if="!data || data.length==0">
-            <td colspan="11">
-              <div class="empty-block">
-                <i class="fa fa-exclamation-circle"></i>
-                <p class="text-muted">没有对账数据，请先筛选</p>
-              </div>
-            </td>
-          </tr>
-        </table>
+                  <td width="55">{{::check.qty}}</td>
+
+                  <td width="80">{{::check.thischeckqty}}</td>
+                  <td width="40">{{::check.orderprice}}</td>
+                  <td width="40" align="center">{{::check.taxrate}}</td>
+                  <td width="70">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</td>
+                  <td width="110" ng-if="check.haveChecked === 1">
+                      <div>{{::check.recorder || '-'}}</div>
+                      <div>{{::check.apCheckDate | date:'yyyy年MM月dd日'  || '-'}}</div>
+                  </td>
+                  <td width="110" ng-if="check.haveChecked !== 1">
+                      未对账
+                  </td>
+                  <!--<td width="70" title="{{check.custname}}"><div-->
+                  <!--style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.custname}}</div></td>-->
+                  <!--<td width="35" align="center">{{::check.detno}}</td>-->
+                  <!--<td width="60">{{::check.piclass}}</td>-->
+                  <!--<td width="60">{{::check.pidate | date:'yyyy-MM-dd' }}</td>-->
+                  <!--<td width="90" title="{{check.receivename}}">-->
+                  <!--<div style="display: -webkit-box; text-overflow: ellipsis; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 3; -webkit-box-orient: vertical;">{{::check.receivename}}</div>-->
+                  <!--</td>-->
+                  <!--<td width="65">{{::check.prodcode}}</td>-->
+                  <!--<td width="65">{{::check.factory}}</td>-->
+                  <!--<td width="30">{{::check.currency}}</td>-->
+                  <!--<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>-->
+
+              </tr>
+              <tr ng-if="!data || data.length==0">
+                  <td colspan="11">
+                      <div class="empty-block">
+                          <i class="fa fa-exclamation-circle"></i>
+                          <p class="text-muted">没有对账数据，请先筛选</p>
+                      </div>
+                  </td>
+              </tr>
+          </table>
       </div>
       <div style="padding: 10px 20px">本期间应收总额：{{totalMoney | number:2 || 0}}</div>
     </div>

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

@@ -277,11 +277,11 @@
       <table class="block table table-default table-striped table-hover">
         <thead>
         <tr class="header">
+          <th width="40">采购单号</th>
+          <th width="100">验收单</th>
           <th width="30" style="padding:8px 0;">行号</th>
           <th width="120">商品</th>
-          <th width="40">采购单号</th>
           <th>采购序号</th>
-          <th width="100">验收单</th>
           <th>验收单序号</th>
           <th>单价</th>
           <!--<th width="80">单据类型</th>-->
@@ -293,16 +293,15 @@
         </thead>
         <tbody ng-repeat="item in data.items" style="text-align: center;">
         <tr>
+          <td ng-bind="item.orderCode"></td>
+          <td ng-bind="item.inoutno"></td>
           <td ng-bind="item.number" style="padding:8px 0;"></td>
           <td style="max-width: 250px;" class="text-left">
             <div>编号： <span ng-bind="item.prodCode"></span></div>
             <div>规格： <span ng-bind="item.prodSpec"></span></div>
           </td>
-          <td ng-bind="item.orderCode"></td>
           <td ng-bind="item.orderDetno"></td>
-          <td ng-bind="item.inoutno"></td>
           <td ng-bind="item.inoutnodetno"></td>
-
           <!--<td ng-bind="item.orderClass"></td>-->
           <td ng-bind="isUser?'-':item.price"></td>
           <td ng-bind="item.taxrate"></td>