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

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

@@ -50,6 +50,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/PurcOrder',
 					templateUrl : "static/tpl/index/sale/index.html"
 				}
 			}
+		}).state('sale.inquiry', {
+			url : "/inquiry",
+			views : {
+				"sale-view" : {
+					templateUrl : "static/tpl/index/sale/inquiry.html"
+				}
+			}
 		}).state('sale.order', {
 			url : "/order",
 			views : {
@@ -398,5 +405,32 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/PurcOrder',
 			}
 		};
 	});
+	app.controller('SaleInquiryCtrl', function($scope, $filter, PurcInquiry, 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) {
+				PurcInquiry.get(parseParams(params.url()), function(page){
+					if(page) {
+						params.total(page.totalElements);
+						$defer.resolve(page.content);
+					}
+				});
+			}
+		});
+		
+		$scope.onReplyClick = function() {
+			
+		};
+	});
 	return app;
 });

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

@@ -32,5 +32,15 @@ define([ 'ngResource' ], function() {
 				}
 			}
 		});
+	}).factory('PurcInquiry', function($resource) {
+		return $resource('sale/inquiry/:id', {}, {
+			reply: {
+				url: 'sale/inquiry/:inquiryId/reply',
+				method: 'POST',
+				params: {
+					inquiryId: 'inquiryId'
+				}
+			}
+		});
 	});
 });

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

@@ -33,7 +33,7 @@
 				<li class="icon">销售</li>
 				<li class="start">
 					<ul class="list-unstyled">
-						<li><a href="#">待报价(0)</a></li>
+						<li><a ui-sref="sale.inquiry">待报价(4)</a></li>
 						<li><a ui-sref="sale.order.reply">待回复(6)</a></li>
 					</ul>
 				</li>

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

@@ -115,6 +115,7 @@
 		<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 class="active"><a ui-sref="sale.change"><span>变更中</span><em

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

@@ -0,0 +1,247 @@
+<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;
+}
+
+.input-trigger .dropdown-menu tr>td>.btn {
+	border-radius: 0;
+	border: none;
+}
+</style>
+<div ng-controller="SaleInquiryCtrl" class="block">
+	<div class="loading in">
+		<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 class="active"><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><a href="#"><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>单价</th>
+				<th width="100">数量</th>
+				<th width="120">交货日期</th>
+				<th width="180">回复状态</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="order in $data">
+			<tr class="order-hd">
+				<td class="first">
+					<div class="order-main">
+						<span> <input type="checkbox" class="selector"
+							ng-model="order.$selected">
+						</span> <span class="text-num text-bold" title="{{order.date}}"
+							ng-bind="order.date | date:'yyyy-MM-dd'"></span> <span>订单号：<a
+							class="text-num" ng-bind="order.code" href="#"></a></span>
+					</div>
+				</td>
+				<td colspan="3"><a href="#" ng-bind="order.enterprise.enName"></a></td>
+				<td colspan="1" class="order-sum">{{order.currency}}： <span
+					ng-bind="getOrderTotal(order.orderItems) | number : 2"
+					class="text-num text-bold"></span>
+				</td>
+				<td colspan="1" class="text-center">
+					<div class="operates">
+						<a ng-click="print(order)" class="text-muted" title="打印"><i
+							class="fa fa-print fa-lg"></i></a>
+					</div>
+				</td>
+			</tr>
+			<tr class="order-bd" ng-repeat="item in order.orderItems">
+				<td class="product">
+					<div class="text-num text-bold">
+						<a href="#" ng-bind="item.product.code"></a>
+					</div>
+					<div>
+						<a href="#" ng-bind="item.product.title"></a>
+					</div>
+					<div class="text-muted" title="{{item.product.spec}}"
+						ng-bind="item.product.spec"></div>
+				</td>
+				<td class="text-center text-num" title="{{item.price}}"
+					ng-bind="item.price"></td>
+				<td class="text-center">
+					<div class="text-num" title="{{item.qty}}" ng-bind="item.qty"></div>
+					<div class="text-muted" ng-bind="item.product.unit"></div>
+					<div style="margin: 0 auto" ng-show="item.$editing">
+						<input type="text" ng-model="item.reply.qty"
+							ng-init="item.reply.qty=item.qty-item.replyQty"
+							class="form-control input-xs" placeholder="回复数量">
+					</div>
+				</td>
+				<td class="text-center br-l">
+					<div class="text-num" ng-bind="item.delivery | date:'yyyy-MM-dd'"></div>
+					<br>
+					<div style="margin: 0 auto"
+						class="input-group input-group-xs input-trigger"
+						ng-show="item.$editing">
+						<input type="text" ng-model="item.reply.delivery"
+							ng-init="item.reply.delivery=parseDate(item.delivery)"
+							class="form-control" placeholder="回复交期"
+							datepicker-popup="yyyy-MM-dd" is-open="item.$opened"
+							min-date="order.date" ng-required="true" current-text="今天"
+							clear-text="清除" close-text="关闭"
+							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
+							ng-focus="openDatePicker($event, item)"> <span
+							class="input-group-btn">
+							<button type="button" class="btn btn-default"
+								ng-click="openDatePicker($event, item)">
+								<i class="fa fa-calendar"></i>
+							</button>
+						</span>
+					</div>
+				</td>
+				<td class="text-center br-l">
+					<div>数量完成48%</div>
+					<div>交期未达标</div>
+					<div style="margin: 0 auto" ng-show="item.$editing">
+						<input type="text" ng-model="item.reply.remark"
+							class="form-control input-xs" placeholder="回复备注">
+					</div>
+				</td>
+				<td class="text-center br-l">
+					<div ng-show="!item.$editing">
+						<a ng-click="item.$editing=!item.$editing">回复</a>
+					</div>
+					<div ng-show="item.$editing">
+						<div>
+							<a ng-click="item.$editing=!item.$editing">取消</a>
+						</div>
+						<br>
+						<div>
+							<a ng-click="onReplyClick(item)" class="text-inverse">确认回复</a>
+						</div>
+					</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>

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

@@ -115,6 +115,7 @@
 		<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 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>