优化商城44期迭代，应收对账

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

@@ -9627,7 +9627,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.condition = {dateZone: 1};
         $scope.currency = Symbol.currency;//将币别转化为对应的符号
         $scope.active = 'all';
-
+        $scope.apCheckCondition = {
+            $open: false
+        }
         /* 时间筛选初始化*/
         var fromDate = new Date();
         var toDate = new Date();
@@ -9659,6 +9661,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.tableParams.page(1);
                 $scope.showNotCheck = false
             }
+            $scope.condition.$open = false
+            $scope.apCheckCondition.$open = false
         };
         $scope.changeDateZone = function (zone) {
             $scope.condition.dateZone = zone;
@@ -9690,6 +9694,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 pageParams.keyword = $scope.keyword;
                 if ($scope.active === 'all') {
                     pageParams.keyword = $scope.keyword
+                    var _fromDate =  $scope.thisMouthOut + '-01 00:00:00'
+                    var _d = new Date(_fromDate)
+                    _d.setDate(1)
+                    _d.setMonth(_d.getMonth() + 1)
+                    _d.setDate(_d.getDate() - 1)
+                    var _endDate = _d.getFullYear() + '-' + (_d.getMonth() + 1) + '-' + _d.getDate() + ' 00:00:00'
+                    _endDate = new Date(_endDate).getTime()
+                    _fromDate = new Date(_fromDate).getTime()
+                    pageParams.searchFilter.fromDate =  _fromDate
+                    pageParams.searchFilter.endDate = _endDate
                     FaApCheck.customer(BaseService.parseParams(pageParams), function (page) {
                         $scope.loading = false;
                         if (page) {
@@ -9851,6 +9865,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
             modalInstance.result.then(function (customer) {
                 $scope.suuorname = customer.myEnterprise.enName;
+                $scope.customerUU = customer.myEnterprise.uu;
             });
 
         }
@@ -9858,9 +9873,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.showNotCheck = false
         $scope.goToMNs = function(item) {
             $scope.chooseItem = item;
-            $scope.showNotCheck = true;
-            $scope.suuorname = item.myEnterprise.enName;
-            $scope.customerUU = item.myEnterprise.uu;
+            $scope.showNotCheck = true
+            $scope.suuorname = item.myEnterprise.enName
+            $scope.customerUU = item.myEnterprise.uu
             this.searchOrder()
         }
 
@@ -9869,6 +9884,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.sdateTo = new Date();
         $scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
         $scope.thisMouth = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
+        $scope.thisMouthOut = $scope.sdateTo.getFullYear() +'-'+ ($scope.sdateTo.getMonth())
         $scope.condition.uuorname = '';
         // $scope.condition.dateFrom = '';
         // $scope.condition.dateTo = '';
@@ -9879,6 +9895,10 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.searchOrder = function (check) {
             $scope.data = [];
+            $scope.dataInfo = {
+                totalCount: [],
+                thisMonthCount: []
+            }
             $scope.checkboxes.checked = false;
             $scope.totalMoney = 0;
             $scope.condition.uuorname = $scope.suuorname;
@@ -9913,10 +9933,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 //     toaster.pop('warning', '提示', '请先选择客户');
                 //     document.getElementById('suuorname').focus();//光标默认在客户
                 // } else {
+                $scope.fromDate = $scope.apCheckCondition.dateFrom ? $scope.apCheckCondition.dateFrom.getTime() : null;
+                $scope.endDate = $scope.apCheckCondition.dateTo ? $scope.apCheckCondition.dateTo.getTime() : null;
                     $scope.loading = true;
-                    FaApCheck.getAllByKeywords({
-                        // fromDate: $scope.fromDate,
-                        // endDate: $scope.endDate,
+                var _params = {}
+                if ($scope.apCheckCondition.$open) {
+                    _params = {
+                        fromDate: $scope.fromDate,
+                        endDate: $scope.endDate,
                         receiveName: $scope.receiveName,
                         factory: $scope.factory,
                         prodTitle: $scope.prodTitle,
@@ -9924,13 +9948,41 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         taxRate: $scope.taxRate,
                         checkDate: $scope.thisMouth,
                         suuorname: $scope.suuorname,
-                        customerUU: $scope.customerUU
-                    }, function (data) {
+                        customerUU: $scope.customerUU,
+                    }
+                } else {
+                    _params = {
+                        receiveName: $scope.receiveName,
+                        factory: $scope.factory,
+                        prodTitle: $scope.prodTitle,
+                        prodSpec: $scope.prodSpec,
+                        taxRate: $scope.taxRate,
+                        checkDate: $scope.thisMouth,
+                        suuorname: $scope.suuorname,
+                        customerUU: $scope.customerUU,
+                    }
+                }
+                    FaApCheck.getAllByKeywords(_params, function (data) {
                         $scope.checkMain = data;
                         if (data.details.length > 0) {
                             angular.forEach(data.details, function (item) {
                                 item.$selected = true;
                             });
+                            var _mouthArr = []
+                            data.thisMonthCount.forEach(function(item) {
+                                if (item.amount > 0) {
+                                    _mouthArr.push(item)
+                                }
+                            })
+                            data.thisMonthCount = _mouthArr
+                            var _totalArr = []
+                            data.totalCount.forEach(function(item) {
+                                if (item.amount > 0) {
+                                    _totalArr.push(item)
+                                }
+                            })
+                            data.totalCount = _totalArr
+                            $scope.dataInfo = data
                             $scope.data = data.details;
                             $scope.checkboxes.checked = true;
                             $scope.getTotalMoney();
@@ -10205,8 +10257,51 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if ($scope.sameCust && $scope.validQty) {
                 $scope.saveApCheck();
             }
+
+
+        }
+        // 新增
+
+        $scope.apCheckopenFilterDatePicker = function ($event, item, openParam) {
+            $event.preventDefault();
+            $event.stopPropagation();
+            item[openParam] = !item[openParam];
+            if ($scope.apCheckCondition.dateFrom && $scope.apCheckCondition.dateTo && !item[openParam]) {
+                $scope.searchOrder()
+            }
+        };
+        $scope.addMouth = function(val) {
+            var _time = new Date($scope.thisMouth)
+            _time.setMonth(_time.getMonth() + val)
+            $scope.thisMouth = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+            $scope.apCheckCondition.$open = false
+            $scope.searchOrder()
+        }
+
+        $scope.addMouthOut = function(val) {
+            var _time = new Date($scope.thisMouthOut)
+            _time.setMonth(_time.getMonth() + val)
+            $scope.thisMouthOut = _time.getFullYear() + '-' + (_time.getMonth() + 1)
+            $scope.tableParams.page(1);
+            $scope.tableParams.reload();
+        }
+
+        $scope.hideshowNotCheck = function() {
+            $scope.showNotCheck = false
         }
 
+        $scope.$watch('thisMouthOut', function(newVal, oldVal) {
+            if (newVal !== oldVal) {
+                $scope.tableParams.page(1);
+                $scope.tableParams.reload();
+            }
+        })
+        $scope.$watch('thisMouth', function(newVal, oldVal) {
+            if (newVal !== oldVal) {
+                $scope.searchOrder()
+            }
+        })
+
     }]);
 
 
@@ -10505,6 +10600,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         // 点击其中一个明细的复选框
         $scope.checkOne = function (check) {
+            check.$selected = !check.$selected
             var result = true;
             angular.forEach($scope.data, function (item) {
                 if (item.$selected != true) {

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

@@ -152,15 +152,15 @@
 						<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=='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')">已确认
+								ng-click="setActive('done')">已对账
 							<!--<b class="new-dot" ng-if="unread.replied > 0">{{unread.replied>99?'99+':unread.replied}}</b>-->
 						</button>
 					</div>
@@ -170,6 +170,7 @@
 							<!--<b class="new-dot" ng-if="unread.cancelled > 0">{{unread.cancelled > 99 ? '99+' : unread.cancelled}}</b>-->
 						</button>
 					</div>
+
 					<!--<div class="btn-group btn-group-sm">-->
 					<!--<button type="button" class="btn btn-default btn-line"-->
 					<!--ng-class="{'btn-info':active=='all'}" ng-click="setActive('all')">全部</button>-->
@@ -195,13 +196,17 @@
 				</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>
 	</div>
 
 	<div ng-hide="showNotCheck">
-		<div class="condition block" >
+		<div class="condition block"  ng-show="!showNotCheck">
 			<div class="search-bg condition block" style="padding: 10px 15px;">
 				<div class="row">
 					<div id="topSearch" ng-show="active !== 'all'" style="float: left">
@@ -210,15 +215,47 @@
 						<a ng-click="changeDateZone(6);condition.$open=false" title="最近六个月" ng-class="{'active':condition.dateZone=='6'}">最近六个月</a>
 						<a ng-click="condition.$open=!condition.$open;changeDateZone(-1)" title="自定义" ng-class="{'active':condition.dateZone=='-1'}" >自定义</a>
 					</div>
+					<div  style="float: left" ng-show="active === 'all'" >
+						<label class="control-label">请选择月份：</label>
+						<span ng-click="addMouthOut(-1)" style="display: inline-block;
+							width: 30px;
+							height: 30px;
+							border: 1px solid #ddd;
+							text-align: center;
+							line-height: 30px;
+							cursor: pointer;
+							vertical-align: middle;">
+							<img src="static/img/vendor/images/arrow-left-d-l.png" width="24"/>
+						</span>
+						<span class="inputsIcon control-label" style="padding-right: 5px;display: inline-block;vertical-align: top;">
+						  <wui-date
+								  format="yyyy-mm"
+								  placeholder="请选择或输入日期"
+								  id="date3"
+								  btns="{'ok':'确定','now':'此刻'}"
+								  ng-model="thisMouthOut"
+						  >
+						  </wui-date>
+						</span>
+									<span  ng-click="addMouthOut(1)" style="display: inline-block;
+							width: 30px;
+							height: 30px;
+							border: 1px solid #ddd;
+							text-align: center;
+							line-height: 30px;
+							cursor: pointer;
+							vertical-align: middle;"><img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
+					</div>
 					<div class="col-xs-6" style="float: right;">
 						<div class="search">
 							<div class="form-group form-group-sm has-feedback" dropdown auto-close="outsideClick"
 								 on-toggle="searchAdvance=open">
 								<input type="search" class="form-control input-sm" ng-model="keyword"
 									   ng-search="onSearch(keyword)" placeholder="输入单据编号、客户名称、物料名称搜索" style="width: 100%" ng-show="active !== 'all'"/>
-								<input type="search" class="form-control input-sm" ng-model="keyword"
-									   ng-search="onSearch(keyword)" placeholder="客户名称" style="width: 100%" ng-show="active == 'all'"/>
-								<a class="btn input-group-addon" ng-click="onSearch(keyword)">搜索</a>
+								<a class="btn input-group-addon" href="javascript:void(0)" ng-click="onSearch(keyword)" ng-show="active !== 'all'">搜索</a>
+
+								<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch(keyword)" placeholder="客户名称" style="width: 100%" ng-show="active === 'all' && !showNotCheck" />
+								<a class="btn input-group-addon" ng-click="onSearch(keyword)" ng-show="active === 'all' && !showNotCheck">搜索</a>
 							</div>
 						</div>
 					</div>
@@ -274,19 +311,28 @@
 				<thead>
 					<tr class="header">
 						<th width="313">客户名称</th>
-						<th width="250">上次对账时间</th>
-						<th width="250">未对账总额</th>
+						<th width="250">本月应收</th>
+						<th width="250">应收总额</th>
 						<th width="160">操作</th>
 					</tr>
 				</thead>
 				<tbody ng-repeat="check in ALLList">
-					<tr >
-						<td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
-						<td ng-if="check.lastCheckDate">{{::check.lastCheckDate | date : 'MM月dd日 HH:mm'}}</td>
-						<td ng-if="!check.lastCheckDate">-</td>
-						<td>{{::check.uncheckedCount || '-'}}</td>
-						<td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">立即对账</td>
-					</tr>
+				<tr >
+					<td style="color: #3f84f6">{{::check.myEnterprise.enName}}</td>
+					<td ng-if="check.thisMonthCount && check.thisMonthCount.length > 0">
+						<div ng-repeat="count in check.thisMonthCount">
+							<span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}：{{count.amount | number:2}}</span>
+						</div>
+					</td>
+					<td ng-if="!check.thisMonthCount">-</td>
+					<td ng-if="check.totalCount && check.totalCount.length > 0">
+						<div ng-repeat="count in check.totalCount">
+							<span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}：{{count.amount | number:2}}</span>
+						</div>
+					</td>
+					<td ng-if="!check.totalCount">-</td>
+					<td style="color: #3f84f6;cursor: pointer" ng-click="goToMNs(check)">立即对账</td>
+				</tr>
 				</tbody>
 			</table>
 		</div>
@@ -394,20 +440,110 @@
 		<form class="form-horizontal"
 			  style="padding-top: 10px; padding-bottom: 20px;">
 			<div class="form-group form-group-sm form-group-inline">
-				<label class="col-sm-1 control-label">客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
-				<div class="col-sm-7 control-label" style="text-align:left">
-					{{suuorname}}
+				<div  class="col-sm-6 control-label">
+					<div style="text-align: left">
+						<label>应收客户：</label>
+						<label style="text-align:left">
+							{{suuorname}}
+						</label>
+					</div>
+					<div style="text-align: left;margin-top: 20px">
+						<label>本期间应收：</label>
+						<label style="text-align:left;vertical-align: top;">
+							<div ng-if="dataInfo.thisMonthCount.length > 0" ng-repeat="count in dataInfo.thisMonthCount">
+								<span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}：{{count.amount | number:2}}</span>
+							</div>
+							<div ng-if="dataInfo.thisMonthCount.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.totalCount.length > 0" ng-repeat="count in dataInfo.totalCount">
+								<span>{{count.currency === 'RMB' ? '¥': (count.currency === 'USD' ? '$' : 'HK$')}}：{{count.amount | number:2}}</span>
+							</div>
+							<div ng-if="dataInfo.totalCount.length === 0">
+								0
+							</div>
+						</label>
+					</div>
 				</div>
-				<label class="col-sm-2 control-label">请选择月份：</label>
-				<div class="col-sm-2" style="padding-right: 5px">
-					<wui-date
-							format="yyyy-mm"
-							placeholder="请选择或输入日期"
-							id="date4"
-							btns="{'ok':'确定','now':'此刻'}"
-							ng-model="thisMouth"
-					>
-					</wui-date>
+				<div  class="col-sm-6 control-label condition">
+					<div>
+						<label class="control-label">请选择月份：</label>
+						<span ng-click="addMouth(-1)" style="display: inline-block;
+							width: 30px;
+							height: 30px;
+							border: 1px solid #ddd;
+							text-align: center;
+							line-height: 30px;
+							cursor: pointer;
+							vertical-align: middle;">
+							<img src="static/img/vendor/images/arrow-left-d-l.png" width="24"/>
+						</span>
+						<span class="control-label" style="padding-right: 5px;display: inline-block;vertical-align: top;padding-top: 0" ng-click="apCheckCondition.$open = false">
+							<wui-date
+								  format="yyyy-mm"
+								  placeholder="请选择或输入日期"
+								  id="date4"
+								  btns="{'ok':'确定','now':'此刻'}"
+								  ng-model="thisMouth"
+						  >
+						</wui-date>
+						</span><span  ng-click="addMouth(1)" style="display: inline-block;
+							width: 30px;
+							height: 30px;
+							border: 1px solid #ddd;
+							text-align: center;
+							line-height: 30px;
+							cursor: pointer;
+							vertical-align: middle;">
+						<img src="static/img/vendor/images/arrow-right-d-l.png" width="24"/></span>
+						<label class="control-label com-check-radio" ng-click="apCheckCondition.$open = true" style="vertical-align: middle;padding-top: 0">
+							<input type="radio" name="psa" ng-checked="apCheckCondition.$open === true"  ng-model="apCheckCondition.$open" style="vertical-align: middle">自定义
+						</label>
+					</div>
+					<div ng-hide="!apCheckCondition.$open" class="more open date fr" style="margin-top: 14px;">
+						<div class="form-inline">
+							<div class="form-group">
+								<div class="form-group input-group input-group-xs input-trigger">
+									<input type="text" ng-model="apCheckCondition.dateFrom"
+										   class="form-control" placeholder="从"
+										   datepicker-popup="yyyy-MM-dd" is-open="apCheckCondition.$fromOpened"
+										   ng-required="true" max-date = "apCheckCondition.dateTo"
+										   current-text="今天" clear-text="清除" close-text="关闭"
+										   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+										   ng-focus="apCheckopenFilterDatePicker($event, apCheckCondition, '$fromOpened')"
+									style="height: 26px">
+									<span class="input-group-btn">
+									<button type="button" class="btn btn-default"
+											ng-click="apCheckopenFilterDatePicker($event, apCheckCondition, '$fromOpened')">
+										<i class="fa fa-calendar"></i>
+									</button>
+									</span>
+								</div>
+								<em style="margin: 0 10px;display: inline-block">–</em>
+								<div class="form-group input-group input-group-xs input-trigger">
+									<input type="text" ng-model="apCheckCondition.dateTo"
+													   class="form-control" placeholder="到"
+													   datepicker-popup="yyyy-MM-dd" is-open="apCheckCondition.$toOpened"
+													   ng-required="true" min-date = "apCheckCondition.dateFrom"
+													   current-text="今天" clear-text="清除" close-text="关闭"
+													   datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+													   ng-focus="apCheckopenFilterDatePicker($event, apCheckCondition, '$toOpened')" style="height: 26px">
+									<span class="input-group-btn">
+										<button type="button" class="btn btn-default"
+												ng-click="apCheckopenFilterDatePicker($event, apCheckCondition, '$toOpened')">
+											<i class="fa fa-calendar"></i>
+										</button>
+									</span>
+								</div>
+							</div>
+						</div>
+
+					</div>
 				</div>
 			</div>
 			<div class="form-group form-group-sm form-group-inline">
@@ -484,68 +620,60 @@
 			<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="100">本次<br>对账数</th>
+						<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="60">单据<br>编号</th>
-						<th width = "60">发货<br>单号</th>
-						<th width="35">序号</th>
-						<th width="60">类型</th>
-						<th width="60">单据<br>日期</th>
-						<th width="90">应付<br>供应商</th>
-						<th width="70">客户<br>采购单</th>
-						<th width="65">客户<br>料号</th>
-						<th width="70">客户物<br>料名称</th>
-						<th width="70">客户规<br>格型号</th>
-						<th width="65">送货<br>工厂</th>
-						<th width="55">数量</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="30">币别</th>
 						<th width="40">税率</th>
-						<th width="60">金额</th>
-						<th width="70">本次对<br>账金额</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>
 			</div>
 			<div class="table-body-wrap">
 				<table class="table table-bordered">
-					<tr ng-repeat="check in data"
-						class="thAlign" style="height: 40px;">
-						<td width="36" style="text-align: center;vertical-align: middle;"><input
-								ng-model="check.$selected" name="checkbox"
-								ng-click="checkOne(check)" ng-change="getTotalMoney()"
-								type="checkbox"></td>
-						<td width="100"><input ng-model="check.thischeckqty"
-											   type="number" max="data.maxThisCheckQty"
-											   min="data.minThisCheckQty" ng-change="getTotalMoney()"
-											   style="width: 75px;" class=" input-sm text-center"></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="60">{{::check.inoutno}}</td>
-						<td width="60">{{::check.sendcode}}</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>
+					<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"></td>
 						<td width="70">{{::check.ordercode}}</td>
-						<td width="65">{{::check.prodcode}}</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>
+							<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="65">{{::check.factory}}</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="30">{{::check.currency}}</td>
 						<td width="40" align="center">{{::check.taxrate}}</td>
-						<td width="60">{{::(check.qty || 0)*(check.orderprice || 0) | number:2}}</td>
-						<td width="60">{{::(check.orderprice || 0)*(check.thischeckqty || 0) | number:2}}</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>-->
+
 					</tr>
 					<tr ng-if="!data || data.length==0">
 						<td colspan="19">