Merge branch 'hotfix-1899-hb' into dev

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

@@ -172,15 +172,29 @@ tbody td div.text-mould {
 	font-weight: inherit;
 	top: -2px;
 }
-.color-black {
-	color: #000;
-}
+
 /* 清楚ie下的输入框X */
 ::-ms-clear, ::-ms-reveal{display: none;}
 
 	.taxrate-input {
 		width: 30px;
 	}
+	/*对齐模具物料输入框*/
+.color-black {
+	color: #000;
+	float: left;
+}
+.text-mu {
+	float: left;
+}
+.text-detail{
+	display: inline-block;
+	width: 470px;
+	float: left;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
 </style>
 <link rel="stylesheet" href="static/css/public.css">
 <div class="block"  id="public">
@@ -424,10 +438,10 @@ tbody td div.text-mould {
 				<td class="product">
 					<div class="text-mould" ng-repeat="items in inquiryMould.inquiryMouldItems">
 						<div class="text-num text-bold text-ps" >
-							<span>模具：</span>{{items.psCode}}-{{items.psName}}
+							<span class="text-mu">模具：</span> <span class="text-detail" title="{{items.psCode}}-{{items.psName}}">{{items.psCode}}-{{items.psName}}</span>
 						</div>
 						<div class="text-muted" ng-repeat="prod in items.inquiryMouldDetails">
-							<div><span class="text-bold color-black">物料：</span>{{prod.prodCode}}-{{prod.prodTitle}}-{{prod.prodSpec}}</div>
+							<div><span class="text-bold color-black">物料：</span><span class="text-detail" title="{{prod.prodCode}}-{{prod.prodTitle}}-{{prod.prodSpec}}">{{prod.prodCode}}-{{prod.prodTitle}}-{{prod.prodSpec}}</span></div>
 						</div>
 					</div>
 					<div ng-if="inquiryMould.attachs.length" class="text-muted">

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

@@ -4,9 +4,16 @@ tbody td .input-price {
 	height: 26px;
 	border: 1px solid #d1d1d1;
 }
-
+#order-detail-list .table-default tbody tr td{
+	vertical-align: auto ;
+}
 tbody td div .text-ps,.text-prod {
 	height: auto;
+	width: 450px;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	margin-bottom: 10px;
 }
 
 tbody td div.text-mould {