Browse Source

fix(order):替代料样式调整

Hu Jie 7 years ago
parent
commit
7435c55923

+ 7 - 5
src/main/webapp/resources/view/usercenter/b2b/order/usercenter_order.html

@@ -4,7 +4,9 @@
 		height: 36px;
 		opacity: 1;
 	}
-
+	.auto-row {
+		width: 270px;word-wrap:break-word;
+	}
 	.condition .more .form-group {
 		margin-bottom: 0;
 	}
@@ -790,20 +792,20 @@
 				<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="dropdown-menu pane" style="width: 300px;">
 						<div class="pane-body">
 							<ul class="list-unstyled list-menu">
 								<li >
-									<div class="text-muted" ng-if="item.repProdCode != null">
+									<div class="text-muted auto-row" 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-muted auto-row" 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-muted auto-row" ng-if="item.repProdSpec != null">
 										<div class="text-bold text-inverse text-flow">替代料规格:</div>{{::item.repProdSpec}}</div>
 								</li>
 							</ul>

+ 14 - 10
src/main/webapp/resources/view/vendor/b2b/sale_order.html

@@ -9,6 +9,10 @@
 		height: 38px;
 	}
 
+	.auto-row {
+		width: 270px;word-wrap:break-word;
+	}
+
 	.toolbar label {
 		margin-right: 10px;
 		margin-bottom: 0;
@@ -409,28 +413,28 @@
 					<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}}"><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-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.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">
 						<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="dropdown-menu pane" style="width: 300px;">
 							<div class="pane-body">
 								<ul class="list-unstyled list-menu">
-									<li >
-										<div class="text-muted" ng-if="item.repProdCode != null">
+									<li>
+										<div class="text-muted auto-row" 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">
+									<li>
+										<div class="text-muted auto-row" 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">
+									<li>
+										<div class="text-muted auto-row" ng-if="item.repProdSpec != null">
 											<div class="text-bold text-inverse text-flow">替代料规格:</div>{{::item.repProdSpec}}</div>
 									</li>
 								</ul>