Browse Source

立即查看带当前企业条件进入新的合作伙伴

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8449 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
177a79d513

+ 21 - 2
src/main/webapp/resources/js/index/app.js

@@ -1000,6 +1000,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 			});
 		}
 	
+		/**
+		 * 立即查看
+		 */
+		$scope.view = function(name) {
+			$rootScope.vendName = name;
+			window.location.hash = "#/baseInfo/myRquest";
+		}
 	}]);
 	
 	app.controller('InviteCtrl', ['$scope', 'toaster', '$modalInstance', 'enname', function($scope, toaster, $modalInstance, enname) {
@@ -10434,7 +10441,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 	/**
 	 * 建立合作关系申请
 	 */
-	app.controller('AddPartnerRequestCtrl', ['$scope', 'AddPartnerMyRequest', 'toaster', 'BaseService', 'ngTableParams', 'AddPartner', '$timeout', function($scope, AddPartnerMyRequest, toaster, BaseService, ngTableParams, AddPartner, $timeout) {
+	app.controller('AddPartnerRequestCtrl', ['$scope', 'AddPartnerMyRequest', 'toaster', 'BaseService', 'ngTableParams', 'AddPartner', '$timeout', '$rootScope', function($scope, AddPartnerMyRequest, toaster, BaseService, ngTableParams, AddPartner, $timeout, $rootScope) {
 		BaseService.scrollBackToTop();
 		$scope.status = "partner";
 		$scope.active = 'all';
@@ -10478,6 +10485,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				$scope.loading = true;
 				var pageParams = params.url();
 				pageParams.keyword = $scope.keyword;
+				if($rootScope.vendName) {
+					pageParams.keyword = $rootScope.vendName;
+					$scope.keyword = $rootScope.vendName;
+					$rootScope.vendName = null;
+				}
 				$scope.tip = $scope.keyword;
 				getService()[getRequestStatus($scope.active)].call(null, BaseService.parseParams(pageParams), function(page){
 					$scope.loading = false;
@@ -13822,7 +13834,14 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				});
 			});
 		}
-		
+
+		/**
+		 * 立即查看
+		 */
+		$scope.view = function(name) {
+			$rootScope.vendName = name;
+			window.location.hash = "#/baseInfo/myRquest";
+		}
 	}]);
     
     // 平台新增的询价单(指定一个供应商)

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

@@ -313,8 +313,8 @@
 			</td>
 			<td width="100" class="text-center">
 				<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">立即添加</a>
-				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请</span>
-				<span class="btn01 btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请</span>
+				<span class="btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==0">已收到申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
+				<span class="btn01 btn label-info btn-primary" ng-if="enterprise.requestStatus==311 && enterprise.method==1">已发出申请<br><a ng-click="view(enterprise.name)">立即查看</a></span>
 				<span class="btn label-info" ng-if="enterprise.requestStatus==313">已添加</span>
 			</td>
 		</tr>

+ 3 - 3
src/main/webapp/resources/tpl/index/search/search_result.html

@@ -278,8 +278,8 @@
 				</td>
 				<td class="pull-right" ng-if="enterprise.status == 313">
 					<a class="btn btn-primary" ng-click="addPartner(enterprise.name,enterprise.businessCode)" ng-if="enterprise.requestStatus==null||enterprise.requestStatus==310">立即添加</a>
-					<a class="btn btn-info" ng-if="enterprise.requestStatus==311 && enterprise.method==0" href="#/baseInfo/myRquest">立即处理</a>
-					<a class="btn btn-info" ng-if="enterprise.requestStatus==311 && enterprise.method==1" href="#/baseInfo/myRquest">立即查看</a>
+					<a class="btn btn-info" ng-if="enterprise.requestStatus==311 && enterprise.method==0" ng-click="view(enterprise.name)">立即处理</a>
+					<a class="btn btn-info" ng-if="enterprise.requestStatus==311 && enterprise.method==1" ng-click="view(enterprise.name)">立即查看</a>
 					<a  class="btn btn-info" ng-if="enterprise.status == 313" href="#/purc/purcinquiry/{{enterprise.businessCode}}" class="btn01">立即询价</a><br/>
 					<a class="btn btn-info" ng-if="enterprise.requestStatus==313" ng-click="PurcByEn(enterprise.businessCode)">立即购买</a>
 				</td>
@@ -346,7 +346,7 @@
 					<a class="btn btn-primary" ng-click="addPartner(prod.enName,prod.businessCode)" ng-if="prod.isPartner==104">立即添加</a>
 					<a class="btn btn-info" ng-if="prod.isPartner==101" ng-click="PurcByEnAndProd(prod.businessCode, prod.id)">立即购买</a>
 					<a class="btn btn-info" ng-click="PurcInquiry(prod.businessCode, prod.id)">立即询价</a>
-					<a class="btn btn-info" ng-if="prod.isPartner==107" href="#/baseInfo/myRquest">立即查看</a>
+					<a class="btn btn-info" ng-if="prod.isPartner==107" ng-clikc="view(prod.enName)">立即查看</a>
 				</td>
 			</tr>
 			</tbody>