Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonForm.js	(revision 29963)
@@ -0,0 +1,321 @@
+var configWin;
+var departWin;
+var formPanel;
+
+function cancel() {
+	configWin.close();
+}
+function reloadGrid(parentId) {
+
+}
+/*
+function openSelectReceiverOrganization(departNames, codes) {
+	//组织机构Store
+	var orgJsonStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/systemmanage/getOrgNameBySpellingAndWB!getOrgNameBySpellingAndWB.do',
+			reader: {
+				root: 'data'
+			},
+			params:{
+				showDisableOrgUnit: false
+			}
+		},
+		fields: [
+			{ name: 'name', mapping: 'name', id: 'id' }
+		]
+	})
+	
+	root = new Ext.tree.AsyncTreeNode({
+		text: '组织机构',
+		id: '0',
+		draggable: false,  //这棵树不可以拖动默认也是false
+		listeners: { click: reloadGrid }
+	});
+
+	var myLoader = new Ext.tree.TreeLoader({ dataUrl: WWWROOT + '/systemmanage/orgUnitTreeLoad.do?showDisableOrgUnit=false' });
+
+	myLoader.on("beforeload", function (treeLoader, node) {
+		treeLoader.baseParams.parentId = node.id;
+		treeLoader.baseParams.showDisableOrgUnit = true;
+		var nodePath = node.getPath();
+		if (nodePath != '/0') {
+			path = nodePath;
+		}
+	});
+
+	departWin = new top.Ext4.window.Window({
+		id: 'departWin',
+		layout: 'border',
+		title: '选择科室',
+		width: 760,
+		height: 500,
+		modal: true,
+		defaults: {
+			bodyStyle: "background-color: none",
+			frame: true,
+			border: false
+		},
+		style: 'padding:20px',
+		items: [{
+			region: "west",
+			width: 350,
+			title: '选择:',
+			items: []
+		}, {
+			region: "east",
+			width: 350,
+			title: '已选:'
+		}],
+		buttonAlign : 'center',
+		buttons: [{
+			id: 'confirmBtn',
+			text: '确定',
+			handler: function () {
+				
+			}
+		}, {
+			text: '取消',
+			handler: function(){
+				departWin.close();
+			}
+		}]
+	});
+	departWin.show();
+}
+*/
+function openSelectReceiverOrganization(departNames, codes) {
+	var param = {
+		allowNull: true,
+		onlyOneOrg: true,
+		resultType: 'code',
+		tabType: 'orgUnit',
+		sameLevel: 'yes',
+		range: 'all',
+		departNames: departNames,
+		departCodes: codes
+	};
+
+	var selectedOrgUnitArray = openModalWindow(WWWROOT + "/common/selectOrgByExt.jsp", param, "800", "450");
+	var codes = '';
+
+	if (selectedOrgUnitArray == undefined) {
+		return;
+	} else if (selectedOrgUnitArray[0] !== undefined) {
+		codes = '';
+		var tem = '';
+
+		var tempArray = selectedOrgUnitArray[0].split(';');
+		for (var i = 0; i < tempArray.length; i++) {
+			codes += tempArray[i] + ";";
+		}
+		for (var j = 0; j < codes.length - 1; j++) {
+			tem += codes.charAt(j);
+		}
+		top.Ext4.getCmp("departNames").setValue(selectedOrgUnitArray[1]);
+		top.Ext4.getCmp("departCodes").setValue(tem);
+	} else {
+		var loop = setInterval(function () {
+			if (selectedOrgUnitArray.closed) {
+				clearInterval(loop);
+
+				codes = '';
+				var tem = '';
+				var returnValue = selectedOrgUnitArray.returnValue || [];
+
+				if (returnValue.length > 0) {
+					var tempArray = selectedOrgUnitArray.returnValue[0].split(';');
+					for (var i = 0; i < tempArray.length; i++) {
+						codes += tempArray[i] + ";";
+					}
+					for (var j = 0; j < codes.length - 1; j++) {
+						tem += codes.charAt(j);
+					}
+					top.Ext4.getCmp("departNames").setValue(selectedOrgUnitArray.returnValue[1]);
+					top.Ext4.getCmp("departCodes").setValue(tem);
+				}
+			}
+		}, 500);
+	}
+}
+
+function editConfig(id) {
+	showAddOrEditWindow(id);
+	if (!Ext4.isEmpty(id)) {
+		var mask = new Ext4.LoadMask({
+			msg: '正在加载，请稍候...',
+			target: formPanel
+		});
+		mask.show();
+		Ext4.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/orgUnitGroupAction!loadOrgUnitGroup.do',
+			params: { id: id },
+			success: function (response, options) {
+				mask.hide();
+				var result = Ext4.JSON.decode(response.responseText);
+				if (result.success && result.data) {
+					top.Ext4.getCmp('id').setValue(result.data.id);
+					top.Ext4.getCmp('departCodes').setValue(result.data.orgUnitCodes);
+					top.Ext4.getCmp('departNames').setValue(result.data.orgUnitNames);
+					top.Ext4.getCmp('name').setValue(result.data.name);
+				} else {
+					showResult('系统加载出错，请稍候再试');
+				}
+			},
+			failure: function (response, options) {
+				mask.hide();
+				showResult('系统加载出错，请稍候再试');
+			}
+		});
+	}
+}
+function deleteConfig(grid) {
+	var selectedRecords = grid.getSelectionModel().getSelection();
+	var selectedCount = grid.getSelectionModel().getCount();
+	var ids = [];
+	if (selectedCount < 1) {
+		showResult("请选择要删除的行");
+	} else {
+		for (var i = 0, len = selectedRecords.length; i < len; i++) {
+			ids[i] = selectedRecords[i].data['id'];
+		}
+		Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？",
+			function (button, text) {
+				if ("yes" == button) {
+					Ext4.Ajax.request({
+						url: WWWROOT + '/disinfectSystem/orgUnitGroupAction!deleteOrgUnitGroupByIds.do',
+						params: { ids: ids.join(';') },
+						success: function (response, options) {
+							var result = Ext4.JSON.decode(response.responseText);
+							var success = result.success;
+							if (true != success) {
+								showResult("删除失败");
+								return;
+							} else {
+								showResult('删除成功!');
+								listStore.load();
+							}
+						},
+						failure: function (response, options) {
+							showResult("删除失败");
+						}
+					});
+				}
+			});
+	}
+}
+
+function saveConfig() {
+	formPanel.form.submit({
+		url: WWWROOT + '/disinfectSystem/orgUnitGroupAction!saveOrUpdateOrgUnitGroup.do',
+		method: 'POST',
+		waitMsg: '正在保存数据，请稍候',
+		timeout: 600000,
+		waitTitle: '提交表单',
+		success: function (form, action) {
+			configWin.close();
+			listStore.load();
+			showResult('保存成功');
+		},
+		failure: function (form, action) {
+			showResult('failure = ' + action.failureType);
+		}
+	});
+}
+
+function showAddOrEditWindow(id) {
+	formPanel = new top.Ext4.form.Panel({
+		id: 'configForm',
+		frame: true,
+		labelSeparator: ':',
+		bodyStyle: 'padding:5px 5px 0px 5px;',
+		width: 800,
+		fieldDefaults: {
+			labelAlign: 'right',
+			labelWidth: 70
+		},
+		items: [{
+			xtype: 'hidden',
+			id: 'departCodes',
+			name: 'departCodes'
+		}, {
+			xtype: 'hidden',
+			id: 'id',
+			name: 'id',
+			value: id
+		}, {
+			layout: 'column',
+			items: [{
+				columnWidth: .8,
+				layout: 'form',
+				items: [{
+					xtype: 'textfield',
+					fieldLabel: '名称',
+					id: 'name',
+					name: 'name',
+					allowBlank: false,
+					anchor: '98%'
+				}, {
+					xtype: 'textarea',
+					fieldLabel: '科室',
+					id: 'departNames',
+					name: 'departNames',
+					height: 230,
+					allowBlank: false,
+					readOnly: true,
+					anchor: '98%'
+				}]
+			}, {
+				columnWidth: .2,
+				layout: 'form',
+				border: 0,
+				items: [{
+					xtype: 'button',
+					text: '选择科室',
+					listeners: {
+						click: function () {
+							var departName = top.Ext4.getCmp('departNames').getValue();
+							var codes = top.Ext4.getCmp("departCodes").getValue();;
+							openSelectReceiverOrganization(departName, codes);
+						}
+					}
+				}]
+			}]
+		}]
+		,
+		buttons: [{
+			id: 'saveBtn',
+			text: '保存',
+			handler: function () {
+				if (formPanel.getForm().isValid()) {
+					saveConfig();
+				} else {
+					showResult('请填写表单！');
+					return false;
+				}
+			}
+		}, {
+			text: '取消',
+			handler: cancel
+		}]
+	});
+	configWin = new top.Ext4.window.Window({
+		id: 'configWin',
+		layout: 'border',
+		title: '科室分组设置',
+		width: 700,
+		height: 400,
+		border: false,
+		plain: true,
+		modal: true,
+		items: [{
+			region: 'center',
+			width: 400,
+			layout: 'fit',
+			items: [formPanel]
+		}]
+	});
+	configWin.show();
+}
+
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.js	(revision 29963)
@@ -0,0 +1,75 @@
+var listStore;
+var departGroupGrid;
+//修改科室分组
+function modify(v, data) {
+	editConfig(data.id);
+}
+
+Ext4.onReady(function () {
+	Ext4.QuickTips.init();
+	var columns = [
+		{ header: "id", dataIndex: 'id', hidden: true },
+		{ header: "名称", dataIndex: 'name', width: 150, renderer: modifyRecord },
+		{ header: "科室名称", dataIndex: 'orgUnitNames', width: document.body.clientWidth - 200, sortable: false }
+	];
+	var tbar = [{
+		text: '添加',
+		iconCls: 'btn_ext_application_add',
+		handler: function () {
+			showAddOrEditWindow();
+		}
+	}, '-', {
+		text: '删除',
+		iconCls: 'btn_ext_application_del',
+		handler: function () {
+			deleteConfig(departGroupGrid);
+		}
+	}];
+
+	Ext4.define('departGroupModel', {
+		extend: 'Ext4.data.Model',
+		fields: ['id', 'name', 'orgUnitNames']
+	});
+
+	listStore = new Ext4.data.Store({
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/orgUnitGroupAction!findOrgUnitGroupList.do',
+			reader: {
+				root: 'data'
+			}
+		},
+		model: 'departGroupModel'
+	});
+
+	listStore.load();
+
+	departGroupGrid = new Ext4.grid.GridPanel({
+		title: '科室分组设置',
+		columns: columns,
+		frame: false,
+		autoScroll: false,
+		store: listStore,
+		tbar: tbar,
+		dockedItems: [{
+			xtype: 'pagingtoolbar',
+			store: listStore,   // same store GridPanel is using  
+			dock: 'bottom',
+			displayInfo: true
+		}],
+		viewConfig: {
+			autoFill: true
+		},
+		selModel: new Ext4.selection.CheckboxModel()
+	});
+
+	new Ext4.container.Viewport({
+		layout: 'border',
+		items: [{
+			region: 'center',
+			layout: 'fit',
+			items: [departGroupGrid]
+		}]
+	});
+
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp	(revision 29963)
@@ -0,0 +1,38 @@
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<%
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
+    request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    request.setAttribute("today", dateFormat.format(new Date()));
+%>
+
+<html>
+<head>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>科室分组设置</title>
+</head>
+<body>
+<style>
+    #departLeft .x4-panel-body-default,#departRight .x4-panel-body-default{
+        background: none;
+    }
+    #departLeft .x4-form-item-label-left,#departRight .x4-form-item-label-left{
+        padding-left: 10px;
+    }
+    .x4-grid-cell a:visited, .x4-grid-cell a:active, .x4-grid-cell a:hover, .x4-grid-cell a:link {
+        color: #367f21 !important;
+        text-decoration: none !important;
+    }
+</style>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="departmentgroupCommonView.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="departmentgroupCommonForm.js?version=${svnRevision}"></script>
+
+</body>
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r29344 -r29963
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 29344)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 29963)
@@ -910,6 +910,7 @@
             {hidden :SSTS_RecyclePrint_Menu || (printRecyclingConfigFormVersion!=2),text:"打印发货计划设置",href:WWWROOT+'/disinfectsystem/printRecyclingConfig2/printRecyclingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu || !((sstsConfig.hasOwnProperty('printInvoiceVersion')) && sstsConfig.printInvoiceVersion==2),text:"打印发货单设置",href:WWWROOT+'/disinfectsystem/printInvoiceConfig/printInvoiceConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"标签模板管理",href:WWWROOT+'/disinfectsystem/labelTemplateDesign/labelTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_RecyclePrint_Menu,text:"科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupCommonView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"回收科室分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/departmentgroup/departmentgroupView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:""+reviewViewText2+"科室分组设置",href:encodeURI(WWWROOT+'/disinfectsystem/basedatamanager/departmentgroupOption/departmentgroupOptionView.jsp?type='+departmentGroupOption_REVIEWE),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RecyclePrint_Menu,text:"物品科室共用配置",href:WWWROOT+'/disinfectsystem/goodsDepartShareConfig/goodsDepartShareConfigView.jsp',hrefTarget:linkTarget,leaf:true},