应付对账单模块，模态框搜索改为模糊搜索，修改模态框大小以适应屏幕不同分辨率

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

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

@@ -3697,7 +3697,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 	}]);
 	
 	//未对账单据列表
-	app.controller('PurchaseApCheckListCtrl',['$scope', '$modalInstance', 'FaApCheck', '$filter', 'toaster', '$state',function($scope, $modalInstance, FaApCheck, $filter, toaster, $state){
+	app.controller('PurchaseApCheckListCtrl',['$scope', '$modalInstance', 'FaApCheck', 'toaster', '$state', function($scope, $modalInstance, FaApCheck, toaster, $state){
 		$scope.data = {};// 列表数据
 		$scope.loading = true;
 		$scope.getData = function(){
@@ -3744,8 +3744,9 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		
 		$scope.searchOrder = function(check) {
 			$scope.condition.uuorname = $scope.suuorname;
-			$scope.condition.dateFrom = $scope.sdateFrom;
-			$scope.condition.dateTo = $scope.sdateTo;
+			$scope.condition.dateFrom = ($scope.sdateFrom || 0);
+			$scope.condition.dateTo = ($scope.sdateTo || 0);
+			console.log($scope.condition.dateTo);
 			$scope.condition.venduuorname = $scope.vuuorname;
 		}
 		

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

@@ -1,8 +1,4 @@
 <style>
-	.modal-lg {
-		width: 1200px;
-	}
-	
 	.modal-header {
 		background-color:#56a022;
 	}
@@ -79,40 +75,36 @@
 			<i></i>
 		</div>
   		<div class="row">
- 			<div class="col-xs-5">
+ 			<div class="col-xs-6">
  			<form class="form-inline">
  				<div class="form-group ">
 					<label>客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
 				</div> 			
 				<div class="form-group form-group-sm">
-					<input ng-model="suuorname" type="search"  class="form-control input-sm" placeholder="可用企业名称筛选">
+					<input ng-model="suuorname" type="search"  class="form-control input-sm" placeholder="可用客户名称筛选">
 				</div>
 			</form>
 			</div>
  			<div class="col-xs-5">
  			<form class="form-inline">
  				<div class="form-group ">
-					<label>应付供应商：</label>
+					<label>供应商：</label>
 				</div> 			
 				<div class="form-group form-group-sm">
-					<input ng-model="vuuorname" type="search"  class="form-control input-sm" placeholder="可用企业名称筛选">
+					<input ng-model="vuuorname" type="search"  class="form-control input-sm" placeholder="可用应付供应商名称筛选">
 				</div>
 			</form>
 			</div>
-			<div class="col-xs-2">
-				<button ng-click="searchOrder()">筛选</button> <button ng-click="createApCheck(check.$selected)">生成对账</button>			
-			</div>
 		</div>
 		<div class="more">
 			<form class="form-inline">
 			  <div class="form-group ">
 			    <label>对账日期：</label>
-				</div>
 			    <div class="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"
-							ng-required="true" max-date="condition.dateTo"
+							 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')"
@@ -128,7 +120,7 @@
 						<input type="text" ng-model="sdateTo"
 							class="form-control" placeholder="截止日期"
 							datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
-							ng-required="true" min-date="condition.dateFrom"
+							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')"
@@ -140,32 +132,34 @@
 							</button>
 						</span>
 					</div>
+					</div>
+					<div class="form-group" style="margin-left: 310px;">
+						<button class="btn btn-default btn-sm" ng-click="searchOrder()">筛选</button> <button class="btn btn-default btn-sm" ng-click="createApCheck(check.$selected)">生成对账</button>			
+					</div>
+				</form>		
 			  </div>
-			</form>
 		</div>
 	<table width="99%" class="tableMargin">
 		<tr>
 		<table width="100%">
 		<tr class="thAlign">
-			<th width="40px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+			<th width="30px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
 			<th width="80px;">本次对账数</th>
-			<th width="105px;">客户名称</th>
-			<th width="95px;">单据编号</th>
+			<th width="77px;">客户名称</th>
+			<th width="60px;">单据编号</th>
 			<th width="30px;">序号</td>
-			<th width="95px;">类型</th>
-			<th width="80px;">日期</th>
-			<th width="95px;">供应商名称</th>
-			<th width="100px;">客户采购单号</th>
-			<th width="70px;">客户料号</th>
-			<th width="50px;">数量</th>
-			<th width="50px;">单价</th>
-			<th width="50px;">币别</th>
-			<th width="50px;">税率</th>
-			<th width="80px;">金额</th>
-			<th width="80px;">本次对帐金额</th>
-			<th style="display:none;">客户UU</th>
-			<th style="display:none;">ＳＯＵＲ</br>ＣＥＩＤ</th>
-			<th width="17px" style="border: none;"></th>
+			<th width="60px;">类型</th>
+			<th width="70px;">日期</th>
+			<th width="70px;">应付供应商名称</th>
+			<th width="50px;">客户采购单号</th>
+			<th width="55px;">客户料号</th>
+			<th width="40px;">数量</th>
+			<th width="40px;">单价</th>
+			<th width="35px;">币别</th>
+			<th width="30px;">税率</th>
+			<th width="61px;">金额</th>
+			<th width="62px;">本次对帐金额</th>
+			<th width="18px" style="border: none;"></th>
 		</tr>
 		</table>
 		</tr>
@@ -173,25 +167,24 @@
 		<td>
 		<div style="overflow-y:scroll; width:100%;max-height:500px">			
 		<table width="100%">
-		<tr ng-repeat="check in data | orderBy: 'piDate': reverse=true" ng-if="((condition.dateFrom == '') || ((condition.dateFrom !== '') && (condition.dateFrom < check.piDate))) && ((condition.dateTo == '') || ((condition.dateTo !== '') && (condition.dateTo > check.piDate))) && ((condition.uuorname == '') || ((condition.uuorname !== '') && (condition.uuorname == check.custUu) || (condition.uuorname == check.custName))) && ((condition.venduuorname == '') ||((condition.venduuorname !== '') && (condition.venduuorname == check.receiveName)))">
-			<td width="40px;" style="text-align: center" class="checkboxSize" n><input ng-model="check.$selected" name="checkbox" ng-click="checkOne(check)" ng-change="getTotalMoney()" type="checkbox"></td>
+		<tr ng-repeat="check in data | 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)))">
+			<td width="30px;" 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="80px;"><input ng-model="check.thisCheckQty" type="number" max="data.maxThisCheckQty" min="data.minThisCheckQty" ng-change="getTotalMoney()" style="width:70px;" class=" input-sm"></td>
-			<td width="105px;">{{check.custName}}</td>
-			<td width="95px;">{{check.inOutNo}}</td>
+			<td width="77px;">{{check.custName}}</td>
+			<td width="60px;">{{check.inOutNo}}</td>
 			<td width="30px;" align="center">{{check.detno}}</td>
-			<td width="95px;">{{check.piClass}}</td>
-			<td width="80px;">{{check.piDate|date:'yyyy-MM-dd'}}</td>
-			<td width="95px;">{{check.receiveName}}</td>
-			<td width="100px;">{{check.orderCode}}</td>
-			<td width="70px;">{{check.prodCode}}</td>
-			<td width="50px;">{{check.qty}}</td>
-			<td width="50px;">{{check.orderPrice}}</td>
-			<td width="50px;">{{check.currency}}</td>
-			<td width="50px;" align="center">{{check.taxrate}}</td>
-			<td width="80px;">{{(check.qty || 0)*(check.orderPrice || 0) | number:2}}</td>
-			<td width="80px;">{{(check.orderPrice || 0)*(check.thisCheckQty || 0) | number:2}}</td>
-			<td style="display:none;">{{check.custUu}}</td>
-			<td style="display:none;">{{check.sourceId}}</td>		
+			<td width="60px;">{{check.piClass}}</td>
+			<td width="70px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
+			<td width="70px;">{{check.receiveName}}</td>
+			<td width="50px;">{{check.orderCode}}</td>
+			<td width="55px;">{{check.prodCode}}</td>
+			<td width="40px;">{{check.qty}}</td>
+			<td width="40px;">{{check.orderPrice}}</td>
+			<td width="35px;">{{check.currency}}</td>
+			<td width="30px;" align="center">{{check.taxrate}}</td>
+			<td width="61px;">{{(check.qty || 0)*(check.orderPrice || 0) | number:2}}</td>
+			<td width="62px;">{{(check.orderPrice || 0)*(check.thisCheckQty || 0) | number:2}}</td>
 		</tr>
 		</table>
 		</div>