应收对账单单据选择 界面，由弹出模态框变为跳转新页面的方式

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

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

@@ -112,7 +112,7 @@
 					<i class="fa fa-fw" ng-class="{'fa-angle-up': condition.$open, 'fa-angle-down': !condition.$open}"></i>
 				</a>
 			</div>
-			<div class="col-xs-2 col-xs-offset-1"><a class="text-simple" style="color: green;" ng-click="showApCheckList()"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a></div>
+			<div class="col-xs-2 col-xs-offset-1"><a class="text-simple" style="color: green;" ui-sref="fa.apCheckList"><big><i class="fa fa-plus-square"></i> 新增对账单</big></a></div>
 		</div>
 		<div class="more" ng-class="{'open': condition.$open}">
 			<form class="form-inline">

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

@@ -1,20 +1,4 @@
 <style>
-	::-webkit-scrollbar  {
-		width:17px;
-	}
-	
-	.modal-lg {
-		width:1200px;	
-	}
-	
-	.modal-header {
-		background-color:#56a022;
-	}
-	
-	.modal-body {
-		background-color: #eff2f9;
-	}
-	
 	.searchcolor {
 		background-color: #eff2f9;
 		}
@@ -62,20 +46,15 @@
 	
 </style>
 
-<div class="modal-header" width="100%">
-	<div class="row">
-	<div class="col-xs-11"><h3 class="modal-title">应收对账单列表</h3></div>
-	<div class="col-xs-1"><button ng-click="modalClose()" class="btn btn-small btn-primary">取消</button></div>
-	</div>
-</div>
-<div class="modal-body" width="100%">
+<div style="margin-right:20px;">
+<div width="100%">
 	<div class="block searchcolor">
 	
  		<div class="loading in" ng-class="{'in': loading}">
 			<i></i>
 		</div>
   		<div class="row">
- 			<div class="col-xs-6">
+ 			<div class="col-xs-5">
  			<form class="form-inline">
  				<div class="form-group ">
 					<label>客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</label>
@@ -85,7 +64,7 @@
 				</div>
 			</form>
 			</div>
- 			<div class="col-xs-4 col-offset-xs-2" style="padding-left: 10px;">
+ 			<div class="col-xs-4 col-xs-offset-1">
  			<form class="form-inline text-right">
  				<div class="form-group ">
 					<label>应付供应商：</label>
@@ -99,7 +78,7 @@
 		<div class="more">
 			<form class="form-inline">
 			<div class="row">
-			  <div class="col-xs-8">	
+			  <div class="col-xs-7">	
 			  <div class="form-group ">
 			    <label>单据日期：</label>
 			    <div class="form-group input-group input-group-xs input-trigger">
@@ -142,7 +121,7 @@
 							<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 						</div>
 					</div>
-					<div class="col-xs-2">
+					<div class="col-xs-3" style="padding-left:52px;">
 					<div class="form-group">
 						<button class="btn btn-default btn-sm" ng-click="searchOrder()">筛选单据</button>&nbsp;&nbsp; <button class="btn btn-default btn-sm" ng-click="createApCheck(check.$selected)">生成对账</button>			
 					</div>
@@ -155,22 +134,22 @@
 		<tr>
 		<table width="100%" class="table table-bordered" style="margin-bottom: 0">
 		<tr class="thAlign">
-			<th width="40px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
-			<th width="107px;">本次对账数</th>
-			<th width="100px;">客户名称</th>
-			<th width="80px;">单据编号</th>
-			<th width="40px;">序号</td>
-			<th width="80px;">类型</th>
-			<th width="80px;">单据日期</th>
-			<th width="100px;">应付供应商名称</th>
-			<th width="80px;">客户采购单号</th>
-			<th width="90px;">客户料号</th>
-			<th width="70px;">数量</th>
-			<th width="50px;">单价</th>
-			<th width="31px;">币别</th>
-			<th width="43px;">税率</th>
-			<th width="80px;">金额</th>
-			<th width="80px;">本次对帐金额</th>
+			<th width="35px;" class="checkboxSize"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll()"></th>
+			<th width="87px;">本次对账数</th>
+			<th width="70px;">客户名称</th>
+			<th width="60px;">单据编号</th>
+			<th width="35px;">序号</td>
+			<th width="60px;">类型</th>
+			<th width="60px;">单据日期</th>
+			<th width="73px;">应付供应商名称</th>
+			<th width="60px;">客户采购单号</th>
+			<th width="65px;">客户料号</th>
+			<th width="55px;">数量</th>
+			<th width="40px;">单价</th>
+			<th width="30px;">币别</th>
+			<th width="39px;">税率</th>
+			<th width="61px;">金额</th>
+			<th width="61px;">本次对帐金额</th>
 			<th width="17px" style="visibility: hidden;"></th>
 		</tr>
 		</table>
@@ -181,22 +160,22 @@
 		<table width="100%"  class="table table-bordered table-striped table-hover">
 		<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="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>
-			<td width="107px;"><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="100px;">{{check.custName}}</td>
-			<td width="80px;">{{check.inOutNo}}</td>
-			<td width="40px;" align="center">{{check.detno}}</td>
-			<td width="80px;">{{check.piClass}}</td>
-			<td width="80px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
-			<td width="100px;">{{check.receiveName}}</td>
-			<td width="80px;">{{check.orderCode}}</td>
-			<td width="90px;">{{check.prodCode}}</td>
-			<td width="70px;">{{check.qty}}</td>
-			<td width="50px;">{{check.orderPrice}}</td>
-			<td width="31px;">{{check.currency}}</td>
-			<td width="43px;" 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 width="35px;" 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="87px;"><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="70px;">{{check.custName}}</td>
+			<td width="60px;">{{check.inOutNo}}</td>
+			<td width="35px;" align="center">{{check.detno}}</td>
+			<td width="60px;">{{check.piClass}}</td>
+			<td width="60px;">{{check.piDate | date:'yyyy-MM-dd' }}</td>
+			<td width="73px;">{{check.receiveName}}</td>
+			<td width="60px;">{{check.orderCode}}</td>
+			<td width="65px;">{{check.prodCode}}</td>
+			<td width="55px;">{{check.qty}}</td>
+			<td width="40px;">{{check.orderPrice}}</td>
+			<td width="30px;">{{check.currency}}</td>
+			<td width="39px;" align="center">{{check.taxrate}}</td>
+			<td width="61px;">{{(check.qty || 0)*(check.orderPrice || 0) | number:2}}</td>
+			<td width="61px;">{{(check.orderPrice || 0)*(check.thisCheckQty || 0) | number:2}}</td>
 		</tr>
 		</table>
 		</div>
@@ -204,7 +183,7 @@
 		</tr>
 	</table>
 	</div>
-	<div class="modal-footer" style="text-align: left;">
+	<div style="text-align: left;">
 		<div class="divid">总金额合计：{{totalMoney | number:2}}</div>
 	</div>
-
+</div>