Browse Source

1、优化应收对账,新增 本月已对,本月未对字段
2、优化应付对账,新增 本月已对,本月未对字段
3、删除顶部tab字段

shenjunjie 7 years ago
parent
commit
632e05d1fa

BIN
src/main/webapp/resources/img/vendor/images/backIcon.png


+ 38 - 3
src/main/webapp/resources/js/index/app.js

@@ -9681,6 +9681,22 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                                 }
                             })
                             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);
@@ -10501,6 +10517,23 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                                 }
                             })
                             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);
@@ -10771,6 +10804,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                                 }
                             })
                             data.thisMonthCount = _mouthArr
+
                             var _totalArr = []
                             data.totalCount.forEach(function(item) {
                                 if (item.amount > 0) {
@@ -10778,6 +10812,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                                 }
                             })
                             data.totalCount = _totalArr
+
                             $scope.dataInfo = data
                             $scope.data = data.details;
                             $scope.checkboxes.checked = true;
@@ -11092,7 +11127,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
             $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
             $scope.apCheckCondition.$open = false
-            $scope.searchOrder()
+            // $scope.searchOrder()
         }
 
         $scope.addMouthOut = function(val) {
@@ -11108,8 +11143,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.MouthOutShow = true
             }
             $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
-            $scope.tableParams.page(1);
-            $scope.tableParams.reload();
+            // $scope.tableParams.page(1);
+            // $scope.tableParams.reload();
         }
 
         $scope.hideshowNotCheck = function() {

+ 81 - 41
src/main/webapp/resources/tpl/index/fa/apCheck.html

@@ -143,33 +143,38 @@
 			<a href="#" ng-click="exportXls()" ng-hide="active === 'all'"
 			   target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
+		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
+			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+		</div>
 	</div>
-	<div class="menu condition block">
-		<div class="row">
-			<div class="col-xs-7">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm/fa/arCheck">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">未对账</button>
-					</div>
+	<!--<div class="menu condition block">-->
+		<!--<div class="row">-->
+			<!--<div class="col-xs-7">-->
+				<!--<div class="btn-group btn-group-sm btn-group-justified">-->
+					<!--<div class="btn-group btn-group-sm/fa/arCheck">-->
+						<!--<button type="button" class="btn btn-default btn-line"-->
+							<!--ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">未对账</button>-->
+					<!--</div>-->
 					<!--<div class="btn-group btn-group-sm">-->
 						<!--<button type="button" class="btn btn-default btn-line"-->
 								<!--ng-class="{'btn-info':active=='todo'}"-->
 								<!--ng-click="setActive('todo')">待确认</button>-->
 					<!--</div>-->
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='done'}"
-								ng-click="setActive('done')">已对账
+					<!--<div class="btn-group btn-group-sm">-->
+						<!--<button type="button" class="btn btn-default btn-line"-->
+								<!--ng-class="{'btn-info':active=='done'}"-->
+								<!--ng-click="setActive('done')">已对账-->
 							<!--<b class="new-dot" ng-if="unread.replied > 0">{{unread.replied>99?'99+':unread.replied}}</b>-->
-						</button>
-					</div>
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-							ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已作废
+						<!--</button>-->
+					<!--</div>-->
+					<!--<div class="btn-group btn-group-sm">-->
+						<!--<button type="button" class="btn btn-default btn-line"-->
+							<!--ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已作废-->
 							<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
-						</button>
-					</div>
+						<!--</button>-->
+					<!--</div>-->
 
 					<!--<div class="btn-group btn-group-sm">-->
 					<!--<button type="button" class="btn btn-default btn-line"-->
@@ -193,17 +198,17 @@
 					<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 					<!--</button>-->
 					<!--</div>-->
-				</div>
-			</div>
-			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
-				<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
-					<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-					<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+				<!--</div>-->
+			<!--</div>-->
+			<!--<div class="col-xs-12 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">-->
+				<!--<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">-->
+					<!--<img src="static/img/vendor/images/backIcon.png" width="20"/>返回-->
+					<!--&lt;!&ndash;<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>&ndash;&gt;-->
 
-				</div>
-			</div>
-		</div>
-	</div>
+				<!--</div>-->
+			<!--</div>-->
+		<!--</div>-->
+	<!--</div>-->
 
 	<div ng-hide="showNotCheck">
 		<div class="condition block"  ng-show="!showNotCheck">
@@ -310,9 +315,11 @@
 			<table class="order-table block order-table2" ng-table="tableParams" width="100%" style="table-layout:fixed">
 				<thead>
 					<tr class="header">
-						<th width="313">客户名称</th>
-						<th width="250">本月应收</th>
-						<th width="250">应收总额</th>
+						<th width="200">客户名称</th>
+						<th width="150">本月应收</th>
+						<th width="150">本月未对</th>
+						<th width="150">本月已对</th>
+						<th width="150">应收总额</th>
 						<th width="160">操作</th>
 					</tr>
 				</thead>
@@ -325,18 +332,34 @@
 						</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>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="4">
+					<td colspan="6">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -640,18 +663,24 @@
 			<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="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="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="110">
+							对账人<br />/日期
+						</th>
 						<!--<th width="35">序号</th>-->
 						<!--<th width="60">类型</th>-->
 						<!--<th width="60">单据<br>日期</th>-->
@@ -666,21 +695,32 @@
 			<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="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>
-						<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="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>-->

+ 73 - 41
src/main/webapp/resources/tpl/index/fa/arCheck.html

