Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r14907 -r14911
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 14907)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 14911)
@@ -439,287 +439,6 @@
 	});
 	
 	
-	function reSetPackagePrintInfo(tousseStore){
-		var resetForm = new top.Ext.form.FormPanel({
-			labelAlign : 'right',
-			buttonAlign : 'center',
-			//collapsible : true,
-			//collapseMode : 'mini',
-			split : true,
-			border : 0,
-			frame : true,
-			layout: 'column',
-			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			items : [{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [ {
-					xtype : 'textfield',
-					fieldLabel : "配包人条码",
-					name : "operatorBarcode",
-					id : "operatorBarcode2",
-					allowBlank : true,
-					listeners : {
-						specialkey : function(thiz, e){
-							if(e.getKey() == 13){
-								loadUserByBarcode2(thiz,'jobType_pack');
-							}
-						}
-					},
-					anchor : '100%'
-				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '配包人',
-					maxLength : '16',
-					id : 'operator2',
-					name : 'operator',
-					allowBlank : false,
-					readOnly : true,
-					anchor : '100%',
-					cls:'x-item-disabled'
-				}]
-			}/*,{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : "审核人条码",
-					name : "reviewerBarcode",
-					id : "reviewerBarcode2",
-					allowBlank : true,
-					listeners : {
-						specialkey : function(thiz, e){
-							if(e.getKey() == 13){
-								loadUserByBarcode(thiz,'jobType_review');
-							}
-						}
-					},
-					anchor : '100%'
-				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : "审核人",
-					name : "reviewer",
-					id : "reviewer2",
-					allowBlank : false,
-					anchor : '100%',
-					readOnly : true,
-					cls:'x-item-disabled'
-				}]
-			}*/, {
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'combo',
-					fieldLabel : "灭菌程序",
-					valueField : 'typeName',
-					displayField : 'typeName',
-					store : sterilizerTypeStore,
-					forceSelection : true,
-					editable : false,
-					triggerAction : 'all',
-					name : "sterilingType",
-					id : "sterilingType2",
-					anchor : '100%',
-					allowBlank : false,
-					listeners : {
-						/*select : function(combo, record, index) {
-							/*var sterilizer = Ext.getCmp('sterilizer').getValue();
-							SterilizationRecordTableManager.getMaxFrequency(sterilizer,0,function(frequency){
-								Ext.getCmp('frequency').setValue(frequency);
-							});
-						}*/
-					}
-				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [ {
-					xtype : 'combo',
-					fieldLabel : "包装类型",
-					valueField : 'typeName',
-					displayField : 'typeName',
-					store : packageTypeStore,
-					forceSelection : true,
-					editable : false,
-					triggerAction : 'all',
-					name : "packageType",
-					id : "packageType2",
-					anchor : '100%',
-					allowBlank : false
-				}]
-			},/*{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '托盘条码',
-					maxLength : '16',
-					id : 'tempStockBarcode2',
-					name : 'tempStockBarcode',
-					allowBlank : true,
-					listeners : {
-						specialkey : function(thiz, e){
-							if(e.getKey() == 13){
-								loadStockByBarcode(thiz.getValue());
-								thiz.setValue();
-							}
-						}
-					},
-					anchor : '100%'
-				}]
-			},{
-				columnWidth : .45,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : '托盘',
-					maxLength : '16',
-					id : 'stock2',
-					name : 'stock',
-					allowBlank : true,
-					anchor : '100%',
-					disabled : true
-				}]
-			},{
-				columnWidth : .05,
-				layout : 'form',
-				items : [{
-					xtype : 'button',
-					iconCls : 'btn_ext_cleanBtn',
-					id : 'cleanBtn2',
-					name : 'cleanBtn',
-					handler : function(){
-						Ext.getCmp('stockTousseName').setValue('');
-						Ext.getCmp('stock').setValue('');
-						Ext.getCmp('stockBarcode').setValue();
-						Ext.getCmp('packAmount').enable();
-					}
-				}]
-			},*/{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'combo',
-					fieldLabel : '灭菌炉',
-					id : 'sterilizer2',
-					name : 'sterilizer',
-					valueField : 'sterilizerName',
-					displayField : 'sterilizerName',
-					store : sterilizerJsonStore,
-					triggerAction : 'all',
-					mode : 'remote',
-					forceSelection : true,
-					allowBlank : true,
-					editable:false,
-					anchor : '100%',
-					listeners : {
-						select : function(combo, record, index) {
-							var sterilingType = top.Ext.getCmp('sterilingType2').getRawValue();
-							SterilizationRecordTableManager.getMaxFrequency(combo.value,0,function(frequency){
-								top.Ext.getCmp('frequency2').setValue(frequency);
-							});
-						}
-					}
-				}]
-			},{
-				columnWidth : .5,
-				layout : 'form',
-				cls:'edit-5char-labelwidth',
-				items : [{
-					xtype : 'numberfield',
-					fieldLabel : '炉次',
-					allowDecimals : false,
-					allowNegative : false,
-					minValue : 1,
-					id : 'frequency2',
-					name : 'frequency',
-					allowBlank : true,
-					value : 1,
-					anchor : '100%'
-				}]
-			}],
-			buttons : [{
-				text : '确定',
-				handler : function() {
-					var operator2 = top.Ext.getCmp('operator2').getRawValue();
-//					var reviewer2 = top.Ext.getCmp('reviewer2').getValue();
-					var sterilingType2 = top.Ext.getCmp('sterilingType2').getValue();
-					var packageType2 = top.Ext.getCmp('packageType2').getValue();
-//					var tempStockBarcode2 = top.Ext.getCmp('tempStockBarcode2').getValue();
-//					var stock2 = top.Ext.getCmp('stock2').getValue();
-					var sterilizer2 = top.Ext.getCmp('sterilizer2').getValue();
-					var frequency2 = top.Ext.getCmp('frequency2').getRawValue();
-					
-					var records = top.Ext.getCmp('tousseGrid').getSelectionModel().getSelections();
-					for ( var i = 0, len = records.length; i < len; i++) {
-						
-						var change = false;
-						var operator =  records[i].get('packer');
-						if(operator2.length >0 && operator != operator2){
-							records[i].set('packer',operator2);
-							change = true;
-						}
-						var sterilizer =  records[i].get('sterilizer');
-						if(sterilizer2.length >0 && sterilizer != sterilizer2){
-							records[i].set('sterilizer',sterilizer2);
-							change = true;
-						}
-						var packType =  records[i].get('packType');
-						if(packageType2.length >0 && packType != packageType2){
-							records[i].set('packType',packageType2);
-							change = true;
-						}
-						var sterilization =  records[i].get('sterilization');
-						if(sterilingType2.length >0 && sterilization != sterilingType2){
-							records[i].set('sterilization',sterilingType2);
-							change = true;
-						}
-						var frequency =  records[i].get('frequency');
-						if(frequency2.length >0 && frequency != frequency2){
-							records[i].set('frequency',frequency2);
-							change = true;
-						}
-						if(change){
-							records[i].set('isChange',"true");
-						}
-						
-					}
-					top.Ext.getCmp('reSetWin').close();
-				}
-			}]
-		});
-		
-		var reSetWin = new top.Ext.Window({
-			id : 'reSetWin',
-			layout : 'fit',
-			title : '修改器械包信息',
-			modal : true,
-			border : false,
-			width : 500,
-			height : 150,
-//			autoHeight : true,
-//			plain : true,
-			items : [resetForm]
-		});
-		reSetWin.show();
-	}
 
 	var material = Ext.data.Record.create([{
 		name : 'materialDefinitionId'