平台新增采购单的方法更新

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

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

@@ -32,14 +32,14 @@
 		<thead>
 			<th width="80px;">用户UU</th>
 			<th width="100px;">用户名称</th>
-			<th width="40px;" style="text-align: center"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll(isChangedAll);isChangedAll = !isChangedAll"></th>
+			<th width="40px;" style="text-align: center"><input type="checkbox" name="checkbox" ng-model="checkboxes.checked" ng-click="checkAll();"></th>
 		</thead>
 		<tbody>
 				<div style="overflow-y:scroll; width:100%;max-height:500px">			
 					<tr ng-repeat="user in userinfos| filter: keyword">
 						<td width="80px;">{{user.userUU}}</td>
 						<td width="100px;">{{user.userName}}</td>
-						<td width="40px;" style="text-align: center"><input ng-model="user.distribute" name="checkbox" ng-click="checkOne(user, user.$isChanged, $index); user.$isChanged=!user.$isChanged" type="checkbox"></td>
+						<td width="40px;" style="text-align: center"><input ng-model="user.distribute" name="checkbox" ng-click="checkOne()" type="checkbox"></td>
 					</tr>
 				</div>
 		<tbody>

src/main/webapp/resources/tpl/index/fa/apCheckList.html

@@ -279,8 +279,7 @@
 					</tr>
 				</table>
 			</div>
-			<div style="padding: 10px 20px" ng-show="totalMoney!=0">总金额合计：{{totalMoney
-				| number:2}}</div>
+			<div style="padding: 10px 20px" ng-show="totalMoney!=0">总金额合计：{{totalMoney | number:2}}</div>
 		</div>
 	</div>
 </div>

src/main/webapp/resources/tpl/index/purc/addOrder.html

@@ -89,7 +89,7 @@
 								autocomplete="off"
 								typeahead-on-select="onAssociateCmpClick($item, order)"
 								spellcheck="false" style="width: 147px;"> <a class="btn"
-								ng-click="dbfindCust()"
+								ng-click="dbfindVend()"
 								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>
@@ -189,7 +189,7 @@
 							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="税率"
+							type="text" ng-model="item.taxrate" 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"

src/main/webapp/resources/tpl/index/purc/cart.html

@@ -191,24 +191,24 @@
 			</td>
 		</tr>
 	</tbody>
-	<tbody ng-repeat="cart in $data| orderBy : '-date' track by cart.id">
-		<tr class="cart-hd" ng-dblclick="cart.$collapsed=!cart.$collapsed" ng-class="{'text-bold': cart.display>0}">
-			<td class="first">供应商：<a class="text-bold" ng-bind="::cart.receiveName" href="#/purc/cart/{{cart.id}}"></a></td>
-			<td colspan="3">录单人：<span class="text-bold" ng-bind="::cart.recorder"></span>（<span class="text-num text-bold"
-					ng-bind="::cart.date | date:'yyyy-MM-dd'"></span> ）</td>
-			<td colspan="1" class="cart-sum">{{::cart.currency}}： <span
-				ng-bind="getCartTotal(cart.cartDetails) | number : 2"
+	<tbody ng-repeat="order in $data| orderBy : '-date' track by cart.id">
+		<tr class="cart-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': cart.display>0}">
+			<td class="first">供应商：<a class="text-bold" ng-bind="::order.receiveName" href="#/purc/cart/{{order.id}}"></a></td>
+			<td colspan="3">录单人：<span class="text-bold" ng-bind="::order.recorder"></span>（<span class="text-num text-bold"
+					ng-bind="::order.date | date:'yyyy-MM-dd'"></span> ）</td>
+			<td colspan="1" class="cart-sum">{{::order.currency}}： <span
+				ng-bind="getCartTotal(order.orderItems) | number : 2"
 				class="text-num text-bold"></span>
 			</td>
 			<td colspan="2" class="text-center">
-				<a class="label label-success" ng-click="addtoOrder(cart.id)">提交</a>
-				<a class="label label-danger" ng-click="deleteCart(cart.id)">删除</a>
+				<a class="label label-success" ng-click="addtoOrder(order.id)">提交</a>
+				<a class="label label-danger" ng-click="deleteCart(order.id)">删除</a>
 			</td>
 		</tr>
-		<tr class="cart-bd" ng-repeat="detail in cart.cartDetails track by detail.id"
+		<tr class="cart-bd" ng-repeat="detail in order.orderItems track by detail.id"
 			ng-if="!cart.$collapsed "><!-- && (!searchFilterXls.keyword || detail.key || cart.$showAll) -->
 			<td class="product">
