企业信息修改。

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

src/main/webapp/resources/css/deputyOrder/order.css

@@ -32,7 +32,7 @@ body {
 .com_head {
     width:100%;
     height:40px;
-    line-height:40px;
+    line-height:44px;
     background:url("../../img/deputyOrder/comm_bg01.png") no-repeat center;
     background-color:#f5f5f5;
     background-size: 100%;

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

@@ -1,198 +1,385 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
-<div class="pane base-info">
-	<div class="pane-header">
-		注册信息<!-- <a ng-disabled class="pull-right text-simple"><i
-			class="fa fa-pencil fa-fw"></i>编辑</a> -->
-	</div>
+<style>
+.com_title {
+	width:100%;
+	margin:0px auto;
+	height:40px;
+	line-height:40px;
+	font-size:14px;
+	color:#323232;
+	background:#f5f5f5;
+}
+.com_title font {
+	color:#327ebe;
+}
+.com_head {
+	width: 100%;
+	height: 40px;
+	line-height: 44px;
+	background: url("static/img/approvalFlow/comm_bg01.png") no-repeat left;
+	background-color: #f5f5f5;
+	background-size: 100% 100%;
+}
+.com_head span {
+	margin-left: 30px;
+	color: #000;
+	font-size: 14px;
+}
+.com_title01 {
+	height: 50px;
+	line-height:50x;
+	width:100%;
+	margin:0 auto;
+	border-bottom:#5078cb 1px dotted;
+}
+.com_title01 span {
+	margin-left:20px;
+	font-size: 14px;
+	line-height: 50px;
+	color: #555;
+	font-weight: bold;
+}
+.com_title01 a{
+	margin-right: 20px;
+	line-height: 50px;
+}
+#company .com-text{
+	height: 35px;
+	line-height: 35px;
+}
+#company .com-text .title{
+	font-size: 14px;
+	font-weight: inherit;
+	color: #323232;
+	width: 120px;
+	padding-left: 20px;
+}
+#company .com-text .content{
+	font-size: 14px;
+	color: #969595;
+}
+#company .logo-load{
+	width: 100px;
+	height: 100px;
+	background: url("static/img/purc/upload.png") no-repeat center;
+	display: inline-block;
+	border: #ccc 1px solid;
+	float: left;
+	margin-left: 0;
+}
+#company .logo-load input{
+	width: 100px !important;
+	height: 100px;
+	filter: alpha(opacity = 0);
+	-moz-opacity: 0;
+	opacity: 0;
+}
+#company .logo-img{
+	height: 100px;
+}
+#company .logo-img .well{
+	float: left;
+	width: 100px;
+	height: 100px;
+	background: #fff;
+}
+#company .input-group-addon{
+	display: inline-block;
+	height: 26px;
+	width: 50px;
+	float: left;
+	margin-top: 5px;
+}
+#company .content{
+	width: 56%;
+	height: 35px;
+}
+#company .form-control{
+	border: #327ebe 1px solid;
+	margin-top: 5px;
+}
+#company .col-xs-4 p{
+	color: #959595;
+}
+#company .col-xs-4 .title{
+	padding: 0;
+}
+#company .row-sm{
+	border-bottom: #e8e8e8 1px solid;
+	padding-bottom: 20px;
+}
+.bule{
+	color: #327ebe;
+	font-size: 14px;
+	padding-left: 20px;
+}
+.save-btn{
+	width: 100%;
+	height: 40px;
+	margin-top: 20px;
+	margin-bottom: 30px;
+}
+.save-btn .btn01{
+	border: 1px;
+	width: 94px;
+	height: 36px;
+	line-height: 36px;
+	font-size: 14px;
+	display: inline-block;
+	text-align: center;
+	float: right;
+	background: #327ebe;
+	color: #fff;
+	margin-right: 20px;
+}
+.com_title01 a.color01{
+	color: #d32526;
+}
+.com_title01 a.color02{
+	color: #3a89d1;
+}
+</style>
+<div class="com_title">设置&gt;企业设置<font>&gt;企业信息</font></div>
+<div class="com_head"><span>企业信息</span></div>
+<div class="pane base-info" id="company">
+	<div class="com_title01"><span>基本信息</span></div>
 	<div class="pane-body">
 		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">企业UU号</span>
