ソースを参照

导出Excel

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@855 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 11 年 前
コミット
f08e8480ca

+ 25 - 22
src/main/webapp/resources/tpl/index/fa/apBill.html

@@ -198,13 +198,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/apBill/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -216,16 +219,16 @@
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="bill.$selected">
-					</span> <span class="text-num text-bold" title="{{bill.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> <span class="text-num text-bold" title="{{::bill.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="bill.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="bill.code" href="#"></a></span>
+						class="text-num" ng-bind="::bill.code" href="#"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="bill.enterprise.enName"></a></td>
+				ng-bind="::bill.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
 				<span title="票据总额">
-					<span class="text-num" ng-bind="bill.apAmount | currency: currency(bill.currency)"></span>
+					<span class="text-num" ng-bind="::bill.apAmount | currency: currency(bill.currency)"></span>
 				</span>
 			</td>
 			<td colspan="1" class="text-center">
@@ -239,44 +242,44 @@
 		<tr class="order-bd" ng-repeat="item in bill.items">
 			<td class="product">
 				<div class="text-num text-bold">
-					<a href="#" ng-bind="item.product.code"></a>
+					<a href="#" ng-bind="::item.product.code"></a>
 				</div>
 				<div>
-					<a href="#" ng-bind="item.product.title"></a>
+					<a href="#" ng-bind="::item.product.title"></a>
 				</div>
-				<div class="text-muted" title="{{item.product.spec}}"
-					ng-bind="item.product.spec"></div>
+				<div class="text-muted" title="{{::item.product.spec}}"
+					ng-bind="::item.product.spec"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{item.price}}" ng-bind="item.price | currency: currency(bill.currency)"></div>
+					title="{{::item.price}}" ng-bind="::item.price | currency: currency(bill.currency)"></div>
 				<div>&nbsp;</div>
 				<div class="text-muted"
-					title="{{'税率:' + item.taxrate + '%'}}" ng-bind="'税率:' + item.taxrate + '%'">
-					税率:<span class="text-num" ng-bind="item.taxrate"></span>%
+					title="{{::'税率:' + item.taxrate + '%'}}">
+					税率:<span class="text-num" ng-bind="::item.taxrate"></span>%
 				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{item.qty}}" ng-bind="item.qty"></div>
-				<div class="text-muted" ng-bind="item.product.unit"></div>
+					title="{{::item.qty}}" ng-bind="::item.qty"></div>
+				<div class="text-muted" ng-bind="::item.product.unit"></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num text-bold"
-					ng-bind="item.apAmount | currency: currency(bill.currency)"></div>
+					ng-bind="::item.apAmount | currency: currency(bill.currency)"></div>
 				<div>&nbsp;</div>
 				<div class="text-muted">
 					税金:<span class="text-num"
-					ng-bind="item.taxAmount | currency: currency(bill.currency)"></span>
+					ng-bind="::item.taxAmount | currency: currency(bill.currency)"></span>
 				</div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号:<a href="#" ng-bind="item.orderCode"></a></div>
+				<div>单据编号:<a href="#" ng-bind="::item.orderCode"></a></div>
 				<div>
-					第 <span ng-bind="item.orderDetno"></span> 行
-					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="item.thisvoQty"></span>
+					第 <span ng-bind="::item.orderDetno"></span> 行
+					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="::item.thisvoQty"></span>
 				</div>
-				<div class="text-muted">单据金额:<span ng-bind="item.amount | currency: currency(bill.currency)"></span></div>
+				<div class="text-muted">单据金额:<span ng-bind="::item.amount | currency: currency(bill.currency)"></span></div>
 			</td>
 		</tr>
 	</tbody>

+ 37 - 34
src/main/webapp/resources/tpl/index/qc/MRB.html

@@ -196,13 +196,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td clas="text-center">
+				<a href="sale/MRB/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -214,86 +217,86 @@
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="MRB.$selected">
-					</span> <span class="text-num text-bold" title="{{MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="MRB.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="MRB.code" href="#"></a></span>
+					</span> <span class="text-num text-bold" title="{{::MRB.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::MRB.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
+						class="text-num" ng-bind="::MRB.code" href="#"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="MRB.orderItem.order.enterprise.enName"></a></td>
+				ng-bind="::MRB.orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="MRB.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="MRB.sendCode"></span></a>
+				<a ng-if="MRB.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::MRB.sendCode"></span></a>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
-					<a href="#" class="text-muted" title="打印">
+					<!-- <a href="#" class="text-muted" title="打印">
 						<i class="fa fa-print fa-lg fa-fw"></i>
