Merge remote-tracking branch 'origin/dev' into dev

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

@@ -254,30 +254,26 @@
 	<div class="pane-body">
 		<div class="row row-sm item">
 			<div class="col-xs-12">
+				<div class="com-text col-xs-6">
+					<span class="title">企业UU号：</span>
+					<div class="content" ng-bind="::enterprise.uu"></div>
+				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">企业名称：</span>
 					<div class="content" ng-bind="::enterprise.enName"></div>
 				</div>
+				<div class="com-text col-xs-6">
+					<span class="title">企业简称：</span>
+					<div class="content" ng-bind="::enterprise.enShortname"></div>
+				</div>
 				<div class="com-text col-xs-6">
 					<span class="title">营业执照号：</span>
 					<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
 				</div>
 				<div class="com-text col-xs-6">
-					<span class="title">法定代表人：</span>
+					<span class="title">注册地区：</span>
 					<div class="content" ng-bind="::enterprise.enArea"></div>
 				</div>
-				<div class="com-text col-xs-6">
-					<span class="title">企业地址：</span>
-					<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-					<div class="content" ng-show="connectionEditing" style="width: 320px;">
-						<input ng-model="enterprise.enAddress" placeholder="详细地址"
-							   class="form-control input-xs" type="text" />
-					</div>
-				</div>
-				<div class="com-text col-xs-6">
-					<span class="title">企业UU号：</span>
-					<div class="content" ng-bind="::enterprise.uu"></div>
-				</div>
 			</div>
 			<!-- <div class="col-xs-4">
 				<div class="com-text col-xs-12">
@@ -322,34 +318,18 @@
 			<div class="row row-sm item">
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
-						<span class="title">联系人：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactMan"></div>
-						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactMan" type="text" class="form-control input-xs" placeholder="联系人">
-							</div>
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">联系电话：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactTel"></div>
-						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactTel" type="text" class="form-control input-xs" placeholder="联系电话">
-							</div>
-						</div>
-					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">邮箱：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactEmail"></div>
+						<span class="title">企业官网：</span><a ng-show="!connectionEditing" class="content"
+														   ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
+														   target="_blank"></a>
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.contactEmail" type="text" class="form-control input-xs" placeholder="邮箱">
+								<span class="input-group-addon">http://</span>
+								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
 							</div>
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
-						<span class="title">企业传真：</span>
+						<span class="title">企业传真</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enFax"></div>
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
@@ -357,42 +337,6 @@
 							</div>
 						</div>
 					</div>
-					<div class="com-text col-xs-6">
-						<span class="title">企业官网：</span>
-						<a ng-show="!connectionEditing" class="content"
-						   ng-bind="::enterprise.enUrl" href="http://{{::enterprise.enUrl}}"
-						   target="_blank">
-						</a>
-						<div class="content" ng-show="connectionEditing">
-							<div class="input-group input-group-xs" style="width: 320px;">
-								<span class="input-group-addon">http://</span>
-								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-6">
-						<span class="title">行业：</span>
-						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.profession"></div>
-						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.profession" type="text" class="form-control input-xs" placeholder="行业" />
-						</div>
-					</div>
-				</div>
-				<div class="col-xs-12">
-					<div class="com-text col-xs-12">
-						<span class="title">经营范围标签：</span>
-						<div ng-show="!connectionEditing" class="content" ng-repeat="tag in 'hahaha,hehehe,hjdksf'.split(',')">
-							<div >{{tag}}</div>
-							<!--<i class='glyphicon glyphicon-remove' aria-hidden='true' style='top: -10.5px; color: red; left: 19.5px;'></i>-->
-						</div>
-
-						<!--<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.tags"></div>-->
-						<!--<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.tags" type="text" class="form-control input-xs" placeholder="行业" />
-						</div>-->
-					</div>
 				</div>
 			<!-- 	<div class="col-xs-12">
 					<div class="com-text col-xs-6">
@@ -407,7 +351,7 @@
 							<input required="required" type="text" class="form-control input-xs" placeholder="员工人数" />
 						</div>
 					</div>
-				</div>
+				</div> -->
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
 						<span class="title">企业电话：</span>
@@ -455,7 +399,7 @@
 							</select>
 						</div>
 					</div>
-				</div> -->
+				</div>
 			</div>
 		</form>
 	</div>
@@ -570,10 +514,10 @@
 						<span class="title">姓名：</span>
 						<div class="content" ng-bind="::enterprise.admin.userName">陈虎</div>
 					</div>
-					<!--<div class="com-text col-xs-6">
+					<div class="com-text col-xs-6">
 						<span class="title">性别：</span>
 						<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
-					</div>-->
+					</div>
 				</div>
 				<div class="col-xs-12">
 					<div class="com-text col-xs-6">
@@ -721,7 +665,6 @@
 		<div class="row">
 			<div class="col-xs-6"><a href="http://uas.ubtob.com/#/index" class="bule">B2B商务平台</a></div>
 			<div class="col-xs-6"><a href="http://www.usoftmall.com/" class="bule" target="_blank">优软商城</a></div>
-			<div class="col-xs-6"><a href="http://v2.usoftchina.com/uu" class="bule">UU互联</a></div>
 		</div>
 	</div>
 	<div class="save-btn">