Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js =================================================================== diff -u -r24914 -r25149 --- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js (.../printConfig.js) (revision 24914) +++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/print/printConfig.js (.../printConfig.js) (revision 25149) @@ -1321,6 +1321,54 @@ var barcodeInformation_DisposablegoodsGodownentry_xjjqzyy = { customPrint:printBarcodeInformation_DisposablegoodsGodownentry_xjjqzyy } +var idCardLargeLabelConfig = { + customPrint:printIDCardLargeLabel_xjjqzyy + } +function printIDCardLargeLabel_xjjqzyy(idCardInstance){ + if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){ + alert('包定义不能为空!'); + return; + } + doGetLodop(); + var barcode = idCardInstance.barcode; + var date = idCardInstance.printDate; + var userName = idCardInstance.userName; + var unit = idCardInstance.unit; + + var barcodeObj = {barcode:barcode}; + if (typeof(sstsConfig) != "undefined" && typeof(sstsConfig.barcodeImgWidth) != "undefined" && typeof(sstsConfig.barcodeImgWidth) != "undefined"){ + barcodeObj.barcodeImgWidth = sstsConfig.barcodeImgWidth; + barcodeObj.barcodeImgHeight = sstsConfig.barcodeImgHeight; + } + + var ret = buildTousseDefinitionMeterialTable(idCardInstance.tousseDefinition,unit); + var tableHtml = ret.tableHtml + ""; + //条码，打印人和时间和器械数量 + if(barcode != '' && userName != '' && date != ''){ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + }else{ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + } + + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += "

"; + tableHtml += ""; + tableHtml += " "+barcode; + tableHtml += "		器械总数量:"+ret.amount+"件"; + tableHtml += "
器械总数量:"+ret.amount+"件"; + tableHtml += "
*重复使用，切勿丢失*

"; + + LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); + LODOP.PRINT(); +} var printConfig = { //发货计划单 invoicePlan : invoicePlanPrintConfig, @@ -1361,6 +1409,9 @@ largeLabel : exLargeLabelConfig, // 加大标签:100x100规格 exLargeLabel : exLargeLabelConfig, + // 标识牌 + idCardSmallLabel:idCardLargeLabelConfig, + idCardLargeLabel:idCardLargeLabelConfig, // 外部代理灭菌标签 foreignProxyDisinfectionLabel : foreignProxyDisinfectionLabelConfig, //外来器械申请单 Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r25105 -r25149 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 25105) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 25149) @@ -3651,6 +3651,10 @@ function getPrintBarcodeURL(obj){ var barcode = obj.barcode; var url = WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode+"&codeType="+getBarcodeCodeType(obj.codeType); + if (typeof(obj.barcodeImgWidth) != "undefined" && typeof(obj.barcodeImgWidth) != "undefined"){ + url += "&barcodeImgWidth=" + sstsConfig.barcodeImgWidth + "&barcodeImgHeight=" + sstsConfig.barcodeImgHeight; + } + return url; } function getBarcodeCodeType(codeType){ Index: ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java =================================================================== diff -u -r24211 -r25149 --- ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java (.../PrintBarcodeAction.java) (revision 24211) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/printbarcode/action/PrintBarcodeAction.java (.../PrintBarcodeAction.java) (revision 25149) @@ -41,8 +41,10 @@ switch (codeType){ case "QRCode": format = BarcodeFormat.QR_CODE; - width = 80; - height = 80; + + // 读取传入的图片宽度和高度参数 + width = Integer.valueOf(StrutsParamUtils.getPraramValue("barcodeImgWidth", "100")); + height = Integer.valueOf(StrutsParamUtils.getPraramValue("barcodeImgHeight", "100")); break; default: break; Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js =================================================================== diff -u -r24914 -r25149 --- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 24914) +++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 25149) @@ -15,6 +15,8 @@ // 条码类型：1：一维码， 2：二维码 barcodeType : 1, barcodeCodeType: 'QRCode', + barcodeImgWidth:150, + barcodeImgHeight:150, // 是否隐藏进入审核列表按钮 hideEnterReviewListButton : false, // 是否自动补全用户名