-				<div class="content" ng-bind="::enterprise.uu"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">企业名称</span>
-				<div class="content" ng-bind="::enterprise.enName"></div>
-			</div>
-			<div class="col-xs-6">
-				<span class="title">企业简称</span>
-				<div class="content" ng-bind="::enterprise.enShortname"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">营业执照</span>
-				<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
+			<div class="col-xs-8">
+				<div class="com-text col-xs-12">
+					<span class="title">企业UU号：</span>
+					<div class="content" ng-bind="::enterprise.uu"></div>
+				</div>
+				<div class="com-text col-xs-12">
+					<span class="title">企业名称：</span>
+					<div class="content" ng-bind="::enterprise.enName"></div>
+				</div>
+				<div class="com-text col-xs-12">
+					<span class="title">企业简称：</span>
+					<div class="content" ng-bind="::enterprise.enShortname"></div>
+				</div>
+				<div class="com-text col-xs-12">
+					<span class="title">营业执照号：</span>
+					<div class="content" ng-bind="::enterprise.enBussinessCode"></div>
+				</div>
+				<div class="com-text col-xs-12">
+					<span class="title">注册地区：</span>
+					<div class="content" ng-bind="::enterprise.enArea"></div>
+				</div>
 			</div>
-			<div class="col-xs-6">
-				<span class="title">注册地区</span>
-				<div class="content" ng-bind="::enterprise.enArea"></div>
+			<div class="col-xs-4">
+				<div class="com-text col-xs-12">
+					<span class="title">企业LOGO:</span>
+				</div>
+				<div class="logo-img col-xs-12">
+					<div class="well margin-b-0" style="display: none" >
+						<div ng-show="previewShow">
+							<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">
+							<div>
+								&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+							</div>
+						</div>
+						<div ng-show="pdfShow">
+							<img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">
+							&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>
+						</div>
+						<div ng-show="noneFileShow">
+							<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>
+						</div>
+					</div>
+					<span class="logo-load">
+						<input ng-file-select="" ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件" class="ng-valid ng-touched ng-dirty ng-valid-parse">
+					</span>
+				</div>
+				<div class="col-xs-12"><p>提示：请上传大小小于20K的PNG图片</p></div>
 			</div>
 		</div>
 	</div>
-</div>
-<div class="row row-sm">
-	<div class="col-xs-6">
-		<div class="pane base-info">
-			<div class="pane-header">
-				详细信息<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
-					class="fa fa-pencil fa-fw"></i>编辑</a>
-					<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple"><i
-					class="fa fa-reply-all fa-fw"></i>取消</a>
-					<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple"><i
-					class="fa fa-save fa-fw"></i>保存</a>
-			</div>
-			<div class="pane-body">
-				<form name="detailForm">
-					<div class="row row-sm item">
-						<div class="col-xs-12">
-							<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: 240px;">
-							      	<span class="input-group-addon">http://</span>
-									<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs" placeholder="企业官方网站网址">
-								</div>
+	<div class="com_title01"><span>详细信息</span>
+		<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
+			class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
+		<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple color01"><i
+				class="fa fa-reply-all fa-fw"></i>取消</a>
+		<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple  color02"><i
+				class="fa fa-save fa-fw"></i>保存</a>
+	</div>
+	<!--详细信息-->
+	<div class="pane-body">
+		<form name="detailForm">
+			<div class="row row-sm item">
+				<div class="col-xs-12">
+					<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: 240px;">
+								<span class="input-group-addon">http://</span>
+								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 190px;" placeholder="企业官方网站网址">
 							</div>
 						</div>
 					</div>
-					<div class="row row-sm item">
-						<div class="col-xs-12">
-							<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: 240px;">
-									<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
-								</div>
+					<div class="com-text col-xs-6">
+						<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: 240px;">
+								<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
 							</div>
 						</div>
 					</div>
