Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r17256 -r17266 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 17256) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 17266) @@ -165,6 +165,7 @@ var frequency = Ext.getCmp("frequency").getValue(); var department = retObj.department; var selectedDepartment = ''; + var packTime = date2string(new Date()); if(sstsConfig.selectDepartInCustomPacking){ selectedDepartment = Ext.getCmp('depart').getValue(); } @@ -221,6 +222,7 @@ obj.virtualSeqNums = [virtualSeqNumArray[j]]; obj.department = department; obj.depart = department; + obj.packTime = packTime; //自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室 obj.printOrgSource = tousseInstance.printOrgSource; if(selectedDepartment){ @@ -1190,12 +1192,7 @@ //此处改为不管器械包定义是否打印,都打印标签 if(isPrint){ - if(action.result.isDisinfection){//是否为消毒物品 - alert('暂时不支持消毒物品!') -// printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode,expirationDate,action.result.packageTypeAbbreviation); - }else{ - printBarcode(action.result,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount); - } + printBarcode(action.result,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount); }else{ showResult("此器械包不打印标签!"); }