应收对账作业UI调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8115 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/webapp/resources/css/index.css

@@ -32,7 +32,9 @@ h1,h2,h3 {
 	font-weight: 400;
 	font-style: normal;
 }
-
+table {
+	outline: none
+}
 a {
 	color: #333;
 	text-decoration: none;
@@ -48,6 +50,18 @@ a.none:hover {
 	position: relative;
 }
 
+.empty-block {
+	margin: 0 auto;
+    padding-top: 20px 25px;
+    text-align: center;
+    text-shadow: 0 2px 0 #fff, 0 -2px 0 #f8f6f2;
+}
+
+.empty-block i {
+    font-size: 120px;
+    color: #d9d7d3;
+}
+
 .f12 {
 	font-size: 12px !important;
 }
@@ -202,18 +216,10 @@ a.none:hover {
 	border-color: #dcdcdc;
 }
 
-/*.btn-info.btn-line {
-	background-color: #fff;
-	color: #6f6f6f;
-	border-color: #6f6f6f;
+.btn-icon-left {
+	margin-top: -1px
 }
 
-.btn-info.btn-line:hover {
-	background-color: #6f6f6f;
-	color: #fff;
-	border-color: #6f6f6f;
-}*/
-
 /*dropdown*/
 .dropdown-menu {
 	min-width: 100%;
@@ -1640,6 +1646,15 @@ ul>li.item-link>a {
 	border: none;
 }
 
+.input-sm,.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn
+	{
+	height: 30px;
+	padding: 0 7px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
+}
+
 .input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
 	{
 	height: 26px;
@@ -1649,11 +1664,40 @@ ul>li.item-link>a {
 	border-radius: 3px;
 }
 
-.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
+.input-group-sm .form-control:last-child,.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not(:first-child),.input-group-btn:last-child>.btn {
 	border-top-left-radius: 0;
 	border-bottom-left-radius: 0;
 }
 
+.input-group+.input-group .input-group-btn:last-child>.btn, .input-group+.input-group .input-group-btn:last-child>.btn-group {
+	margin-left: -2px
+}
+
+.form-horizontal .form-group-inline, .form-horizontal .form-group-inline .form-group {
+	margin-left: 0;
+	margin-right: 0	
+}
+
+.form-horizontal .form-group-inline .input-group {
+	display: inline-table
+}
+
+.form-horizontal .form-group-sm .control-label {
+	padding-top: 5px
+}
+
+.form-group-inline .has-feedback .form-control-feedback {
+	right: 5px
+}
+
+.form-group.form-group-sm {
+	margin-bottom: 10px
+}
+
+.form-group .form-group {
+	margin-bottom: 0
+}
+
 .ng-table-pager {
 	padding: 10px 15px;
 	height: 55px;

src/main/webapp/resources/js/common/directives.js

@@ -0,0 +1,17 @@
+define(['angular'], function(angular) {
+	'use strict';
+	angular.module('common.directives', []).directive('scrollTable', [function(){
+		// table 固定表头
+		return {
+			restrict : 'A',
+			link : function(scope, element, attrs, ngModel) {
+				var header = element.find('.table-header-wrap'), body = element.find('.table-body-wrap');
+				if(header && body) {
+					body.bind('scroll', function() {
+						header.scrollLeft(body.scrollLeft());
+	                });
+				}
+			}
+		};
+	}]);
+});

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

@@ -1,6 +1,6 @@
-define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'service/Make', 'service/Fa', 'service/Account', 'service/Alert', 'service/CheckTel', 'ui.router', 'ui.bootstrap', 'file-upload', 'ngSanitize', 'service/BaseInfo', 'service/Cart', 'service/ApprovalFlow', 'service/DeputyOrder'], function() {
+define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives', 'service/Purc', 'service/Make', 'service/Fa', 'service/Account', 'service/Alert', 'service/CheckTel', 'ui.router', 'ui.bootstrap', 'file-upload', 'ngSanitize', 'service/BaseInfo', 'service/Cart', 'service/ApprovalFlow', 'service/DeputyOrder'], function() {
 	'use strict';
-	var app = angular.module('myApp', [ 'toaster', 'angularCharts', 'ngTable', 'ui.router', 'common.services', 'PurcServices', 'MakeServices', 'FaServices', 'AccountServices', 'AlertServices', 'ui.bootstrap', 'angularFileUpload', 'ngSanitize', 'CheckTelModule', 'ProductServices', 'CartServices', 'ApprvoalFlowService', 'DeputyOrderService']);
+	var app = angular.module('myApp', [ 'toaster', 'angularCharts', 'ngTable', 'ui.router', 'common.services', 'common.directives', 'PurcServices', 'MakeServices', 'FaServices', 'AccountServices', 'AlertServices', 'ui.bootstrap', 'angularFileUpload', 'ngSanitize', 'CheckTelModule', 'ProductServices', 'CartServices', 'ApprvoalFlowService', 'DeputyOrderService']);
 	app.init = function() {
 		angular.bootstrap(document, [ 'myApp' ]);
 	};
@@ -458,14 +458,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         }).state('baseInfo.businessGroups', {
             url : '/businessGroups',
             controller : 'BusinessGroupsCtrl'
-        }).state('baseInfo.inquiryList', {
-            url : '/inquiryList',
-            templateUrl : "static/tpl/index/baseInfo/inquiry_list.html",
-            controller : 'PublicInquiryListCtrl'
-        }).state('baseInfo.inquiryListDetail', {
-            url : '/inquiryList/:id',
-            templateUrl : "static/tpl/index/baseInfo/inquiryItem_detail.html",
-            controller : 'PublicInquiryListDetailCtrl'
         }).state('qc', {
             url : "/qc",
             views : {
@@ -815,7 +807,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 $scope.tableParams.page(1);
                 $scope.tableParams.reload();
             });
-            $scope.checks.checked = false;
         };
 
         // 搜索框回车
@@ -2784,8 +2775,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		$scope.inquiry = {
 				code: 'XJ' + $filter('date')(new Date(), 'yyMMddsss'),
 				showdate: $filter('date')(new Date, 'yyyy-MM-dd'),
-				priceType: '采购',
-				isOpen: 0
+				priceType: '采购'
 		};
 		
 	    $scope.currentDay = function() {
@@ -2902,7 +2892,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         
         // 保存
         $scope.save = function() {
-        	console.log($scope.inquiry);
 //        	var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
 //    		$upload.upload({
 //    			url: 'product/baseInfo/updateProdInfo',
@@ -2923,76 +2912,36 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 //    			$scope.loadingShow = false;
 //    			toaster.pop('error', '操作失败', data.error);
 //    		});    
-        	if($scope.inquiry.isOpen == 0) {
-        		if( $scope.vendors.length > 0) { // 指定询价
-            		PurchaseInquiry.save({inquiry: $scope.inquiry}, $scope.vendors, function(data) {
-            			if(data.success) {
-            				toaster.pop('success', '提示', data.success);
-            				$timeout(function() {
-            					window.location.hash = "#/purc/inquiry_unapply";
-            				}, 500);
-            			}
-            			if(data.error) {
-            				toaster.pop('error', '提示', data.error);
-            			}
-            		}, function(response) {
-            			toaster.pop('error', '提示', response.data);
-            		});
-            	} else {
-            		toaster.pop('info', '提示', '请先选择供应商');
-            	}
-        	} else {
-        		PurchaseInquiry.saveWithoutVendor({inquiry: $scope.inquiry}, {}, function(data) {
-        			if(data.success) {
-        				toaster.pop('success', '提示', data.success);
-        				$timeout(function() {
-        					window.location.hash = "#/purc/inquiry_unapply";
-        				}, 500);
-        			}
-        			if(data.error) {
-        				toaster.pop('error', '提示', data.error);
-        			}
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+        	PurchaseInquiry.save({inquiry: $scope.inquiry}, $scope.vendors, function(data) {
+        		if(data.success) {
+        			toaster.pop('success', '提示', data.success);
+        			$timeout(function() {
+        				window.loaction.hash = "#/purc/inquiry_unapply";
+        			}, 500);
+        		}
+        		if(data.error) {
+        			toaster.pop('error', '提示', data.error);
+        		}
+        	}, function(response) {
+        		toaster.pop('error', '提示', response.data);
+        	});
     	}
         
         // 保存并提交
         $scope.submit = function() {
-        	if( $scope.inquiry.isOpen == 0) { // 指定询价
-        		if($scope.vendors.length > 0) {
-        			PurchaseInquiry.submit({inquiry: $scope.inquiry}, $scope.vendors, function(data) {
-            			if(data.success) {
-            				toaster.pop('success', '提示', data.success);
-            				$timeout(function() {
-            					window.location.hash = "#/purc/purchaseinquiry";
-            				}, 500);
-            			}
-            			if(data.error) {
-            				toaster.pop('error', '提示', data.error);
-            			}
-            		}, function(response) {
-            			toaster.pop('error', '提示', response.data);
-            		});
-        		} else {
-        			toaster.pop('info', '提示', '请先选择供应商');
+        	PurchaseInquiry.submit({inquiry: $scope.inquiry}, $scope.vendors, function(data) {
+        		if(data.success) {
+        			toaster.pop('success', '提示', data.success);
+        			$timeout(function() {
+        				window.location.hash = "#/purc/inquiry_unapply";
+        			}, 500);
+        		}
+        		if(data.error) {
+        			toaster.pop('error', '提示', data.error);
         		}
-        	} else {
-        		PurchaseInquiry.saveAndSubmitWithoutVendor({inquiry: $scope.inquiry}, {}, function(data) {
-        			if(data.success) {
-        				toaster.pop('success', '提示', data.success);
-        				$timeout(function() {
-        					window.location.hash = "#/purc/purchaseinquiry";
-        				}, 500);
-        			}
-        			if(data.error) {
-        				toaster.pop('error', '提示', data.error);
-        			}
-        		}, function(response) {
-        			toaster.pop('error', '提示', response.data);
-        		});
-        	}
+        	}, function(response) {
+        		toaster.pop('error', '提示', response.data);
+        	});
     	}
 	}]);
 
@@ -3170,193 +3119,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				toaster.pop('error', '提示', response.data);
 			})
 		}
-		
-		// 发布公共询价
-		$scope.publish = function(id) {
-			PurchaseInquiry.publishInquiry({id: id}, {}, function(data) {
-				toaster.pop('success', '提示', data.success);
-			}, function(response) {
-				toaster.pop('error', '提示', response.data);
-			})
-		}
-	}]);
-	
-	// 公共询价列表
-	app.controller('PublicInquiryListCtrl', ['$scope', '$stateParams', 'PurchaseInquiry','$filter', 'toaster', 'BaseService', 'ngTableParams', function($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams) {
-		BaseService.scrollBackToTop();
-        /**
-         * 改变单据日期范围
-         */
-        var getTenderDateCondition = function(zone, condition) {
-            var date = new Date();
-            if(zone == -1) {
-                condition.dateFrom = null;
-                condition.dateTo = null;
-            } else if(zone == 7) { // 一星期内
-                date.setDate(date.getDate() - 7);
-                condition.dateFrom = date;
-                condition.dateTo = new Date();
-            } else if(zone == 1) { // 一个月内
-                date.setMonth(date.getMonth() - 1);
-                condition.dateFrom = date;
-                condition.dateTo = new Date();
-            } else if(zone == 3) { // 三个月内
-                date.setMonth(date.getMonth() - 3);
-                condition.dateFrom = date;
-                condition.dateTo = new Date();
-            } else if (zone == 6) { // 半年内
-                date.setMonth(date.getMonth() - 6);
-                condition.dateFrom = date;
-                condition.dateTo = new Date();
-            } else {  // 一年内
-                date.setYear(date.getYear() - 1);
-                condition.dateFrom = date;
-                condition.dateTo = new Date();
-            }
-        };
-
-        $scope.dateZoneText = '不限';
-        $scope.deliveryZoneText = '不限';
-        $scope.condition = {dateZone: -1};
-        $scope.changeDateZone = function(zone) {
-            $scope.condition.dateZone = zone;
-            $scope.condition.$dateZoneOpen = false;
-            getTenderDateCondition(zone, $scope.condition);
-            $scope.tableParams.reload();
-        };
-
-        $scope.openDatePicker = function($event, item, openParam) {
-            $event.preventDefault();
-            $event.stopPropagation();
-            item[openParam] = !item[openParam];
-        };
-
-        $scope.parseDate = function(dateStr) {
-            if(dateStr)
-                return Date.parse(dateStr, 'yyyy-MM-dd');
-            return new Date();
-        };
-
-        // 选择查找日期
-        $scope.onDateCondition = function(){
-            $scope.tableParams.page(1);
-            $scope.tableParams.reload();
-        };
-        // $scope.setActive = function(state) {
-        //     if($scope.active != state) {
-        //         $scope.active = state;
-        //         if($scope.tableParams.page() == 1)
-        //             $scope.tableParams.reload();
-        //         else
-        //             $scope.tableParams.page(1);
-        //     }
-        // };
-        
-        $scope.nowdate = new Date().getTime();
-        var getOpenState = function(active) {
-            var fn = 'getOpenAll';
-            switch(active) {
-                case 'all':
-                    fn = 'getOpenAll';break;
-                case 'todo':
-                    fn = 'getOpenTodo';break;
-                case 'end':
-                    fn = 'getOpenEnd';break;
-            }
-            return fn;
-        };
-
-        $scope.tableParams = new ngTableParams({
-            page : 1,
-            count : 10,
-            sorting: {
-//                'tender.endDate': 'desc',
-//                'tender.enterprise.enName': 'asc',
-//                'tender.code': 'asc'
-            }
-        }, {
-            total : 0,
-            counts: [10, 25, 50, 100],
-            getData : function($defer, params) {
-                $scope.loading = true;
-                var pageParams = params.url();
-//                var realActive = {};
-                pageParams.searchFilter = { // 筛选条件
-                    keyword: $scope.keyword,
-                    fromDate: getDateTime($scope.condition.dateFrom),
-                    endDate: getDateTime($scope.condition.dateTo)
-                };
-//                AccountEnterprise.get({}, function(data){
-//                    $scope.loading = false;
-//                    $scope.currentEn = data;
-//                });
-                PurchaseInquiry.publicInquiryItem.call(null, BaseService.parseParams(pageParams), function(page){
-                    $scope.loading = false;
-                    if(page) {
-                        params.total(page.totalElement);
-                        $defer.resolve(page.content);
-                        // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
-                    }
-                }, function(response){
-                    $scope.loading = false;
-                    toaster.pop('error', '数据加载失败', response.data);
-                });
-            }
-        });
-
-        $scope.toDetail = function(id) {
-            window.location.hash = '#/baseInfo/inquiryList/' + id;
-        };
-
-        // 搜索框回车
-        $scope.onSearch = function() {
-            $scope.tableParams.page(1);
-            $scope.tableParams.reload();
-        };
-
-	}]);
-	
-	/**
-	 * 公共询价详情
-	 */
-	app.controller('PublicInquiryListDetailCtrl', ['$scope', '$stateParams', 'PurchaseInquiry','$filter', 'toaster', 'BaseService', 'ngTableParams', 'AccountEnterprise', function($scope, $stateParams, PurchaseInquiry, $filter, toaster, BaseService, ngTableParams, AccountEnterprise) {
-		BaseService.scrollBackToTop();
-		var loadData = function() {
-			PurchaseInquiry.inquiryItemDetail({id: $stateParams.id}, function(data) {
-				$scope.inquiryItem = data;
-			}, function(response) {
-				toaster.pop('error', '提示', response.data);
-			});
-		}
-		loadData();
-		
-		// 当前时间
-        $scope.nowdate = new Date().getTime();
-        
-		 // 当前企业
-		AccountEnterprise.get({}, function(data){
-			$scope.loading = false;
-			$scope.enterprise = data;
-		});
-        
-		// 转客户询价
-		$scope.transtoInquiry = function(id) {
-			PurchaseInquiry.transtoInquiry({id: id}, {}, function(data) {
-				if(data.success) {
-					toaster.pop('success', '提示', data.success);
-				} 
-				if(data.error) {
-					toaster.pop('error', '提示', data.error);
-				}
-				if(data.info) {
-					toaster.pop('info', '提示', data.info);
-				}
-			}, function(response) {
-				toaster.pop('error', '提示', response.data);
-			});
-		}
 	}]);
