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

src/main/webapp/resources/js/index/app.js

@@ -78,6 +78,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 					templateUrl : "static/tpl/index/sale/change.html"
 				}
 			}
+		}).state('sale.notice', {
+			url : "/notice",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/notice.html"
+				}
+			}
 		}).state('user', {
 			url : "/user",
 			views : {
@@ -451,6 +458,35 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ui.
 			
 		};
 	});
+	app.controller('SaleNoticeCtrl', function($scope, $filter, PurcNotice, ngTableParams, toaster){
+		$scope.tableParams = new ngTableParams({
+			page : 1, 
+			count : 5,
+			sorting: {
+                'date': 'desc'
+            },
+            filter: {
+            	'status' : 200
+            }
+		}, {
+			total : 0, 
+			counts: [5, 10, 25, 50],
+			getData : function($defer, params) {
+				$scope.loading = true;
+				PurcNotice.get(parseParams(params.url()), function(page){
+					$scope.loading = false;
+					if(page) {
+						params.total(page.totalElements);
+						$defer.resolve(page.content);
+					}
+				});
+			}
+		});
+		
+		$scope.onReplyClick = function() {
+			
+		};
+	});
 	/**
 	 * 计算时间差
 	 */

src/main/webapp/resources/js/index/services/Purc.js

@@ -54,5 +54,9 @@ define([ 'ngResource' ], function() {
 				}
 			}
 		});
+	}).factory('PurcNotice', function($resource) {
+		return $resource('sale/notice/:id', {}, {
+			
+		});
 	});
 });

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

@@ -39,7 +39,7 @@
 				</li>
 				<li class="doing">
 					<ul class="list-unstyled">
-						<li><a href="#">待发货(0)</a></li>
+						<li><a ui-sref="sale.notice">待发货(0)</a></li>
 						<li><a ui-sref="sale.change">变更中(2)</a></li>
 					</ul>
 				</li>

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

@@ -120,7 +120,7 @@
 						class="tm-h">6</em></a></li>
 				<li class="active"><a ui-sref="sale.change"><span>变更中</span><em
 						class="tm-h">2</em></a></li>
-				<li><a href="#"><span>待发货</span><em class="tm-h">0</em></a></li>
+				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>

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

@@ -5,13 +5,13 @@
 			<ul class="list-unstyled list-inline">
 				<li>
 					<div class="title">
-						<a href="#">待报价</a>
+						<a ui-sref="sale.inquiry">待报价</a>
 					</div>
 					<div class="count">0</div>
 				</li>
 				<li>
 					<div class="title">
-						<a href="#">待发货</a>
+						<a ui-sref="sale.notice">待发货</a>
 					</div>
 					<div class="count">0</div>
 				</li>

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

@@ -127,7 +127,7 @@
 						class="tm-h">6</em></a></li>
 				<li><a ui-sref="sale.change"><span>变更中</span><em
 						class="tm-h">2</em></a></li>
-				<li><a href="#"><span>待发货</span><em class="tm-h">0</em></a></li>
+				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>

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

