Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r34965 -r35149
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 34965)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 35149)
@@ -4,6 +4,24 @@
 var tousseArray = [];
 var tousseCount = 0;
 
+var tousseDefinitionStore = new top.Ext4.data.Store({
+	proxy: {
+		type: 'ajax',
+		url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type=' + encodeURI('器械包和外来器械包'),
+		reader: {
+			root: 'data',
+			totalProperty: 'totalCount'
+		}
+	},
+	fields: [
+		{ name: 'id', mapping: 'id' },
+		{ name: 'spelling', mapping: 'spelling' },
+		{ name: 'name', mapping: 'name' },
+		{ name: 'displayName', mapping: 'displayName' },
+		{ name: 'amount', mapping: 'amount' }
+	]
+});
+
 function cancel() {
 	win.close();
 }
@@ -152,7 +170,6 @@
 		],
 		listeners: {
 			beforeload: function (thiz, options) {
-				console.log(index !== undefined && index !== 'undefined')
 				if (index !== undefined && index !== 'undefined') {
 					if (top.Ext4.getCmp('tousseDefinitionID_' + index) && top.Ext4.getCmp('tousseDefinitionID_' + index).getValue()) {
 						materialDefinitionStore.proxy.extraParams.tousseDefinitionId = top.Ext4.getCmp('tousseDefinitionID_' + index).getValue();
@@ -165,31 +182,10 @@
 			}
 		}
 	});
+	materialDefinitionStore.load();
 	return materialDefinitionStore;
 }
 
-//获取器械包的store
-function getTousseDefinition() {
-	var tousseDefinitionStore = new top.Ext4.data.Store({
-		proxy: {
-			type: 'ajax',
-			url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTousseAndDiposableGoodsData.do?type=' + encodeURI('器械包和外来器械包'),
-			reader: {
-				root: 'data',
-				totalProperty: 'totalCount'
-			}
-		},
-		fields: [
-			{ name: 'id', mapping: 'id' },
-			{ name: 'spelling', mapping: 'spelling' },
-			{ name: 'name', mapping: 'name' },
-			{ name: 'displayName', mapping: 'displayName' },
-			{ name: 'amount', mapping: 'amount' }
-		]
-	});
-	return tousseDefinitionStore;
-}
-
 function getTime(time) {
 	if ((time || '') !== '') {
 		var t = time.split(':')[0] + ':' + time.split(':')[1];
@@ -353,7 +349,7 @@
 			minChars: 0,
 			valueField: 'id',
 			displayField: 'name',
-			store: getTousseDefinition(),
+			store: tousseDefinitionStore,
 			lazyInit: true,
 			forceSelection: false,
 			triggerAction: 'all',
@@ -368,7 +364,7 @@
 					top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
 					top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
 					top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
-					getMaterialDefinition(index).load();
+					getMaterialDefinition(index)
 				},
 				blur: function (field) {
 					var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).getValue();
@@ -673,7 +669,7 @@
 					minChars: 0,
 					valueField: 'id',
 					displayField: 'name',
-					store: getTousseDefinition(),
+					store: tousseDefinitionStore,
 					lazyInit: true,
 					triggerAction: 'all',
 					hideTrigger: true,
@@ -687,7 +683,7 @@
 							top.Ext4.getCmp('materialDefinitionID').setValue('');
 							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
 							top.Ext4.getCmp('materialDefinitionName').setValue('');
-							getMaterialDefinition().load();
+							getMaterialDefinition();
 						},
 						blur: function (field) {
 							var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName').getValue();
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r35051 -r35149
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 35051)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 35149)
@@ -1026,10 +1026,17 @@
 			if (arr.indexOf('手术预约管理') == -1 && itemId == 'operationReservationView'){
 				return returnContent;
 			}
+
+			if((!sstsConfig.enableInstrumentRepairManagement || arr.indexOf('器械维修') == -1) && itemId == 'instrumentRepair'){
+				return returnContent;
+			}
 		}else {
 			if(itemId == 'cardinalNumManage' || itemId == 'sterilizerDelivery' || itemId == 'deviceMaintenance' || itemId == 'deviceMaintenanceCustom' || itemId == 'foreignProxySterilizationManage' || itemId == 'foreignTousseApplication' || itemId == 'customform' || itemId == 'tousseGoodsStockView' || itemId == 'operationReservationView'){
 				return returnContent;
 			}
+			if(!sstsConfig.enableInstrumentRepairManagement && itemId == 'instrumentRepair'){
+				return returnContent;
+			}
 		}
 		
 		//如果没有开启库位管理功能,则桌面图标不显示