-					<div class="row row-sm item">
-						<div class="col-xs-12">
-							<span class="title"><i class="fa fa-fw fa-map-marker"></i>&nbsp;地&nbsp;址</span>
-							<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enAddress"></div>
-							<div class="content" ng-show="connectionEditing" style="width: 240px;">
-								<input ng-model="enterprise.enAddress" placeholder="详细地址"
-									class="form-control input-xs" type="text" />
-							</div>
+				</div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">成立时间：</span>
+						<div class="content" ng-show="connectionEditing">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="成立时间" />
 						</div>
 					</div>
-					<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">
-								{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}
-							</div>
-							<div class="content" ng-show="connectionEditing">
-								<select ng-model="enterprise.enIndustry" placeholder="所属行业"
-									class="form-control input-xs" type="text" style="width: 240px;">
-									<option value="make">制造型</option>
-					      			<option value="trade">贸易型</option>
-					      		</select>
-							</div>
+					<div class="com-text col-xs-6">
+						<span class="title">员工人数：</span>
+						<div class="content" ng-show="connectionEditing">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="员工人数" />
 						</div>
 					</div>
-				</form>
-			</div>
-		</div>
-	</div>
-	<div class="col-xs-6">
-		<div class="pane base-info">
-			<div class="pane-header">
-				企业管理员<!-- <a href="#" class="pull-right text-simple"><i
-					class="fa fa-pencil fa-fw"></i>编辑</a> -->
-			</div>
-			<div class="pane-body">
-				<div class="row row-sm item">
-					<div class="col-xs-12">
-						<span class="title">姓名</span>
-						<div class="content" ng-bind="::enterprise.admin.userName"></div>
-					</div>
 				</div>
-				<div class="row row-sm item">
-					<div class="col-xs-12">
-						<span class="title">性别</span>
-						<div class="content"
-							>{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">企业电话：</span>
+						<div class="content" ng-show="connectionEditing">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业电话" />
+						</div>
+					</div>
+					<div class="com-text col-xs-6">
+						<span class="title">开户银行：</span>
+						<div class="content" ng-show="connectionEditing">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="开户银行" />
+						</div>
 					</div>
 				</div>
-				<div class="row row-sm item">
-					<div class="col-xs-12">
-						<span class="title">电话</span>
-						<div class="content" ng-bind="::enterprise.admin.userTel"></div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">经营范围：</span>
+						<div class="content" ng-show="connectionEditing">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="经营范围" />
+						</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: 240px;">
+							<input ng-model="enterprise.enAddress" placeholder="详细地址"
+								   class="form-control input-xs" type="text" />
+						</div>
 					</div>
 				</div>
-				<div class="row row-sm item">
-					<div class="col-xs-12">
-						<span class="title">邮箱</span>
-						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">行业：</span>
+						<div ng-show="!connectionEditing" class="content">
+							{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}
+						</div>
+						<div class="content" ng-show="connectionEditing">
+							<select ng-model="enterprise.enIndustry" placeholder="所属行业"
+									class="form-control input-xs" type="text" style="width: 240px;">
+								<option value="make">制造型</option>
+								<option value="trade">贸易型</option>
+							</select>
+						</div>
 					</div>
 				</div>
 			</div>
-		</div>
+		</form>
 	</div>
-</div>
-<div class="pane base-info">
-	<div class="pane-header">
-		优企云服<!-- <a ng-disabled class="pull-right text-simple"><i
-			class="fa fa-pencil fa-fw"></i>编辑</a> -->
+	<div class="com_title01"><span>收货人信息</span>
+		<a ng-show="!connectionEditings" ng-click="connectionEditings = true" class="pull-right text-simple"><i
+				class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
+		<a ng-show="connectionEditings" ng-click="connectionEditings = false" class="pull-right text-simple color01"><i
+				class="fa fa-reply-all fa-fw"></i>取消</a>
+		<a ng-show="connectionEditings" ng-click="updateDetailInfo()" class="pull-right text-simple color02"><i
+				class="fa fa-save fa-fw"></i>保存</a>
 	</div>
+	<!--收货人信息-->
 	<div class="pane-body">
-		<div class="row row-sm item">
-			<div class="col-xs-6">
-				<span class="title">优企云服域名</span>
-				<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 | status}}] </label>
+		<form name="detailForm">
+			<div class="row row-sm item">
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">收货人：</span>
+						<div class="content" ng-show="connectionEditings">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="收货人" />
+						</div>
+					</div>
+					<div class="com-text col-xs-6">
+						<span class="title">手机：</span> <div ng-show="!connectionEditings" class="content"
+															ng-bind="::enterprise.enFax"></div>
+						<div class="content" ng-show="connectionEditings">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="手机" />
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">固定电话：</span>
+						<div class="content" ng-show="connectionEditings">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="固定电话" />
+						</div>
+					</div>
+					<div class="com-text col-xs-6">
+						<span class="title">邮箱：</span>
+						<div class="content" ng-show="connectionEditings">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="邮箱" />
+						</div>
+					</div>
+				</div>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">地址：</span>
+						<div class="content" ng-show="connectionEditings">
+							<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="成立时间" />
+						</div>
 					</div>
