Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js =================================================================== diff -u -r29133 -r29326 --- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js (.../printConfig.js) (revision 29133) +++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js (.../printConfig.js) (revision 29326) @@ -161,7 +161,8 @@ isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品 isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印 printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印 - printApplyInfo : false, + printApplyInfo : false, + print2column:true,//是否打印2列 printOrder : 1, // 1:优先打印一次性物品, 2:优先打印器械包 // 在器械包和一次性物品不合并打印的情况下,消毒物品打印方式: // 1:优先与一次性物品合并打印,如果无一次性物品则与器械包合并打印, 2:优先与器械包一起合并打印,如果没有器械包则与一次性物品合并打印 ,3:单独打印 @@ -185,13 +186,8 @@ content : [ {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11}, - {header : "名称", dataIndex : 'goodsName', width : 340, align : 'left', fontSize : 11}, - {header : "规格", dataIndex : 'sp', width : 185, align : 'center', fontSize : 11}, - {header : "包装规格", dataIndex : 'packageSpec', width : 100, align : 'center', fontSize : 11}, - {header : "单位", dataIndex : 'unit', width : 60, align : 'center', fontSize : 11}, - {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11} - //{header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11} - //header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11} + {header : "名称", dataIndex : 'goodsName', width : 282, align : 'left', fontSize : 11}, + {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11} ] }, footer: { Index: ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js =================================================================== diff -u -r28846 -r29326 --- ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 28846) +++ ssts-web/src/main/webapp/disinfectsystem/print/printApplicationGoods.js (.../printApplicationGoods.js) (revision 29326) @@ -186,9 +186,9 @@ var myObj = printConfig[formTypeOfPrinted]; if(myObj && myObj.print2){ printSummaryObj.goods=printSummaryObj.pages[0].rows; - print2(printSummaryObj); + print2(printSummaryObj,myObj.print2column); }else{ - print(printSummaryObj); + print(printSummaryObj,myObj.print2column); } if(printType == 0){//直接打印 LODOP.PRINT(); @@ -370,7 +370,7 @@ */ function printByJsonPrintObject(printObj, msgBox, isNotSupplyRoomUser,printType,isBatchPrint){ var totalPageAmount = printObj.totalPageAmount; - var count = 0; + var count = 0; for (var i=0;i" + item.header + ""; + for(var j=0;j<2;j++){ + for (var i=0;i" + item.header + ""; + } } tableHtml += ""; // 打印物品内容行 var columnCount = myObj.goodsTable.content.length; var page = printSummaryObj.pages[printSummaryObj.pageIndex]; var rows = page.rows; + var leftSumTotal = 0; + var rightSumTotal = 0; if(rows != null && rows.length > 0){ - for ( var k = 0; k < rows.length; k++) { - var row = rows[k]; - - tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize); - - for (var i=0;i" + rows[k][serialNumber1] + " "; + tableHtml += "" + rows[k][goodsName1] + " "; + tableHtml += "" + rows[k][goodsAmount1] + " "; + leftSumTotal += parseInt(rows[k][goodsAmount1]); + if(rows[index]){ + tableHtml += "" + (rows[index][serialNumber2] || '') + " "; + tableHtml += "" + (rows[index][goodsName2] || '') + " "; + tableHtml += "" + (rows[index][goodsAmount2] || '') + " "; + rightSumTotal += parseInt(rows[index][goodsAmount2]); + }else { + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + } + tableHtml += ""; + } + }else { + for ( var k = 0; k < rows.length; k++) { + var row = rows[k]; - var value = row[item.dataIndex]; + tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize); - if (value == undefined || value == 'undefined'){ - value = ""; + for (var i=0;i" + value + " "; } - if (item.dataIndex == 'price' || item.dataIndex == "rowPrice"){ - value = formatMoney(value); - } - - tableHtml += "" + value + " "; + tableHtml += ""; } - - tableHtml += ""; } } if(page.pageNumber == printSummaryObj.pageAmount){ // 打印合计信息 tableHtml = appendTableRowString(tableHtml, myObj.goodsTable.rowHeight , myObj.goodsTable.fontSize); + if(print2column == true){ + tableHtml += "合计"; + tableHtml += "" + leftSumTotal + " "; + tableHtml += "合计"; + tableHtml += "" + rightSumTotal + " "; + }else { + tableHtml += "合计"; - tableHtml += "合计"; - - for (var i=2;i= 0 ){ - value = printSummaryObj.totalGoodsAmount; - } - else if (indexName == "applyAmount"){ - value = printSummaryObj.totalApplyAmount; - } - else if (indexName == "recyclingAmount"){ - value = printSummaryObj.totalRecyclingAmount; - if(value == 0){ - value = ""; + for (var i=2;i= 0 ){ + value = printSummaryObj.totalGoodsAmount; } + else if (indexName == "applyAmount"){ + value = printSummaryObj.totalApplyAmount; + } + else if (indexName == "recyclingAmount"){ + value = printSummaryObj.totalRecyclingAmount; + if(value == 0){ + value = ""; + } + } + else if(indexName == "rowPrice" || indexName == "totalPrice"){ + value = formatMoney(printSummaryObj.totalPrice); + } + + + tableHtml += "" + value + " "; } - else if(indexName == "rowPrice" || indexName == "totalPrice"){ - value = formatMoney(printSummaryObj.totalPrice); - } - - - tableHtml += "" + value + " "; } tableHtml += "";