-				<div class="text-num cart-number" ng-class="{'key': detail.key&&cart.$showAll}" title="第{{::detail.number}}行">{{::detail.number}}</div>
+				<div class="text-num cart-number" ng-class="{'key': detail.key&&order.$showAll}" title="第{{::detail.number}}行">{{::detail.number}}</div>
 				<div class="text-num text-bold">
 					<span ng-bind="::detail.product.code"></span>
 				</div>

src/main/webapp/resources/tpl/index/purc/cart_detail.html

@@ -1,119 +1,433 @@
-<div class="loading" ng-class="{'in': loading}">
-	<i></i>
-</div>
-<div class="pane base-info" id="order-detail-list">
-	<div class="pub-com_head">
-		<span>购物车</span>
-		<div class="p-right">
-			<!-- <a ng-click="print(cart)" class="pull-right text-simple"><i
-			class="fa fa-print fa-fw"></i>打印</a> -->
-		</div>
-	</div>
-	<div class="pane-body">
-		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">购物车信息</span>&nbsp;
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-5">
-				<span class="title">供应商</span>
-				<div class="content" ng-bind="::cart.receiveName"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">日期</span>
-				<div class="content" ng-bind="::cart.date | date:'yyyy-MM-dd'"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">录单人</span>
-				<div class="content" ng-bind="::cart.recorder"></div>
-			</div>
-		</div>
-		<div class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">币别</span>
-				<div class="content" ng-bind="::cart.currency"></div>
+<!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 " />
+</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;
+}
+
+.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>
-			<div class="col-xs-3">
-				<span class="title">金额</span>
-				<div class="content" ng-bind="::cart.total| number:2"></div>
-			</div>
-			<div class="col-xs-3">
-				<span class="title">汇率</span>
-				<div class="content" ng-bind="::cart.rate"></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>{{order.receiveName}}
+						</div>
+						<div class="fr">
+							<em>供应商联系人：</em>
+							<span> 
+								<select class="select01" ng-model="order.vendor"
+									ng-options="(contact.venduser + '' + contact.tel) for contact in contacts">
+										<option value="">{{order.venduser}}</option>
+								</select> 
+								<a class="add-address" ng-if="order.vendUU != 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 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"> 
+								<select class="select fl" ng-model="order.shipadd"
+									ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">
+									<option value="">{{order.shipAddress}}</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.length == 0 && order.receiveCode">
+					<span>请先选择供应商产品</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				</div>
+				<div class="com_title01"
+					ng-if="order.orderItems.length > 0 && order.receiveCode">
+					<span>产品信息</span> <a ng-click="uplodaByBatch()">批量导入</a>
+				</div>
+				<!--产品信息-->
+				<dl ng-if="order.orderItems.length > 0">
+					<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" ng-if="item.id != null">
+							<p>{{item.product.code}}</p>
+							<p>{{item.product.title}}</p>
+							<p>{{item.product.spec}}</p>
+						</b> 
+						<b class="wid01" ng-if="item.id == null">
+							<p>{{item.code}}</p>
+							<p>{{item.title}}</p>
+							<p>{{item.spec}}</p>
+						</b> 
+						<b ng-if="item.id != null">{{item.product.unit}}</b> 
+						<b ng-if="item.id == null">{{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.taxrate" 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-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, item.id)"><i class="fa fa-close"></i></a></b>
+					</dd>
+				</dl>
+				<div class="save" ng-if="order.orderItems[0].code != null || order.orderItems[0].product.code != null ">
+					<button ng-click="addToOrder(order)"
+						ng-disabled="orderForm.$invalid || savetoOrder">立即购买</button>
+					<button ng-click="addToCart(order)"
+						ng-disabled="orderForm.$invalid || savetoCart">添加购物车</button>
+				</div>
+			</form>
+			<!-- 搜索结果列表-->
+			<div class="pro-add-data02" style="min-height: 500px;"
+				ng-if="order.receiveCode">
+				<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 class="row row-sm item">
-			<div class="col-xs-3">
-				<span class="title">支付方式</span>
-				<div class="content" ng-bind="::cart.payments"></div>
-			</div>
-			<div class="col-xs-9">
-				<span class="title">交货地址</span>
-				<div class="content-hide content" ng-bind="::cart.shipAddress"></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>
-		</div>
-		<div class="title-div" style="border-bottom: 1px dashed #327ebe;">
-			<span class="f14">商品清单</span>&nbsp;
-		</div>
-		<div class="block">
-			<table class="block table table-default table-striped table-hover">
-				<thead>
-					<tr class="header">
-						<th width="50">行号</th>
-						<th>商品</th>
-						<th width="100">单价</th>
-						<th width="100">数量</th>
-						<th width="120">交货日期</th>
-						<th width="180">备注</th>
-						<th width="100">操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					<tr ng-repeat="item in cart.cartDetails track by item.id">
-						<td class="text-center text-num text-bold f-16 text-success">
-							<span ng-bind="::item.number"></span>
-						</td>
-						<td>
-							<div class="text-num text-bold">
-								<span ng-bind="::item.product.code"></span>
-							</div>
-							<div>
-								<span ng-bind="::item.product.title"></span>
-							</div>
-							<div class="text-muted" ng-bind="::item.product.spec"></div>
-							<div class="text-muted text-bold" ng-if="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
-							<div class="text-bold text-inverse" ng-if="item.factory">送货工厂：<span ng-bind="::item.factory"></span></div>
-						</td>
-						<td class="text-center">
-							<div class="text-num" ng-bind="::item.price | number:6"></div>
-							<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>
-						</td>
-						<td class="text-center">
-							<div class="text-num" ng-bind="::item.qty"></div>
-							<div class="text-muted" ng-bind="::item.product.unit"></div>
-							<div style="margin: 0 auto" ng-if="item.$editing">
-								<input type="text" ng-model="item.reply.qty" min="0" max="{{item.qty}}"
-									ng-init="item.reply.qty=item.qty-item.replyQty"
-									class="form-control input-xs" placeholder="0~{{item.qty-item.replyQty}}">
-							</div>
-						</td>
-						<td class="text-center">
-							<div class="text-num"
-								ng-bind="::item.delivery | date:'yyyy-MM-dd'">
-							</div>
-						</td>
-						<td>
-							<div ng-bind="::item.remark">
-							</div>
-						</td>
-						<td class="text-center">
-							<a class="btn btn-sm btn-danger" ng-click="deleteDetail(item.id)">删除</a>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-		</div>
-		<div class="text-center">
-			<a class="btn btn-sm btn-success" ng-click="addtoOrder(cart.id)">提交</a> <a class="btn btn-sm btn-danger" ng-click="deleteCart(cart.id)">清空</a>
-		</div>
+		</form>
 	</div>
-</div>
+	<script src="static/lib/jquery/jquery.min.js"></script>
+	<script>
+    $(function(){
+        /*下拉效果*/
+        $('.select p').click(function(e){
+            $('.select').toggleClass('open');
+            e.stopPropagation();
+        });
+        $('.select ul li').click(function(e){
+            var title=$(this).html();
+            $('.select p').html(title);
+            $(this).addClass('selected').siblings().removeClass('selected');
+            $('.select').removeClass('open');
+            e.stopPropagation();
+        });
+        $(document).click(function(){
+            $('.select').removeClass('open');
+        })
+        /*鼠标移动上去删除*/
+        $('.oder-change dl dd').hover(function(){
+            $(this).find('a').toggle();
+        });
+        /*点击添加弹出框*/
+        $(".pro-add-data02 .add01").click(function(){
+            $(".add-tanchuang").show();
+            $(this).parents("dd").addClass("active").siblings().removeClass("active");
+        });
+        $(".add-tanchuang a.off").click(function(){
+            $(this).parents(".add-tanchuang").hide();
+            $(this).parents(".pro-add-data02").find("dd").removeClass("active");
+        });
+        //增加数量
+        $(document).on('click','.add-tanchuang .btn-wrap span.number a.add',function () {
+            var sum = parseInt($(this).prev().val())+1;
+            $(this).prev().val(sum)
+        });
+        //减少数量
+        $(document).on('click','.add-tanchuang .btn-wrap span.number a.reduce',function () {
+            var sum = parseInt($(this).next().val())-1;
+            $(this).next().val(sum);
+        });
+        //新增收货地址
+        $(".oder-change ul li .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>
+</body>
+</html>

src/main/webapp/resources/tpl/index/purc/order.html

@@ -332,6 +332,7 @@
 				<div class="operates">
 					<a ng-click="custPrint(order)" title="打印{{order.custPrint? '(已打印)':'(未打印)'}}" ng-class="{'unPrinted' : !order.custPrint, 'text-muted': order.custPrint}"><i
 							class="fa fa-print fa-lg"></i></a></a>
+					<a ng-click="copyorder(order.id)">复制</a>
 				</div>
 			</td>
 		</tr>