@@ -0,0 +1,235 @@
+<style>
+.order-table .header>th {
+	height: 38px;
+	text-align: center;
+	background: #f5f5f5;
+	border-top: 1px solid #e8e8e8;
+	border-bottom: 1px solid #e8e8e8;
+}
+
+.order-table .sep-row {
+	height: 10px;
+}
+
+.order-table .selector {
+	vertical-align: middle;
+	margin: 0 0 2px 0;
+}
+
+.toolbar label {
+	margin-right: 10px;
+	margin-bottom: 0;
+}
+
+.toolbar .select_all {
+	margin: 0 6px 0 10px;
+	line-height: 20px;
+}
+
+.toolbar .btn {
+	-moz-border-radius: 2px;
+	margin-right: 5px;
+	border: 1px solid #dcdcdc;
+	border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+.order-table .order-hd {
+	background: #f5f5f5;
+	height: 40px;
+	line-height: 40px;
+}
+
+.order-table .order-hd td.first {
+	padding-left: 20px;
+}
+
+.order-table .order-hd .order-main span {
+	margin-right: 8px;
+}
+
+.order-table .order-hd .order-code {
+	font-style: normal;
+	font-family: verdana;
+}
+
+.order-table .order-hd .order-sum {
+	padding: 0 5px;
+}
+
+.order-table>tbody {
+	border: 1px solid transparent;
+}
+
+.order-table>tbody:hover {
+	border-color: #ccc;
+}
+
+.order-table .operates {
+	display: none;
+}
+
+.order-table>tbody:hover .operates {
+	display: block;
+}
+
+.order-table .order-bd {
+	border-bottom: 1px solid #e6e6e6;
+}
+
+.order-table .order-bd>td {
+	padding: 10px 5px;
+	vertical-align: top;
+	position: relative;
+}
+
+.order-table .order-bd .product {
+	padding-left: 20px;
+}
+
+.input-xs,.input-group-xs>.form-control,.input-group-xs>.input-group-addon,.input-group-xs>.input-group-btn>.btn
+	{
+	height: 26px;
+	padding: 0 5px;
+	font-size: 12px;
+	line-height: 1.5;
+	border-radius: 3px;
+}
+
+.input-group-xs .form-control:last-child,.input-group-addon:last-child,.input-group-btn:first-child>.btn:not
+	 (:first-child ),.input-group-btn:last-child>.btn {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+@media ( min-width : 768px) {
+	.form-horizontal .form-group-xs .control-label {
+		padding-top: 5px;
+	}
+}
+
+.input-trigger .dropdown-menu tr>td>.btn {
+	border-radius: 0;
+	border: none;
+}
+</style>
+<div ng-controller="SaleNoticeCtrl" class="block">
+	<div class="loading in" ng-class="{'in': loading}">
+		<i></i>
+	</div>
+	<div class="condition block">
+		<div class="state-wrap">
+			<ul class="list-unstyled list-inline">
+				<li class="first"><a href="#"><span>所有订单</span></a></li>
+				<li><a ui-sref="sale.inquiry"><span>待报价</span><em
+						class="tm-h">4</em></a></li>
+				<li><a ui-sref="sale.order.reply"><span>待回复</span><em
+						class="tm-h">6</em></a></li>
+				<li><a ui-sref="sale.change"><span>变更中</span><em
+						class="tm-h">2</em></a></li>
+				<li class="active"><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
+				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
+			</ul>
+		</div>
+	</div>
+	<table class="order-table block" ng-table="tableParams">
+		<thead>
+			<tr class="header">
+				<th>商品</th>
+				<th width="90">数量</th>
+				<th width="90">价格</th>
+				<th width="90">交货日期</th>
+				<th width="120">备注</th>
+				<th width="60">操作</th>
+			</tr>
+			<tr class="sep-row">
+				<td colspan="6"></td>
+			</tr>
+			<tr class="toolbar toolbar-top">
+				<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>
+					</div> <!-- 分页 -->
+				</td>
+			</tr>
+			<tr class="sep-row">
+				<td colspan="6"></td>
+			</tr>
+		</thead>
+		<tbody ng-repeat="notice in $data">
+			<tr class="order-hd">
+				<td class="first">
+					<div class="order-main">
+						<span> <input type="checkbox" class="selector"
+							ng-model="notice.$selected">
+						</span> <span class="text-num text-bold"
+							title="{{notice.date}}"
+							ng-bind="notice.date | date:'yyyy-MM-dd'"></span>
+					</div>
+				</td>
+				<td colspan="2"><a href="#"
+					ng-bind="notice.orderItem.order.enterprise.enName"></a></td>
+				<td class="text-right" colspan="2" class="order-sum">
+					PO：<a class="text-num text-bold" ng-bind="notice.orderItem.order.code" href="#"></a> 第{{notice.orderItem.number}}行
+				</td>
+				<td class="text-center">
+					<div class="operates">
+						<a ng-click="print(notice)" class="text-muted" title="打印"><i
+							class="fa fa-print fa-lg"></i></a>
+					</div>
+				</td>
+			</tr>
+			<tr class="order-bd">
+				<td class="product">
+					<div class="text-num text-bold">
+						<a href="#" ng-bind="notice.orderItem.product.code"></a>
+					</div>
+					<div>
+						<a href="#" ng-bind="notice.orderItem.product.title"></a>
+					</div>
+					<div class="text-muted" title="{{notice.orderItem.product.spec}}"
+						ng-bind="notice.orderItem.product.spec"></div>
+				</td>
+				<td>
+					<div ng-show="!notice.$editing">
+						<ul>
+							<li>订单数：{{notice.orderItem.qty}}</li>
+							<li>本次需求：{{notice.qty}}</li>
+							<li>已发货：{{notice.endQty}}</li>
+							<li>剩余未货：{{notice.qty-(notice.endQty || 0)}}</li>
+						</ul>
+					</div>
+					<div style="margin: 0 auto" ng-show="notice.$editing" ng-init="notice.send.qty=notice.qty-(notice.endQty || 0)">
+						<input type="text" class="form-control input-xs"
+										ng-model="notice.send.qty" placeholder="数量">
+					</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">
+					{{notice.remark}}
+				</td>
+				<td class="text-center br-l">
+					<div ng-show="!notice.$editing">
+						<a ng-click="notice.$editing=!notice.$editing">发 货</a>
+					</div>
+					<div ng-show="notice.$editing">
+						<div>
+							<a ng-click="notice.$editing=!notice.$editing">取消</a>
+						</div>
+						<br>
+						<div>
+							<a ng-click="onReplyClick(notice)" class="text-inverse">确认发货</a>
+						</div>
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>

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

@@ -119,7 +119,7 @@
 				<li class="active"><a ui-sref="sale.order.reply"><span>待回复</span><em
 						class="tm-h">6</em></a></li>
 				<li><a ui-sref="sale.change"><span>变更中</span><em class="tm-h">2</em></a></li>
-				<li><a href="#"><span>待发货</span><em class="tm-h">0</em></a></li>
+				<li><a ui-sref="sale.notice"><span>待发货</span><em class="tm-h">0</em></a></li>
 				<li><a href="#"><span>退货中</span><em class="tm-h">0</em></a></li>
 			</ul>
 		</div>