平台UI更新

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

src/main/webapp/WEB-INF/views/normal/index.html

@@ -54,7 +54,7 @@
 				<div id="home-headerBtns">
 					<i class="fa fa-mobile-phone fa-lg"></i>
 					<a ng-click="showMessage()" title="查看消息"><i class="fa fa-comments-o fa-lg"></i></a>
-					<a href="#/approvalFlow"><i class="fa fa-cog fa-lg"></i></a>
+					<a ui-sref="approvalflow.flow"><i class="fa fa-cog fa-lg"></i></a>
 					<a ng-click="logout()" title="退出登录"><i class="fa fa-power-off fa-lg"></i></a>
 				</div>
 			</nav>
@@ -70,18 +70,28 @@
 						<div class="col-xs-10">
 							<ul class="nav nav-pills">
 								<li><a href="#/sale/customer" title="客户资料">客户资料</a></li>
+								<li><a href="#/sale/prodList" title="产品资料">产品资料</a></li>
+								<li><a href="#/sale/inquiry" title="客户采购询价单">客户采购询价单</a></li>
+								<li><a href="#/sale/inquiryMould" title="客户模具询价单">客户模具询价单</a></li>
+								<li><a href="#/sale/quotation/list" title="主动报价单">主动报价单</a></li>
+								<li><a href="#/sale/tender" title="客户招投标">客户招投标</a></li>
+								<li><a href="#/sale/opentender" title="平台公共招标">平台公共招标</a></li>
 								<li><a href="#/sale/order" title="客户采购订单">客户采购订单</a></li>
-								<li><a href="#/sale/change" title="客户采购变更">客户采购变更</a></li>
-								<li><a href="#/sale/forecast" title="客户采购预测">客户采购预测</a></li>
+								<li><a href="#/sale/change" title="客户采购变更">客户采购变更单</a></li>
+								<li><a href="#/sale/maketodo/makeorder" title="客户委外单">客户委外单</a></li>
 								<li><a href="#/sale/notice" title="客户发货提醒">客户发货提醒</a></li>
 								<li><a href="#/sale/send" title="发货单">发货单</a></li>
-								<li><a href="#/sale/accept" title="客户验收单">客户验收单</a></li>
-								<li><a href="#/sale/returns" title="客户验退单">客户验退单</a></li>
+								<li><a href="#/sale/accept" title="客户验收单">客户采购验收单</a></li>
+								<li><a href="#/sale/returns" title="客户验退单">客户采购验退单</a></li>
+								<li><a href="#/sale/makeaccept" title="客户委外验收单">客户委外验收单</a></li>
+								<li><a href="#/sale/makechange" title="客户委外变更单">客户委外变更单</a></li>
+								<li><a href="#/sale/makereturns" title="客户委外验退单">客户委外验退单</a></li>
 								<li><a href="#/sale/sample" title="客户打样申请">客户打样申请</a></li>
 								<li><a href="#/sale/approval" title="客户认定单">客户认定单</a></li>
 								<li><a href="#/sale/badIn" title="客户不良品入库">客户不良品入库</a></li>
 								<li><a href="#/sale/badOut" title="客户不良品出库">客户不良品出库</a></li>
 								<li><a href="#/sale/MRB" title="客户MRB单">客户MRB单</a></li>
+								<li><a href="#/cs/" title="客户服务">客户服务</a></li>
 							</ul>
 						</div>
 					</div>
@@ -96,6 +106,7 @@
 								<li><a href="#/purc/order" title="采购订单">采购订单</a></li>
 								<li><a href="" title="采购询价">采购询价</a></li>
 								<li><a href="#/purc/deputy" title="采购询价">代采订单</a></li>
+								<li><a href="#/purc/makeoutorder" title="委外单">委外单</a></li>
 							</ul>
 						</div>
 					</div>
@@ -117,9 +128,9 @@
 						</div>
 						<div class="col-xs-10">
 							<ul class="nav nav-pills" >