-					<div ng-if="!enterprise.enSaasUrl"><a href="https://account.ubtob.com/userspace/applyApp?appId=saas">立即申请</a></div>
 				</div>
 			</div>
-		</div>
-	</div>
-</div>
-<div class="pane base-info">
-	<div class="pane-header">
-		成长历程
-		<div class="pull-right">
-			<!-- <a href="#" class="text-simple"><i class="fa fa-bolt fa-fw"></i>同行PK</a>
-			<a href="#" class="text-simple"><i class="fa fa-code-fork fa-fw"></i>企业诊断</a>
-			<a href="#" class="text-simple"><i class="fa fa-rss fa-fw"></i>寻找合伙人</a> -->
-		</div>
+		</form>
 	</div>
+	<div class="com_title01"><span>企业管理员</span></div>
 	<div class="pane-body">
-		<dl class="events">
-			<dd ng-repeat="grow in growth">
-				<div ng-if="grow.year">
-					<div class="year">
-						<span ng-bind="::grow.year"></span><span class="character">年</span>
+		<form name="detailForm">
+			<div class="row row-sm item">
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">姓名：</span>
+						<div class="content" ng-bind="::enterprise.admin.userName">陈虎</div>
+					</div>
+					<div class="com-text col-xs-6">
+						<span class="title">性别：</span>
+						<div class="content">{{enterprise.admin.userSex === 'F' ? '女' : '男'}}</div>
 					</div>
-					<div class="icon year-icon"></div>
 				</div>
-				<div ng-if="grow.title">
-					<div class="date" ng-bind="::grow.date"></div>
-					<div class="icon">
-						<i class="fa"
-							ng-class="{'fa-user':grow.type=='about-user','fa-shopping-cart':grow.type=='about-order','fa-line-chart':grow.type=='about-sale'}"></i>
+				<div class="col-xs-12">
+					<div class="com-text col-xs-6">
+						<span class="title">电话：</span>
+						<div class="content" ng-bind="::enterprise.admin.userTel"></div>
 					</div>
-					<div class="event">
-						<div class="event_tit-wrapper">
-							<div class="event_tit" ng-bind-html="::grow.title"></div>
-						</div>
-						<div class="event_cnt" ng-if="grow.description">
-							<span ng-bind-html="::grow.description"></span> <a
-								href="#{{::grow.detail}}" target="_blank" class="pull-right"
-								ng-if="grow.detail">详细&gt;&gt;</a>
-						</div>
+					<div class="com-text col-xs-6">
+						<span class="title">邮箱：</span>
+						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
 					</div>
 				</div>
-			</dd>
-		</dl>
+			</div>
+		</form>
+	</div>
+	<div class="com_title01"><span>你拥有的服务</span></div>
+	<div class="pane-body">
+		<div class="row">
+			<div class="col-xs-6"><a href="#" class="bule">B2B商务平台</a></div>
+			<div class="col-xs-6"><a href="#" class="bule">优软商城</a></div>
+		</div>
+	</div>
+	<div class="save-btn">
+		<button class="btn01">保存</button>
 	</div>
 </div>