-	
 	// 询价单明细
 	app.controller('PurcInquiryDetailCtrl', ['$scope', '$stateParams', 'PurcInquiry','$filter', 'toaster', function($scope, $stateParams, PurcInquiry,$filter, toaster){
 		var loadData = function() {
@@ -6288,27 +6051,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	
 	//未对账单据列表
 	app.controller('PurchaseApCheckListCtrl',['$scope', 'FaApCheck', 'toaster', '$state','$filter', '$modal', function($scope, FaApCheck, toaster, $state, $filter, $modal){
-		$scope.data = {};// 列表数据
-		$scope.loading = true;
-//		$scope.getData = function(){
-//		    FaApCheck.getAll(function(data){
-//				$scope.data = data;
-//				angular.forEach($scope.data, function(item) {
-//						item:{
-//							$selected:true;
-//						}
-//					});
-//				$scope.loading = false;
-//			});
-//
-//		}
-		
-		document.getElementById('suuorname').focus();//光标默认在客户
-		
-//		$scope.getData();
+		$scope.data = [];// 列表数据
 		
 		$scope.condition = {
-			$fromOpened:false
+			$fromOpened: false
 		}
 		
 		$scope.openDatePicker = function($event, item, openParam) {
@@ -6319,7 +6065,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		
 		//查找客户
 		$scope.searchCust = function(suuorname) {
-			console.log('eeee');
 			var modalInstance = $modal.open({
 				animation: true,
 				templateUrl: 'static/tpl/index/fa/custInfo.html',
@@ -6338,8 +6083,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		
 		// 点击筛选根据条件选择数据
 		$scope.suuorname = '';
-		$scope.sdateFrom = '';
-		$scope.sdateTo = '';
+		// 默认本月
+		$scope.sdateTo = new Date();
+		$scope.sdateFrom = new Date($scope.sdateTo.getFullYear(), $scope.sdateTo.getMonth(), 1);
 		$scope.vuuorname = '';
 		$scope.factory = '';
 		$scope.prodTitle = '';
@@ -6353,10 +6099,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		$scope.condition.prodSpec = '';
 		
 		$scope.searchOrder = function(check) {
-			angular.forEach($scope.data, function(item) {
-				$scope.checkboxes.checked = false;
-				item.$selected = false;
-			});
+			$scope.data = [];
+			$scope.checkboxes.checked = false;
 			$scope.totalMoney = 0;
 			$scope.condition.uuorname = $scope.suuorname;
 			$scope.condition.factory = $scope.factory
@@ -6370,14 +6114,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 				$scope.condition.dateTo = ($scope.sdateTo || 0);
 			}
 			$scope.condition.venduuorname = $scope.vuuorname;
-//			//物料名称和物料规格存在特殊符号，用|作分割符
-//			$scope.keywordXls = angular.copy(($scope.condition.uuorname == null ? "" : $scope.condition.uuorname)
-//							+ "|"+ ($scope.condition.venduuorname == null ? "" : $scope.condition.venduuorname)
-//							+ "|"+ ($scope.condition.factory == null ? "" : $scope.condition.factory)
-//							+ "|"+ ($scope.condition.prodTitle == null ? "" : $scope.condition.prodTitle)
-//							+ "|"+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
-//			$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
-//			$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
 			if($scope.condition.dateFrom != null || $scope.condition.dateTo != null || $scope.keywordXls != null) {
 				
 				$scope.fromDate =$scope.condition.dateFrom ?  $scope.condition.dateFrom.getTime() : null;
@@ -6389,19 +6125,25 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 						+ "|"+ ($scope.condition.prodSpec == null ? "" : $scope.condition.prodSpec));//保存当前取值的关键词
 				$scope.fromDateXls = angular.copy($scope.condition.dateFrom ? $scope.condition.dateFrom.getTime() : null);//保存当前取值的起始日期
 				$scope.endDateXls = angular.copy($scope.condition.dateTo ? $scope.condition.dateTo.getTime() : null);//保存当前取值的截止日期
-				if($scope.suuorname == '') {
-					toaster.pop('info','提示', '请先选择客户');
+				if(!$scope.suuorname) {
+					toaster.pop('warning','提示', '请先选择客户');
 					document.getElementById('suuorname').focus();//光标默认在客户
 				} else {
+					$scope.loading = true;
 					FaApCheck.getAllByKeywords({fromDate: $scope.fromDate, endDate: $scope.endDate, keyword:$scope.keywordXls}, function(data) {
-						$scope.data = data;
-						angular.forEach($scope.data, function(item) {
-							item:{
-								$selected:true;
-							}
-						});
+						if(data.length > 0) {
+							angular.forEach(data, function(item) {
+								item.$selected = true;
+							});
+							$scope.data = data;
+							$scope.checkboxes.checked = true;
+							$scope.getTotalMoney();
+						} else {
+							toaster.pop('info', '提示', '当前没有需要对账记录');
+						}
 						$scope.loading = false;
 					}, function(response) {
+						$scope.loading = false;
 						toaster.pop('error', '提示', response.data);
 					});
 				}
@@ -8486,6 +8228,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			return str.substring(0, 1);
 		};
 	});
+	app.filter('summary', function(){
+		return function(data, field) {
+			var sum = 0;
+			if (data) {
+				angular.forEach(data, function(d){
+					sum += d[field];
+				});
+			}
+			return sum;
+		};
+	});
 	/**
 	 * 搜索框，回车触发
 	 */
@@ -10172,23 +9925,17 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	 * 财务对账时，企业进行筛选操作
 	 */
 	app.controller('SearchCustInfoCtrl', ['$scope', '$modalInstance', 'suuorname', 'FaApCheck', function($scope, $modalInstance, suuorname, FaApCheck) {
-		$scope.getData = function(){
+		var getData = function(){
+			$scope.loading = true;
 		    FaApCheck.getAllCustomers(function(data) {
-		    	console.log(data);
-				$scope.custs= data;
-				angular.forEach($scope.data, function(item) {
-						item:{
-							$selected: true;
-						}
-					});
+				$scope.custs = data;
 				$scope.loading = false;
 			});
-
-		}
+		};
 		
-		$scope.getData();
+		getData();
 		
-		$scope.CustName= function(suuorname) {
+		$scope.select = function(suuorname) {
 			$modalInstance.close(suuorname);
 		}
 		
@@ -11125,7 +10872,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                     fn = 'getMyWaiting';break;
             }
             return fn;
-        };
+        }
 
         $scope.tableParams = new ngTableParams({
             page : 1,
@@ -11207,7 +10954,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             ShipAddress.shipAddList({}, function(data) {
                 $scope.ships = data;
                 $scope.tender.shipadd = $scope.ships[0];
-                console.log($scope.ships);
             });
         };
         loadShipAddress();
@@ -11449,7 +11195,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             date: new Date(),
             unit: 'PCS',
             currency: 'RMB',
-            ifOpen: 1,
+            ifOpen: 0,
             ifTax: 1,
             invoiceType: 2,
             tenderAttachs:[{}]
@@ -11499,30 +11245,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             });
         };
 
-        // 新增供应商联系人
-        $scope.addContact = function(uu) {
-            var modalInstance = $modal.open({
-                animation: true,
-                templateUrl: 'static/tpl/index/purc/modal/contact_person_modal.html',
-                controller: 'AddContacCtrl',
-                resolve: {
-                }
-            });
-            modalInstance.result.then(function(data) {
-                $scope.contact = data;
-                $scope.contact.venduu = uu;
-                Vendor.saveContact({}, $scope.contact, function(data) {
-                    Vendor.contacts({venduu: $scope.order.cust.uu}, {}, function(data) {
-                        $scope.contacts = data;
-                        $scope.order.vendor = $scope.contacts[0];
-                    });
-                    toaster.pop('success', '提示', '联系人保存成功');
-                }, function(response) {
-                    toaster.pop('error', '失败', response.data);
-                });
-            });
-        };
-
         // 已存在id的为查看招标单(用于在录入的招标单的发布和删除)
         if( ! angular.isUndefined($stateParams.id)) {
             $scope.loading  = true;
@@ -11760,7 +11482,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 切换为在平台公开招标时，清除掉已添加的供应商信息
         $scope.removeChecked = function() {
-            if ($scope.tenderProd.enterpriseBaseInfo && $scope.tenderProd.enterpriseBaseInfo.length > 0) {
+            if ($scope.tenderProd.enterpriseBaseInfo.size > 0) {
                 $scope.tenderProd.enterpriseBaseInfo = [];
             }
         };

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

@@ -1,306 +1,276 @@
 <style>
-	.searchcolor {
-		background-color: #fff;
-		}
-		
-	.searchMargin { 
-		margin-left:-126px;
-	}
-	
-	.thAlign th{
-		text-align:center;
-	}
-	
-	.more{
-		margin-top: 10px;
-	}
+.add-apCheckList {
+	background: #fff
+}
 
-	.tableMargin {
-		margin-top: 20px;
-	}
-	
-	.checkboxSize input{
-		width: 12px;
-		height: 12px;
-	}
-	
-	form {
-		margin-bottom: 12px;
-		margin-left: 7px;
-	}
-		
-	.form-inline .form-control {
-		width:219%;
-	}
-			
-	table{
-		margin:0 auto;
-		
-	}
-	
-	td {
-		/*border:1px solid;*/
-		word-break: break-all;
-		text-align: center;
-	}
+.add-apCheckList input[type="checkbox"] {
+	width: 16px;
+	height: 16px
+}
 
-	
-	.info {
-		overflow:scroll;
-	}
-	
-	#tip {
-		margin: 10px;
-	}
-	.searchcolor .col-xs-2{
-		font-size: 14px;
-		padding-left: 38px;
-	}
-	.searchcolor .col-xs-3{
-		font-size: 14px;
-	}
-	.searchcolor .col-xs-2 label,.searchcolor .col-xs-3 label{
-		font-weight: normal;
-	}
-	.add-apCheckList .form-control{
-		border: #bfbfbf 1px solid !important;
-		height: 34px;
-		background: #fff;
-		font-size: 14px;
-	}
-	.add-apCheckList .row{
-		line-height: 34px;
-	}
-	.input-group-btn button{
-		height: 34px;
-	}
-	.thAlign th{
-		border-top: none !important;
-		border-right: none !important;
-		border-left: none !important;
-		border-bottom: #e8e8e8 1px solid;
-	}
-	#order-detail-list .input-sm{
-		border: #ccc 1px solid;
-	}
-	.tab-style table td{
-		padding-left: 0 !important;
-		padding-right: 0 !important;
-	}
-	.has-feedback input[type="search"]{
-		padding-right: 0 !important;
-	}
-</style>
+.add-apCheckList .table-wrap {
+	overflow: hidden
+}
 
-<div style="margin-right:20px;">
-<div class="add-apCheckList">
-	<div class="pub-com_head">
-		<span>新增对账单</span>
-		<div class="p-right">
+.add-apCheckList .table-header-wrap {
+	background: #f9f9f9;
+	overflow-x: hidden;
+	overflow-y: scroll;
+}
 
+.add-apCheckList .table-header-wrap table,.add-apCheckList .table-body-wrap table
+	{
+	width: 100%;
+	table-layout: fixed;
+	border-collapse: collapse;
+	border-spacing: 0;
+	margin-bottom: 0
+}
+
+.add-apCheckList .table-header-wrap th {
+	text-align: center;
+}
+
+.add-apCheckList .table-body-wrap {
+	max-height: 1000px;
+	overflow-x: auto;
+	overflow-y: scroll;
+}
+
+.add-apCheckList td {
+	word-break: break-all;
+	text-align: center;
+}
+
+.add-apCheckList tbody {
+	overflow: auto;
+}
+
+#order-detail-list .input-sm {
+	border: #ccc 1px solid;
+}
+
+.has-feedback input[type="search"] {
+	padding-right: 0 !important;
+}
+</style>
+
+<div style="margin-right: 20px;">
+	<div class="add-apCheckList">
+		<div class="pub-com_head">
+			<span>新增对账单</span>
+			<div class="p-right"></div>
 		</div>
-	</div>
-	<div class="block searchcolor" style="padding-top: 10px; padding-bottom: 20px;">
-	
- 	<!-- 	<div class="loading in" ng-class="{'in': loading}">
-			<i></i>
-		</div> -->
-		<div class="row" id="tip">（<a class="text-inverse">*提示</a>：为了提高反应速率，现在所有单据都由用户手动筛选得出）</div>
-  		<div class="row">
-  			<div class="col-xs-2">
-				<label>客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
-			</div>
- 			<div class="col-xs-3">
- 				<div class="form-group form-group-sm has-feedback">
-					<input type="text" class="form-control input-sm" 
-						id="suuorname" ng-model="suuorname" placeholder="可用客户名称筛选" ng-click="searchCust(suuorname)"/><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
-			</div>
-			<div class="col-xs-2">
-				<label>应付供应商：</label>
-			</div>
- 			<div class="col-xs-3">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm" 
-						ng-model="vuuorname" placeholder="可用应付供应商名称筛选" /><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-xs-2">
-				<label>送货工厂：</label>
-			</div>
-			<div class="col-xs-3">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm"
-						   ng-model="factory" placeholder="请输入送货工厂名称" /><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
-			</div>
-			<div class="col-xs-2">
-				<label>物料名称：</label>
-			</div>
-			<div class="col-xs-3">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm"
-						   ng-model="prodTitle" placeholder="请输入物料名称" /><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-xs-2">
-				<label>规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</label>
+		<form class="form-horizontal"
+			style="padding-top: 10px; padding-bottom: 20px;">
+			<div class="loading" ng-class="{'in': loading}">
+				<i></i>
 			</div>
-			<div class="col-xs-3">
-				<div class="form-group form-group-sm has-feedback">
-					<input type="search" class="form-control input-sm"
-						   ng-model="prodSpec" placeholder="请输入物料规格" /><span
-						class="form-control-feedback text-simple"><i
-						class="fa fa-search"></i></span>
-				</div>
-			</div>
-		</div>
-		<div class="more">
-			<form class="form-inline">
-			<div class="row">
-			  	<div class="col-xs-7">
-					<div class="col-xs-3">
-						<label>单据日期：</label>
+			<div class="form-group form-group-sm form-group-inline">
+				<label class="col-sm-2 control-label">客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
+				<div class="col-sm-4">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="text" class="form-control input-sm" id="suuorname"
+							ng-model="suuorname" placeholder="选择对账客户"
+							ng-click="searchCust(suuorname)" autofocus /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
 					</div>
-			  <div class="col-xs-9 form-group">
-			    <div class="col-xs-5 form-group input-group input-group-xs input-trigger">
-						<input type="text" ng-model="sdateFrom"
-							class="form-control" placeholder="起始日期" 
-							datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-							 max-date="condition.dateTo"
+				</div>
+				<label class="col-sm-2 control-label">单据日期：</label>
+				<div class="col-sm-2" style="padding-right: 5px">
+					<div
+						class="form-group form-group-sm input-group input-group-sm input-trigger">
+						<input type="text" ng-model="sdateFrom" class="form-control"
+							placeholder="起始日期" datepicker-popup="yyyy-MM-dd"
+							is-open="condition.$fromOpened" max-date="condition.dateTo"
 							current-text="今天" clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 							ng-click="openDatePicker($event, condition, '$fromOpened')"
-							ng-change="onDateCondition()">
-						<span class="input-group-btn">
-							<button type="button" class="btn-ht34 btn btn-default"
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
+							<button type="button" class="btn btn-default"
 								ng-click="openDatePicker($event, condition, '$fromOpened')">
 								<i class="fa fa-calendar"></i>
 							</button>
 						</span>
 					</div>
-				<div class="col-xs-5 form-group input-group input-group-xs input-trigger">
-					<input type="text" ng-model="sdateTo"
-						class="form-control" placeholder="截止日期"
-						datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-						min-date="condition.dateFrom"
-						current-text="今天" clear-text="清除" close-text="关闭"
-						datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-						ng-click="openDatePicker($event, condition, '$toOpened')"
-						ng-change="onDateCondition()">
-					<span class="input-group-btn">
-						<button type="button" class="btn-ht34 btn btn-default"
-							ng-click="openDatePicker($event, condition, '$toOpened')">
-							<i class="fa fa-calendar"></i>
-						</button>
-					</span>
 				</div>
+				<div class="col-sm-2" style="padding-left: 5px">
+					<div
+						class="form-group form-group-sm input-group input-group-sm input-trigger">
+						<input type="text" ng-model="sdateTo" class="form-control"
+							placeholder="截止日期" datepicker-popup="yyyy-MM-dd"
+							is-open="condition.$toOpened" min-date="condition.dateFrom"
+							current-text="今天" clear-text="清除" close-text="关闭"
+							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							ng-click="openDatePicker($event, condition, '$toOpened')"
+							ng-change="onDateCondition()"> <span
+							class="input-group-btn">
+							<button type="button" class="btn btn-default"
+								ng-click="openDatePicker($event, condition, '$toOpened')">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+					</div>
+				</div>
+			</div>
+			<div class="form-group form-group-sm form-group-inline">
+				<div class="col-sm-12 text-right">
+					<a ng-click="condition.$open=!condition.$open" class="text-simple"><span
+						ng-bind="condition.$open ? '收起筛选条件' : '更多筛选条件'"></span><i
+						class="fa fa-fw"
+						ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i></a>
+					<div class="btn-group btn-group-sm">
+						<a class="btn btn-default" ng-click="searchOrder()"><i
+							class="fa fa-search fa-fw btn-icon-left"></i>筛选</a> <a
+							class="btn btn-default" ng-click="createApCheck(check.$selected)"
+							ng-disabled="!data || data.length==0"><i
+							class="fa fa-check-circle-o fa-fw btn-icon-left"></i>对账</a> <a
+							class="btn btn-default"
+							href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}"
+							target="_self" title="导出Excel"
+							ng-disabled="!data || data.length==0"><i
+							class="fa fa-file-excel-o fa-fw btn-icon-left"></i>导出</a>
+					</div>
+				</div>
+			</div>
+			<div class="form-group form-group-sm form-group-inline"
+				ng-show="condition.$open">
+				<label class="col-sm-2 control-label">应付供应商：</label>
+				<div class="col-sm-4">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="search" class="form-control input-sm"
+							ng-model="vuuorname" placeholder="可用应付供应商名称筛选" /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
 					</div>
+				</div>
+				<label class="col-sm-2 control-label">送货工厂：</label>
+				<div class="col-sm-4">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="search" class="form-control input-sm"
+							ng-model="factory" placeholder="请输入送货工厂名称" /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
 					</div>
-				<div class="col-xs-2" style="margin-top:4px; padding: 0;">
-					<a href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" title="导出Excel表格" class="blue f14">
-						<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 				</div>
-				<div class="col-xs-3" >
-				<div class="form-group">
-					<button class="btn btn-default btn-sm" ng-click="searchOrder()" title="若果没有筛选条件，将筛选出所有的单据">筛选单据</button>&nbsp;&nbsp; <button class="btn btn-default btn-sm" ng-click="createApCheck(check.$selected)">生成对账</button>
+			</div>
+			<div class="form-group form-group-sm form-group-inline"
+				ng-show="condition.$open">
+				<label class="col-sm-2 control-label">物料名称：</label>
+				<div class="col-sm-4">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="search" class="form-control input-sm"
+							ng-model="prodTitle" placeholder="请输入物料名称" /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
+					</div>
 				</div>
+				<label class="col-sm-2 control-label">规&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;格：</label>
+				<div class="col-sm-4">
+					<div class="form-group form-group-sm has-feedback">
+						<input type="search" class="form-control input-sm"
+							ng-model="prodSpec" placeholder="请输入物料规格" /><span
+							class="form-control-feedback text-simple"><i
+							class="fa fa-search"></i></span>
+					</div>
 				</div>
 			</div>
-				</form>		
-			  </div>
-		</div>
-	<div class="info" style="background: #fff;" id="order-detail-list">
-			<table width="1600px" class="tableMargin">
-				<tr>
-					<table width="1600px" class="table-bordered"
-						style="margin-bottom: 0">
-						<tr class="thAlign" style="height: 40px;">
-							<th width="36px;" class="checkboxSize"><input
-								type="checkbox" name="checkbox" ng-model="checkboxes.checked"
-								ng-click="checkAll()"></th>
-							<th width="100px;">本次对账数</th>
-							<th width="70px;">客户名称</th>
-							<th width="60px;">单据编号</th>
-							<th width="35px;">序号</th>
-							<th width="60px;">类型</th>
-							<th width="60px;">单据日期</th>
-							<th width="90px;">应付供应商名称</th>
-							<th width="70px;">客户采购单号</th>
-							<th width="65px;">客户料号</th>
-							<th width="70px;">客户物料名称</th>
-							<th width="70px;">客户规格型号</th>
-							<th width="65px;">送货工厂</th>
-							<th width="55px;">数量</th>
-							<th width="40px;">单价</th>
-							<th width="30px;">币别</th>
-							<th width="40px;">税率</th>
-							<th width="60px;">金额</th>
-							<th width="70px;">本次对帐金额</th>
-						</tr>
-						<tr
-								ng-repeat="check in data | filter:condition.factory | filter:condition.prodSpec | filter:condition.prodTitle | filter:condition.uuorname | filter:condition.venduuorname | orderBy: 'piDate': reverse=true"
-								ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom <= check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo >= check.piDate)))"
-								class="thAlign" style="height: 40px;">
-							<td width="36px;" style="text-align: center"
-								class="checkboxSize" n><input ng-model="check.$selected"
-															  name="checkbox" ng-click="checkOne(check)"
-															  ng-change="getTotalMoney()" type="checkbox"></td>
-							<td width="99.5px;"><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="69.5px;" 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="59.5px;">{{check.inOutNo}}</td>
-							<td width="34.5px;" align="center">{{check.detno}}</td>
-							<td width="59.5px;">{{check.piClass}}</td>
-							<td width="59.5px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
-							<td width="89.5px;" 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="69.5px;">{{check.orderCode}}</td>
-							<td width="64.5px;">{{check.prodCode}}</td>
-							<td width="64.5px;" 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="64.5px;" 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="64.5px;">{{check.factory}}</td>
-							<td width="54.5px;">{{check.qty}}</td>
-							<td width="39.5px;">{{check.orderPrice}}</td>
-							<td width="29.5px;">{{check.currency}}</td>
-							<td width="39.5px;" align="center">{{check.taxrate}}</td>
-							<td width="59.5px;">{{(check.qty || 0)*(check.orderPrice ||
-								0) | number:2}}</td>
-							<td width="60px;">{{(check.orderPrice ||
-								0)*(check.thisCheckQty || 0) | number:2}}</td>
-						</tr>
-					</table>
-				</tr>
-				<tr>
-					<td>
-						<div style="overflow-y: scroll; width: 1600px; max-height: 500px" class="tab-style">
-							<table class="table table-bordered table-striped table-hover">
-
-							</table>
-						</div>
-					</td>
-				</tr>
-			</table>
+		</form>
+		<!-- 标签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"><input type="checkbox" name="checkbox"
+							ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+						<th width="100">本次<br>对账数
+						</th>
+						<th width="70">客户<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="40">单价</th>
+						<th width="30">币别</th>
+						<th width="40">税率</th>
+						<th width="60">金额</th>
+						<th width="70">本次对<br>账金额
+						</th>
+					</tr>
+				</table>
+			</div>
+			<div class="table-body-wrap">
+				<table class="table table-bordered">
+					<tr
+						ng-repeat="check in data | filter:condition.factory | filter:condition.prodSpec | filter:condition.prodTitle | filter:condition.uuorname | filter:condition.venduuorname | orderBy: 'piDate': reverse=true"
+						ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom <= check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo >= check.piDate)))"
+						class="thAlign" style="height: 40px;">
+						<td width="36" style="text-align: center"><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="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="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>
+						</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="55">{{::check.qty}}</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>
+					</tr>
+					<tr ng-if="!data || data.length==0">
+						<td colspan="19">
+							<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" ng-show="totalMoney!=0">总金额合计：{{totalMoney
+				| number:2}}</div>
 		</div>
 	</div>
-	<div style="text-align: left; background: #fff; height: 40px; line-height: 40px;">
-		<div class="divid" style="margin-left: 20px">总金额合计：{{totalMoney | number:2}}</div>
-	</div>
 </div>

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

@@ -5,18 +5,20 @@
 </div>
 <div class="modal-body">
 	<div>
-		<table width="50%" class="block table table-bordered table-striped table-hover">
-		<thead>
+		<table width="50%"
+			class="block table table-bordered table-striped table-hover">
+			<thead>
 				<th width="120px;" class="text-center">客户名称</th>
-		</thead>
-		<tbody>
-				<div style="overflow-y:scroll; width:100%;max-height:500px">			
+			</thead>
+			<tbody>
+				<div style="overflow-y: scroll; width: 100%; max-height: 500px">
 					<tr ng-repeat="cust in custs">
-						<td width="80px;"><a style="text-decoration:none" ng-bind="cust" ng-click="CustName(cust)"></a></td>
+						<td width="80px;"><a style="text-decoration: none"
+							ng-bind="::cust" ng-click="select(cust)"></a></td>
 					</tr>
 				</div>
-		<tbody>
-	</table>
+			<tbody>
+		</table>
 	</div>
 </div>
 <div class="modal-footer">