Browse Source

fix(order,notice):替代料显示样式调整

Hu Jie 7 years ago
parent
commit
8db80e64d1

+ 7 - 4
src/main/webapp/resources/tpl/index/purc/order.html

@@ -184,6 +184,9 @@
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
+.auto-row {
+	width: 270px;word-wrap:break-word;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -410,20 +413,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>

+ 8 - 4
src/main/webapp/resources/tpl/index/sale/notice.html

@@ -7,6 +7,10 @@
         border-bottom: 1px solid #e8e8e8;
     }
 
+    .auto-row {
+        width: 270px;word-wrap:break-word;
+    }
+
     .order-table .sep-row {
         height: 10px;
     }
@@ -395,20 +399,20 @@
                 <div ng-if="notice.orderItem.repProdCode" class="dropdown">
                     <a href="javascript:void(0);" class="dropdown-toggle text-default"
                        ng-mouseover="getRepProd(notice.orderItem)">替代物料<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="notice.orderItem.repProdCode != null">
+                                    <div class="text-muted auto-row" ng-if="notice.orderItem.repProdCode != null">
                                         <div class="text-bold text-inverse text-flow">替代料号:</div>{{::notice.orderItem.repProdCode}}
                                     </div>
                                 </li>
                                 <li >
-                                    <div class="text-muted" ng-if="notice.orderItem.repProdTitle != null">
+                                    <div class="text-muted auto-row" ng-if="notice.orderItem.repProdTitle != null">
                                         <div class="text-bold text-inverse text-flow">替代料名称:</div>{{::notice.orderItem.repProdTitle}}</div>
                                 </li>
                                 <li >
-                                    <div class="text-muted" ng-if="notice.orderItem.repProdSpec != null">
+                                    <div class="text-muted auto-row" ng-if="notice.orderItem.repProdSpec != null">
                                         <div class="text-bold text-inverse text-flow">替代料规格:</div>{{::notice.orderItem.repProdSpec}}</div>
                                 </li>
                             </ul>

+ 11 - 9
src/main/webapp/resources/tpl/index/sale/order.html

@@ -4,7 +4,9 @@
 	height: 36px;
 	opacity: 1;
 }
-
+.auto-row {
+	width: 270px;word-wrap:break-word;
+}
 .condition .more .form-group {
 	/*margin-bottom: 10px;*/
 }
@@ -409,28 +411,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-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">
+				<div ng-if="item.repProdCode" class="dropdown" ng-class="text-center">
 					<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>