金额相关小数位设为6位，订单明细页面增加明细行行号

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

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

@@ -226,9 +226,10 @@
 			</td>
 			<td colspan="3"><a title="客户名称"
 				ng-bind="::bill.enterprise.enName"></a></td>
-			<td colspan="1" class="order-sum">
+			<td colspan="1" class="order-sum text-num">
 				<span title="票据总额">
-					<span class="text-num" ng-bind="::bill.apAmount | currency: currency(bill.currency)"></span>
+					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::bill.apAmount"></span>
 				</span>
 			</td>
 			<td colspan="1" class="text-center">
@@ -251,8 +252,10 @@
 					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>
+				<div class="text-num" title="{{::item.price}}">
+					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::item.price"></span>
+				</div>
 				<div>&nbsp;</div>
 				<div class="text-muted"
 					title="{{::'税率：' + item.taxrate + '%'}}">
@@ -265,12 +268,15 @@
 				<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>
+				<div class="text-num text-bold">
+					<span ng-bind="::currency(bill.currency)"></span>
+					<span ng-bind="::item.apAmount"></span>
+				</div>
 				<div>&nbsp;</div>
 				<div class="text-muted">
-					税金：<span class="text-num"
-					ng-bind="::item.taxAmount | currency: currency(bill.currency)"></span>
+					税金：
+					<span class="text-num" ng-bind="::currency(bill.currency)"></span>
+					<span class="text-num" ng-bind="::item.taxAmount"></span>
 				</div>
 			</td>
 			<td class="br-l" colspan="2">
@@ -279,7 +285,10 @@
 					第 <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 class="text-num" ng-bind="::item.amount"></span>
+					<span class="text-num" ng-bind="::currency(bill.currency)"></span>
+				</div>
 			</td>
 		</tr>
 	</tbody>

src/main/webapp/resources/tpl/index/qc/badIn.html

@@ -246,8 +246,10 @@
 					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>
+				<div class="text-num" title="{{item.orderPrice}}">
+					<span ng-bind="::currency(badIn.currency)"></span>
+					<span ng-bind="::item.orderPrice"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

src/main/webapp/resources/tpl/index/qc/badOut.html

@@ -246,8 +246,10 @@
 					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>
+				<div class="text-num" title="{{::item.orderPrice}}">
+					<span ng-bind="::item.orderPrice"></span>
+					<span ng-bind="::currency(badOut.currency)"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

src/main/webapp/resources/tpl/index/sale/change.html

@@ -296,9 +296,9 @@
 			<td class="text-center">
 				<div class="text-num"
 					ng-class="{'text-inverse': item.newPrice != item.orderItem.price}"
-					title="{{item.newPrice}}" ng-bind="::item.newPrice"></div>
+					title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
 				<div ng-show="item.newPrice != item.orderItem.price">
-					<s class="text-num text-muted" ng-bind="::item.orderItem.price"></s>
+					<s class="text-num text-muted" ng-bind="::item.orderItem.price | number:6"></s>
 				</div>
 			</td>
 			<td class="text-center">

src/main/webapp/resources/tpl/index/sale/change_detail.html

@@ -155,9 +155,9 @@
 						<td class="text-center">
 							<div class="text-num"
 								ng-class="{'text-inverse': item.newPrice != item.orderItem.price}"
-								title="{{item.newPrice}}" ng-bind="::item.newPrice"></div>
+								title="{{item.newPrice}}" ng-bind="::item.newPrice | number:6"></div>
 							<div ng-show="item.newPrice != item.orderItem.price">
-								<s class="text-num text-muted" ng-bind="::item.orderItem.price"></s>
+								<s class="text-num text-muted" ng-bind="::item.orderItem.price | number:6"></s>
 							</div>
 						</td>
 						<td class="text-center">

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -317,7 +317,7 @@
 				<td class="text-center br-l">
 					<div ng-show="!inquiryItem.$editing">
 						<div ng-repeat="reply in inquiryItem.replies">
-							<span ng-bind="reply.price"></span> <span
+							<span ng-bind="reply.price | number:6"></span> <span
 								ng-show="reply.price == null" class="text-muted">-</span>
 						</div>
 						<div class="dropdown">
@@ -332,7 +332,7 @@
 												<div class="row row-sm"
 													ng-repeat="historyReply in historyItem.replies">
 													<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