@@ -143,44 +143,49 @@
 			<a href="#" ng-click="exportXls()" ng-hide="active === 'all'"
 			   target="_self" title="导出Excel表格" class="blue f14"><i class="fa fa-file-text fa-fw"></i>导出</a>
 		</div>
+		<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;text-align: right;height: 40px;line-height: 40px; margin-right: 20px;;color: #fff;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
+			<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
+			<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+
+		</div>
 	</div>
-	<div class="menu condition block">
-		<div class="row">
-			<div class="col-xs-7">
-				<div class="btn-group btn-group-sm btn-group-justified">
-					<div class="btn-group btn-group-sm/fa/arCheck">
-						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">未对账</button>
-					</div>
-					<!--<div class="btn-group btn-group-sm">-->
-					<!--<button type="button" class="btn btn-default btn-line"-->
-					<!--ng-class="{'btn-info':active=='todo'}"-->
-					<!--ng-click="setActive('todo')">待确认</button>-->
+	<!--<div class="menu condition block">-->
+		<!--<div class="row">-->
+			<!--<div class="col-xs-7">-->
+				<!--<div class="btn-group btn-group-sm btn-group-justified">-->
+					<!--<div class="btn-group btn-group-sm/fa/arCheck">-->
+						<!--<button type="button" class="btn btn-default btn-line"-->
+								<!--ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">未对账</button>-->
 					<!--</div>-->
-					<div class="btn-group btn-group-sm">
-						<button type="button" class="btn btn-default btn-line"
-								ng-class="{'btn-info':active=='done'}"
-								ng-click="setActive('done')">已对账
-							<!--<b class="new-dot" ng-if="unread.replied > 0">{{unread.replied>99?'99+':unread.replied}}</b>-->
-						</button>
-					</div>
+					<!--&lt;!&ndash;<div class="btn-group btn-group-sm">&ndash;&gt;-->
+					<!--&lt;!&ndash;<button type="button" class="btn btn-default btn-line"&ndash;&gt;-->
+					<!--&lt;!&ndash;ng-class="{'btn-info':active=='todo'}"&ndash;&gt;-->
+					<!--&lt;!&ndash;ng-click="setActive('todo')">待确认</button>&ndash;&gt;-->
+					<!--&lt;!&ndash;</div>&ndash;&gt;-->
 					<!--<div class="btn-group btn-group-sm">-->
 						<!--<button type="button" class="btn btn-default btn-line"-->
-								<!--ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已作废-->
-							<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+								<!--ng-class="{'btn-info':active=='done'}"-->
+								<!--ng-click="setActive('done')">已对账-->
+							<!--&lt;!&ndash;<b class="new-dot" ng-if="unread.replied > 0">{{unread.replied>99?'99+':unread.replied}}</b>&ndash;&gt;-->
 						<!--</button>-->
 					<!--</div>-->
-				</div>
-			</div>
-			<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">
-				<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">
-					<img src="static/img/vendor/images/backIcon.png" width="20"/>返回
-					<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
+					<!--&lt;!&ndash;<div class="btn-group btn-group-sm">&ndash;&gt;-->
+						<!--&lt;!&ndash;<button type="button" class="btn btn-default btn-line"&ndash;&gt;-->
+								<!--&lt;!&ndash;ng-class="{'btn-info':active=='end'}" ng-click="setActive('end')">已作废&ndash;&gt;-->
+							<!--&lt;!&ndash;<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>&ndash;&gt;-->
+						<!--&lt;!&ndash;</button>&ndash;&gt;-->
+					<!--&lt;!&ndash;</div>&ndash;&gt;-->
+				<!--</div>-->
+			<!--</div>-->
+			<!--<div class="col-xs-4 f12" style="text-align: right;height: 40px;line-height: 40px; margin-right: 20px; float: right;">-->
+				<!--<div class="btn-group btn-group-sm"  style="float: right;font-size: 14px;cursor: pointer;" ng-hide="!showNotCheck" ng-click="hideshowNotCheck()">-->
+					<!--<img src="static/img/vendor/images/backIcon.png" width="20"/>返回-->
+					<!--&lt;!&ndash;<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>&ndash;&gt;-->
 
-				</div>
-			</div>
-		</div>
-	</div>
+				<!--</div>-->
+			<!--</div>-->
+		<!--</div>-->
+	<!--</div>-->
 
 	<div ng-hide="showNotCheck">
 		<div class="condition block"  ng-show="!showNotCheck">
@@ -287,9 +292,11 @@
 			<table class="order-table block order-table2" ng-table="tableParams" width="100%" style="table-layout:fixed">
 				<thead>
 				<tr class="header">
-					<th width="313">应付供应商</th>
-					<th width="250">本月应付</th>
-					<th width="250">应付总额</th>
+					<th width="200">应付供应商名称</th>
+					<th width="150">本月应付</th>
+					<th width="150">本月未对</th>
+					<th width="150">本月已对</th>
+					<th width="150">应付总额</th>
 					<th width="160">操作</th>
 				</tr>
 				</thead>
@@ -302,18 +309,34 @@
 						</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>
 				<tbody ng-if="!ALLList || ALLList.length == 0">
 				<tr>
-					<td colspan="4">
+					<td colspan="6">
 						<div id="empty">
 							<div class="left_img">
 								<a><img src="static/img/empty/uas_empty.png"></a>
@@ -553,15 +576,18 @@
 				<table class="table table-bordered">
 					<tr>
 						<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>
 					</tr>
 				</table>
 			</div>
@@ -569,21 +595,27 @@
 				<table class="table table-bordered">
 					<tr ng-repeat="check in data" ng-click="checkOne(check);getTotalMoney()" class="thAlign" style="height: 40px;">
 						<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="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>