Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r12532 -r12895 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 12532) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 12895) @@ -163,7 +163,7 @@ barcodeField.setValue(); } - function printBarcode(barcodeStr,disinfectionDate,isTraceable,fixedBarcode){ + function printBarcode(barcodeStr,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount){ var names = getPrintNames(isPrintUserFullName, Ext.getCmp('operator').getValue(), Ext.getCmp('reviewer').getValue(), Ext.getCmp('operatorCode').getValue(), Ext.getCmp('reviewerCode').getValue()); @@ -172,7 +172,7 @@ var sterilingType = Ext.getCmp("sterilingType").getValue(); var sterilizer = Ext.getCmp("sterilizer").getValue(); var frequency = Ext.getCmp("frequency").getValue(); - + if(barcodeStr != null && barcodeStr.length > 0){ var tousseName = Ext.getCmp('tousseName').getValue(); @@ -222,7 +222,7 @@ var obj = {'barcode':pBarcode, 'name':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount, - 'packageTypeAbbreviation':packageTypeAbbreviation}; + 'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation}; defaultPrintPackage(obj); tempPrintNum--; } @@ -1325,11 +1325,13 @@ var isPrint = action.result.isPrint; var isTraceable = action.result.isTraceable; var fixedBarcode = action.result.fixedBarcode; + var idCardDefinitionUseAmount = action.result.idCardDefinitionUseAmount; + if(isPrint){ if(action.result.isDisinfection){//是否为消毒物品 printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode); }else{ - printBarcode(action.result.barcode,disinfectionDate,isTraceable,fixedBarcode); + printBarcode(action.result.barcode,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount); } }else{ showResult("此器械包不打印标签!");