feat(order):采购订单和销售订单替代物料展示

src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -691,6 +691,7 @@
 		<thead>
 		<tr class="header">
 			<th>物料</th>
+			<th width="120"></th>
 			<th width="80">含税单价</th>
 			<th width="100">税率</th>
 			<th width="100">数量</th>
@@ -701,7 +702,7 @@
 		</thead>
 		<tbody ng-if="tableParams.total() == 0">
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty">
 					<div class="left_img">
 						<a><img src="static/img/all/empty-cart.png"></a>
@@ -714,7 +715,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td colspan="7">
+			<td colspan="8">
 				<div id="empty_info">
 					<div class="f16 text-center empty_title">
 						<p>为什么我没有采购订单？</p>
@@ -739,7 +740,7 @@
 		</tbody>
 		<tbody ng-repeat="order in $data track by order.id">
 		<tr class="order-hd" ng-dblclick="order.$collapsed=!order.$collapsed" ng-class="{'text-bold': order.display>0}">
-			<td class="first" colspan="4" style="border: 0">
+			<td class="first" colspan="5" style="border: 0">
 				<div class="order-main">
 					<span class="no-circle-icon icon" ng-if="isUnread(order.id)" title="标记为未查看">未读</span>
 					<span class="circle-icon icon" ng-if="!isUnread(order.id)" title="标记为已查看">已读</span>
@@ -785,6 +786,31 @@
 				<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
 				<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
 			</td>
+			<td class="text-center">
+				<div ng-if="item.repProdCode" class="dropdown">
+					<a href="javascript:void(0);" class="dropdown-toggle text-default"
+					   ng-mouseover="getRepProd(item)">替代物料<i class="fa fa-fw fa-angle-down"></i></a>
+					<div class="dropdown-menu pane" style="width: 270px;">
+						<div class="pane-body">
+							<ul class="list-unstyled list-menu">
+								<li >
+									<div class="text-muted" ng-if="item.repProdCode != null">
+										<div class="text-bold text-inverse text-flow">替代料号：</div>{{::item.repProdCode}}
+									</div>
+								</li>
+								<li >
+									<div class="text-muted" ng-if="item.repProdTitle != null">
+										<div class="text-bold text-inverse text-flow">替代料名称：</div>{{::item.repProdTitle}}</div>
+								</li>
+								<li >
+									<div class="text-muted" ng-if="item.repProdSpec != null">
+										<div class="text-bold text-inverse text-flow">替代料规格：</div>{{::item.repProdSpec}}</div>
+								</li>
+							</ul>
+						</div>
+					</div>
+				</div>
+			</td>
 			<td class="text-center">
 				<div ng-if="!isUser" class="text-num text-red" ng-bind="::item.price | number:6"></div>
 			</td>

src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -288,12 +288,13 @@
 		<table class="order-table table public-tab block" ng-table="tableParams">
 			<thead>
 			<tr class="header">
-				<th width="400">产品</th>
+				<th width="300">产品</th>
+				<th width="140"></th>
 				<th width="100">单价</th>
 				<th width="100">数量</th>
 				<th width="120">交货日期</th>
 				<th width="180">单据状态</th>
-				<th width="100">操作</th>
+				<th width="120">操作</th>
 			</tr>
 			<tr class="toolbar toolbar-top">
 				<td colspan="5">
@@ -316,7 +317,7 @@
 			</thead>
 			<tbody ng-if="tableParams.total() == 0">
 			<tr>
-				<td colspan="6">
+				<td colspan="7">
 					<div id="empty">
 						<div class="left_img">
 							<a><img src="static/img/all/empty-cart.png"></a>
@@ -329,7 +330,7 @@
 				</td>
 			</tr>
 			<tr>
-				<td colspan="6">
+				<td colspan="7">
 					<div id="empty_info">
 						<div class="f16 text-center empty_title">
 							<p>为什么我没有接收到客户的采购订单？</p>
@@ -373,11 +374,11 @@
 						<span class="text-num text-bold">订单号：<a class="text-num order-detail" ng-bind="::order.code" ui-sref="sale_order_detail({id:order.id})" target="_self" title="查看详情" ng-click="setOrdersRead(order.id)"></a></span>
 					</div>
 				</td>
-				<td ng-if="!isUser" colspan="1" class="order-sum">{{::order.currency}}： <span
+				<td ng-if="!isUser" colspan="2" class="order-sum">{{::order.currency}}： <span
 						ng-bind="getOrderTotal(order.orderItems) | number : 2"
 						class="text-num text-bold"></span>
 				</td>
-				<td ng-if="isUser" colspan="1" class="order-sum"></td>
+				<td ng-if="isUser" colspan="2" class="order-sum"></td>
 				<td colspan="1" class="text-center">
 					<span ng-if="order.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #5D6C79">已打印</span>
 					<span ng-if="!order.print" class="label ng-scope operates-status" style="margin-right: 5px;background-color: #CA3955">未打印</span>
@@ -393,11 +394,11 @@
 				ng-if="!order.$collapsed ">
 				<td class="product">
 					<div class="text-num order-number" ng-class="{'key': item.key&&order.$showAll}" title="第{{::item.number}}行">{{::item.number}}</div>
-					<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
+					<div class="text-num text-bold text-overflow text-over" title="{{::item.product.code}}">
 						物料编号：
 						<span ng-bind="::item.product.code"></span>
 					</div>
-					<div class="text-overflow" title="{{::item.product.title}}">
+					<div class="text-overflow text-over" title="{{::item.product.title}}">
 						物料名称：
 						<span ng-bind="::item.product.title"></span>
 					</div>
@@ -412,6 +413,31 @@
 					<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂：</b><span ng-bind="::item.factory"></span></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注：</b><span ng-bind="::item.remark"></span></div>
 				</td>
+				<td class="text-center">
+					<div ng-if="item.repProdCode" class="dropdown">
+						<a href="javascript:void(0);" class="dropdown-toggle text-default"
+						   ng-mouseover="getRepProd(item)">替代物料<i class="fa fa-fw fa-angle-down"></i></a>
+						<div class="dropdown-menu pane" style="width: 270px;">
+							<div class="pane-body">
+								<ul class="list-unstyled list-menu">
+									<li >
+										<div class="text-muted" ng-if="item.repProdCode != null">
+											<div class="text-bold text-inverse text-flow">替代料号：</div>{{::item.repProdCode}}
+										</div>
+									</li>
+									<li >
+										<div class="text-muted" ng-if="item.repProdTitle != null">
+											<div class="text-bold text-inverse text-flow">替代料名称：</div>{{::item.repProdTitle}}</div>
+									</li>
+									<li >
+										<div class="text-muted" ng-if="item.repProdSpec != null">
+											<div class="text-bold text-inverse text-flow">替代料规格：</div>{{::item.repProdSpec}}</div>
+									</li>
+								</ul>
+							</div>
+						</div>
+					</div>
+				</td>
 				<td class="text-center">
 					<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>
 					<div class="text-muted">税率：{{::item.taxrate || 0}}%</div>