客户采购订单样式调整

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

@@ -158,6 +158,31 @@
 	color: #fff;
 	font-weight: inherit;
 	top: -2px;
+}
+	.order-table .product div.text-over {
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+.order-table .product div.text-flow b{
+	float: left;
+}
+.order-table .product div.text-flow span{
+	float: left;
+	display: inline-block;
+	width: 290px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+.order-table .product div.text-overflow span{
+	float: left;
+	display: inline-block;
+	width: 340px;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
 }
 </style>
 <link rel="stylesheet" href="static/css/public.css">
@@ -361,17 +386,18 @@
 			ng-if="!order.$collapsed "><!-- && (!searchFilterXls.keyword || item.key || order.$showAll) -->
 			<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">
+				<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
 					<span ng-bind="::item.product.code"></span>
 				</div>
-				<div>
+				<div class="text-overflow" title="{{::item.product.title}}">
 					<span ng-bind="::item.product.title"></span>
 				</div>
-				<div class="text-muted"
+				<div class="text-muted text-over"
+					 title="{{::item.product.spec}}"
 					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>
-				<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></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>
 			</td>
 			<td class="text-center">
 				<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>

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

@@ -1,3 +1,30 @@
+<style>
+	.block .product div.text-over {
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.block .product div.text-flow b{
+		float: left;
+	}
+	.block .product div.text-flow span{
+		float: left;
+		display: inline-block;
+		width: 290px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.block .product div.text-overflow span{
+		float: left;
+		display: inline-block;
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+</style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
@@ -97,17 +124,17 @@
 						<td class="text-center text-num f-16 text-success "  width="50">
 							<span ng-bind="::item.number"></span>
 						</td>
-						<td width="270">
-							<div class="text-num text-bold">
+						<td width="270" class="product">
+							<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
 								<span ng-bind="::item.product.code"></span>
 							</div>
-							<div>
+							<div class="text-overflow" title="{{::item.product.title}}">
 								<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>
-							<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span></div>
+							<div class="text-muted text-over" ng-bind="::item.product.spec" title="{{::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>
 						</td>
 						<td class="text-center" width="110">
 							<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>

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

@@ -144,6 +144,31 @@
 	font-weight: inherit;
 	top: -2px;
 }
+	.order-table .product div.text-over {
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.order-table .product div.text-flow b{
+		float: left;
+	}
+	.order-table .product div.text-flow span{
+		float: left;
+		display: inline-block;
+		width: 290px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.order-table .product div.text-overflow span{
+		float: left;
+		display: inline-block;
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block" id="public">
@@ -425,17 +450,18 @@
 			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">
+				<div class="text-num text-bold text-overflow" title="{{::item.product.code}}">
 					<span ng-bind="::item.product.code"></span>
 				</div>
-				<div>
+				<div class="text-overflow" title="{{::item.product.title}}">
 					<span ng-bind="::item.product.title"></span>
 				</div>
-				<div class="text-muted"
+				<div class="text-muted text-over"
+					 title="{{::item.product.spec}}"
 					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>
-				<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></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>
 			</td>
 			<td class="text-center">
 				<div ng-if="!isUser" class="text-num" ng-bind="::item.price | number:6"></div>

src/main/webapp/resources/tpl/index/sale/order_detail.html

@@ -1,3 +1,31 @@
+<style>
+	.order-bd .product .text-over{
+		display: inline-block;
+		width: 1200px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.order-bd .product div.text-flow b{
+		float: left;
+	}
+	.order-bd .product div.text-flow span{
+		float: left;
+		display: inline-block;
+		width: 290px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.order-bd .product div.text-overflow span{
+		float: left;
+		display: inline-block;
+		width: 340px;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+</style>
 <div class="loading" ng-class="{'in': loading}">
 	<i></i>
 </div>
@@ -109,17 +137,17 @@
 							<span ng-bind="::item.number"></span>
 						</td>
 						<td width="200">
-							<div class="text-num">
+							<div class="text-num text-overflow" title="{{::item.product.code}}">
 								<span ng-bind="::item.product.code"></span>
 							</div>
-							<div>
+							<div class="text-overflow" title="{{::item.product.title}}">
 								<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>
-							<div class="text-bold text-inverse" ng-if="item.remark">备注：<span ng-bind="::item.remark"></span></div>
-							<div ng-repeat="att in item.attachs" class="text-bold text-bold">
+							<div class="text-muted text-over" ng-bind="::item.product.spec" title="{{::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 ng-repeat="att in item.attachs" class="text-bold text-bold text-overflow">
 								<a href="file/{{att.id}}">{{att.name}}</a>
 							</div>
 						</td>