-													<div class="col-xs-5">价格{{historyReply.price}}</div>
+													<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
 												</div>
 											</div>
 											<div class="text-muted">{{historyItem.inquiry.date |

src/main/webapp/resources/tpl/index/sale/inquiry_detail.html

@@ -112,7 +112,7 @@
 						<td class="text-center">
 							<div ng-show="!inquiryItem.$editing">
 								<div ng-repeat="reply in inquiryItem.replies">
-									<span ng-bind="reply.price"></span> <span
+									<span ng-bind="reply.price | number:6"></span> <span
 										ng-show="reply.price == null" class="text-muted">-</span>
 								</div>
 								<div class="dropdown">
@@ -128,7 +128,7 @@
 														<div class="row row-sm"
 															ng-repeat="historyReply in historyItem.replies">
 															<div class="col-xs-5">≥{{historyReply.lapQty}}</div>
-															<div class="col-xs-5">价格{{historyReply.price}}</div>
+															<div class="col-xs-5">价格{{historyReply.price | number:6}}</div>
 														</div>
 													</div>
 													<div class="text-muted">{{historyItem.inquiry.date |

src/main/webapp/resources/tpl/index/sale/notice.html

@@ -406,7 +406,7 @@
 					</div>
 				</div>
 			</td>
-			<td class="text-center br-l">{{::notice.orderItem.price}}</td>
+			<td class="text-center br-l">{{::notice.orderItem.price | number:6}}</td>
 			<td class="text-center br-l">
 				<div><span ng-bind="::notice.delivery | date : 'yyyy-MM-dd'"></span></div>
 				<div style="margin-top: 10px;" ng-if="notice.waiting" class="text-inverse">
@@ -489,7 +489,10 @@
 								ng-init="notice.thisSendQty = notice.qty-notice.endQty" class="form-control input-sm" type="number">
 							</td>
 							<td>
-								<div class="text-num" ng-bind="::notice.orderItem.price | currency: currency(notice.orderItem.order.currency)"></div>
+								<div class="text-num">
+									<span ng-bind="::currency(notice.orderItem.order.currency)"></span>
+									<span ng-bind="::notice.orderItem.price|number:6"></span>
+								</div>
 							</td>
 							<td>
 								<div ng-bind="::notice.delivery | date: 'yyyy-MM-dd'"></div>

src/main/webapp/resources/tpl/index/sale/order.html

@@ -247,7 +247,7 @@
 					ng-bind="::item.product.spec"></div>
 			</td>
 			<td class="text-center">
-				<div class="text-num" ng-bind="::item.price"></div>
+				<div class="text-num" ng-bind="::item.price | number:6"></div>
 				<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
 			</td>
 			<td class="text-center">

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -73,6 +73,7 @@
 			<table class="block table table-default table-striped table-hover">
 				<thead>
 					<tr class="header">
+						<th width="50">行号</th>
 						<th>商品</th>
 						<th width="80">单价</th>
 						<th width="100">数量</th>
@@ -83,6 +84,9 @@
 				</thead>
 				<tbody>
 					<tr ng-repeat="item in order.orderItems track by item.id">
+						<td class="text-center text-num text-bold f-16 text-success br-r">
+							<span ng-bind="::item.number"></span>
+						</td>
 						<td>
 							<div class="text-num text-bold">
 								<span ng-bind="::item.product.code"></span>
@@ -93,7 +97,7 @@
 							<div class="text-muted" ng-bind="::item.product.spec"></div>
 						</td>
 						<td class="text-center">
-							<div class="text-num" ng-bind="::item.price"></div>
+							<div class="text-num" ng-bind="::item.price | number:6"></div>
 							<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
 						</td>
 						<td class="text-center">

src/main/webapp/resources/tpl/index/sale/returns.html

@@ -239,7 +239,9 @@
 			</td>
 			<td class="text-center">
 				<div class="text-num"
-					title="{{::item.orderPrice}}" ng-bind="::item.orderPrice | currency: currency(returns.currency)"></div>
+					title="{{::item.orderPrice}}" >
+					<span ng-bind="::currency(returns.currency)"></span><span ng-bind="::item.orderPrice | number:6"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

src/main/webapp/resources/tpl/index/sale/sample.html

@@ -281,7 +281,8 @@
 			<td class="text-center">
 				<div ng-show="sample.proofing.isCharge != '是'" class="label label-default">不收费</div>
 				<div ng-show="sample.proofing.isCharge == '是'" class="text-num">
-					<span ng-bind="::sample.price | currency: currency(sample.currency)"></span>
+					<span ng-bind="::currency(sample.currency)"></span>
+					<span ng-bind="::sample.price | number:6"></span>
 				</div>
 				<div ng-show="sample.proofing.isCharge == '是'" class="text-muted">
 					税率：<span class="text-num" ng-bind="::sample.taxrate"></span>%
@@ -315,7 +316,7 @@
 										送样数量：<span class="text-num" ng-bind="::sample.send.sendQty"></span>
 									</div>
 									<div>
-										采购单价：<span class="text-num" ng-bind="::sample.send.puprice | number:2"></span>
+										采购单价：<span class="text-num" ng-bind="::sample.send.puprice | number:6"></span>
 									</div>
 									<div class="row row-sm">
 										<div class="col-xs-6" ng-if="sample.send.minQty">最小包装量：<span ng-bind="::sample.send.minQty"></span></div>
@@ -430,7 +431,7 @@
 					<div class="col-md-4 col-sm-4 col"><input ng-model="sampleItem.sampleSend.brand" class="form-control input-sm" type="text"></div>
 					<label class="col-md-2 col-sm-2 col">采购单价：</label>
 					<div class="col-md-4 col-sm-4 col">
-						<input ng-model="sampleItem.sampleSend.puprice" class="form-control input-sm" type="text" 
+						<input ng-model="sampleItem.sampleSend.puprice | number:6" class="form-control input-sm" type="text" 
 							ng-pattern="/^[1-9]\d*\.{0,1}\d*|0\.\d*[1-9]\d*$/">
 					</div>
 				</div>

src/main/webapp/resources/tpl/index/sale/send.html

@@ -251,8 +251,10 @@
 					ng-bind="::item.orderItem.product.spec"></div>
 			</td>
 			<td class="text-right" colspan="2">
-				<div class="text-num"
-					ng-bind="::item.price | currency: currency(send.currency)"></div>
+				<div class="text-num">
+					<span ng-bind="::currency(send.currency)"></span>
+					<span ng-bind="::item.price | number:6"></span>
+				</div>
 				<div class="text-muted">
 					税率：<span class="text-num" ng-bind="::item.orderItem.taxrate || 0"></span>%
 				</div>