发货单

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

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

@@ -230,9 +230,9 @@
 			</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>

src/main/webapp/resources/tpl/index/home/right.html

@@ -1,3 +1,10 @@
+<style>
+.data-wrap .todo {
+  height: 140px;
+  margin-bottom: 15px;
+}
+</style>
+
 <!-- 交易信息 Start -->
 <div class="data-wrap">
 	<!-- 待处理统计 Start -->

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

@@ -66,6 +66,10 @@
 	border-width: 2px;
 }
 
+.order-table .order-info {
+	padding-left: 21px;
+}
+
 .order-table .operates {
 	display: none;
 }
@@ -185,13 +189,12 @@
 	<thead>
 		<tr class="header">
 			<th>商品</th>
-			<th>采购单价</th>
-			<th>验收数量</th>
-			<th width="120">入库批号</th>
+			<th colspan="2">商品价格</th>
+			<th width="120">发货数量</th>
 			<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">
@@ -200,66 +203,79 @@
 					<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> <!-- 分页 -->
+				</div> 分页
 			</td>
-		</tr>
+		</tr> -->
 		<tr class="sep-row">
 			<td colspan="6"></td>
 		</tr>
 	</thead>
-	<tbody ng-repeat="accept in $data">
+	<tbody ng-repeat="send in $data">
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
-						ng-model="accept.$selected">
-					</span> <span class="text-num text-bold" title="{{accept.date | date: 'yyyy年MM月dd日 hh:mm'}}"
-						ng-bind="accept.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-						class="text-num" ng-bind="accept.code" href="#"></a></span>
+					<!-- <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'}}"
+						ng-bind="send.date | date:'yyyy-MM-dd'"></span> <span>送货单号：<a
+						class="text-num" ng-bind="send.code" href=""></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a title="客户名称" href="#"
-				ng-bind="accept.acceptItems[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="accept.sendCode != null" title="送货单号" href="#"> <i style="color: #CC9933;" class="fa fa-truck"></i> <span ng-bind="accept.sendCode"></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">
-					<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 accept.acceptItems">
+		<tr class="order-hd" ng-if="send.sendItems[0].orderItem.order.shipAddress">
+			<td colspan="6" class="order-info">
+				 <span><span class="text-bold">收货地址：</span>
+				 	<span ng-bind="::send.sendItems[0].orderItem.order.shipAddress"></span>
+				 </span>
+				 <span ng-if="send.remark">&nbsp;&nbsp;&nbsp;<span class="text-bold">备注：</span>
+				 	<span ng-bind="::send.remark"></span>
+				 </span>
+			</td>
+		</tr>
+		<tr class="order-bd" ng-repeat="item in send.sendItems">
 			<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>
+					<span ng-bind="::item.orderItem.product.title"></span>
 				</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">
+			<td class="text-right" colspan="2">
 				<div class="text-num"
-					title="{{item.orderPrice}}" ng-bind="item.orderPrice | currency: currency(accept.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>
+					ng-bind="::item.price | currency: currency(send.currency)"></div>
+				<div class="text-muted">
+					税率：<span class="text-num" ng-bind="::item.orderItem.taxrate || 0"></span>%
+				</div>
+				<div class="text-muted">
+					付款条件：<span ng-bind="::item.orderItem.order.payments"></span>
+				</div>
 			</td>
 			<td class="text-center br-l">
-				<div class="text-num"
-					ng-bind="item.batchCode"></div>
+				<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>
+				
 			</td>
 			<td class="br-l" colspan="2">
-				<div>单据编号：<a href="#" ng-bind="item.orderItem.order.code"></a></div>
+				<div>单据编号：<a href="#/sale/order/{{::item.orderItem.order.id}}" 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>