Browse Source

企业合作伙伴页。

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7229 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
dongbw 9 years ago
parent
commit
677957a3d5

+ 11 - 3
src/main/webapp/resources/js/index/app.js

@@ -2074,8 +2074,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 	}]);
 	
-	// 模具询价管理
-	//TODO 
+	// 模具询价管理 
 	app.controller('SaleInquiryMouldCtrl',['$scope', '$filter', 'PurcInquiryMould', 'ngTableParams', 'toaster', 'BaseService', '$upload', function($scope, $filter, PurcInquiryMould, ngTableParams, toaster, BaseService, $upload){
 		$scope.active = 'todo';
 		$scope.agreedText = '全部';
@@ -2293,7 +2292,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 	}]);
 		
 	
-	//TODO 模具询价单明细
+	// 模具询价单明细
 	app.controller('SaleInquiryMouldDetailCtrl', ['$scope', '$stateParams', 'PurcInquiryMould','$filter', 'toaster','$upload', function($scope, $stateParams, PurcInquiryMould, $filter, toaster, $upload){
 		
 		var inquiryMould_copy = {};
@@ -7758,6 +7757,9 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				toaster.pop('error', '失败', response.data);
 			})
 		};
+		
+		
+		$scope.status = 'send';
 	}]);
 	
 	
@@ -7838,12 +7840,17 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 				toaster.pop('error', '提示', response.data);
 			});
 		}
+		
+		$scope.status = 'get';
 	}]);
 	
 	/**
 	 * 我的合作伙伴
 	 */
 	app.controller('MyPartnersCtrl', ['$scope', 'toaster', 'GetProductInfo', function($scope, toaster, GetProductInfo) {
+		// 默认显示合作伙伴
+		$scope.status = 'news';
+		
 		// 获取所有的合作伙伴
 		GetProductInfo.getAllPartners({}, function(data) {
 			console.log(data);
@@ -7910,5 +7917,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
 		});
 	}]);
 	
+	
 	return app;
 });

+ 28 - 0
src/main/webapp/resources/tpl/index/baseInfo/enMenu.html

@@ -0,0 +1,28 @@
+<div class="group-container condition block">
+	<div class="row">
+		<div class="col-xs-6">
+			<div class="btn-group btn-group-sm btn-group-justified">
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myPartners"
+						ng-class="{'btn-info':status=='news'}" >伙伴动态</a>
+				</div>
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myMessage"
+						ng-class="{'btn-info':status=='get'}" >收到的申请</a>
+				</div>
+				<div class="btn-group btn-group-sm">
+					<a type="button" class="btn btn-default btn-line" ui-sref="baseInfo.myRequest"
+						ng-class="{'btn-info':status=='send'}" >发出的申请</a>
+				</div>
+			</div>
+		</div>
+		<div class="search col-xs-5">
+			<div class="form-group form-group-sm has-feedback">
+				<input type="search" class="form-control input-sm" ng-model="keyword" ng-search="onSearch()" placeholder="输入商品、客户名称或单据流水号搜索" /><span
+					class="form-control-feedback text-simple"><i
+					class="fa fa-search"></i></span>
+			</div>
+		</div>
+	</div>
+	
+</div>

+ 1 - 0
src/main/webapp/resources/tpl/index/baseInfo/myMessage.html

@@ -138,6 +138,7 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
 <div class="condition block">
 		<div class="row">
 			<div class="col-xs-4">

+ 1 - 0
src/main/webapp/resources/tpl/index/baseInfo/myPartners.html

@@ -1,3 +1,4 @@
+<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
 <div class="pane base-info" style="max-height: 500px;overflow: auto;">
 	<div class="pane-header">
 		我的合作伙伴

+ 1 - 0
src/main/webapp/resources/tpl/index/baseInfo/myRequest.html

@@ -138,6 +138,7 @@
 <div class="loading in" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>
 <div class="condition block">
 		<div class="row">
 			<div class="col-xs-4">

+ 2 - 2
src/main/webapp/resources/tpl/index/baseInfo/right.html

@@ -122,7 +122,7 @@
 
 </style>
 <div class="block">
-	<div class="condition block">
+	<!-- <div class="condition block">
 		<div class="row">
 			<div class="col-xs-10">
 				<div class="f16 text-default text-bold" style="line-height: 30px;">
@@ -130,6 +130,6 @@
 			</div>
 			<p></p>
 		</div>
-	</div>
+	</div> -->
 	<div ui-view></div>
 </div>