Browse Source

feat(order):新增帝显旧物料显示

Hu Jie 7 years ago
parent
commit
e6c7dd36cd

+ 6 - 3
src/main/webapp/resources/view/usercenter/b2b/Purc/order_detail.html

@@ -310,9 +310,12 @@
 						<div class="text-muted text-over" title="{{::item.product.spec}}" style="font-size: 14px">
 							物料规格:{{::item.product.spec}}
 						</div>
-						<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
-						<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>
+						<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号:</b><div ng-bind="::item.prodOldCode"></div></div>
+						<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称:</b><div ng-bind="::item.prodOldTitle"></div></div>
+						<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格:</b><div ng-bind="::item.prodOldSpec"></div></div>
+						<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
+						<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂:</b><div ng-bind="::item.factory"></div></div>
+						<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注:</b><div ng-bind="::item.remark"></div></div>
 					</td>
 					<td class="text-center" width="110">
 						<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>

+ 6 - 3
src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -784,9 +784,12 @@
 				</div>
 				<div class="text-muted text-over"
 					 title="{{::item.product.spec}}"><b class="text-muted01">物料规格:</b><span ng-bind="::item.product.spec"></span></div>
-				<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><span ng-bind="::item.vendspec"></span></div>
-				<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>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号:</b><div ng-bind="::item.prodOldCode"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称:</b><div ng-bind="::item.prodOldTitle"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格:</b><div ng-bind="::item.prodOldSpec"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂:</b><div ng-bind="::item.factory"></div></div>
+				<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注:</b><div ng-bind="::item.remark"></div></div>
 			</td>
 			<td class="text-center">
 				<div ng-if="item.repProdCode" class="dropdown">

+ 4 - 1
src/main/webapp/resources/view/vendor/b2b/change/sale_order_details.html

@@ -332,7 +332,10 @@
             <div class="text-muted text-over text-overflow" style="color: #666 !important;">
               <span>物料规格:</span><span  ng-bind="::item.product.spec" title="{{::item.product.spec}}"></span>
             </div>
-            <div class="text-muted text-bold text-overflow f14" ng-if="item.vendspec" title="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
+            <div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号:</b><span ng-bind="::item.prodOldCode"></span></div>
+            <div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称:</b><span ng-bind="::item.prodOldTitle"></span></div>
+            <div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格:</b><span ng-bind="::item.prodOldSpec"></span></div>
+            <div class="text-bold text-inverse text-flow f14" ng-if="item.vendspec" title="item.vendspec"><span ng-bind="::item.vendspec"></span></div>
             <div class="text-bold text-inverse text-flow f14" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂:</b><span ng-bind="::item.factory"></span></div>
             <div class="text-bold text-inverse text-flow f14" ng-if="item.remark" title="{{item.remark}}"><b>备注:</b><span ng-bind="::item.remark"></span></div>
             <div ng-repeat="att in item.attachs" class="text-bold text-bold text-overflow f14">

+ 4 - 1
src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -410,10 +410,13 @@
 						物料规格:
 						<span ng-bind="::item.product.spec"></span>
 					</div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.prodOldCode" ><b>旧料编号:</b><div ng-bind="::item.prodOldCode"></div></div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.prodOldTitle" ><b>旧料名称:</b><div ng-bind="::item.prodOldTitle"></div></div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.prodOldSpec" ><b>旧料规格:</b><div ng-bind="::item.prodOldSpec"></div></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.custPurchaseCode" ><b>客户采购单号:</b><div ng-bind="::item.custPurchaseCode"></div></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustName" ><b>收货客户:</b><div ng-bind="::item.acceptCustName"></div></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.acceptCustAddress" ><b>客户收货地址:</b><div ng-bind="::item.acceptCustAddress"></div></div>
-					<div class="text-muted text-bold text-overflow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
+					<div class="text-bold text-inverse text-flow" ng-if="item.vendspec" title="{{item.vendspec}}"><div ng-bind="::item.vendspec"></div></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.factory" title="{{item.factory}}"><b>送货工厂:</b><div ng-bind="::item.factory"></div></div>
 					<div class="text-bold text-inverse text-flow" ng-if="item.remark" title="{{item.remark}}"><b>备注:</b><div ng-bind="::item.remark"></div></div>
 				</td>