Browse Source

新增采购PO页面样式调整

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8496 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
commit
5771d4dc1c
1 changed files with 367 additions and 311 deletions
  1. 367 311
      src/main/webapp/resources/tpl/index/purc/addOrder.html

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

@@ -1,335 +1,391 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-	<meta charset="UTF-8"/>
-	<title>B2B商务采购变更-添加</title>
-	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-	<meta name="Keywords" content=""/>
-	<meta name="Description" content=""/>
-	<link rel="stylesheet" href="static/css/add.css "/>
+<meta charset="UTF-8" />
+<title>B2B商务采购变更-添加</title>
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+<meta name="Keywords" content="" />
+<meta name="Description" content="" />
+<link rel="stylesheet" href="static/css/add.css " />
 </head>
 <style>
-    #pub .purc li div span .select02{
-        background: none;
-        -webkit-appearance: inherit;
-        appearance: inherit;
-        -o-appearance: inherit;
-        -moz-appearance: inherit;
-        -ms-appearance: inherit;
-        border: #bfbfbf 1px solid !important;
-        width: 187px;
-    }
-    .dropdown-menu tr td button{
-        border: none;
-    }
-    .oder-change .purc li .dropdown-menu{
-        padding: 0;
-        margin: 0;
-        width: 185px;
-    }
-    .oder-change .purc li .dropdown-menu li{
-        margin-bottom: 0;
-        height: 34px;
-        line-height: 34px;
-    }
-    .oder-change .purc li  .dropdown-menu>li>a{
-        display: inline-block;
-        width: 100%;
-        padding: 0;
-        height: 34px;
-        line-height: 34px;
-        padding-left: 10px;
-    }
-    .dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus{
-        background: #5078cb;
-    }
+#pub .purc li div span .select02 {
+	background: none;
+	-webkit-appearance: inherit;
+	appearance: inherit;
+	-o-appearance: inherit;
+	-moz-appearance: inherit;
+	-ms-appearance: inherit;
+	border: #bfbfbf 1px solid !important;
+	width: 187px;
+}
+
+.dropdown-menu tr td button {
+	border: none;
+}
+
+.oder-change .purc li .dropdown-menu {
+	padding: 0;
+	margin: 0;
+	width: 185px;
+}
+
+.oder-change .purc li .dropdown-menu li {
+	margin-bottom: 0;
+	height: 34px;
+	line-height: 34px;
+}
+
+.oder-change .purc li  .dropdown-menu>li>a {
+	display: inline-block;
+	width: 100%;
+	padding: 0;
+	height: 34px;
+	line-height: 34px;
+	padding-left: 10px;
+}
+
+.dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus
+	{
+	background: #5078cb;
+}
+
+.com_title01 a {
+    float: right;
+    color: #5078cb;
+    font-weight: normal;
+    margin-right: 30px;
+    margin-top: 20px;
+    font-size: 14px;
+}
 </style>
 <body>
