Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r41451 -r41457
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41451)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 41457)
@@ -3291,6 +3291,51 @@
 			}, {
 				columnWidth: .5,
 				xtype: 'textfield',
+				fieldLabel: '配包人条码',
+				componentCls: 'formItemMgn',
+				id: 'operatorBarcode',
+				name: 'operatorBarcode',
+				labelWidth: 90,
+				anchor: '90%',
+				labelAlign: 'right',
+				listeners: {
+					specialkey: function (thiz, e) {
+						if (e.getKey() == 13) {
+							if (processActionBarcode(thiz)) {
+								return;
+							}
+							var focusField = Ext4.getCmp('reviewerBarcode');
+							if (!showReviewerField) {
+								if (showSterileField) {
+									focusField = Ext4.getCmp('sterileBarcode');
+								} else {
+									focusField = Ext4.getCmp('wrapperBarcode');
+								}
+							}
+							loadUserByBarcode(thiz, Ext4.getCmp('operator'), Ext4.getCmp('operatorCode'), focusField);
+							operatorCode = Ext4.getCmp('operatorCode').getValue();
+							jobType_pack_name = Ext4.getCmp('operator').getValue();
+						}
+					}
+				}
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
+				fieldLabel: '配包人',
+				componentCls: 'formItemMgn',
+				id: 'operator',
+				name: 'operator',
+				labelWidth: 90,
+				anchor: '95%',
+				allowBlank: false,
+				readOnly: true,
+				labelAlign: 'right',
+				value: jobType_pack_name
+
+			}, {
+				columnWidth: .5,
+				xtype: 'textfield',
 				fieldLabel: inspectorName + '条码',
 				componentCls: 'formItemMgn',
 				id: 'inspectorBarcode',
@@ -3326,13 +3371,14 @@
 				readOnly: true,
 				labelAlign: 'right',
 				value: jobType_inspector_name
-			}, {
+			},{
 				columnWidth: .5,
 				xtype: 'textfield',
-				fieldLabel: '配包人条码',
+				fieldLabel: '包装人条码',
 				componentCls: 'formItemMgn',
-				id: 'operatorBarcode',
-				name: 'operatorBarcode',
+				id: 'wrapperBarcode',
+				name: 'wrapperBarcode',
+				hidden: !showWrapperField,
 				labelWidth: 90,
 				anchor: '90%',
 				labelAlign: 'right',
@@ -3342,34 +3388,27 @@
 							if (processActionBarcode(thiz)) {
 								return;
 							}
-							var focusField = Ext4.getCmp('reviewerBarcode');
-							if (!showReviewerField) {
-								if (showSterileField) {
-									focusField = Ext4.getCmp('sterileBarcode');
-								} else {
-									focusField = Ext4.getCmp('wrapperBarcode');
-								}
-							}
-							loadUserByBarcode(thiz, Ext4.getCmp('operator'), Ext4.getCmp('operatorCode'), focusField);
-							operatorCode = Ext4.getCmp('operatorCode').getValue();
-							jobType_pack_name = Ext4.getCmp('operator').getValue();
+							loadUserByBarcode(thiz, Ext4.getCmp('wrapper'), Ext4.getCmp('wrapperCode'), null);
+							wrapperCode = Ext4.getCmp('wrapperCode').getValue();
+							jobType_wrapper_name = Ext4.getCmp('wrapper').getValue();;
 						}
 					}
 				}
 
 			}, {
 				columnWidth: .5,
 				xtype: 'textfield',
-				fieldLabel: '配包人',
+				fieldLabel: '包装人',
 				componentCls: 'formItemMgn',
-				id: 'operator',
-				name: 'operator',
+				id: 'wrapper',
+				name: 'wrapper',
+				hidden: !showWrapperField,
+				labelAlign: 'right',
 				labelWidth: 90,
 				anchor: '95%',
-				allowBlank: false,
+				allowBlank: wrapperFieldAllowBlank,
 				readOnly: true,
-				labelAlign: 'right',
-				value: jobType_pack_name
+				value: jobType_wrapper_name
 
 			}, {
 				columnWidth: .5,
@@ -3455,45 +3494,6 @@
 				readOnly: true,
 				value: jobType_sterile_name
 			}, {
-				columnWidth: .5,
-				xtype: 'textfield',
-				fieldLabel: '包装人条码',
-				componentCls: 'formItemMgn',
-				id: 'wrapperBarcode',
-				name: 'wrapperBarcode',
-				hidden: !showWrapperField,
-				labelWidth: 90,
-				anchor: '90%',
-				labelAlign: 'right',
-				listeners: {
-					specialkey: function (thiz, e) {
-						if (e.getKey() == 13) {
-							if (processActionBarcode(thiz)) {
-								return;
-							}
-							loadUserByBarcode(thiz, Ext4.getCmp('wrapper'), Ext4.getCmp('wrapperCode'), null);
-							wrapperCode = Ext4.getCmp('wrapperCode').getValue();
-							jobType_wrapper_name = Ext4.getCmp('wrapper').getValue();;
-						}
-					}
-				}
-
-			}, {
-				columnWidth: .5,
-				xtype: 'textfield',
-				fieldLabel: '包装人',
-				componentCls: 'formItemMgn',
-				id: 'wrapper',
-				name: 'wrapper',
-				hidden: !showWrapperField,
-				labelAlign: 'right',
-				labelWidth: 90,
-				anchor: '95%',
-				allowBlank: wrapperFieldAllowBlank,
-				readOnly: true,
-				value: jobType_wrapper_name
-
-			}, {
 				columnWidth: sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction?.46:.5,
 				xtype: 'combo',
 				fieldLabel: '灭菌程序',