页面优化

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

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

@@ -177,8 +177,8 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>采购单价</th>
-			<th>入库数量</th>
+			<th width="120">采购单价</th>
+			<th width="100">验收数量</th>
 			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
@@ -216,7 +216,10 @@
 			<td colspan="3"><a title="客户名称"
 				ng-bind="::badIn.badInItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="badIn.sendCode != null" title="送货单号"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::badIn.sendCode"></span></a>
+				<div class="text-ellipsis" ng-if="badIn.sendCode != null" style="width: 120px;" title="送货单号：{{::badIn.sendCode}}" > 
+					<i style="color: #CC9933;" class="fa fa-truck"></i> 
+					<span ng-bind="badIn.sendCode"></span>
+				</div>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
@@ -242,6 +245,11 @@
 					<span ng-bind="::currency(badIn.currency)"></span>
 					<span ng-bind="::item.orderPrice"></span>
 				</div>
+				<div class="text-muted"
+					title="{{item.orderItem.taxrate}}%">
+					<br>
+					税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

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

@@ -177,9 +177,9 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>采购单价</th>
-			<th>出库数量</th>
-			<th width="120">出库批号</th>
+			<th width="120">采购单价</th>
+			<th width="100">验收数量</th>
+			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
@@ -216,7 +216,10 @@
 			<td colspan="3"><a title="客户名称"
 				ng-bind="::badOut.badOutItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="badOut.sendCode != null" title="送货单号"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::badOut.sendCode"></span></a>
+				<div class="text-ellipsis" ng-if="badOut.sendCode != null" style="width: 120px;" title="送货单号：{{::badOut.sendCode}}" > 
+					<i style="color: #CC9933;" class="fa fa-truck"></i> 
+					<span ng-bind="badOut.sendCode"></span>
+				</div>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
@@ -242,6 +245,11 @@
 					<span ng-bind="::item.orderPrice"></span>
 					<span ng-bind="::currency(badOut.currency)"></span>
 				</div>
+				<div class="text-muted"
+					title="{{item.orderItem.taxrate}}%">
+					<br>
+					税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

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

@@ -177,8 +177,8 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>采购单价</th>
-			<th>验收数量</th>
+			<th width="120">采购单价</th>
+			<th width="100">验收数量</th>
 			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
@@ -216,7 +216,10 @@
 			<td colspan="3"><a title="客户名称" 
 				ng-bind="accept.acceptItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="accept.sendCode != null" title="送货单号" > <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="accept.sendCode"></span></a>
+				<div class="text-ellipsis" ng-if="accept.sendCode != null" style="width: 120px;" title="送货单号：{{::accept.sendCode}}" > 
+					<i style="color: #CC9933;" class="fa fa-truck"></i> 
+					<span ng-bind="accept.sendCode"></span>
+				</div>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
@@ -242,6 +245,11 @@
 					title="{{item.orderPrice}}">
 					<span ng-bind="::currency(accept.currency)"></span><span ng-bind="item.orderPrice | number : 6"></span>
 				</div>
+				<div class="text-muted"
+					title="{{item.orderItem.taxrate}}%">
+					<br>
+					税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"

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

@@ -177,9 +177,9 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>采购单价</th>
-			<th>退货数量</th>
-			<th width="120">出库批号</th>
+			<th width="120">采购单价</th>
+			<th width="100">验收数量</th>
+			<th width="120">入库批号</th>
 			<th width="140">单据信息</th>
 			<th width="70">操作</th>
 		</tr>
@@ -216,7 +216,10 @@
 			<td colspan="3"><a title="客户名称"
 				ng-bind="::returns.returnItems[0].orderItem.order.enterprise.enName"></a></td>
 			<td colspan="1" class="order-sum">
-				<a ng-if="returns.sendCode != null" title="送货单号"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="::returns.sendCode"></span></a>
+				<div class="text-ellipsis" ng-if="returns.sendCode != null" style="width: 120px;" title="送货单号：{{::returns.sendCode}}" > 
+					<i style="color: #CC9933;" class="fa fa-truck"></i> 
+					<span ng-bind="returns.sendCode"></span>
+				</div>
 			</td>
 			<td colspan="1" class="text-center">
 				<div class="operates">
@@ -242,6 +245,11 @@
 					title="{{::item.orderPrice}}" >
 					<span ng-bind="::currency(returns.currency)"></span><span ng-bind="::item.orderPrice | number:6"></span>
 				</div>
+				<div class="text-muted"
+					title="{{item.orderItem.taxrate}}%">
+					<br>
+					税率：<span ng-bind="::item.orderItem.taxrate + '%'" class="text-num"></span>
+				</div>
 			</td>
 			<td class="text-center">
 				<div class="text-num text-bold"