Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r17921 -r17925
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 17921)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 17925)
@@ -387,7 +387,12 @@
 		LODOP.SET_PRINT_STYLE("ItemType",4);
 		// 打印物品表格
 		// 打印表格头
-		var tableHtml = "<table border =0 cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
+		var tableStyle = "border-collapse:collapse;";
+		if(myObj.fixed){
+			tableStyle += "table-layout:fixed;";
+		}
+		var tableHtml = "<table border =0 cellspacing=0 cellpadding=0 bordercolor='#000000' style='"+tableStyle+"'>";
+		
 		// 如果需要表头在每页重复打印，则增加thead标签
 		if (myObj.goodsTable.headRepeat){
 			tableHtml += "<thead>";
@@ -413,7 +418,6 @@
 			var row = goodsArray[k];
 				
 			tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize);
-			
 			for (var i=0;i<columnCount;i++){
 				var item = myObj.goodsTable.columns[i];
 				
@@ -428,8 +432,26 @@
 						value = '';
 					}
 				}
+				var tdContent = value;
+				tdContent += "&nbsp;";
+				if(myObj.nowrap){
+					//不换行.如果直接将样式应用到td标签,效果出不来,在td里加一个div是可以的
+					tdContent = "<div style='overflow:hidden;white-space:nowrap;";
+					if(myObj.fixed){
+						tdContent += "width:" + item.width + ";";
+					}
+					if(myObj.ellipsis){
+						tdContent += "text-overflow:ellipsis;'>"
+					}else{
+						tdContent += "'>";
+					}
+					tdContent += value;
+					tdContent += "&nbsp;"
+					tdContent += "</div>";
+				}
 				var style = getTableTdStyle(myObj.goodsTable,i);
-				tableHtml += "<td align=" + item.align + " style="+style+">" + value + "&nbsp</td>";
+				var tdWidth = myObj.fixed?'width='+item.width:'';
+				tableHtml += "<td align='" + item.align + "' " + tdWidth + " style="+style+">" + tdContent + "</td>";
 			}
 			tableHtml += "</tr>";
 		}