-					</a>
+					</a> -->
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd">
 			<td class="product">
 				<div class="text-num text-bold">
-					<a href="#" ng-bind="MRB.orderItem.product.code"></a>
+					<a href="#" ng-bind="::MRB.orderItem.product.code"></a>
 				</div>
 				<div>
-					<a href="#" ng-bind="MRB.orderItem.product.title"></a>
+					<a href="#" ng-bind="::MRB.orderItem.product.title"></a>
 				</div>
-				<div class="text-muted" title="{{MRB.orderItem.product.spec}}"
-					ng-bind="MRB.orderItem.product.spec"></div>
+				<div class="text-muted" title="{{::MRB.orderItem.product.spec}}"
+					ng-bind="::MRB.orderItem.product.spec"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{MRB.inQty}}" ng-bind="MRB.inQty">
+					title="{{::MRB.inQty}}" ng-bind="::MRB.inQty">
 				</div>
 				<div class="text-muted"
-					title="{{MRB.orderItem.product.unit}}" ng-bind="MRB.orderItem.product.unit">
+					title="{{::MRB.orderItem.product.unit}}" ng-bind="::MRB.orderItem.product.unit">
 				</div>
 			</td>
 			<td>
-				<div class="text-success text-bold">合  格:<span ng-bind="MRB.okQty"></span></div>
-				<div class="text-danger text-bold">不合格:<span ng-bind="MRB.ngQty"></span></div>
+				<div class="text-success text-bold">合  格:<span ng-bind="::MRB.okQty"></span></div>
+				<div class="text-danger text-bold">不合格:<span ng-bind="::MRB.ngQty"></span></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="label label-primary"
-					ng-bind="MRB.result"></div>
+					ng-bind="::MRB.result"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号:<a href="#" ng-bind="MRB.orderItem.order.code"></a></div>
+				<div>单据编号:<a href="#" ng-bind="::MRB.orderItem.order.code"></a></div>
 				<div>
-					第 <span ng-bind="MRB.orderItem.number"></span> 行
-					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="MRB.orderItem.qty"></span>
+					第 <span ng-bind="::MRB.orderItem.number"></span> 行
+					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="::MRB.orderItem.qty"></span>
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd checkItem">
 			<td class="product" colspan="6">
 				<ul class="list-group">
-					<li class="list-group-item text-muted" ng-show="MRB.checkItems.length == 0">
+					<li class="list-group-item text-muted" ng-show="::MRB.checkItems.length == 0">
 						<i class="fa fa-check-square-o fa-fw"></i>&nbsp;
 						无检验明细
 					</li>
 					<li class="list-group-item text-muted" ng-repeat="check in MRB.checkItems">
 						<i class="fa fa-check-square-o fa-fw"></i>&nbsp;
-						检验日期:<span>{{check.checkDate | date: 'yyyy-MM-dd'}}</span>&nbsp;&nbsp;
-						检验员:<span>{{check.checkMan}}</span>&nbsp;&nbsp;
-						检验数量:<span>{{check.checkQty}}</span>&nbsp;&nbsp;
-						合格数:<span>{{check.okQty}}</span>&nbsp;&nbsp;
-						不合格数:<span>{{check.ngQty}}</span>&nbsp;&nbsp;
+						检验日期:<span>{{::check.checkDate | date: 'yyyy-MM-dd'}}</span>&nbsp;&nbsp;
+						检验员:<span>{{::check.checkMan}}</span>&nbsp;&nbsp;
+						检验数量:<span>{{::check.checkQty}}</span>&nbsp;&nbsp;
+						合格数:<span>{{::check.okQty}}</span>&nbsp;&nbsp;
+						不合格数:<span>{{::check.ngQty}}</span>&nbsp;&nbsp;
 					</li>
 				</ul>
 				<ul class="list-group" style="margin-top: 10px;">
