Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r24650 -r24662
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 24650)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 24662)
@@ -714,7 +714,7 @@
 										            }
 													top.Ext.getCmp("depart").setValue(result.name);
 													top.Ext.getCmp("orgUnitCoding").setValue(result.orgUnitCoding);
-													top.Ext.getCmp('senderBarcode').focus();
+													top.Ext.getCmp('assistantSenderBarcode').focus();
 												}
 												
 											});
@@ -763,8 +763,8 @@
 						xtype : 'textfield',
 						fieldLabel : '发货员',
 						maxLength : '41',
-						id : 'deliveryPerson',
-						name : 'deliveryPerson',
+						id : 'sender',
+						name : 'sender',
 						readOnly:true,
 						allowBlank : false,
 						anchor : '99%',
@@ -780,26 +780,26 @@
 						xtype : 'textfield',						
 						fieldLabel : '核对员条码',
 						maxLength : '16',
-						id : 'senderBarcode',
-						name : 'senderBarcode',
+						id : 'assistantSenderBarcode',
+						name : 'assistantSenderBarcode',
 						anchor : '99%',
 						listeners : {
 							render : function(p) {
 								p.getEl().on('keypress',function(e) {
 									if (e.getKey() == 13) {//回车键
 											InvoiceTableManager.getUserNameOfCurrentLoginUserOrgsByBarcode(
-												top.Ext.getCmp('senderBarcode').getValue(),function(userName) {
+												top.Ext.getCmp('assistantSenderBarcode').getValue(),function(userName) {
 												if (userName != null) {
 													var resultArray = userName.split(":");
 													if(resultArray[0] == "success"){
-														top.Ext.getCmp('sender').setValue(resultArray[1]);
+														top.Ext.getCmp('assistantSender').setValue(resultArray[1]);
 														Ext.state.Manager.getProvider().set('cookieAssistantSender',resultArray[1]);
 													}else{
 														showResult(resultArray[1]);
-														top.Ext.getCmp('sender').setValue("");
+														top.Ext.getCmp('assistantSender').setValue("");
 													}
 												}
-												top.Ext.getCmp('senderBarcode').setValue("");
+												top.Ext.getCmp('assistantSenderBarcode').setValue("");
 												top.Ext.getCmp('personInChargeBarcode').focus();
 											});
 									}
@@ -816,8 +816,8 @@
 						xtype : 'textfield',
 						fieldLabel : '核对员',
 						maxLength : '41',
-						id : 'sender',
-						name : 'sender',
+						id : 'assistantSender',
+						name : 'assistantSender',
 						readOnly:true,
 						allowBlank : false,
 						allowBlank : !getSystemSetConfig('showInvoiceAssistantSender',true) || !getSystemSetConfig('invoiceAssistantSenderRequired',true),
@@ -1191,7 +1191,7 @@
 	
 	var cookieAssistantSender = Ext.state.Manager.getProvider().get('cookieAssistantSender');
 	if(getSystemSetConfig('rememberLastInvoiceAssistantSender',false) && cookieAssistantSender){
-		top.Ext.getCmp('sender').setValue(cookieAssistantSender);
+		top.Ext.getCmp('assistantSender').setValue(cookieAssistantSender);
 	}
 
 	var window = new top.Ext.Window( {