-<div class="wrap" id="pub">
-	<div class="content">
-		<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->
-		<div class="com_head"><span>新增采购单</span></div>
-		<!--B2B商务采购变更-添加-->
-        <form class="oder-change clearfix" name="orderForm" id="orderForm">
-            <ul class="purc">
-                <li>
-                    <div class="fl">
-                        <em>流水号:</em>
-                        <span>{{::order.code}}</span>
-                    </div>
-                    <div class="fr">
-                        <em>录入时间:</em>
-                        <span>{{::order.date | date:'yyyy-MM-dd HH:mm:ss'}}</span>
-                    </div>
-                </li>
-                <li>
-                    <div class="fl">
-                        <em>供应商:</em>
-                        <span><input type="text" ng-model="order.cust.enName" placeholder="输入供应商名称" class="bor01" ng-required="true" ng-change="getSimilarVendors(order.cust.enName)"
-                        	name="enName" ng-focus="onFocus('enName')" typeahead="order.vendName for order in getSimilarVendors($viewValue)" autocomplete="off"
-                        	 typeahead-on-select="onAssociateCmpClick($item, order)" spellcheck = "false" style="width: 147px;">
-                        	 <a class="btn" ng-click="dbfindCust()" style="width: 40px;border: #bfbfbf 1px solid !important; border-radius: 0px; margin-left: -5px; margin-top: -3px;"><i class="fa fa-search" aria-hidden="true"></i></a>
-                        </span>
-                    </div>
-                    <div class="fr">
-                        <em>供应商联系人:</em>
-                        <span>
-                            <select class="select01"
+	<div class="wrap" id="pub">
+		<div class="content">
+			<!--<div class="com_title">服务>采购模块>采购单<font>>新增采购单</font></div>-->
+			<div class="com_head">
+				<span>新增采购单</span>
+			</div>
+			<!--B2B商务采购变更-添加-->
+			<form class="oder-change clearfix" name="orderForm" id="orderForm">
+				<ul class="purc">
+					<li>
+						<div class="fl">
+							<em>流水号:</em> <span>{{::order.code}}</span>
+						</div>
+						<div class="fr">
+							<em>录入时间:</em> <span>{{::order.date | date:'yyyy-MM-dd
+								HH:mm:ss'}}</span>
+						</div>
+					</li>
+					<li>
+						<div class="fl">
+							<em>供应商:</em> <span><input type="text"
+								ng-model="order.cust.enName" placeholder="输入供应商名称" class="bor01"
+								ng-required="true"
+								ng-change="getSimilarVendors(order.cust.enName)" name="enName"
+								ng-focus="onFocus('enName')"
+								typeahead="order.vendName for order in getSimilarVendors($viewValue)"
+								autocomplete="off"
+								typeahead-on-select="onAssociateCmpClick($item, order)"
+								spellcheck="false" style="width: 147px;"> <a class="btn"
+								ng-click="dbfindCust()"
+								style="width: 40px; border: #bfbfbf 1px solid !important; border-radius: 0px; margin-left: -5px; margin-top: -3px;"><i
+									class="fa fa-search" aria-hidden="true"></i></a> </span>
+						</div>
+						<div class="fr">
+							<em>供应商联系人:</em> <span> <select class="select01"
 								ng-model="order.vendor" required="required"
 								ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
-								<option value="">请选择供应商联系人</option>
+									<option value="">请选择供应商联系人</option>
+							</select> <a class="add-address" ng-if="id!=null"
+								ng-click="addContact(venduu)">+增加联系人</a>
+							</span>
+						</div>
+					</li>
+					<li>
+						<div class="fl">
+							<em>付款方式:</em> <span> <input ng-model="order.payments"
+								list="paymentmethod" class="select02 wid152"
+								placeholder="选择付款方式" /> <datalist id="paymentmethod">
+									<option value="月结30天">月结30天</option>
+									<option value="月结60天">月结60天</option>
+									<option value="现金支付">现金支付</option>
+								</datalist>
+							</span>
+						</div>
+						<div class="fr">
+							<em>交易币别:</em> <span> <select name=""
+								class="select02 wid100" ng-model="order.currency"
+								ng-init="order.currency = 'RMB'">
+									<option value="RMB">RMB</option>
+									<option value="USD">USD</option>
+									<option value="HKD">HKD</option>
 							</select>
-							<a class="add-address" ng-if="id!=null" ng-click="addContact(venduu)">+增加联系人</a>
-                        </span>
-                    </div>
-                </li>
-                <li>
-                    <div class="fl">
-                        <em>付款方式:</em>
-                        <span>
-                        	 <input  ng-model="order.payments" list="paymentmethod" class="select02 wid152" placeholder="选择付款方式"/>
-                             <datalist id="paymentmethod">
-                             	<option value="月结30天">月结30天</option>
-                                <option value="月结60天">月结60天</option>
-                                <option value="现金支付">现金支付</option>
-                             </datalist>
-                        </span>
-                    </div>
-                    <div class="fr">
-                        <em>交易币别:</em>
-                        <span>
-                            <select name="" class="select02 wid100" ng-model="order.currency" ng-init="order.currency = 'RMB'">
-                                <option value="RMB">RMB</option>
-                                <option value="USD">USD</option>
-                                <option value="HKD">HKD</option>
-                            </select>
-                        </span>
-                    </div>
-                </li>
-                <li>
-                    <div class="fr address">
-                        <em>收货信息:</em>
-                        <span class="fr" required="required">
-                             <select class="select fl" ng-model="order.shipadd" required="required" ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
-								<option value="">请选择收货地址</option>
+							</span>
+						</div>
+					</li>
+					<li>
+						<div class="fr address">
+							<em>收货信息:</em> <span class="fr" required="required"> <select
+								class="select fl" ng-model="order.shipadd" required="required"
+								ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
+									<option value="">请选择收货地址</option>
+							</select> <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
+							</span>
+						</div>
+					</li>
+					<li class="beizhu">
+						<div class="fl">
+							<em>备注:</em> <span><input type="text"
+								ng-model="order.remark" class="bor01" placeholder="请填写备注"
+								style="cursor: pointer; width: 568px;" /></span>
+						</div>
+					</li>
+					<li>
+						<div class="fl">
+							<em>税率:</em> <span class="fl" required="required"
+								ng-if="order.currency == 'RMB'"> <select
+								class="select02 wid100" ng-model="order.rate"
+								required="required">
+									<option value="17">17</option>
+									<option value="0">0</option>
 							</select>
-                            <a href="javascript:void(0);" class="add-address">+新增收货信息</a>
-                        </span>
-                    </div>
-                </li>
-                <li class="beizhu">
-                    <div class="fl">
-                        <em>备注:</em>
-                        <span><input type="text" ng-model="order.remark" class="bor01" placeholder="请填写备注" style="cursor: pointer; width: 568px;"/></span>
-                    </div>
-                </li>
-                 <li>
-                    <div class="fl">
-                        <em>税率:</em>
-                        <span class="fl" required="required" ng-if="order.currency == 'RMB'">
-                             <select class="select02 wid100" ng-model="order.rate" required="required">
-								<option value="17">17</option>
-								<option value="0">0</option>
-							</select>
-                        </span>
-                        <span class="fl" required="required" ng-if="order.currency != 'RMB'">
-                        	<input class="text select02 wid100" value="0" readonly>
-                        </span>
-                    </div>
-                </li>
-            </ul>
-            <div class="com_title01" ng-if="order.orderItems[0].code == null && !order.cust.uu"><span>请先选择供应商</span></div>
-            <div class="com_title01" ng-if="order.orderItems[0].code == null && order.cust.uu"><span>请先选择供应商产品</span>
-            	<a ng-click="uplodaByBatch()">批量导入</a>
-            </div>
-            <div class="com_title01" ng-if="order.orderItems[0].code != null && order.cust.uu"><span>产品信息</span>
-            	<a ng-click="uplodaByBatch()">批量导入</a>
-            </div>
-            <!--产品信息-->
-            <dl ng-if="order.orderItems[0].code != null">
-                <dt>
-                    <b>序号</b>
-                    <b class="wid01">产品信息</b>
-                    <b>单位</b>
-                    <b>数量</b>
-                    <b>单价</b>
-                    <b>税率(%)</b>
-                    <b>交货日期</b>
-                    <b>备注</b>
-                    <b class="wid02">&nbsp;</b>
-                </dt>
-                <dd ng-repeat="item in order.orderItems">
-                    <b>{{$index + 1}}</b>
-                    <b class="wid01">
-                        <p>{{item.code}}</p>
-                        <p>{{item.title}}</p>
-                        <p>{{item.spec}}</p>
-                    </b>
-                    <b>{{item.unit}}</b>
-                     <b><input class="editable" type="text" ng-model="item.qty"  placeholder="数量" style="cursor: pointer;" required="true" ng-pattern="/^(([0-9]+\.[0-9]{1,2})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/"/></b>
-                    <b><input class="editable" type="text" ng-model="item.price" placeholder="单价" style="cursor: pointer;" required="true" ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/"/></b>
-                    <b ng-if="order.currency == 'RMB'"><input class="editable" type="text" ng-model="item.rate" placeholder="税率" style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/"/></b>
-                    <b ng-if="order.currency != 'RMB'"><input class="editable" type="text" style="cursor: pointer;" value="0" readonly="readonly" /></b>
-                    <b>
-						<input ng-model="item.delivery" type="text" class="editable" 
-							placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
-							min-date="getMinDate()" ng-required="true"
-							current-text="今天" clear-text="清除" close-text="关闭"
+							</span> <span class="fl" required="required"
+								ng-if="order.currency != 'RMB'"> <input
+								class="text select02 wid100" value="0" readonly>
+							</span>
+						</div>
+					</li>
+				</ul>
+				<div class="com_title01"
+					ng-if="order.orderItems[0].code == null && !order.cust.uu">
+					<span>请先选择供应商</span>
+				</div>
+				<div class="com_title01"
+					ng-if="order.orderItems[0].code == null && order.cust.uu">
+					<span>请先选择供应商产品</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				</div>
+				<div class="com_title01"
+					ng-if="order.orderItems[0].code != null && order.cust.uu">
+					<span>产品信息</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				</div>
+				<!--产品信息-->
+				<dl ng-if="order.orderItems[0].code != null">
+					<dt>
+						<b>序号</b> <b class="wid01">产品信息</b> <b>单位</b> <b>数量</b> <b>单价</b>
+						<b>税率(%)</b> <b>交货日期</b> <b>备注</b> <b class="wid02">&nbsp;</b>
+					</dt>
+					<dd ng-repeat="item in order.orderItems">
+						<b>{{$index + 1}}</b> <b class="wid01">
+							<p>{{item.code}}</p>
+							<p>{{item.title}}</p>
+							<p>{{item.spec}}</p>
+						</b> <b>{{item.unit}}</b> <b><input class="editable" type="text"
+							ng-model="item.qty" placeholder="数量" style="cursor: pointer;"
+							required="true"
+							ng-pattern="/^(([0-9]+\.[0-9]{1,2})|([0-9]*[1-9][0-9]*\.[0-9]{1,3})|([0-9]*[1-9][0-9]*))$/" /></b>
+						<b><input class="editable" type="text" ng-model="item.price"
+							placeholder="单价" style="cursor: pointer;" required="true"
+							ng-pattern="/^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/" /></b>
+						<b ng-if="order.currency == 'RMB'"><input class="editable"
+							type="text" ng-model="item.rate" placeholder="税率"
+							style="cursor: pointer;" ng-pattern="/^[0-9][0-9]{0,1}$/" /></b> <b
+							ng-if="order.currency != 'RMB'"><input class="editable"
+							type="text" style="cursor: pointer;" value="0"
+							readonly="readonly" /></b> <b> <input ng-model="item.delivery"
+							type="text" class="editable" placeholder="选择时间"
+							datepicker-popup="yyyy-MM-dd" is-open="item.$endDateOpen"
+							min-date="getMinDate()" ng-required="true" current-text="今天"
+							clear-text="清除" close-text="关闭"
 							datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-							ng-focus="openDatePicker($event, item.$endDateOpen)" readonly="readonly"
+							ng-focus="openDatePicker($event, item.$endDateOpen)"
+							readonly="readonly"
 							ng-click="openDatePicker($event, item.$endDateOpen, $index)">
-					</b>
-                    <b class="textMore"><input class="editable" type="text" ng-model="item.remark" placeholder="备注"/></b>
-                    <b class="wid02"><a ng-click="deleteProduct($index)"><i class="fa fa-close"></i></a></b>
-                </dd>
-            </dl>
-            <div class="save" ng-if="order.orderItems[0].code != null">
-           		<button ng-click="addToOrder(order)" ng-disabled="orderForm.$invalid">立即购买</button>
-            	<button ng-click="addToCart(order)" ng-disabled="orderForm.$invalid">添加购物车</button>
-            </div>
-        </form>
-       <!-- 搜索结果列表-->
-        <div class="pro-add-data02" style="min-height: 500px;" ng-if="order.cust.uu">
-			<!--<div class="pro-search">
+						</b> <b class="textMore"><input class="editable" type="text"
+							ng-model="item.remark" placeholder="备注" /></b> <b class="wid02"><a
+							ng-click="deleteProduct($index)"><i class="fa fa-close"></i></a></b>
+					</dd>
+				</dl>
+				<div class="save" ng-if="order.orderItems[0].code != null">
+					<button ng-click="addToOrder(order)"
+						ng-disabled="orderForm.$invalid">立即购买</button>
+					<button ng-click="addToCart(order)"
+						ng-disabled="orderForm.$invalid">添加购物车</button>
+				</div>
+			</form>
+			<!-- 搜索结果列表-->
+			<div class="pro-add-data02" style="min-height: 500px;"
+				ng-if="order.cust.uu">
+				<!--<div class="pro-search">
                  <div class="search-result fl"><img src="static/img/purc/search01.png"/>搜索“{{tip}}”,为您找到<em>{{total}}</em>个结果</div>
                  <div class="search fr">
                      <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" autofocus ng-search="onSearch(keyword)"/>
                      <a class="seek" ng-click="onSearch(keyword)">搜索</a>
                  </div>
              </div>-->
-            <div class="pro-search">
-                <div class="col-xs-2 search-title fl">供应商产品库</div>
-                <div class="col-xs-8 fr">
-                    <div class="col-xs-9 search" style="margin-right: 0;">
-                        <input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword" ng-search="onSearch(keyword)"/>
-                        <a class="seek" ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
-                    </div>
-                    <div class="col-xs-3 result-title fr">搜索到<em>{{total}}</em>条</div>
-                </div>
-            </div>
-			<table class="block table table-default table-striped" ng-table="tableParams">
-				<thead>
-					<tr class="header">
-						<th width="250">名称</th>
-						<th width="160">编号</th>
-						<th>规格</th>
-						<th width="80">单位</th>
-						<th width="80">选择</th>
-					</tr>
-				</thead>
-				<tbody ng-if="tableParams.total() == 0">
-					<tr>
-						<td class="text-center" colspan="7" ng-if="tip != null">
-							<br>
-							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件</div>
-						</td>
-						<td class="text-center" colspan="7" ng-if="tip == null">
-							<br>
-							<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商</div>
-						</td>
-					</tr>
-				</tbody>
-				<tbody>
-					<tr ng-repeat="product in $data">
-						<td class="text-center" ng-bind="::product.title"></td>
-						<td class="text-center" ng-bind="::product.code"></td>
-						<td class="text-center f12" ng-bind="::product.spec"></td>
-						<td class="text-center" ng-bind="::product.unit"></td>
-						<td class="text-center" ><a title="添加" href="javascript:void(0)" ng-click="check(product)" style="text-decoration: none; color: #327ebe;" id="click" class="add01">添加</a>
-						<div class="add-tanchuang">
-		                        <ul>
-		                            <li>
-		                                <div class="fl">数量:</div>
-		                                <div class="fr">
-		                                    <div class="btn-wrap">
-		                                        <span class="number">
-		                                            <a href="###" class="reduce">-</a>
-		                                            <input type="text" value="100">
-		                                            <a href="###" class="add">+</a>
-		                                        </span>
-		                                    </div>
-		                                </div>
-		                            </li>
-		                            <li>
-		                                <div class="fl">交期:</div>
-		                                <div class="fr"><input type="text" class="price-input" value="时间选择"></div>
-		                            </li>
-		                            <li>
-		                                <div class="fl">单价:</div>
-		                                <div class="fr"><input type="text" class="price-input" value="¥1.23"></div>
-		                            </li>
-		                            <li class="add-btn">
-		                                <div class="fl">&nbsp;</div>
-		                                <div class="fr"><a href="javascript:void(0);" class="off">取消</a><a href="javascript:void(0);" class="ok">确认</a></div>
-		                            </li>
-		                        </ul>
-		                    </div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
+				<div class="pro-search">
+					<div class="col-xs-2 search-title fl">供应商产品库</div>
+					<div class="col-xs-8 fr">
+						<div class="col-xs-9 search" style="margin-right: 0;">
+							<input type="text" placeholder="输入供应商物料关键字查询" ng-model="keyword"
+								ng-search="onSearch(keyword)" /> <a class="seek"
+								ng-click="onSearch(keyword)" style="right: inherit;">搜索</a>
+						</div>
+						<div class="col-xs-3 result-title fr">
+							搜索到<em>{{total}}</em>条
+						</div>
+					</div>
+				</div>
+				<table class="block table table-default table-striped"
+					ng-table="tableParams">
+					<thead>
+						<tr class="header">
+							<th width="250">名称</th>
+							<th width="160">编号</th>
+							<th>规格</th>
+							<th width="80">单位</th>
+							<th width="80">选择</th>
+						</tr>
+					</thead>
+					<tbody ng-if="tableParams.total() == 0">
+						<tr>
+							<td class="text-center" colspan="7" ng-if="tip != null"><br>
+								<div class="text-muted" style="font-size: 14px;">
+									<i class="fa fa-spinner"></i> 搜索"{{tip}}"未找到产品信息,请重新输入搜索条件
+								</div></td>
+							<td class="text-center" colspan="7" ng-if="tip == null"><br>
+								<div class="text-muted" style="font-size: 14px;">
+									<i class="fa fa-spinner"></i> 您的供应商还未添加商品信息,请尽快通知供应商
+								</div></td>
+						</tr>
+					</tbody>
+					<tbody>
+						<tr ng-repeat="product in $data">
+							<td class="text-center" ng-bind="::product.title"></td>
+							<td class="text-center" ng-bind="::product.code"></td>
+							<td class="text-center f12" ng-bind="::product.spec"></td>
+							<td class="text-center" ng-bind="::product.unit"></td>
+							<td class="text-center"><a title="添加"
+								href="javascript:void(0)" ng-click="check(product)"
+								style="text-decoration: none; color: #327ebe;" id="click"
+								class="add01">添加</a>
+								<div class="add-tanchuang">
+									<ul>
+										<li>
+											<div class="fl">数量:</div>
+											<div class="fr">
+												<div class="btn-wrap">
+													<span class="number"> <a href="###" class="reduce">-</a>
+														<input type="text" value="100"> <a href="###"
+														class="add">+</a>
+													</span>
+												</div>
+											</div>
+										</li>
+										<li>
+											<div class="fl">交期:</div>
+											<div class="fr">
+												<input type="text" class="price-input" value="时间选择">
+											</div>
+										</li>
+										<li>
+											<div class="fl">单价:</div>
+											<div class="fr">
+												<input type="text" class="price-input" value="¥1.23">
+											</div>
+										</li>
+										<li class="add-btn">
+											<div class="fl">&nbsp;</div>
+											<div class="fr">
+												<a href="javascript:void(0);" class="off">取消</a><a
+													href="javascript:void(0);" class="ok">确认</a>
+											</div>
+										</li>
+									</ul>
+								</div></td>
+						</tr>
+					</tbody>
+				</table>
+			</div>
 		</div>
 	</div>
-</div>
-<!--设置-企业设置-收货地址编辑-->
-<div class="bomb-box" style="display: none">
-    <form class="box04 box" name="shipAddress" id="shipAddress">
-        <i class="off"><img src="static/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" ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/"/></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"  ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/"/></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 href="#" class="btn02">取消</a>
-        </div>
-    </form>
-</div>
-<script src="static/lib/jquery/jquery.min.js"></script>
-<script>
+	<!--设置-企业设置-收货地址编辑-->
+	<div class="bomb-box" style="display: none">
+		<form class="box04 box" name="shipAddress" id="shipAddress">
+			<i class="off"><img src="static/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"
+							ng-pattern="/^[\u4e00-\u9fa5]{1,6}$|^[\dA-Za-z]{1,12}$/" /></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"
+							ng-pattern="/([0-9]{3,4}-)?[0-9]{7,8}/" /></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 href="#" class="btn02">取消</a>
+			</div>
+		</form>
+	</div>
+	<script src="static/lib/jquery/jquery.min.js"></script>
+	<script>
     $(function(){
         /*下拉效果*/
         $('.select p').click(function(e){