9 years ago · 9525f4604e
--- a/src/main/webapp/resources/js/index/app.js
+++ b/src/main/webapp/resources/js/index/app.js
@@ -486,7 +486,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
															             templateUrl : "static/tpl/index/baseInfo/addPartners.html",

														
 
															             controller : 'AddPartnersCtrl'

														
 
															         }).state('baseInfo.partner_searchresult', {

														
 
															-            url : '/search?keyword=',

														
 
															+            url : '/search',

														
 
															             templateUrl : "static/tpl/index/baseInfo/searchresult.html",

														
 
															             controller : 'EnterpriseSearchCtrl'

														
 
															         }).state('qc', {

														
@@ -13207,7 +13207,8 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
															     // 企业圈搜索结果

														
 
															     app.controller('EnterpriseSearchCtrl', ['$scope', 'getAccountUserSpace', 'ngTableParams', '$filter', 'BaseService', 'toaster', 'AddPartner', '$rootScope', function($scope, getAccountUserSpace, ngTableParams, $filter, BaseService, toaster, AddPartner, $rootScope) {

														
 
															-		BaseService.scrollBackToTop();

														
 
															+    	$scope.status = 'add';

														
 
															+    	BaseService.scrollBackToTop();

														
 
															 		$scope.active = 'all';

														
 
															 		$scope.agreedText = '全部';

														
 
															 		$scope.dateZoneText = '一个月内';

														
@@ -13286,7 +13287,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
															 			});

														
 
															 		}

														
 
															-		$scope.status = 'enList';

														
 
															 	}]);

														
 
															     // 平台新增的询价单（指定一个供应商）

														
@@ -13489,5 +13489,11 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
															     	}

														
 
															 	}]);

														
 
															+	// 企业圈查询收到待处理的数目

														
 
															+	app.controller('RequestAmountCtrl', ['$scope', 'AddPartnerMyRequest', function($scope, AddPartnerMyRequest) {

														
 
															+		AddPartnerMyRequest.requestAmount({}, function(data) {

														
 
															+			$scope.requestTodo = data;

														
 
															+		});

														
 
															+	}]);

														
 
															     return app;

														
 
															 });
														
--- a/src/main/webapp/resources/tpl/index/baseInfo/addPartners.html
+++ b/src/main/webapp/resources/tpl/index/baseInfo/addPartners.html
@@ -5,6 +5,7 @@
 
															 <title>Insert title here</title>

														
 
															 </head>

														
 
															 <body>

														
 
															+<div ng-include src="'static/tpl/index/baseInfo/enMenu.html'"></div>

														
 
															 <div class="sreach-index">

														
 
															 	<div class="row">

														
 
															 		<img src="static/img/home/sreach-logo.png"/>

														
--- a/src/main/webapp/resources/tpl/index/baseInfo/enMenu.html
+++ b/src/main/webapp/resources/tpl/index/baseInfo/enMenu.html
@@ -1,24 +1,7 @@
 
															 <div class="tab-first">

														
 
															 	<div class="row">

														
 
															-		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send'}" class="tab-btn">我的合作伙伴</a>

														
 
															+		<a type="button" ui-sref="baseInfo.vendorInfo" ng-class="{'active':status=='vendor' || 'customer' && status!='send' && status!='add'}" class="tab-btn">我的合作伙伴</a>

														
 
															 		<a type="button" ui-sref="baseInfo.myRequest" ng-class="{'active':status=='send'}" class="tab-btn">新的合作伙伴<b class="new-dot"></b></a>

														
 
															-		<a type="button" href="#/baseInfo/partner" class="tab-btn">添加合作伙伴</a>

														
 
															+		<a type="button" ui-sref="baseInfo.partner_searchresult" class="tab-btn" ng-class="{'active':status=='add'}">添加合作伙伴</a>

														
 
															 	</div>

														
 
															 </div>

														
 
															-<!--<div class="tab-active margin-bot group-container condition">

														
 
															-	<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.vendorInfo"

														
 
															-					   ng-class="{'btn-info':status=='vendor' || 'customer' && status!='send'}" >合作伙伴</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'}" >新的合作伙伴<b class="new-dot"></b></a>

														
 
															-				</div>

														
 
															-			</div>

														
 
															-		</div>

														
 
															-	</div>

														
 
															-

														
 
															-</div>-->

														
--- a/src/main/webapp/resources/tpl/index/baseInfo/myRequest.html
+++ b/src/main/webapp/resources/tpl/index/baseInfo/myRequest.html
@@ -348,12 +348,12 @@
 
															 			<td class="first" colspan="4">

														
 
															 				<div>营业执照：<span ng-bind="::request.vendUID"></span></div>

														
 
															 				<div>申请人：<span ng-bind="::request.custUserName"></span></div>

														
 
															-				<div>审核人：<span ng-bind="request.vendUserName"></span></div>

														
 
															-				<div>

														
 
															+				<div ng-if="::request.vendUserName != null">审核人：<span ng-bind="::request.vendUserName"></span></div>

														
 
															+				<!-- <div>

														
 
															 					原因：

														
 
															-					<!--<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">-->

														
 
															+					<input class="form-control" ng-model="request.reason" ng-if="request.statusCode==311 && request.method==0" style="width: 90%; float: right;">

														
 
															 					<span ng-bind="request.reason" ng-if="request.statusCode!=311"></span>

														
 
															-				</div>

														
 
															+				</div> -->

														
 
															 			<td width="200" class="text-center">

														
 
															 				<p><a class="btn label-success white" ng-click="addSupplier(request.vendUID)" ng-if="request.statusCode==313 && request.vendor == 0">添加供应商 </a></p>

														
 
															 				<p><span class="btn01 btn label-danger white" ng-if="request.statusCode==313 && request.vendor == 1">供应商 </span></p>

														
--- a/src/main/webapp/resources/tpl/index/baseInfo/searchresult.html
+++ b/src/main/webapp/resources/tpl/index/baseInfo/searchresult.html
@@ -268,6 +268,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="myReuest search-bg condition block">

														
 
															 		<div class="row">

														
 
															 			<div class="col-xs-6">