【前台】+【对账单 送货工厂字段】

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

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

@@ -10,6 +10,10 @@
 	.thAlign th{
 		text-align:center;
 	}
+	
+	.more{
+		margin-top: 10px;
+	}
 
 	.tableMargin {
 		margin-top: 20px;
@@ -54,31 +58,60 @@
 			<i></i>
 		</div>
   		<div class="row">
- 			<div class="col-xs-5">
- 			<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="可用客户名称筛选">
+  			<div class="col-xs-1">
+				<label>&nbsp;&nbsp;客&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;户：</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="suuorname" placeholder="可用客户名称筛选" /><span
+						class="form-control-feedback text-simple"><i
+						class="fa fa-search"></i></span>
 				</div>
-			</form>
+<!-- 	 			<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="可用客户名称筛选">
+					</div>
+				</form> -->
+			</div>
+			<div class="col-xs-1">
+				<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>
+			<!-- 		<form class="form-inline text-right">
+	 				<div class="form-group ">
+						<label>应付供应商：</label>
+					</div> 			
+					<div class="form-group form-group-sm">
+						<input ng-model="vuuorname" type="search"  style="margin-left: 2px;" class="input-sm form-control" placeholder="可用应付供应商名称筛选">
+					</div>
+				</form> -->
+			</div>
+			<div class="col-xs-1">
+				<label>送货工厂：</label>
 			</div>
- 			<div class="col-xs-4 col-xs-offset-1">
- 			<form class="form-inline text-right">
- 				<div class="form-group ">
-					<label>应付供应商：</label>
-				</div> 			
-				<div class="form-group form-group-sm">
-					<input ng-model="vuuorname" type="search"  style="margin-left: 2px;" class="input-sm form-control" placeholder="可用应付供应商名称筛选">
+			<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>
-			</form>
 			</div>
 		</div>
 		<div class="more">
 			<form class="form-inline">
 			<div class="row">
-			  <div class="col-xs-7">	
+			  <div class="col-xs-6">	
 			  <div class="form-group ">
 			    <label>单据日期：</label>
 			    <div class="form-group input-group input-group-xs input-trigger">
@@ -115,14 +148,14 @@
 					</div>
 					</div>
 					</div>
-					<div class="col-xs-2" style="margin-top:4px">
+					<div class="col-xs-2 col-xs-offset-1" style="margin-top:4px">
 						<div class="pull-right">
 							<a href="sale/apCheck/xls?keyword={{keywordXls}}&fromDate={{fromDateXls}}&endDate={{endDateXls}}" target="_self" title="导出Excel表格">
 							<i class="fa fa-file-excel-o fa-fw"></i>导出Excel</a>
 						</div>
 					</div>
-					<div class="col-xs-3" style="padding-left:52px;">
-					<div class="form-group">
+					<div class="col-xs-3" >
+					<div class="form-group pull-right">
 						<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>
 					</div>
@@ -159,7 +192,7 @@
 		<td>
 		<div style="overflow-y:scroll; width:960px;max-height:500px">			
 		<table class="table table-bordered table-striped table-hover">
-		<tr ng-repeat="check in data | filter:condition.uuorname |filter:condition.venduuorname |orderBy: 'piDate': reverse=true" 
+		<tr ng-repeat="check in data | filter:condition.factory | 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="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="87px;"><input ng-model="check.thisCheckQty" type="number" max="data.maxThisCheckQty" min="data.minThisCheckQty" ng-change="getTotalMoney()" style="width:70px;" class=" input-sm"></td>