送货提醒根据物料的备货提前期判断是否可以发货

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

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

@@ -270,7 +270,7 @@
 						ng-model="checkboxes.checked" ng-click="checkAll()">全选</label> <a href="javascript:void(0)"
 						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>批量送货要求对应订单的客户相同、币别相同、收款方式相同、采购员相同。
+						&nbsp;&nbsp;<i class="fa fa-exclamation-triangle"></i>批量送货要求对应订单的客户相同、币别相同、收款方式相同。
 						
 					</span>
 				</div> <!-- 分页 -->
@@ -287,7 +287,7 @@
 		<tr class="order-hd">
 			<td class="first">
 				<div class="order-main">
-					<span> <input type="checkbox" class="selector"
+					<span> <input type="checkbox" ng-disabled="notice.waiting" class="selector"
 						ng-model="notice.$selected" ng-click="checkOne(notice)">
 					</span> <span class="text-num text-bold"
 						ng-bind="::notice.date | date:'yyyy-MM-dd'"></span>
@@ -342,7 +342,7 @@
 						ng-model="notice.send.code" placeholder="送货单号">
 				</div>
 				<div style="margin: 5px auto" ng-if="notice.$editing" ng-click="autoCode(notice)">
-					<button style="width: 100%;" class="btn btn-default btn-xs">系统随机号</button>
+					<button style="width: 100%;" class="btn btn-default btn-xs">生产随机单号</button>
 				</div>
 			</td>
 			<td class="br-l">
@@ -405,8 +405,13 @@
 				</div>
 			</td>
 			<td class="text-center br-l">{{::notice.orderItem.price}}</td>
-			<td class="text-center br-l">{{::notice.delivery | date :
-				'yyyy-MM-dd'}}</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">
+					可发货日期<br>
+					<span ng-bind="::sendDate(notice) | date : 'yyyy-MM-dd'"></span>
+				</div>
+			</td>
 			<td class="text-center br-l">
 				<div ng-if="notice.endQty>=notice.qty" class="block">
 					<span class="text-trans success">已发货</span>
@@ -414,9 +419,9 @@
 				<div ng-if="notice.end" class="block">
 					<span class="text-trans warning">已结案</span>
 				</div>
-				<div ng-if="(!notice.endQty || notice.endQty<notice.qty) && !notice.end">
+				<div ng-if="(!notice.endQty || notice.endQty<notice.qty) && !notice.end && !notice.waiting">
 					<div ng-show="!notice.$editing">
-						<a ng-click="notice.$editing=!notice.$editing">发 货</a>
+						<a ng-click="notice.$editing=!notice.$editing"><i class="fa fa-send-o fa-lg"></i><br>发 货</a>
 					</div>
 					<div ng-show="notice.$editing">
 						<div>
@@ -428,6 +433,9 @@
 						</div>
 					</div>
 				</div>
+				<div ng-if="notice.waiting" class="text-muted">
+					<div title="暂时不可发货"><i class="fa fa-cog fa-lg"></i><br>备料中</div>
+				</div>
 			</td>
 		</tr>
 	</tbody>
@@ -453,12 +461,12 @@
 					<tbody style="background-color: #f5f5f5;">
 						<tr class="text-center">
 							<th>商品</th>
-							<th>剩余未发</th>
-							<th>本次发货</th>
+							<th width="90px">剩余未发</th>
+							<th width="92px">本次发货</th>
 							<th>单价</th>
 							<th width="120px">交货日期</th>
 							<th>订单</th>
-							<th class="text-center">操作</th>
+							<th width="50px" class="text-center">操作</th>
 						</tr>
 					</tbody>
 					<tbody>

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

@@ -212,7 +212,7 @@
 					<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>送货单号：<span
+						ng-bind="send.date | date:'yyyy-MM-dd'"></span> <span>发货单号：<span
 						class="text-num" ng-bind="::send.code"></span></span>
 				</div>
 			</td>