Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js =================================================================== diff -u -r22654 -r22662 --- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 22654) +++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js (.../directPacking.js) (revision 22662) @@ -280,7 +280,17 @@ } function printBarcode(retObj,virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount){ - var names = getPrintNames(isPrintUserFullName, Ext.getCmp('operator').getValue(), Ext.getCmp('reviewer').getValue(), Ext.getCmp('sterileUser').getValue(), Ext.getCmp('operatorCode').getValue(), Ext.getCmp('reviewerCode').getValue(),Ext.getCmp('sterileCode').getValue()); + var namesObj = { + operator: Ext.getCmp('operator').getValue(), + operatorCode: Ext.getCmp('operatorCode').getValue(), + wrapper: Ext.getCmp('wrapper').getValue(), + wrapperCode: Ext.getCmp('wrapperCode').getValue(), + reviewer: Ext.getCmp('reviewer').getValue(), + reviewerCode: Ext.getCmp('reviewerCode').getValue(), + sterileUser: Ext.getCmp('sterileUser').getValue(), + sterileCode: Ext.getCmp('sterileCode').getValue() + } + var names = getPrintNames(isPrintUserFullName,namesObj); var tousseInstances = retObj.tousseInstances; var printNum = Ext.getCmp('tempPrintNum').getValue();//打印张数 var packageType = Ext.getCmp("packageType").getValue(); @@ -357,6 +367,7 @@ } } top.Ext4.applyIf(obj,tousseInstance); + top.Ext4.applyIf(obj,names); doPrintLabel(obj); tempPrintNum--; } @@ -751,12 +762,12 @@ xtype : 'hidden', id : 'wrapperCode', name : 'wrapperCode', - value : wrapperCode + value : '' },{ xtype : 'hidden', id : 'departCoding', name : 'departCoding', - value : wrapperCode + value : '' },{ xtype : 'hidden', id : 'continueOnVirtualBasketInsufficient', @@ -1531,6 +1542,8 @@ } if (wrapper != "") { Ext.getCmp('wrapper').setValue(wrapper); + Ext.getCmp('wrapperCode').setValue(wrapperCode); + } }); Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js =================================================================== diff -u -r22651 -r22662 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 22651) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js (.../dataSource.js) (revision 22662) @@ -180,7 +180,7 @@ displayName: '配包人', textForPreview: '张三' }),new ObjectDataSourceProperty({ - propName: 'wrapper', + propName: 'wrapperForPrint', displayName: '包装人', textForPreview: '张三' }),new ObjectDataSourceProperty({ Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js =================================================================== diff -u -r22403 -r22662 --- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 22403) +++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js (.../rePrintBarcodeWin.js) (revision 22662) @@ -99,6 +99,7 @@ {name : 'fixedBarcode'}, {name : 'packer'}, {name : 'wrapper'}, + {name : 'wrapperCode'}, {name : 'washOperator'}, {name : 'washOperatorCode'}, {name : 'reviewer'}, @@ -406,17 +407,20 @@ var operator = records[i].data['packer']; + var wrapperForPrint = records[i].data['wrapper']; var washOperator = records[i].data['washOperator']; var reviewer = records[i].data['reviewer']; var sterilizationUser = records[i].data['sterilizationUser']; if(!printFullName){ operator = records[i].data['packerCode']; + wrapperForPrint = records[i].data['wrapperCode']; reviewer = records[i].data['reviewerCode']; sterilizationUser = records[i].data['sterilizationUserCode']; washOperator = records[i].data['washOperatorCode']; } tousseObj.washOperator = washOperator; tousseObj.operatorToPrint = operator; + tousseObj.wrapperForPrint = wrapperForPrint; tousseObj.reviewerToPrint = reviewer; tousseObj.sterilizationUserToPrint = sterilizationUser; tousseObj.sterilizerName = records[i].data['sterilizer'];