批量发货

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

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

@@ -57,6 +57,10 @@
 	padding: 0 5px;
 }
 
+.order-table .order-info {
+	padding-left: 45px;
+}
+
 .order-table>tbody {
 	border: 1px solid transparent;
 }
@@ -251,6 +255,22 @@
 				</div>
 			</td>
 		</tr>
+		<tr class="order-hd">
+			<td colspan="6" class="order-info">
+				 <span><span class="text-bold">币别：</span>
+				 	<span ng-class="{'text-inverse': change.newCurrency != change.order.currency}" ng-bind="::change.newCurrency"></span>&nbsp;
+				 	<s class="text-muted" ng-if="change.newCurrency != change.order.currency" ng-bind="::change.order.currency"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 </span>
+				 <span><span class="text-bold">汇率：</span>
+				 	<span ng-class="{'text-inverse': change.newRate != change.order.rate}" ng-bind="::change.newRate"></span>&nbsp;
+				 	<s class="text-muted" ng-if="change.newRate != change.order.rate" ng-bind="::change.order.rate"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 </span>
+				 <span><span class="text-bold">支付方式：</span>
+				 	<span ng-class="{'text-inverse': change.newPayments != change.order.payments}" ng-bind="::change.newPayments"></span>&nbsp;
+				 	<s class="text-muted" ng-if="change.newPayments != change.order.payments" ng-bind="::change.order.payments"></s>&nbsp;&nbsp;&nbsp;&nbsp;
+				 </span>
+			</td>
+		</tr>
 		<tr ng-if="change.$editing" class="br-b">
 			<td colspan="3"></td>
 			<td>

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

@@ -141,6 +141,9 @@
 	border-right-color: #fff;
 	margin-top: -10px;
 }
+.padding-20 {
+	padding: 20px;
+}
 </style>
 <div class="block">
 <div class="loading in" ng-class="{'in': loading}">
@@ -236,7 +239,7 @@
 			<th width="120">备注</th>
 			<th width="240">数量</th>
 			<th width="90">价格</th>
-			<th width="90">交货日期</th>
+			<th width="120">交货日期</th>
 			<th width="60">操作</th>
 		</tr>
 		<tr class="sep-row">
@@ -246,8 +249,12 @@
 			<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="checkboxes.checked" ng-click="checkAll()">全选</label> <a href="javascript:void(0)"
+						 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>
 		</tr>
@@ -260,7 +267,7 @@
 			<td class="first">
 				<div class="order-main">
 					<span> <input type="checkbox" class="selector"
-						ng-model="notice.$selected">
+						ng-model="notice.$selected" ng-click="checkOne(notice)">
 					</span> <span class="text-num text-bold"
 						ng-bind="::notice.date | date:'yyyy-MM-dd'"></span>
 				</div>
@@ -270,7 +277,7 @@
 			<td class="text-right dropdown" colspan="2" class="order-sum"><a
 				class="dropdown-toggle" href="javascript:void(0);"> <span
 					class="text-num text-bold" ng-bind="::notice.orderItem.order.code"></span>
-					第{{notice.orderItem.number}}行
+					第{{notice.orderItem.number}}行 <i class="fa fa-fw fa-angle-down"></i>
 			</a>
 				<div class="dropdown-menu order-snapshot" style="padding: 10px 15px">
 					<div class="text-center text-bold title">订单快照</div>
@@ -281,7 +288,7 @@
 						<dd>{{::notice.orderItem.order.user.userName}}</dd>
 						<dt>付款条件</dt>
 						<dd>{{::notice.orderItem.order.payments}}</dd>
-						<dt>付款币种</dt>
+						<dt>付款币别</dt>
 						<dd>{{::notice.orderItem.order.currency}}</dd>
 						<dt>交货地址</dt>
 						<dd>{{::notice.orderItem.order.shipAddress}}</dd>
@@ -316,7 +323,7 @@
 			</td>
 			<td class="br-l">
 				<div ng-show="notice.endQty >= notice.qty" class="text-center dropdown">
-					<a href="javascript:void(0);" class="dropdown-toggle text-default">发货记录<i class="fa fa-fw fa-angle-down"></i></a>
+					<a href="javascript:void(0);" class="dropdown-toggle text-default" ng-click="getSends(notice)">发货记录<i class="fa fa-fw fa-angle-down"></i></a>
 					<div class="dropdown-menu order-send arrow-border arrow-bottom-right" style="padding: 10px 15px">
 						<span class="text-muted">还未发货</span>
 					</div>
@@ -327,7 +334,7 @@
 							<li>本次需求：{{::notice.qty}}<span class="text-muted pull-right">[订单数：{{::notice.orderItem.qty}}]</span></li>
 							<li class="dropdown dropdown-submenu">剩余未发：<span
 								class="text-num text-inverse"
-								ng-bind="::notice.qty-(notice.endQty || 0)"></span> <a
+								ng-bind="notice.qty-(notice.endQty || 0)"></span> <a
 								href="javascript:void(0);" class="dropdown-toggle pull-right"><span
 									ng-class="{'text-muted' : notice.endQty == null || notice.endQty == 0,'text-default': notice.endQty > 0}">[已发货：{{notice.endQty}}]</span></a>
 								<div
@@ -373,4 +380,60 @@
 		</tr>
 	</tbody>
 </table>
-</div>
+</div>
+	<script type="text/ng-template" id="sendByBatch.html">
+        <div class="modal-header">
+            <h3 class="modal-title">批量送货</h3>
+        </div>
+		<form class="sampleSend" name="sampleSendForm" ng-submit="ok(sampleSendForm)">
+        	<div class="modal-body">
+				<div class="row" style="margin-bottom:10px;line-height:30px;">
+					<label class="col-md-3 col-sm-3 text-right">送货单号：</label>
+					<div class="col-md-6 col-sm-6">
+					<input class="form-control input-sm" ng-model="saleSend.code" required type="text" placeholder="请输入送货单号"></div>
+				</div>
+				<table class="table table-bordered table-hover">
+					<tbody style="background-color: #f5f5f5;" class="text-center">
+						<th>商品</th>
+						<th>剩余未发</th>
+						<th>本次发货</th>
+						<th>单价</th>
+						<th>交货日期</th>
+						<th>订单</th>
+					</tbody>
+					<tbody>
+						<tr ng-repeat="notice in notices" ng-if="notice.$selected">
+							<td>
+								<div ng-bind="::notice.orderItem.product.title"></div>
+								<div class="text-muted" ng-bind="::notice.orderItem.product.spec"></div>
+							</td>
+							<td>
+								<div>
+									<span class="text-num" ng-bind="notice.qty-notice.endQty"></span>&nbsp;
+									<span ng-bind="notice.orderItem.product.unit"></span>
+								</div>
+							</td>
+							<td>
+								<input style="width:120px;" ng-model="notice.thisSendQty" 
+								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>
+							</td>
+							<td>
+								<div ng-bind="::notice.delivery | date: 'yyyy-MM-dd'"></div>
+							</td>
+							<td>
+								<div ng-bind="::notice.orderItem.order.code"></div>
+								<div>第 <span ng-bind="::notice.orderItem.number"></span> 行</div>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+        	</div>
+        	<div class="modal-footer">
+            	<button class="btn btn-primary" ng-click="sendByBatch()" type="button">确认送货</button>
+            	<button class="btn btn-warning" ng-click="cancel()" type="button">取消</button>
+        	</div>
+		</form>
+    </script>