Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r12908 -r12936 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12908) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 12936) @@ -1415,6 +1415,17 @@ LODOP.PREVIEW(); } } +//一次性物品入库单 +function printGodownEntryList(obj,printType) { + formTypeOfPrinted = "godownEntryList"; + print2(obj); + if(printType == 0){//直接打印 + LODOP.PRINT(); + }else{//打印预览 + LODOP.SET_SHOW_MODE("HIDE_PAPER_BOARD",1); + LODOP.PREVIEW(); + } +} //一次性物品采购计划 function printPurchasePlanInfo(obj,printType) { formTypeOfPrinted = "purchasePlan"; Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js =================================================================== diff -u -r12935 -r12936 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12935) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 12936) @@ -1,4 +1,27 @@ +var godownEntryListPrintConfig = { + headerFooter : [ + // 页眉名称 + //{label : "广州复大肿瘤医院", dataIndex : '', fontSize : 10, position : ["5","1%","90%",5]}, + ], + currentPageNumber : {label : "第#页", fontSize : 11, position : ["30","45%","90%",5]}, + totalPageAmount : {label : "共&页", fontSize : 11, position : ["30","50%","90%",5]}, + goodsTable :{ + rowHeight : 20, + //position : ["50","1%","96%","6.0cm"], + position : ["50","1%","97%","2000"], + headRepeat : true, + columns : [ + {header : "单号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11}, + {header : "操作员", dataIndex : 'operator', width : 60, align : 'center', fontSize : 11}, + {header : "入库时间", dataIndex : 'time', width : 130, align : 'center', fontSize : 11}, + {header : "金额", dataIndex : 'totalPrice', width : 75, align : 'center', fontSize : 11}, + {header : "供应商", dataIndex : 'supplierName', width : 285, align : 'center', fontSize : 11}, + {header : "备注", dataIndex : 'remark', width : 170, align : 'center', fontSize : 11} + ] + } +} + var invoicePlanPrintConfig = { isPrintTousse : true, isPrintDisinfectGoods : true, @@ -911,6 +934,8 @@ foreignTousseAppliation : foreignTousseAppliationPrintConfig, // 标识牌 idCardLargeLabel:idCardLargeLabelConfig, - idCardSmallLabel:idCardSmallLabelConfig + idCardSmallLabel:idCardSmallLabelConfig, // ,diposableGoodsBatchStock:diposableGoodsBatchStockConfig + // 入库单列表 + godownEntryList : godownEntryListPrintConfig }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js =================================================================== diff -u -r12866 -r12936 --- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12866) +++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js (.../godownEntryView.js) (revision 12936) @@ -1228,6 +1228,26 @@ showResult("本次入库物品没有新的批次。"); } } +// 打印入库单列表 +function printGodownEntryListInternal(printType){ + top.Ext.MessageBox.show({ + title:'请等待', + msg:'打印中……', + width:350, + progress:true, + closable:false + }); + var itemListJson = buildJSONStringFromStore(grid.store); + var itemList = Ext.decode(itemListJson); + var totalPriceSum = 0; + // 计算总金额 + for ( var i = 0; i < itemList.length; i++) { + totalPriceSum += Number(itemList[i].totalPrice); + } + var obj = {goods:itemList,totalPrice:totalPriceSum}; + printGodownEntryList(obj,printType); + hideMessageBox(true); +} // 打印,目前只支持单个打印 function batchPrintGodownEntrys(ids, printType){ if(ids == null) @@ -1476,7 +1496,8 @@ handler : function() { var records = grid.getSelectionModel().getSelections(); if (records.length == 0) { - showResult("请选择要打印的入库单!"); + //showResult("请选择要打印的入库单!"); + printGodownEntryListInternal(0); return; } if (records.length != 1) {