Explorar o código

企业资料增加收货人信息

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7726 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq %!s(int64=9) %!d(string=hai) anos
pai
achega
239cfe556a

+ 130 - 37
src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -1,6 +1,7 @@
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
+<link rel="stylesheet" href="static/css/add.css "/>
 <style>
 .com_title {
 	width:100%;
@@ -293,9 +294,35 @@
 			</div>
 		</form>
 	</div>
-	<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>
+	<div class="com_title01"><span>企业管理员</span></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>
+						<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>
+				<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="com-text col-xs-6">
+						<span class="title">邮箱:</span>
+						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
+					</div>
+				</div>
+			</div>
+		</form>
+	</div>
+		<div class="com_title01"><span>收货人信息</span>
+		<a ng-show="!connectionEditings"  class="pull-right add-address" ng-click="">+新增收货人信息</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
@@ -304,69 +331,62 @@
 	<!--收货人信息-->
 	<div class="pane-body">
 		<form name="detailForm">
-			<div class="row row-sm item">
+			<div class="row row-sm item" ng-repeat="ship in ships">
 				<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 class="content">
+							<span ng-bind="ship.receiver"></span>
 						</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="手机" />
+						<span class="title">手机:</span>
+						<div class="content">
+							<span ng-bind="ship.usertel"></span>
 						</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 class="content">
+							<span ng-bind="ship.phone"></span>
 						</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 class="content">
+							<span ng-bind="ship.email"></span>
 						</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 class="content">
+							<span ng-bind="ship.address"></span>
 						</div>
 					</div>
-				</div>
-			</div>
-		</form>
-	</div>
-	<div class="com_title01"><span>企业管理员</span></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>
-						<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>
+						<span class="title">详细地址:</span>
+						<div class="content">
+							<span ng-bind="ship.addressdet"></span>
+						</div>
 					</div>
 				</div>
 				<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>
+						<span class="title">地址别名:</span>
+						<div class="content">
+							<span ng-bind="ship.addalias"></span>
+						</div>
 					</div>
 					<div class="com-text col-xs-6">
-						<span class="title">邮箱:</span>
-						<div class="content" ng-bind="::enterprise.admin.userEmail"></div>
+						<span class="title"></span>
+						<div class="content">
+							<a ng-click="editShip(ship)">编辑</a>
+							<a ng-click="removeShip(ship.id, $index)">删除</a>
+						</div>
 					</div>
 				</div>
 			</div>
@@ -380,6 +400,79 @@
 		</div>
 	</div>
 	<div class="save-btn">
-		<button class="btn01">保存</button>
+		<!-- <button class="btn01">保存</button> -->
 	</div>
-</div>
+</div>
+<div class="bomb-box" style="display: none">
+    <form class="box04 box" name="shipAddress" id="shipAddress">
+        <i class="off"><img src="resources/img/purc/close.png" alt="" /></i>
+        <p>收货人资料</p>
+        <ul>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">收货人<em>*</em>:</span>
+                    <span class="fr"><input type="text" placeholder="填写收货人" ng-model="ship.receiver" required="true"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">手机<em>*</em>:</span>
+                    <span class="fr"><input type="text" ng-model="ship.usertel" required="true" ng-pattern="/^1(3|4|5|7|8)\d{9}$/"/></span>
+                </div>
+            </li>
+            <li class="line01">
+                <div class="fl">
+                    <span class="fl">固定电话<em></em>:</span>
+                    <span class="fr"><input type="text" ng-model="ship.phone"/></span>
+                </div>
+                <div class="fr">
+                    <span class="fl">邮箱:</span>
+                    <span class="fr emaill"><input type="text" ng-model="ship.email" ng-pattern="/^(\w-*\.*)+@(\w-?)+(\.\w{2,})+$/"/><i>用于接收订单提醒邮件,便于您及时了解订单状态</i></span>
+                </div>
+            </li>
+            <li class="line02 margin-top40">
+                <div class="fl">所在地址<em>*</em>:</div>
+                <!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
+				 <div class="select fr">
+                    <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
+                            ng-change="ship.city='';ship.district='';" required="true">  
+                        <option value="">省</option>  
+                    </select>
+                    <select class="area-select" ng-model="ship.city" ng-options="key as key for (key,value) in provinces[ship.province]"
+                            ng-change="ship.district='';" required="true">  
+                        <option value="">市</option>  
+                    </select>
+                    <select class="area-select" ng-model="ship.district" ng-options="value as value for value in provinces[ship.province][ship.city]" required="true">
+                        <option value="">区</option>  
+                    </select>  
+				</div>
+            </li>
+            <li class="line02">
+                <div class="fl">详细地址<em>*</em>:</div>
+                <div class="fr"><input type="text" ng-model="ship.addressdet" required="true"/></div>
+            </li>
+            <li class="line02">
+                <div class="fl">地址别名:</div>
+                <div class="fr address"><input type="text" ng-model="ship.addalias"/><i>建议填写常用名称:家里/父母家/公司</i></div>
+            </li>
+        </ul>
+        <div class="many-file-btn">
+            <button class="btn01" ng-click="saveShipAddress(ship)" ng-disabled="shipAddress.$invalid">保存</button><a class="btn02" ng-click="">取消</a>
+        </div>
+    </form>
+</div>
+<script src="static/lib/jquery/jquery.min.js"></script>
+<script>
+    $(function(){
+        //新增收货地址
+        $(".com_title01 .add-address").click(function(){
+        	document.getElementById('shipAddress').reset();
+            $(".bomb-box").show();
+        });
+        $(".bomb-box .box04 .off,.box04 .many-file-btn .btn02").click(function(){
+            $(".bomb-box").hide();
+        })
+         $(".bomb-box .box04 .off,.box04 .many-file-btn .btn01").click(function(){
+            $(".bomb-box").hide();
+        })
+        
+    })
+</script>

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -208,7 +208,7 @@
 <div class="bomb-box" style="display: none">
     <form class="box04 box" name="shipAddress" id="shipAddress">
         <i class="off"><img src="resources/img/purc/close.png" alt="" /></i>
-        <p>人资料</p>
+        <p>收货人资料</p>
         <ul>
             <li class="line01">
                 <div class="fl">