B2B用户完善企业信息，申请SAAS

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

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

@@ -2732,14 +2732,13 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 					templateUrl: 'static/tpl/index/account/applySaas.html',
 					controller: 'ApplySaasCtrl',
 					resolve: {
-						enterprise: function(){return $scope.enterprise;}
+						enterprise: function(){return angular.copy($scope.enterprise);}
 					}
 				});
 				
 				modalInstance.result.then(function(){
 					$state.reload();
 				}, function(){
-					
 				});
 			} else {
 				toaster.pop('info', '请完善信息', '申请SAAS服务请先完善企业详细信息');
@@ -3483,6 +3482,27 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 		};
 	}]);
 	
+		
+	/**
+	 * 状态码  -> 描述
+	 */
+	app.filter('status', function(){
+		return function(data) {
+			var statusConfig = {
+				'101': '已提交',
+				'102': '已审核',
+				'103': '未通过',
+				'200': '未回复',
+				'201': '已回复',
+				'313': '已激活',
+				'316': '已过账', 
+				'311': '申请中',
+				'312': '未激活'
+			};
+			return statusConfig[data];
+		}
+	});
+	
 	
 	return app;
 });

src/main/webapp/resources/tpl/index/account/enterprise.html

@@ -74,9 +74,11 @@
 					<div class="row row-sm item">
 						<div class="col-xs-12">
 							<span class="title"><i class="fa fa-fw fa-trophy"></i>&nbsp;行&nbsp;业</span>
-							<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enIndustry"></div>
+							<div ng-show="!connectionEditing" class="content">
+								{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}
+							</div>
 							<div class="content" ng-show="connectionEditing">
-								<select ng-model="enterprise.enIndustry" placeholder="传真号码"
+								<select ng-model="enterprise.enIndustry" placeholder="所属行业"
 									class="form-control input-xs" type="text" style="width: 240px;">
 									<option value="make">制造型</option>
 					      			<option value="trade">贸易型</option>
@@ -134,7 +136,7 @@
 				<div class="content">
 					<div ng-if="enterprise.enSaasUrl">
 						<a href="http://{{::enterprise.enSaasUrl}}.saas.ubtob.com">http://{{::enterprise.enSaasUrl}}.saas.ubtob.com</a>
-						<label> [{{::enterprise.enSaasStatus}}] </label>
+						<label> [{{::enterprise.enSaasStatus | status}}] </label>
 					</div>
 					<div ng-if="!enterprise.enSaasUrl"><a ng-click="applySaas()">立即申请</a></div>
 				</div>