Index: ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js
===================================================================
diff -u -r35013 -r40445
--- ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js	(.../printInvoiceConfigForm.js)	(revision 35013)
+++ ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigForm.js	(.../printInvoiceConfigForm.js)	(revision 40445)
@@ -6,183 +6,175 @@
 	configWin.close();
 }
 
-function editConfig(id){
+function editConfig(id) {
 	showWindow(id);
-	if(!Ext4.isEmpty(id)){
+	if (!Ext4.isEmpty(id)) {
 		var mask = new Ext4.LoadMask({
-		    msg    : '正在加载，请稍候...',
-		    target : formPanel
+			msg: '正在加载，请稍候...',
+			target: formPanel
 		});
 		mask.show();
-		
+
 		Ext4.Ajax.request({
-			url : WWWROOT + '/disinfectSystem/printInvoiceConfigAction!loadConfigData.do',
-			params : {id : id},
-			success : function(response,options){
-//				mask.hide();
+			url: WWWROOT + '/disinfectSystem/printInvoiceConfigAction!loadConfigData.do',
+			params: { id: id },
+			success: function (response, options) {
 				mask.destroy();
 				var result = Ext4.JSON.decode(response.responseText);
-				if(result.success && result.data){
-					Ext4.ComponentQuery.query("#configForm #id")[0].setValue(result.data.id);
-					Ext4.ComponentQuery.query("#configForm #shift")[0].setValue(result.data.shift);
-					var cmp1 = Ext4.ComponentQuery.query("#configForm #mergePrintType")[0];
-					
-					cmp1.setValue(result.data.mergePrintType);
-					
-					
-					Ext4.ComponentQuery.query("#configForm #departCodes")[0].setValue(result.data.departCodes);
-					Ext4.ComponentQuery.query("#configForm #departNames")[0].setValue(result.data.departNames);
-					
+				if (result.success && result.data) {
+					Ext4.getCmp('departNames').setValue(result.data.departNames);
+					Ext4.getCmp('departCodes').setValue(result.data.departCodes);
 					Ext4.getCmp('tousseGroupConfig').setValue(result.data.tousseGroupConfig);
+					Ext4.getCmp('mergePrintType').setValue(result.data.mergePrintType);
+					Ext4.getCmp('id').setValue(result.data.id);
+					Ext4.getCmp('shift').setValue(result.data.shift);
+					if (printInvoiceConfig) {
+						Ext4.getCmp('handlerDepartCode').setValue(result.data.handlerDepartCode);
+						Ext4.getCmp('handlerDepartId').setValue(result.data.handlerDepartId);
+						Ext4.getCmp('handlerDepartName').setRawValue(result.data.handlerDepartName);
+					}
 					initTousseGroupConfigGrid();
-					
-				}else{
+
+				} else {
 					showResult('系统加载出错，请稍候再试');
 				}
 			},
-			failure : function(response, options) {
-//				mask.hide();
+			failure: function (response, options) {
 				mask.destroy();
 				showResult('系统加载出错，请稍候再试');
 			}
 		});
 	}
 }
-function deleteConfig(grid){
+function deleteConfig(grid) {
 	var selectedRecords = grid.getSelectionModel().getSelections();
 	var selectedCount = grid.getSelectionModel().getCount();
 	var ids = "";
-	if(selectedCount < 1){
+	if (selectedCount < 1) {
 		showResult("请选择要删除的行");
-	}else{
-		for ( var i = 0, len = selectedRecords.length; i < len; i++) {
+	} else {
+		for (var i = 0, len = selectedRecords.length; i < len; i++) {
 			if (ids == "") {
 				ids = selectedRecords[i].data['id'];
 			} else {
 				ids = ids + ';' + selectedRecords[i].data['id'];
 			}
 		}
-		Ext4.MessageBox.confirm("请确认","确定要删除选中的信息吗？",
-				function(button, text) {
-					if ("yes" == button){
-						Ext4.Ajax.request({
-							url : WWWROOT + '/disinfectSystem/printInvoiceConfigAction!delete.do',
-							params : {ids : ids},
-							success : function(response, options) {
-								var result = Ext4.JSON.decode(response.responseText);
-								var success = result.success;
-								if (true != success) {
-									showResult("删除失败");
-									return;
-								} else {
-									showResult('删除成功!');
-									grid.dwrReload();
-								}
-							},
-							failure : function(response, options) {
-								showResult("删除失败");
-							}
-						});
+		Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？", function (button, text) {
+			if ("yes" == button) {
+				Ext4.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/printInvoiceConfigAction!delete.do',
+					params: { ids: ids },
+					success: function (response, options) {
+						var result = Ext4.JSON.decode(response.responseText);
+						var success = result.success;
+						if (true != success) {
+							showResult("删除失败");
+							return;
+						} else {
+							showResult('删除成功!');
+							grid.dwrReload();
+						}
+					},
+					failure: function (response, options) {
+						showResult("删除失败");
 					}
 				});
+			}
+		});
 	}
 }
 
-function saveConfig(){
+function saveConfig() {
 	settousseGroupConfigParamsForSave();
 	formPanel.form.submit({
-		url : WWWROOT + '/disinfectSystem/printInvoiceConfigAction!save.do',
-		method : 'POST',
-		waitMsg : '正在保存数据，请稍候',
-		timeout : 600000,
-		waitTitle : '提交表单',
-		success : function(form, action) {
+		url: WWWROOT + '/disinfectSystem/printInvoiceConfigAction!save.do',
+		method: 'POST',
+		waitMsg: '正在保存数据，请稍候',
+		timeout: 600000,
+		waitTitle: '提交表单',
+		success: function (form, action) {
 			configWin.close();
 			showResult('保存成功');
 			grid.dwrReload();
 		},
-		failure : function(form, action) {
+		failure: function (form, action) {
 			showResult('failure = ' + action.failureType);
 		}
 	});
 }
 
-function istousseGroupConfigValid(){
+function istousseGroupConfigValid() {
 	var sheetsGridStore = sheetsGrid.getStore();
-	if(sheetsGridStore.getCount() == 0){
+	if (sheetsGridStore.getCount() == 0) {
 		showResult('打印类型列表不能为空 !');
 		return false;
 	}
-	for(var i=0;i<sheetsGridStore.getCount();++i){
+	for (var i = 0; i < sheetsGridStore.getCount(); ++i) {
 		var sheetRecord = sheetsGridStore.getAt(i);
 		var sheetTousseTypes = sheetRecord.data.tousseTypes;
-		if(sheetTousseTypes.length == 0){
+		if (sheetTousseTypes.length == 0) {
 			showResult('打印类型不能为空 !');
-//			sheetsGrid.getView().focusRow(i);
 			return false;
 		}
 	}
 	return true;
 }
 
-function settousseGroupConfigParamsForSave(){
+function settousseGroupConfigParamsForSave() {
 	var tousseGroupConfig = {
-		sheets:[]
+		sheets: []
 	};
 	var sheetsGridStore = sheetsGrid.getStore();
-	for(var i=0;i<sheetsGridStore.getCount();++i){
+	for (var i = 0; i < sheetsGridStore.getCount(); ++i) {
 		var sheetRecord = sheetsGridStore.getAt(i);
 		var sheetTousseTypes = sheetRecord.data.tousseTypes;
-//		var tousseTypes = [];
-//		for(var j=0;j<sheetTousseTypes.length;++j){
-//			tousseTypes.push()
-//		}
 		tousseGroupConfig.sheets.push({
-			name:sheetRecord.data.name,
-			tousseTypes:sheetTousseTypes
+			name: sheetRecord.data.name,
+			tousseTypes: sheetTousseTypes
 		});
 	}
 	var jsonStr = JSON.stringify(tousseGroupConfig);
 	Ext4.getCmp('tousseGroupConfig').setValue(jsonStr);
 }
 
-function initTousseGroupConfigGrid(){
+function initTousseGroupConfigGrid() {
 	var tousseGroupConfigStr = Ext4.getCmp('tousseGroupConfig').getValue();
-	if(isUndefinedOrNullOrEmpty(tousseGroupConfigStr)){
+	if (isUndefinedOrNullOrEmpty(tousseGroupConfigStr)) {
 		return;
 	}
 	var sheetsGridStore = sheetsGrid.getStore();
 	var tousseGroupConfig = JSON.parse(tousseGroupConfigStr);
 	var sheets = tousseGroupConfig.sheets;
-	for(var i=0;i<sheets.length;++i){
+	for (var i = 0; i < sheets.length; ++i) {
 		var sheet = sheets[i];
 		sheetsGridStore.add({
-			tousseTypesForDisplay:getTousseTypesForDisplay(sheet.tousseTypes),
-			name:sheet.name,
-			tousseTypes:sheet.tousseTypes
+			tousseTypesForDisplay: getTousseTypesForDisplay(sheet.tousseTypes),
+			name: sheet.name,
+			tousseTypes: sheet.tousseTypes
 		});
 	}
 }
 
-function getTousseTypesForDisplay(tousseTypes){
+function getTousseTypesForDisplay(tousseTypes) {
 	var tousseTypesForDisplay = '';
-	for(var i=0;i<tousseTypes.length;++i){
+	for (var i = 0; i < tousseTypes.length; ++i) {
 		var tousseType = tousseTypes[i];
-		if(tousseTypesForDisplay != ''){
+		if (tousseTypesForDisplay != '') {
 			tousseTypesForDisplay += ',';
 		}
 		tousseTypesForDisplay += tousseType.tousseGroupName + tousseType.type;
 	}
 	return tousseTypesForDisplay;
 }
 
-function onAvailableTousseTypeCheckChange(thiz, rowIndex, checked, eOpts){
+function onAvailableTousseTypeCheckChange(thiz, rowIndex, checked, eOpts) {
 	var sheetRecords = sheetsGrid.getSelectionModel().getSelection();
-	if(sheetRecords.length == 0){
+	if (sheetRecords.length == 0) {
 		showResult('请选择要修改的设置项!');
 		return;
 	}
-	if(sheetRecords.length > 1){
+	if (sheetRecords.length > 1) {
 		showResult('一次只能选择一个设置项!');
 		return;
 	}
@@ -191,352 +183,383 @@
 	var curAvailableTousseTypeRecord = availableTousseTypeesGrid.getStore().getAt(rowIndex);
 	var store = availableTousseTypeesGrid.getStore();
 	var tousseTypes = sheetRecord.data.tousseTypes;
-	if(checked){
+	if (checked) {
 		tousseTypes.push({
 			type: curAvailableTousseTypeRecord.data.type,
 			tousseGroupName: curAvailableTousseTypeRecord.data.tousseGroupName,
 			tousseGroupID: curAvailableTousseTypeRecord.data.tousseGroupID
 		});
-	}else{
+	} else {
 		var newTousseTypes = [];
-		for(var i=0;i<tousseTypes.length;++i){
-			if(tousseTypes[i].type == curAvailableTousseTypeRecord.data.type && tousseTypes[i].tousseGroupID == curAvailableTousseTypeRecord.data.tousseGroupID){
+		for (var i = 0; i < tousseTypes.length; ++i) {
+			if (tousseTypes[i].type == curAvailableTousseTypeRecord.data.type && tousseTypes[i].tousseGroupID == curAvailableTousseTypeRecord.data.tousseGroupID) {
 				continue;
 			}
 			newTousseTypes.push(tousseTypes[i]);
 		}
-		sheetRecord.set('tousseTypes',newTousseTypes);
+		sheetRecord.set('tousseTypes', newTousseTypes);
 	}
 	tousseTypes = sheetRecord.data.tousseTypes;
-//	var newTousseTypes = [];
-//	for(var i=0;i<store.getCount();++i){
-//		var record = store.getAt(i);
-//		if(record.data.checked){
-//			newTousseTypes.push({
-//				type: record.data.type,
-//				tousseGroupName: record.data.tousseGroupName,
-//				tousseGroupID: record.data.tousseGroupID
-//			});
-//		}
-//	}
 	var tousseTypesForDisplay = getTousseTypesForDisplay(tousseTypes);
-	sheetRecord.set('tousseTypesForDisplay',tousseTypesForDisplay);
+	sheetRecord.set('tousseTypesForDisplay', tousseTypesForDisplay);
 }
-function onSheetsSelectChange(thiz, selected, eOpts){
+function onSheetsSelectChange(thiz, selected, eOpts) {
 	var sheetRecord = null;
-	if(selected.length > 0){
+	if (selected.length > 0) {
 		sheetRecord = selected[0];
 	}
 	var availableTousseTypeStore = availableTousseTypeesGrid.getStore();
-	for(var i=0;i<availableTousseTypeStore.getCount();++i){
+	for (var i = 0; i < availableTousseTypeStore.getCount(); ++i) {
 		var tousseTypeRecord = availableTousseTypeStore.getAt(i);
-		if(shouldCheckThisTousseType(tousseTypeRecord,sheetRecord)){
-			tousseTypeRecord.set('checked',true);
-		}else{
-			tousseTypeRecord.set('checked',false);
+		if (shouldCheckThisTousseType(tousseTypeRecord, sheetRecord)) {
+			tousseTypeRecord.set('checked', true);
+		} else {
+			tousseTypeRecord.set('checked', false);
 		}
 	}
 }
 
-function shouldCheckThisTousseType(tousseTypeRecord,sheetRecord){
-	if(sheetRecord == null){
+function shouldCheckThisTousseType(tousseTypeRecord, sheetRecord) {
+	if (sheetRecord == null) {
 		return false;
 	}
 	var tousseTypes = sheetRecord.data.tousseTypes;
-	for(var i=0;i<tousseTypes.length;++i){
-		if(tousseTypes[i].type == tousseTypeRecord.data.type && tousseTypes[i].tousseGroupID == tousseTypeRecord.data.tousseGroupID){
+	for (var i = 0; i < tousseTypes.length; ++i) {
+		if (tousseTypes[i].type == tousseTypeRecord.data.type && tousseTypes[i].tousseGroupID == tousseTypeRecord.data.tousseGroupID) {
 			return true;
 		}
 	}
 	return false;
 }
-function showForm2(id){
+function showForm2(id) {
 	var sheets = [];//
 	// 待选的grid
 	Ext4.define('AvailableTousseType', {
-	    extend: 'Ext4.data.Model',
-	    fields: ['checked','type','tousseGroupName','tousseGroupID']
+		extend: 'Ext4.data.Model',
+		fields: ['checked', 'type', 'tousseGroupName', 'tousseGroupID']
 	});
-	
-    var availableTousseTypeStore = Ext4.create('Ext4.data.Store', {
-        pageSize: 1000,
-        model: 'AvailableTousseType',
-        proxy: {
-            type: 'ajax',
-            url: WWWROOT + '/disinfectSystem/printInvoiceConfigAction!loadAvailableTousseType.do',
-            reader: { root: 'items', totalProperty: 'total' }
-        }
-    });
-    availableTousseTypeStore.load();
+
+	var availableTousseTypeStore = Ext4.create('Ext4.data.Store', {
+		pageSize: 1000,
+		model: 'AvailableTousseType',
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/printInvoiceConfigAction!loadAvailableTousseType.do',
+			reader: { root: 'items', totalProperty: 'total' }
+		}
+	});
+	availableTousseTypeStore.load();
 	availableTousseTypeesGrid = Ext4.create('Ext4.grid.Panel', {
-		store : availableTousseTypeStore,
-		columnLines : true,
-//		height : 280,
-//		height : 250,
-		autoScroll : true,
-		viewConfig : {
-			loadMask : {
-				msg : '正在加载，请稍候...'
+		store: availableTousseTypeStore,
+		columnLines: true,
+		autoScroll: true,
+		viewConfig: {
+			loadMask: {
+				msg: '正在加载，请稍候...'
 			}
 		},
-		columns : [ {
-			xtype : 'checkcolumn', 
-			text : '添加/移除', 
-			dataIndex : 'checked',
-			width : 80,
-			listeners : {
-				checkchange : function(thiz, rowIndex, checked, eOpts) {
+		columns: [{
+			xtype: 'checkcolumn',
+			text: '添加/移除',
+			dataIndex: 'checked',
+			width: 80,
+			listeners: {
+				checkchange: function (thiz, rowIndex, checked, eOpts) {
 					onAvailableTousseTypeCheckChange(thiz, rowIndex, checked, eOpts);
 				}
 			}
-		},{
-			header : '类型',
-			dataIndex : 'type',
-			width : 350
 		}, {
-			header : '分组',
-			dataIndex : 'tousseGroupName',
-			width : 320
-		} ],
-		autoExpandColumn : 'type'
+			header: '类型',
+			dataIndex: 'type',
+			width: 350
+		}, {
+			header: '分组',
+			dataIndex: 'tousseGroupName',
+			width: 320
+		}],
+		autoExpandColumn: 'type'
 	});
 	// 已设置grid
 	// 待选的grid
 	Ext4.define('Sheet', {
-	    extend: 'Ext4.data.Model',
-	    fields: ['tousseTypesForDisplay','tousseTypes','name']
+		extend: 'Ext4.data.Model',
+		fields: ['tousseTypesForDisplay', 'tousseTypes', 'name']
 	});
-	
-    var sheetStore = Ext4.create('Ext4.data.Store', {
-        pageSize: 1000,
-        model: 'Sheet'
-    });
-    sheetsGrid = Ext4.create('Ext4.grid.Panel', {
-		store : sheetStore,
-		columnLines : true,
-//		height : 250,
-		autoScroll : true,
-//		selModel: new Ext4.selection.CheckboxModel({
-//			mode: 'SINGLE'
-//		}),
+
+	var sheetStore = Ext4.create('Ext4.data.Store', {
+		pageSize: 1000,
+		model: 'Sheet'
+	});
+	sheetsGrid = Ext4.create('Ext4.grid.Panel', {
+		store: sheetStore,
+		columnLines: true,
+		autoScroll: true,
 		selModel: {
 			mode: 'SINGLE'
 		},
 		selType: 'checkboxmodel',
-		viewConfig : {
-			loadMask : {
-				msg : '正在加载，请稍候...'
+		viewConfig: {
+			loadMask: {
+				msg: '正在加载，请稍候...'
 			}
 		},
 		plugins: {
-	        ptype: 'cellediting',
-	        clicksToEdit: 1
-	    },
-		columns : [{
+			ptype: 'cellediting',
+			clicksToEdit: 1
+		},
+		columns: [{
 			text: '名称',
-			dataIndex : 'name',
-			width : 230,
+			dataIndex: 'name',
+			width: 230,
 			editor: 'textfield'
-		},{
-			text : '打印类型列表',
-			dataIndex : 'tousseTypesForDisplay',
-			width : 500
+		}, {
+			text: '打印类型列表',
+			dataIndex: 'tousseTypesForDisplay',
+			width: 500
 		}],
-		autoExpandColumn : 'tousseTypesForDisplay',
-		listeners : {
-			selectionchange : function(thiz, selected, eOpts) {
+		autoExpandColumn: 'tousseTypesForDisplay',
+		listeners: {
+			selectionchange: function (thiz, selected, eOpts) {
 				onSheetsSelectChange(thiz, selected, eOpts);
 			}
 		}
 	});
-	
+
 	tab2 = Ext4.create('Ext4.Panel', {
-        width : 880,
-        height : configWinHeight,
-        autoScroll : true,
-	    layout: {
-	        type: 'vbox',
-	        align: 'stretch'
-	    },
-	    items: [{
-//	    	flex: 1,
-	    	height : 260,
-	    	layout: {
-		        type: 'fit'
-		    },
-	    	title: '可设置项',
-	    	items: [availableTousseTypeesGrid]
-	    },{
-	        xtype: 'panel',
-	        id: 'tousseTypesPanel',
-	        title: '已设置项',
-//	        flex: 1,
-	        height : 260,
-	        layout: {
-		        type: 'fit'
-		    },
-	        items: [sheetsGrid],
-	        tbar: [{
-	        	text: '新增',
-	        	handler: function(){
-	        		sheetStore.add({
-	        			tousseTypesForDisplay:'',
-	        			tousseTypes:[]
-	        		});
-	        	}
-	        },{
-	        	text: '删除',
-	        	handler: function(){
-	        		var sheetRecords = sheetsGrid.getSelectionModel().getSelection();
-	        		if(sheetRecords.length == 0){
-	        			showResult('请选择要删除的设置项!');
-	        			return;
-	        		}
-	        		sheetsGrid.getStore().remove(sheetRecords); 
-//	        		for(var i=0;i<sheetRecords.length;++i){
-//	        			sheetsGrid.getStore().remove(sheetRecords[i]); 
-//	        		}
-	        	}
-	        }]
-	    }]
+		width: 880,
+		height: configWinHeight,
+		autoScroll: true,
+		layout: {
+			type: 'vbox',
+			align: 'stretch'
+		},
+		items: [{
+			height: 260,
+			layout: {
+				type: 'fit'
+			},
+			title: '可设置项',
+			items: [availableTousseTypeesGrid]
+		}, {
+			xtype: 'panel',
+			id: 'tousseTypesPanel',
+			title: '已设置项',
+			height: 260,
+			layout: {
+				type: 'fit'
+			},
+			items: [sheetsGrid],
+			tbar: [{
+				text: '新增',
+				handler: function () {
+					sheetStore.add({
+						tousseTypesForDisplay: '',
+						tousseTypes: []
+					});
+				}
+			}, {
+				text: '删除',
+				handler: function () {
+					var sheetRecords = sheetsGrid.getSelectionModel().getSelection();
+					if (sheetRecords.length == 0) {
+						showResult('请选择要删除的设置项!');
+						return;
+					}
+					sheetsGrid.getStore().remove(sheetRecords);
+				}
+			}]
+		}]
 	});
 }
 
-function showWindow(id){
-	 formPanel = new Ext4.form.Panel({
-		id : 'configForm',
-		frame : true,
-		labelSeparator : ':',
-		bodyStyle : 'padding:5px 5px 0px 5px;',
-	    width : 890,
-	    height : 540,
-	    autoScroll : true,
+function showWindow(id) {
+	var departInfoStore = new top.Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSupplyRoomOrgUnitList.do',
+			reader: {
+				type: 'json',
+				root: 'data'
+			}
+		},
+		fields: ["orgUnitCoding", "orgUnitName", "id"]
+	});
+	formPanel = new Ext4.form.Panel({
+		id: 'configForm',
+		frame: true,
+		labelSeparator: ':',
+		bodyStyle: 'padding:5px 5px 0px 5px;',
+		width: 890,
+		height: 540,
+		autoScroll: true,
 		fieldDefaults: {
-	        labelAlign: 'left',
-	        labelWidth: 200
-	    },
-		items : [{
-			xtype : 'hidden',
-			id:'departCodes',
-			name:'departCodes'
-		},{
-			xtype : 'hidden',
-			id:'id',
-			name:'id'
-		},{
-			xtype : 'hidden',
-			id:'tousseGroupConfig',
-			name:'tousseGroupConfig'
-		},{
-			xtype:"fieldset", 
-			title :'基础信息', 
-			height:470,
-			items:[{
-				layout : 'column',
-				xtype : 'container',
-				labelWidth : 170,
-				items : [{
-					columnWidth : .8,
-					layout : 'form',
-					items : [{
-						xtype : 'textfield',
-						fieldLabel : '班次',
-						id : 'shift',
-						name : 'shift',
-						allowBlank : false,
-						anchor : '98%'
-					},{
-						xtype : 'combo',
-						fieldLabel : '发货单合并方式',
-						id : 'mergePrintType',
-						name : 'mergePrintType',
-						editable:false,
-						valueField : 'value',
-						displayField : 'value',
-						store : ['不合并','科室','申请单'],
-						queryMode:'local',
-						forceSelection : true,
-						triggerAction : 'all',
-						typeAhead : false,
-						allowBlank : false,
-						triggerAction : 'all',
-						anchor : '98%'
-					},
-					{
-						xtype : 'textarea',
-						fieldLabel : '科室',
-						id : 'departNames',
-						name : 'departNames',
-						height : 230,
-						allowBlank : false,
-						readOnly:true,
-						anchor : '98%'
+			labelAlign: 'right',
+			labelWidth: 100
+		},
+		buttonAlign: 'center',
+		items: [{
+			xtype: 'hidden',
+			id: 'departCodes',
+			name: 'departCodes'
+		}, {
+			xtype: 'hidden',
+			id: 'id',
+			name: 'id'
+		}, {
+			xtype: 'hidden',
+			id: 'tousseGroupConfig',
+			name: 'tousseGroupConfig'
+		}, {
+			xtype: "fieldset",
+			title: '基础信息',
+			height: 470,
+			items: [{
+				layout: 'column',
+				border: 0,
+				items: [{
+					columnWidth: .8,
+					layout: 'form',
+					border: 0,
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '班次',
+						id: 'shift',
+						name: 'shift',
+						allowBlank: false,
+						anchor: '98%'
 					}]
-				},{
-					columnWidth : .2,
-					layout : 'form',
-					items : [{
-						xtype : 'button',
-						text : '选择科室',
-						listeners:{
-							click : function(){
+				}, {
+					columnWidth: .2,
+					layout: 'form',
+					border: 0,
+					style: 'margin-left:10px',
+					items: [{
+						xtype: 'button',
+						text: '选择科室',
+						listeners: {
+							click: function () {
 								var departName = Ext4.getCmp('departNames').getValue();
 								var codes = Ext4.getCmp("departCodes").getValue();;
-								openSelectReceiverOrganization(departName,codes);
-							} 								
+								openSelectReceiverOrganization(departName, codes);
+							}
 						}
 					}]
+				}, {
+					columnWidth: .8,
+					layout: 'form',
+					border: 0,
+					items: [{
+						xtype: 'combo',
+						fieldLabel: '发货单合并方式',
+						id: 'mergePrintType',
+						name: 'mergePrintType',
+						editable: false,
+						valueField: 'value',
+						displayField: 'value',
+						store: ['不合并', '科室', '申请单'],
+						queryMode: 'local',
+						forceSelection: true,
+						triggerAction: 'all',
+						typeAhead: false,
+						allowBlank: false,
+						triggerAction: 'all',
+						anchor: '98%'
+					}]
+				}, {
+					columnWidth: .8,
+					layout: 'form',
+					border: 0,
+					hidden: !printInvoiceConfig,
+					items: [{
+						xtype: 'hidden',
+						id: 'handlerDepartId',
+						name: 'handlerDepartId'
+					}, {
+						xtype: 'hidden',
+						id: 'handlerDepartCode',
+						name: 'handlerDepartCode'
+					}, {
+						xtype: 'combo',
+						fieldLabel: '处理科室',
+						id: 'handlerDepartName',
+						name: 'handlerDepartName',
+						width: 120,
+						valueField: 'orgUnitName',
+						displayField: 'orgUnitName',
+						store: departInfoStore,
+						forceSelection: true,
+						editable: false,
+						triggerAction: 'all',
+						allowBlank: true,
+						anchor: '95%',
+						listeners: {
+							select: function (combo, record, index) {
+								Ext4.getCmp('handlerDepartCode').setValue(record[0].data.orgUnitCoding);
+								Ext4.getCmp('handlerDepartId').setValue(record[0].data.id);
+							}
+						}
+					}]
+				}, {
+					columnWidth: .8,
+					layout: 'form',
+					border: 0,
+					items: [{
+						xtype: 'textarea',
+						fieldLabel: '科室',
+						id: 'departNames',
+						name: 'departNames',
+						height: 230,
+						allowBlank: false,
+						readOnly: true,
+						anchor: '98%'
+					}]
 				}]
 			}]
-		}
-
-		]
-	 ,
-		buttons : [{
-			id : 'saveBtn',
-			text : '保存',
-			hidden:SSTS_printApplication_manager,
-			handler : function(){
-				if(!istousseGroupConfigValid()){
+		}],
+		buttons: [{
+			id: 'saveBtn',
+			text: '保存',
+			hidden: SSTS_printApplication_manager,
+			handler: function () {
+				if (!istousseGroupConfigValid()) {
 					return false;
 				}
-				if(formPanel.getForm().isValid()){
+				if (formPanel.getForm().isValid()) {
 					saveConfig();
-				}else{
+				} else {
 					showResult('请填写表单！');
 					return false;
 				}
 			}
 		}, {
-			text : '取消',
-			id : 'saveAndNewBtn',
-			handler : cancel
+			text: '取消',
+			id: 'saveAndNewBtn',
+			handler: cancel
 		}]
 	});
-	 showForm2(id);
-	 var tabs = Ext4.widget('tabpanel', {
-			width : configWinWidth,
-	        activeTab: 0,
-	        items: [{
-	        	title: '基础信息',
-	        	items: [formPanel]
-	        },{
-	        	title: '合并方式设置',
-	        	items: [tab2]
-	        }]
-	    });
-	 
-	 configWin = new Ext4.window.Window({
-			layout : 'fit',
-			title : '打印发货单设置',
-            width : configWinWidth,
-            height : configWinHeight,
-			border : false,
-			plain : true,
-			modal :true,
-			items : [tabs]
+	showForm2(id);
+	var tabs = Ext4.widget('tabpanel', {
+		width: configWinWidth,
+		activeTab: 0,
+		items: [{
+			title: '基础信息',
+			items: [formPanel]
+		}, {
+			title: '合并方式设置',
+			items: [tab2]
+		}]
 	});
+
+	configWin = new Ext4.window.Window({
+		layout: 'fit',
+		title: '打印发货单设置',
+		width: configWinWidth,
+		height: configWinHeight,
+		border: false,
+		plain: true,
+		modal: true,
+		items: [tabs]
+	});
 	configWin.show();
-    
 }
 
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp
===================================================================
diff -u -r39652 -r40445
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp	(.../selectInvoiceConfigForCheckbox.jsp)	(revision 39652)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfigForCheckbox.jsp	(.../selectInvoiceConfigForCheckbox.jsp)	(revision 40445)
@@ -7,7 +7,7 @@
 <head>
 <%
 PrintInvoiceConfigManager printInvoiceConfigManager = (PrintInvoiceConfigManager)  SpringBeanManger.getBean("printInvoiceConfigManager");
-List<PrintInvoiceConfig> list = printInvoiceConfigManager.getAll();
+List<PrintInvoiceConfig> list = printInvoiceConfigManager.getPrintInvoiceConfigForBatchPrint();
 %>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <%@ include file="/common/clearCache.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp
===================================================================
diff -u -r35013 -r40445
--- ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp	(.../printInvoiceConfigView.jsp)	(revision 35013)
+++ ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp	(.../printInvoiceConfigView.jsp)	(revision 40445)
@@ -22,6 +22,7 @@
 </head>
 <body>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/PrintInvoiceConfigTableManager.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp
===================================================================
diff -u -r39652 -r40445
--- ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp	(.../selectInvoiceConfig.jsp)	(revision 39652)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/selectInvoiceConfig.jsp	(.../selectInvoiceConfig.jsp)	(revision 40445)
@@ -7,7 +7,7 @@
 <head>
 <%
 PrintInvoiceConfigManager printInvoiceConfigManager = (PrintInvoiceConfigManager)  SpringBeanManger.getBean("printInvoiceConfigManager");
-List<PrintInvoiceConfig> list = printInvoiceConfigManager.getAll();
+List<PrintInvoiceConfig> list = printInvoiceConfigManager.getPrintInvoiceConfigForBatchPrint();
 %>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <%@ include file="/common/clearCache.jsp"%>
Index: ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js
===================================================================
diff -u -r16206 -r40445
--- ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js	(.../printInvoiceConfigView.js)	(revision 16206)
+++ ssts-web/src/main/webapp/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.js	(.../printInvoiceConfigView.js)	(revision 40445)
@@ -1,74 +1,82 @@
 var grid;
+
+//FSEYEQ-18：数据隔离
+var printInvoiceConfig = false;
+if (sstsConfig.supplyRoomDataIsolationModule && sstsConfig.supplyRoomDataIsolationModule.indexOf('printInvoiceConfig') >= 0) {
+	printInvoiceConfig = true;
+}
 /**
  * 修改记录
  * modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
  * 页面中需要定义 modify(v,data) 函数
  */
-function modify(v,data){
+function modify(v, data) {
 	editConfig(data.id);
 }
 
-function moveUp(number){
-	if(number>1){
-		PrintInvoiceConfigTableManager.moveUpRecord(number,function(){
+function moveUp(number) {
+	if (number > 1) {
+		PrintInvoiceConfigTableManager.moveUpRecord(number, function () {
 			grid.getStore().reload();
 		});
 	}
 }
-function moveDown(number){
-	PrintInvoiceConfigTableManager.moveDownRecord(number,function(){
+function moveDown(number) {
+	PrintInvoiceConfigTableManager.moveDownRecord(number, function () {
 		grid.getStore().reload();
 	});
 }
 
-Ext.onReady(function() {
+Ext.onReady(function () {
 	Ext.QuickTips.init();
-	
-	function moveUpDown(v, p, record){
-    	var html = '<a href="javascript:moveUp(' + v + ')">';
-    	html += '<img src="' + WWWROOT + '/ext/resources/images/default/grid/col-move-bottom.gif" border="0" align="middle" alt="向上移动"></a>&#160;&#160;&#160;&#160;&#160;';
-    	html += '<a href="javascript:moveDown(' + v + ')">';
-    	html += '<img src="' + WWWROOT + '/ext/resources/images/default/grid/col-move-top.gif" border="0" align="middle" alt="向下移动"></a>';
-    	return html;
-    }
-	
+
+	function moveUpDown(v, p, record) {
+		var html = '<a href="javascript:moveUp(' + v + ')">';
+		html += '<img src="' + WWWROOT + '/ext/resources/images/default/grid/col-move-bottom.gif" border="0" align="middle" alt="向上移动"></a>&#160;&#160;&#160;&#160;&#160;';
+		html += '<a href="javascript:moveDown(' + v + ')">';
+		html += '<img src="' + WWWROOT + '/ext/resources/images/default/grid/col-move-top.gif" border="0" align="middle" alt="向下移动"></a>';
+		return html;
+	}
+
 	var columns = [
-	       	    {header : "标识号",dataIndex : 'id',hidden :true},
-	       	    {header : "班次",dataIndex : 'shift',width : 150, renderer : modifyRecord},
-	       	    {header : "发货单合并方式",dataIndex : 'mergePrintType',width : 170},
-	       	    {id : 'departNames',header : "科室名称",dataIndex : 'departNames'},
-	       	    {header : "排序操作",dataIndex : 'orderNum', renderer : moveUpDown, sortable: false, menuDisabled: true},
-	       	    {header : "科室代码",dataIndex : 'departCodes',hidden : true}
-	       	];
+		{ header: "标识号", dataIndex: 'id', hidden: true },
+		{ header: "班次", dataIndex: 'shift', width: 150, renderer: modifyRecord },
+		{ header: "处理科室", dataIndex: 'handlerDepartName', sortable: false, hidden: !printInvoiceConfig },
+		{ header: "发货单合并方式", dataIndex: 'mergePrintType', width: 170 },
+		{ id: 'departNames', header: "科室名称", dataIndex: 'departNames' },
+		{ header: "排序操作", dataIndex: 'orderNum', renderer: moveUpDown, sortable: false, menuDisabled: true },
+		{ header: "科室代码", dataIndex: 'departCodes', hidden: true }
+	];
 	var filters = new Ext.grid.GridFilters({
-		filters : [
-			{type:'string',dataIndex:'name'}
+		filters: [
+			{ type: 'string', dataIndex: 'name' }
 		]
 	});
 	var readerDetail = [
-	    {name : 'id'}, 
-	    {name : 'shift'},
-	    {name : 'mergePrintType'},
-	    {name : 'mergePrintTousseDisposable'},
-	    {name : 'printOrder'},
-	    {name : 'disinfectGoodsPrintMode'},
-	    {name : 'departNames'},
-	    {name : 'departCodes'},
-	    {name : 'orderNum'}
+		{ name: 'id' },
+		{ name: 'shift' },
+		{ name: 'mergePrintType' },
+		{ name: 'handlerDepartName' },
+		{ name: 'mergePrintTousseDisposable' },
+		{ name: 'printOrder' },
+		{ name: 'disinfectGoodsPrintMode' },
+		{ name: 'departNames' },
+		{ name: 'departCodes' },
+		{ name: 'orderNum' }
 	];
-	
+
 	var tbar = [{
-		text : '添加',
-		hidden : SSTS_printApplication_manager,
-		iconCls : 'btn_ext_application_add',
-		handler : function() {
+		text: '添加',
+		hidden: SSTS_printApplication_manager,
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
 			showWindow();
 		}
-	},'-',{
-		text : '修改',
-		hidden : SSTS_printApplication_manager,
-		iconCls : 'btn_ext_application_edit',
-		handler : function() {
+	}, '-', {
+		text: '修改',
+		hidden: SSTS_printApplication_manager,
+		iconCls: 'btn_ext_application_edit',
+		handler: function () {
 			var records = grid.getSelectionModel().getSelections();
 			if (records.length == 0) {
 				showResult("请选择要修改的数据！");
@@ -82,40 +90,41 @@
 			editConfig(id);
 		}
 	}, '-', {
-		text : '删除',
-		hidden : SSTS_printApplication_manager,
-		iconCls : 'btn_ext_application_del',
-		handler : function() {
+		text: '删除',
+		hidden: SSTS_printApplication_manager,
+		iconCls: 'btn_ext_application_del',
+		handler: function () {
 			deleteConfig(grid);
 		}
 	}];
 	var dwrCallParams = null;
-	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
-	grid = new Ext.ux.ForgonPageGrid( {
-		tbar : tbar,
-		pageSize : 20,
-		defaultSortField : 'orderNum',
-		defaultSortDirection : 'ASC',
-		title : '打印发货单设置',
-		isCheckboxSelectionModel : true,
-		rememberSelected : false,
-		isShowSearchField : true,
-		columns : columns,
-		plugins : filters,
-		autoExpandColumn : 'departNames',
-		renderTo : 'gridDiv',
-		frame : false
+	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { };
+	grid = new Ext.ux.ForgonPageGrid({
+		tbar: tbar,
+		pageSize: 20,
+		defaultSortField: 'orderNum',
+		defaultSortDirection: 'ASC',
+		title: '打印发货单设置',
+		isCheckboxSelectionModel: true,
+		rememberSelected: false,
+		isShowSearchField: true,
+		columns: columns,
+		plugins: filters,
+		autoExpandColumn: 'departNames',
+		renderTo: 'gridDiv',
+		searchDisableIndexes: ["handlerDepartName"],
+		frame: false
 	}, readerDetail,
-	PrintInvoiceConfigTableManager.findPrintInvoiceConfigTableList,
+		PrintInvoiceConfigTableManager.findPrintInvoiceConfigTableList,
 		dwrCallParams // 这个参数只是占位作用
 	);
 	var viewport = new Ext.Viewport({
-		layout : 'border',
-		items : [{
-			region : 'center',
-			margins : '0 0 0 0',
-			layout : 'fit',
-			items : grid
+		layout: 'border',
+		items: [{
+			region: 'center',
+			margins: '0 0 0 0',
+			layout: 'fit',
+			items: grid
 		}]
 	});
 });
\ No newline at end of file