-								<li><a href="" title="销售出货统计">销售出货统计</a></li>
-								<li><a href="" title="采购订单统计">采购订单统计</a></li>
-								<li><a href="" title="考勤统计">考勤统计</a></li>
+								<li><a title="销售出货统计">销售出货统计</a></li>
+								<li><a title="采购订单统计">采购订单统计</a></li>
+								<li><a title="考勤统计">考勤统计</a></li>
 							</ul>
 						</div>
 					</div>

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

@@ -152,11 +152,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             templateUrl : "static/tpl/index/purc/vendor_detail.html",
             controller : 'PurcVendorDetailCtrl'
             /* 客户指定招标列表 */
-        }).state('sale.makeoutorder', {
+        }).state('purc.makeoutorder', {
             url : "/makeoutorder",
             templateUrl : "static/tpl/index/make/outorder.html",
             controller: 'MakeOutOrderCtrl'
-        }).state('sale.outorder_detail', {
+        }).state('purc.outorder_detail', {
             url : "/makeoutorder/:id",
             templateUrl : "static/tpl/index/make/outorder_detail.html",
             controller: 'MakeOutOrderDetailCtrl'
@@ -357,6 +357,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             url : "/makereturns",
             templateUrl : "static/tpl/index/make/returns.html",
             controller: 'MakeReturnCtrl'
+        }).state('sale.makechange', {
+            url : "/makechange",
+            templateUrl : "static/tpl/index/make/change.html",
+            controller: 'MakeChangeCtrl'
+        }).state('sale.makechange_detail', {
+            url : "/makechange/:id",
+            templateUrl : "static/tpl/index/make/change_detail.html",
+            controller: 'MakeChangeDetailCtrl'
         }).state('account', {
             url : "/account",
             views : {
@@ -496,14 +504,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
         }).state('make.home', {
             url : "/",
             templateUrl : "static/tpl/index/make/index.html"
-        }).state('make.change', {
-            url : "/change",
-            templateUrl : "static/tpl/index/make/change.html",
-            controller: 'MakeChangeCtrl'
-        }).state('make.change_detail', {
-            url : "/change/:id",
-            templateUrl : "static/tpl/index/make/change_detail.html",
-            controller: 'MakeChangeDetailCtrl'
         }).state('cs', {// 客户服务
             url : "/cs",
             views : {
@@ -8402,8 +8402,10 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		});
 		
 		// 查看供应商详情
-		$scope.VendorDetail = function(id) {
-			console.log(id);
+		$scope.VendorDetail = function(id, uu) {
+			$rootScope.vendorId = id;
+			$rootScope.vendoruu = uu;
+			window.location.hash = "#/purc/vendor/"+$rootScope.vendorId;
 		}
 		
 		// 向企业购买
@@ -8418,7 +8420,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 	/**
 	 * 供应商详情
 	 */
-	app.controller('PurcVendorDetailCtrl', ['$scope', 'toaster', '$stateParams', 'Vendor', '$modal', function($scope, toaster, $stateParams, Vendor, $modal) {
+	app.controller('PurcVendorDetailCtrl', ['$scope', 'toaster', '$stateParams', 'Vendor', '$modal', 'Product', 'ngTableParams', 'BaseService', '$rootScope', function($scope, toaster, $stateParams, Vendor, $modal, Product, ngTableParams, BaseService, $rootScope) {
 		$scope.vendorContacts = [];
 		var loadData = function() {
 			Vendor.getVendorDetail({id: $stateParams.id}, {}, function(data) {
@@ -8428,6 +8430,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				});
 			});
 		};
+		loadData();
 		
 		// 新增供应商联系人
 		$scope.addContact = function(uu) {
@@ -8481,7 +8484,34 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				toaster.pop('error', '提示', response.data);
 			});
 		}
-		loadData();
+		
+		// 供应商物料信息
+		$scope.tableParams = new ngTableParams({
+			page : 1, 
+			count : 10
+		}, {
+			total : 0, 
+			counts: [5, 10, 25, 50],
+			getData : function($defer, params) {
+				$scope.loading = true;
+				var pageParams = params.url();
+				pageParams.custUU = $scope.uu;
+				pageParams.keyword = $scope.keyword;
+				$scope.tip = $scope.keyword;
+				Product.get.call(null, BaseService.parseParams(pageParams), function(page){
+					$scope.loading = false;
+					if(page) {
+						params.total(page.totalElement);
+						$scope.total = page.totalElement;
+						$defer.resolve(page.content);
+						$scope.keywordXls = angular.copy($scope.keyword);//保存当前取值的关键词
+					}
+				}, function(response){
+					$scope.loading = false;
+					toaster.pop('error', '数据加载失败', response.data);
+				});
+			}
+		});
 	}]);
 	
 	/**

src/main/webapp/resources/tpl/index/cs/left.html

@@ -1,9 +1,3 @@
-<div class="left-nav left-home">
-	<div class="nav-home">
-		<a ui-sref="sale" class="text-default"><span
-			class="glyphicon glyphicon-home icon-left"></span>客户服务</a>
-	</div>
-</div>
 <div class="left-nav">
 	<div class="nav-label">
 		<i></i>增值服务
@@ -15,17 +9,3 @@
 		<li><a>我的物流</a></li>
 	</ul>
 </div>
-<div class="left-nav">
-	<div class="nav-label">
-		<i></i>自定义菜单
-	</div>
-	<ul class="list-unstyled">
-		<li><a>添加自定义菜单<span class="pull-right"><i class="fa fa-plus icon-right"></i></span></a></li>
-	</ul>
-</div>
-<div class="left-nav">
-	<ul class="list-unstyled">
-		<li><a href="serve">问题反馈<span class="pull-right"><i class="fa fa-bell-o icon-right"></i></span></a></li>
-		<li><a href="serve">客服中心<span class="pull-right"><i class="fa fa-headphones icon-right"></i></span></a></li>
-	</ul>
-</div>

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

@@ -26,7 +26,7 @@
 			<ul class=" ">
 				<li>
 					<li class="dropdown-submenu">
-					<a style="font-size: 14px; font-family: 'Microsoft YaHei', 'Hiragino Sans GB'; text-decoration: none;" href="#/account/enterprise">{{userInfo.enterprise.enName}}
+					<a style="font-size: 14px; font-family: 'Microsoft YaHei', 'Hiragino Sans GB'; text-decoration: none;" ui-sref="approvalflow.enterprise">{{userInfo.enterprise.enName}}
 						<i class="fa fa-angle-double-right" ng-if="userInfo.enSelect"></i></a>
 						<ul class="dropdown-menu" ng-if="userInfo.enSelect" id="change-company">
 							<li class="text-muted text-bold">切换企业</li>
@@ -39,7 +39,7 @@
 					UU号: {{userInfo.enterprise.uu}}
 				</li>
 				<li>
-					业务员：<a href="#/account/user" style="text-decoration: none;">{{userInfo.userName}}</a>
+					业务员：<a ui-sref="approvalflow.user" style="text-decoration: none;">{{userInfo.userName}}</a>
 				</li>
 			</ul>
 		</div>

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

@@ -31,11 +31,11 @@
 											|| 0}}</span>)
 								</a></li>
 								<li><a ui-sref="sale.todo.inquirymould">待报价模具询价单(<span
-										ng-class="{'text-inverse': todo.inquiry>0}">{{todo.inquiry
+										ng-class="{'text-inverse': todo.inquiryMouldTodo>0}">{{todo.inquiryMouldTodo
 											|| 0}}</span>)
 								</a></li>
 								<li><a ui-sref="sale.quotation.list">待确认主动报价单(<span
-										ng-class="{'text-inverse': todo.inquiry>0}">{{todo.inquiry
+										ng-class="{'text-inverse': todo.inquiryTodo>0}">{{todo.inquiryTodo
 											|| 0}}</span>)
 								</a></li>
 								<li><a ui-sref="sale.todo.order">待回复客户采购单(<span
@@ -52,8 +52,8 @@
 										ng-class="{'text-inverse': todo.orderChange>0}">{{todo.orderChange
 											|| 0}}</span>)
 								</a></li>
-								<li><a ui-sref="make.todo.order">待回复的客户委外单(<span
-										ng-class="{'text-inverse': todo.orderChange>0}">{{todo.orderChange
+								<li><a ui-sref="sale.makeorder">待回复的客户委外单(<span
+										ng-class="{'text-inverse': todo.makeOrder>0}">{{todo.makeOrder
 											|| 0}}</span>)
 								</a></li>
 							</ul>
@@ -61,10 +61,11 @@
 					</ul>
 					<div id="operateTips" ng-controller="VendCountCtrl">
 						<a class="col-xs-4" href="#/sale/customer"> 我的客户（<span ng-class="{'text-inverse': count.customer>0}">{{count.customer || 0}}</span>）</a>
+						<a class="col-xs-4" ui-sref="sale.prodList">产品信息</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加客户</a>
 						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.newProdInfo"><i class="fa fa-plus"></i> 新增产品信息</a>
 						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.uploadByBatch"><i class="fa fa-plus"></i> 导入产品信息</a>
-						<a class="col-xs-4" style="color: #327ebe" ui-sref="sale.prodList">产品信息</a>
+						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增主动报价单</a>
 					</div>
 				</div>
 			</div>
@@ -85,7 +86,6 @@
 											0}}</span>)
 								</a></li>
 								<li><a>未交货采购单</a></li>
-								<li><a>待回复采购单</a></li>
 								<li><a>进行中的招标单</a></li>
 							</ul>
 						</li>
@@ -94,7 +94,6 @@
 						<a class="col-xs-4" ui-sref="purc.vendor">我的供应商（<span ng-class="{'text-inverse': count.vendor>0}">{{count.vendor || 0}}</span>）</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/baseInfo/myRquest"><i class="fa fa-plus"></i> 添加供应商</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/addOrder"><i class="fa fa-plus"></i> 新增采购单</a>
-						<a class="col-xs-4" style="color: #327ebe" href="#/sale/quotation/new"><i class="fa fa-plus"></i> 新增报价单</a>
 						<a class="col-xs-4" style="color: #327ebe" href="#/purc/deputy/add"><i class="fa fa-plus"></i> 新增代采订单</a>
 						<a class="col-xs-4" style="color: #327ebe" href=""><i class="fa fa-plus"></i> 发布招标</a>
 					</div>
@@ -108,18 +107,10 @@
 					<ul class="list-unstyled list-inline">
 						<li class="start">
 							<ul class="list-unstyled">
-								<!-- <li><a ui-sref="fa.apBill">客户应付发票（<span
-										ng-class="{'text-inverse': todo.apBillAll>0}">{{todo.apBillAll || 0}}</span>）
-								</a></li> -->
-								<li><a ui-sref="fa.apCheck">待我确认应付对账单（<span
+								<li><a ui-sref="fa.apCheck">应收对账单（<span
 										ng-class="{'text-inverse': todo.acceptAll>0}">{{todo.acceptAll ||
 											0}}</span>）
 									</a></li>
-								<li><a>我发出的待确认对账单</a></li>
-								<!-- <li><a ui-sref="#">招标单</a></li>
-								<li><a ui-sref="fa.arCheck">应付对账单（<span
-										ng-class="{'text-inverse': todo.arCheckToConfirm>0}">{{todo.arCheckToConfirm || 0}}</span>）
-								</a></li> -->
 							</ul>
 						</li>
 					</ul>

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

@@ -217,7 +217,7 @@
 						ng-model="change.$selected">
 					</span> <span class="text-num text-bold"
 						ng-bind="::change.orderChange.date | date:'yyyy-MM-dd'"></span> <span>流水号：<a
-						class="text-num" ng-bind="::change.orderChange.code" ui-sref="make.change_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
+						class="text-num" ng-bind="::change.orderChange.code" ui-sref="sale.makechange_detail({id:change.id})" target="_self"></a></span> <span>订单：<a
 						class="text-num text-bold" ng-bind="::change.orderCode" ui-sref="make.order_detail({id:change.orderId})" target="_blank"></a></span>
 				</div>
 			</td>

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

@@ -246,7 +246,7 @@
 					</span> 
 					<span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：
-					  <a class="text-num" ng-bind="::order.code" ui-sref="make.order_detail({id:order.id})" target="_self"></a></span>
+					  <a class="text-num" ng-bind="::order.code" ui-sref="sale.makeorder_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><a ng-bind="::order.enterprise.enName"></a></td>

src/main/webapp/resources/tpl/index/make/outorder.html

@@ -217,7 +217,7 @@
 					</span> 
 					<span class="text-num text-bold"
 						ng-bind="::order.date | date:'yyyy-MM-dd'"></span> <span>订单号：
-					  <a class="text-num" ng-bind="::order.code" ui-sref="make.outorder_detail({id:order.id})" target="_self"></a></span>
+					  <a class="text-num" ng-bind="::order.code" ui-sref="purc.makeoutorder_detail({id:order.id})" target="_self"></a></span>
 				</div>
 			</td>
 			<td colspan="3"><!-- <a ng-bind="::order.enterprise.enName"></a> --></td>

src/main/webapp/resources/tpl/index/purc/left.html

@@ -17,6 +17,9 @@
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.deputy">代采订单</a></li>
 	</ul>
+	<ul class="list-unstyled">
+		<li ui-sref-active="active"><a ui-sref="purc.makeoutorder">委外单</a></li>
+	</ul>
 	<!-- 测试 -->
 	<ul class="list-unstyled">
 		<li ui-sref-active="active"><a ui-sref="purc.tenderlist">招标</a></li>

src/main/webapp/resources/tpl/index/purc/vendor_detail.html

@@ -47,7 +47,7 @@
                         <span>邮箱</span>
                         <span class="wid02">操作</span>
                     </dt>
-                    <dd ng-repeat = "contact in vendorContacts">
+                    <dd ng-repeat = "contact in vendorContacts| orderBy: '$index'">
                         <span class="wid01">{{contact.venduser}}</span>
                         <span class="wid01" ng-bind="contact.sex == 'F' ? '女' : '男'"></span>
                         <span class="wid01">{{contact.position}}</span>
@@ -62,74 +62,49 @@
                 </dl>
             </div>
             <!--已分配人员-->
-        <!--     <div class="com_title01"><span>已分配人员</span></div>
-            <div class="supply-list01 pro-info clearfix">
-                <dl>
-                    <dt>
-                        <span class="wid01">姓名</span>
-                        <span class="wid01">性别</span>
-                        <span class="wid01">职务</span>
-                        <span>手机</span>
-                        <span>电话</span>
-                        <span>邮箱</span>
-                        <span class="wid02">操作</span>
-                    </dt>
-                    <dd>
-                        <span class="wid01">陈先生</span>
-                        <span class="wid01">男</span>
-                        <span class="wid01">业务</span>
-                        <span>1313565636523</span>
-                        <span>0755-313232313</span>
-                        <span>1231313212156@qq.com</span>
-                        <span class="wid02"><a href="#">删除</a></span>
-                    </dd>
-                    <dd>
-                        <span class="add-wl"><a href="#">+新增分配人员</a></span>
-                    </dd>
-                </dl>
-            </div> -->
         </div>
         <div class="pro-add-data02">
-            <div class="pro-info clearfix">
-                <div class="pro-search">
-                    <div class="search fr">
-                        <input type="text" placeholder="平板">
-                        <a class="seek" href="###">搜索</a>
-                    </div>
-                </div>
-                <dl>
-                    <dt>
-                        <span>产品编号</span>
-                        <span>产品名称</span>
-                        <span>产品规格</span>
-                        <span>单位</span>
-                        <span>单价</span>
-                        <span>税率</span>
-                        <span>最小包量数</span>
-                        <span>最小订货量</span>
-                    </dt>
-                    <dd>
-                        <span>1000001</span>
-                        <span>电阻</span>
-                        <span>042-455555</span>
-                        <span>PCS</span>
-                        <span>0.26</span>
-                        <span>17%</span>
-                        <span>1000</span>
-                        <span>1000</span>
-                    </dd>
-                    <dd>
-                        <span>1000001</span>
-                        <span>电阻</span>
-                        <span>042-455555</span>
-                        <span>PCS</span>
-                        <span>0.26</span>
-                        <span>17%</span>
-                        <span>1000</span>
-                        <span>1000</span>
-                    </dd>
-                </dl>
-            </div>
+           <div class="pro-search">
+                 <div class="search-result fl"><img src="resources/img/purc/search01.png"/>搜索“{{tip}}”，为您找到<em>{{total}}</em>个结果</div>
+                 <div class="search fr">
+                     <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
+                     <a class="seek" ng-click="onSearch(keyword)">搜索</a>
+                 </div>
+             </div>
+			<table class="block table table-default table-striped" ng-table="tableParams">
+				<thead>
+					<tr class="header">
+						<th width="160px">编号</th>
+						<th width="160px">名称</th>
+						<th>规格</th>
+						<th width="80px">单位</th>
+						<th width="50px">选择</th>
+					</tr>
+				</thead>
+				<tbody ng-if="tableParams.total() == 0">
+					<tr>
+						<td class="text-center" colspan="7" ng-if="tip != null">
+							<br>
+							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息，请重新输入搜索条件</div>
+						</td>
+						<td class="text-center" colspan="7" ng-if="tip == null">
+							<br>
+							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您的供应商还未添加商品信息，请尽快通知供应商</div>
+						</td>
+						<br>
+					</tr>
+				</tbody>
+				<tbody>
+					<tr ng-repeat="product in $data">
+						<td class="text-center" ng-bind="::product.code"></td>
+						<td class="text-center" ng-bind="::product.title"></td>
+						<td class="text-center f12" ng-bind="::product.spec"></td>
+						<td class="text-center" ng-bind="::product.unit"></td>
+						<td class="text-center" ><a title="选择" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>
+						</td>
+					</tr>
+				</tbody>
+			</table>
         </div>
 	</div>
 </div>

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

@@ -39,9 +39,9 @@
 		<li ui-sref-active="active"><a ui-sref="sale.order">客户采购订单</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.change">客户采购变更单</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.maketodo.order">客户委外单</a></li>
+		<li ui-sref-active="active"><a ui-sref="sale.makechange">委外变更单</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.notice">客户发货提醒</a></li>
 		<li ui-sref-active="active"><a ui-sref="sale.send">发货单</a></li>
-		<li ui-sref-active="active"><a ui-sref="sale.makeoutorder">委外单</a></li>
 	</ul>
 </div>
 <div class="left-nav">

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

@@ -128,6 +128,22 @@
 				<div class="f16 text-default text-bold" style="line-height: 30px;">
 					 主动报价单</div>
 			</div>
+			<div class="col-xs-2">
+				<div class="btn-group btn-group-sm btn-group-justified">
+					<div class="btn-group btn-group-sm">
+						<a class="btn btn-default btn-line"
+							ui-sref-active="btn-info" ui-sref="sale.quotation.new">
+							<i class="fa fa-plus-square-o"></i> 新增
+						</a>
+					</div>
+					<div class="btn-group btn-group-sm">
+						<a class="btn btn-default btn-line"
+							ui-sref-active="btn-info" ui-sref="sale.quotation.list">
+							<i class="fa fa-list"></i> 列表
+						</a>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
 	<div ui-view></div>