-					<li class="list-group-item text-muted" ng-show="MRB.projectItems.length == 0">
+					<li class="list-group-item text-muted" ng-show="::MRB.projectItems.length == 0">
 						<i class="fa fa-tags fa-fw"></i>&nbsp;
 						无项目明细
 					</li>
 					<li class="list-group-item text-muted" ng-repeat="project in MRB.projectItems">
 						<i class="fa fa-tags fa-fw"></i>&nbsp;
-						项目:<span>{{project.projectName}}</span>&nbsp;&nbsp;
-						异常情况:<span>{{project.content}}</span>&nbsp;&nbsp;
-						不良数量:<span>{{project.ngQty}}</span>&nbsp;&nbsp;
-						处理结果:<span>{{project.result}}</span>&nbsp;&nbsp;
+						项目:<span>{{::project.projectName}}</span>&nbsp;&nbsp;
+						异常情况:<span>{{::project.content}}</span>&nbsp;&nbsp;
+						不良数量:<span>{{::project.ngQty}}</span>&nbsp;&nbsp;
+						处理结果:<span>{{::project.result}}</span>&nbsp;&nbsp;
 					</li>
 				</ul>
 			</td>

+ 25 - 22
src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -195,13 +195,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/badIn/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -213,53 +216,53 @@
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="badIn.$selected">
-					</span> <span class="text-num text-bold" title="{{badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="badIn.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="badIn.code" href="#"></a></span>
+					</span> <span class="text-num text-bold" title="{{::badIn.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badIn.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
+						class="text-num" ng-bind="::badIn.code" href="#"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="badIn.badInItems[0].orderItem.order.enterprise.enName"></a></td>
+				ng-bind="::badIn.badInItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="badIn.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="badIn.sendCode"></span></a>
+				<a ng-if="badIn.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::badIn.sendCode"></span></a>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
-					<a href="#" class="text-muted" title="打印">
+					<!-- <a href="#" class="text-muted" title="打印">
 						<i class="fa fa-print fa-lg fa-fw"></i>
-					</a>
+					</a> -->
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd" ng-repeat="item in badIn.badInItems">
 			<td class="product">
 				<div class="text-num text-bold">
-					<a href="#" ng-bind="item.orderItem.product.code"></a>
+					<a href="#" ng-bind="::item.orderItem.product.code"></a>
 				</div>
 				<div>
-					<a href="#" ng-bind="item.orderItem.product.title"></a>
+					<a href="#" ng-bind="::item.orderItem.product.title"></a>
 				</div>
-				<div class="text-muted" title="{{item.orderItem.product.spec}}"
-					ng-bind="item.orderItem.product.spec"></div>
+				<div class="text-muted" title="{{::item.orderItem.product.spec}}"
+					ng-bind="::item.orderItem.product.spec"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{item.orderPrice}}" ng-bind="item.orderPrice | currency: currency(badIn.currency)"></div>
+					title="{{item.orderPrice}}" ng-bind="::item.orderPrice | currency: currency(badIn.currency)"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"
-					title="{{item.qty}}" ng-bind="item.qty"></div>
-				<div class="text-muted" ng-bind="item.orderItem.product.unit"></div>
+					title="{{::item.qty}}" ng-bind="::item.qty"></div>
+				<div class="text-muted" ng-bind="::item.orderItem.product.unit"></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num"
-					ng-bind="item.batchCode"></div>
+					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号:<a href="#" ng-bind="item.orderItem.order.code"></a></div>
+				<div>单据编号:<a href="#" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
-					第 <span ng-bind="item.orderItem.number"></span> 行
-					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="item.orderItem.qty"></span>
+					第 <span ng-bind="::item.orderItem.number"></span> 行
+					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="::item.orderItem.qty"></span>
 				</div>
 			</td>
 		</tr>

+ 25 - 22
src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -195,13 +195,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/badOut/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -213,53 +216,53 @@
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
 						ng-model="badOut.$selected">
