Merge branches 'hy' and 'master' of 47.92.228.5:huyi/warehouse into hy

src/main/webapp/webpage/modules/warehouse/goods/goodsList.js

@@ -297,7 +297,7 @@ $(document).ready(function() {
 				jp.get("${ctx}/warehouse/goods/goods/printQr?goodsInfoId="+id, function (res) {
 					var row = res.body.goodsInfo.qrCode;
 					LODOP.PRINT_INIT("打印货品");
-					LODOP.SET_PRINT_PAGESIZE(1,800,600,0)
+					LODOP.SET_PRINT_PAGESIZE(1, 1600, 1000, 0)
 					createAllPage(row);
 					LODOP.PREVIEW();
 					jp.close();
@@ -321,10 +321,10 @@ $(document).ready(function() {
 		//    var imgUrl = "${ctxPath}/" + item.url;
 		//    LODOP.ADD_PRINT_IMAGE('0%',"0%","100%","100%","<img width='150'  border='0' src='"+imgUrl+"' />");
 	  //  })
-		debugger
 		LODOP.NewPage();
 		var imgUrl = "${ctxPath}/" + item.url;
-		LODOP.ADD_PRINT_IMAGE('0%',"0%","100%","100%","<img width='300'  border='0' src='"+imgUrl+"' />");
+		LODOP.ADD_PRINT_IMAGE('0%',"0%","100%","100%","<img width='800' border='0' src='"+imgUrl+"' />");
+		LODOP.SET_PRINT_STYLEA(0,"Stretch",1)
 	}
 
 	function cleanQr(id) {

src/main/webapp/webpage/modules/warehouse/storage/storageDetail.jsp

@@ -17,6 +17,9 @@
 <table id="detail_table" data-toolbar="#toolbar"></table>
 <script>
     var selector = "#detail_table";
+
+    console.log(${fns:toJson(storage)})
+
     function initTable(){
         var data = ${fns:toJson(storage.storageInfoList)};
         if(data.length){