Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
===================================================================
diff -u -r27664 -r28708
--- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 27664)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 28708)
@@ -381,6 +381,7 @@
 					layout : 'form',
 					labelWidth :fontSize == 12 ? 70 : 120,
 					columnWidth :.33,
+					hidden: !getSystemSetConfig('showInvoiceAssistantSender',true),
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '核对员条码',
@@ -398,7 +399,7 @@
 													var resultArray = userName.split(":");
 													if(resultArray[0] == "success"){
 														top.Ext.getCmp('sender').setValue(resultArray[1]);
-														Ext.state.Manager.getProvider().set('cookieSender',resultArray[1]);
+														Ext.state.Manager.getProvider().set('cookieAssistantSender',resultArray[1]);
 													}else{
 														showResult(resultArray[1] , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
 														top.Ext.getCmp('sender').setValue("");
@@ -416,14 +417,15 @@
 					layout : 'form',
 					labelWidth :fontSize == 12 ? 70 : 120,
 					columnWidth :.33,
+					hidden: !getSystemSetConfig('showInvoiceAssistantSender',true),
 					items : [{
 						xtype : 'textfield',
 						fieldLabel : '核对员',
 						maxLength : '41',
 						id : 'sender',
 						name : 'sender',
 						readOnly:true,
-						allowBlank : false,
+						allowBlank : !getSystemSetConfig('showInvoiceAssistantSender',true) || !getSystemSetConfig('invoiceAssistantSenderRequired',true),
 						anchor : '99%',
 						cls:'x-item-disabled'
 					}]
@@ -754,6 +756,11 @@
 					}
 				}]
 			});
+	// 核对员
+	var cookieAssistantSender = Ext.state.Manager.getProvider().get('cookieAssistantSender');
+	if(getSystemSetConfig('rememberLastInvoiceAssistantSender',false) && cookieAssistantSender){
+		top.Ext.getCmp('sender').setValue(cookieAssistantSender);
+	}
 
 	Ext.Ajax.request({
 		url : WWWROOT + '/disinfectSystem/invoicePlanAction!loadDepartApplicationInfo.do',
@@ -766,10 +773,7 @@
 		failure : function(form, action) {
 		}
 	});
-	var cookieSender = Ext.state.Manager.getProvider().get('cookieSender');
-	if(cookieSender){
-		top.Ext.getCmp('sender').setValue(cookieSender);
-	}
+
 	var cookiePersonInCharge = Ext.state.Manager.getProvider().get('cookiePersonInCharge');
 	var cookiePersonInChargeCode = Ext.state.Manager.getProvider().get('cookiePersonInChargeCode');
 	if(cookiePersonInCharge){