-					</span> <span class="text-num text-bold" title="{{badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="badOut.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
-						class="text-num" ng-bind="badOut.code" href="#"></a></span>
+					</span> <span class="text-num text-bold" title="{{::badOut.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+						ng-bind="::badOut.date | date:'yyyy-MM-dd'"></span> <span>流水号:<a
+						class="text-num" ng-bind="::badOut.code" href="#"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="badOut.badOutItems[0].orderItem.order.enterprise.enName"></a></td>
+				ng-bind="::badOut.badOutItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="badOut.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="badOut.sendCode"></span></a>
+				<a ng-if="badOut.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::badOut.sendCode"></span></a>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
-					<a href="#" class="text-muted" title="打印">
+					<!-- <a href="#" class="text-muted" title="打印">
 						<i class="fa fa-print fa-lg fa-fw"></i>
-					</a>
+					</a> -->
 				</div>
 			</td>
 		</tr>
 		<tr class="order-bd" ng-repeat="item in badOut.badOutItems">
 			<td class="product">
 				<div class="text-num text-bold">
-					<a href="#" ng-bind="item.orderItem.product.code"></a>
+					<a href="#" ng-bind="::item.orderItem.product.code"></a>
 				</div>
 				<div>
-					<a href="#" ng-bind="item.orderItem.product.title"></a>
+					<a href="#" ng-bind="::item.orderItem.product.title"></a>
 				</div>
-				<div class="text-muted" title="{{item.orderItem.product.spec}}"
-					ng-bind="item.orderItem.product.spec"></div>
+				<div class="text-muted" title="{{::item.orderItem.product.spec}}"
+					ng-bind="::item.orderItem.product.spec"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{item.orderPrice}}" ng-bind="item.orderPrice | currency: currency(badOut.currency)"></div>
+					title="{{::item.orderPrice}}" ng-bind="::item.orderPrice | currency: currency(badOut.currency)"></div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"
-					title="{{item.qty}}" ng-bind="item.qty"></div>
-				<div class="text-muted" ng-bind="item.orderItem.product.unit"></div>
+					title="{{::item.qty}}" ng-bind="::item.qty"></div>
+				<div class="text-muted" ng-bind="::item.orderItem.product.unit"></div>
 			</td>
 			<td class="text-center br-l">
 				<div class="text-num"
-					ng-bind="item.batchCode"></div>
+					ng-bind="::item.batchCode"></div>
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号:<a href="#" ng-bind="item.orderItem.order.code"></a></div>
+				<div>单据编号:<a href="#" ng-bind="::item.orderItem.order.code"></a></div>
 				<div>
-					第 <span ng-bind="item.orderItem.number"></span> 行
-					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="item.orderItem.qty"></span>
+					第 <span ng-bind="::item.orderItem.number"></span> 行
+					&nbsp;&nbsp;&nbsp;&nbsp;数量:<span ng-bind="::item.orderItem.qty"></span>
 				</div>
 			</td>
 		</tr>

+ 7 - 4
src/main/webapp/resources/tpl/index/sale/accept.html

@@ -187,13 +187,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/accept/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 6 - 3
src/main/webapp/resources/tpl/index/sale/approval.html

@@ -208,13 +208,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td>
+				<a href="sale/sample/approval/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 6 - 3
src/main/webapp/resources/tpl/index/sale/change.html

@@ -203,13 +203,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs" title="不支持批量回复">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/changes/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 6 - 3
src/main/webapp/resources/tpl/index/sale/forecast.html

@@ -180,20 +180,23 @@
 			<th></th>
 			<th>数量</th>
 			<th width="120">交货日期</th>
-			<th width="140"></th>
+			<th width="200"></th>
 			<th width="70">操作</th>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
+						ng-model="selectAll">全选</label> <a ng-if="false" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/forecast/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 5 - 2
src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -220,13 +220,16 @@
 				<td colspan="7"></td>
 			</tr>
 			<tr class="toolbar toolbar-top">
-				<td colspan="7">
+				<td colspan="6">
 					<div>
 						<label><input type="checkbox" class="selector select_all"
-							ng-model="selectAll">全选</label> <a href="javascript:void(0)"
+							ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 							class="btn btn-default btn-xs">批量报价</a>
 					</div> <!-- 分页 -->
 				</td>
+				<td>
+					<a href="sale/inquiry/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+				</td>
 			</tr>
 			<tr class="sep-row">
 				<td colspan="7"></td>

+ 5 - 2
src/main/webapp/resources/tpl/index/sale/notice.html

