Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js =================================================================== diff -u -r20589 -r20632 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 20589) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 20632) @@ -1544,6 +1544,9 @@ var idCardSmallLabelConfig = { customPrint:printIDCardLargeSmall_zsyy } +var idCardAndTousseImageConfig = { + customPrint:printIDCardAndTousseImage_zsyy + } function printIDCardLargeSmall_zsyy(obj){ doGetLodop(); @@ -1708,6 +1711,58 @@ LODOP.ADD_PRINT_HTM(0,0,"95%","100%",""+tableHtml+""); LODOP.PRINT(); } +function printIDCardAndTousseImage_zsyy(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 ret = buildTousseDefinitionMeterialTable_zsyy(idCardInstance,idCardInstance.tousseDefinition,unit); + var tableHtml = ret.tableHtml ; + // 打印图片 + if(idCardInstance.tousseDefinition.imagesCount > 0){ + var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + idCardInstance.tousseDefinition.id + '&page=' + 1 +'&time='+new Date(); + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += "

"; + tableHtml += "

"; + } + tableHtml += ""; + //条码，打印人和时间和器械数量 + if(barcode != '' && userName != '' && date != ''){ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + }else{ + tableHtml += ""; + tableHtml += ""; + tableHtml += ""; + } + + //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) + 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, @@ -1757,6 +1812,7 @@ // 标识牌 idCardLargeLabel:idCardLargeLabelConfig, idCardSmallLabel:idCardSmallLabelConfig,// 小标签 + idCardAndTousseImage: idCardAndTousseImageConfig, // 入库单列表 godownEntryList : godownEntryListPrintConfig, //盘盈盘亏列表 Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r20499 -r20632 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 20499) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 20632) @@ -2030,6 +2030,8 @@ formTypeOfPrinted = "idCardMiddleLabel"; }else if(paperType == "小标签"){ formTypeOfPrinted = "idCardSmallLabel"; + }else if(paperType == "标识牌和图片"){ + formTypeOfPrinted = "idCardAndTousseImage"; }else{ formTypeOfPrinted = "idCardLargeLabel"; } Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js =================================================================== diff -u -r20435 -r20632 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 20435) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js (.../tousseForm.js) (revision 20632) @@ -36,7 +36,7 @@ } //标识牌标签类型 -var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']]; +var idCardPaperTypeData = [['大标签'],['中标签'],['小标签'],['标识牌和图片']]; if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){ idCardPaperTypeData = []; for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){ Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java =================================================================== diff -u -r20444 -r20632 --- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 20444) +++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java (.../IDCardDefinitionManagerImpl.java) (revision 20632) @@ -602,6 +602,9 @@ String tousseDefinitionJsonStr = JSONObject.fromObject(tousseDefinition,config).toString(); JsonObject tousseDefinitionObj = new JsonParser().parse( tousseDefinitionJsonStr).getAsJsonObject(); + + + tousseDefinitionObj.addProperty("imagesCount", tousseDefinition.getImagesCount(objectDao)); idCardInstanceObj.add("tousseDefinition", tousseDefinitionObj); idCardInstanceObj.addProperty("tousseID", tousseDefinition.getId()); Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js =================================================================== diff -u -r19521 -r20632 --- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 19521) +++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardForm.js (.../idCardForm.js) (revision 20632) @@ -18,12 +18,14 @@ var supplementResult = false;// 补充结果 //标识牌标签类型 + var idCardPaperTypeData = [['大标签'],['中标签'],['小标签']]; if(sstsConfig.canUseBarcodeTypes && sstsConfig.canUseBarcodeTypes.length > 0){ idCardPaperTypeData = []; for(var i = 0;i < sstsConfig.canUseBarcodeTypes.length;i++){ idCardPaperTypeData.push([sstsConfig.canUseBarcodeTypes[i]]); } +// idCardPaperTypeData.push(['标识牌和图片']); } var idCardInstanceFields = [ @@ -521,6 +523,7 @@ editable:false, valueField : 'value', displayField : 'value', + listWidth: 150, store : new Ext.data.SimpleStore( { fields : [ 'value'], data : idCardPaperTypeData