@@ -246,17 +246,20 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
 						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a href="javascript:void(0)"
-						 ng-click="sendByBatch()" class="btn btn-default btn-xs">批量送货</a>
+						ng-disabled="active!='todo'" ng-click="sendByBatch()" class="btn btn-default btn-xs">批量送货</a>
 					<span class="text-muted">
 						&nbsp;&nbsp;<i class="fa fa-exclamation-triangle"></i>批量送货要求对应订单的客户相同、币别相同、收款方式相同、采购员相同。
 						
 					</span>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/notice/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 5 - 4
src/main/webapp/resources/tpl/index/sale/order.html

@@ -194,13 +194,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
-						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a href="javascript:void(0)"
+						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a ng-if="active=='todo'" href="javascript:void(0)"
 						class="btn btn-default btn-xs" ng-click="replyByBatch()">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td class="text-center">
+				<a href="sale/orders/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
@@ -315,7 +318,6 @@
 						</div>
 				</div>
 				<div style="margin: 0 auto" ng-if="item.$editing">
-					<br>
 					<br> <input type="text" ng-model="item.reply.remark"
 						class="form-control input-xs" placeholder="回复备注" />
 				</div>
@@ -335,7 +337,6 @@
 						<div>
 							<a ng-click="item.$editing=!item.$editing">取消</a>
 						</div>
-						<br>
 						<div>
 							<a ng-click="onReplyClick(item)" class="text-inverse">确认回复</a>
 						</div>

+ 2 - 2
src/main/webapp/resources/tpl/index/sale/returns.html

@@ -190,8 +190,8 @@
 			<td colspan="6">
 				<div>
 					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
 				</div> <!-- 分页 -->
 			</td>
 		</tr>

+ 6 - 3
src/main/webapp/resources/tpl/index/sale/sample.html

@@ -209,13 +209,16 @@
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
 						class="btn btn-default btn-xs">批量回复</a>
 				</div> <!-- 分页 -->
 			</td>
+			<td>
+				<a href="sale/sample/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
+			</td>
 		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>

+ 15 - 12
src/main/webapp/resources/tpl/index/sale/send.html

@@ -186,18 +186,21 @@
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
-		<!-- <tr class="sep-row">
+		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
 		<tr class="toolbar toolbar-top">
-			<td colspan="6">
+			<td colspan="5">
 				<div>
-					<label><input type="checkbox" class="selector select_all"
-						ng-model="selectAll">全选</label> <a href="javascript:void(0)"
-						class="btn btn-default btn-xs">批量回复</a>
-				</div> 分页
+					<label><input ng-disabled="true" type="checkbox" class="selector select_all"
+						ng-model="selectAll">全选</label> <a ng-disabled="true" href="javascript:void(0)"
+						class="btn btn-default btn-xs">批量处理</a>
+				</div> <!-- 分页 -->
+			</td>
+			<td>
+				<a href="sale/notice/sends/xls" target="_self" class="text-simple" title="导出Excel表格"><i class="fa fa-file-excel-o fa-fw"></i>导出</a>
 			</td>
-		</tr> -->
+		</tr>
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
@@ -206,17 +209,17 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<!-- <span> <input type="checkbox" class="selector"
+					<span> <input type="checkbox" class="selector"
 						ng-model="send.$selected">
-					</span> --> <span class="text-num text-bold" title="{{send.date | date: 'yyyy年MM月dd日 hh:mm'}}"
+					</span> <span class="text-num text-bold" title="{{::send.date | date: 'yyyy年MM月dd日 hh:mm'}}"
 						ng-bind="send.date | date:'yyyy-MM-dd'"></span> <span>送货单号:<a
-						class="text-num" ng-bind="send.code" href=""></a></span>
+						class="text-num" ng-bind="::send.code" href=""></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="send.sendItems[0].orderItem.order.enterprise.enName"></a></td>
+				ng-bind="::send.sendItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="send.recorder != null" title="录入人" href=""> <i style="color: #339999;" class="fa fa-user"></i> <span ng-bind="send.recorder"></span></a>
+				<a ng-if="send.recorder != null" title="录入人" href=""> <i style="color: #339999;" class="fa fa-user"></i> <span ng-bind="::send.recorder"></span></a>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">