Index: ssts-web/src/main/resources/systemset/portalPage.xml
===================================================================
diff -u -r33869 -r34965
--- ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 33869)
+++ ssts-web/src/main/resources/systemset/portalPage.xml	(.../portalPage.xml)	(revision 34965)
@@ -36,6 +36,7 @@
 		<portalItem type="1" system="1" title="召回信息" itemId="recallRecord" operationIds="SSTS_RecallRecord_Select" imgUrl="/themes/portalPage/img/1528.png" itemLinkUrl="/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp" />
 		<portalItem type="1" system="1" title="质量监测" itemId="qualityMonitoring" operationIds="SSTS_QualityRecord_Create,SSTS_QualityRecord_Update,SSTS_QualityRecord_Select,SSTS_QualityRecord_Delete" imgUrl="/themes/portalPage/img/tabs_qualityMonitoring.png" itemLinkUrl="/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp?editMode=true" />
 		<portalItem type="1" system="1" title="器械包信息" itemId="tousseInstance" operationIds="SSTS_TousseInstanceManager_ViewMenu,SSTS_TousseInstanceManager_Selectall" imgUrl="/themes/portalPage/img/tousse.png" itemLinkUrl="/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp" />
+		<portalItem type="1" system="1" title="器械维修管理" itemId="instrumentRepair" operationIds="SSTS_InstrumentRepair_list,SSTS_InstrumentRepair_handle" imgUrl="/themes/portalPage/img/instrumentRepair.png" itemLinkUrl="/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.jsp" />
 		<portalItem type="1" system="1" title="定期监测" itemId="routineMonitoring" operationIds="SSTS_RoutineMonitoring_Create,SSTS_RoutineMonitoring_Update,SSTS_RoutineMonitoring_Delete,SSTS_RoutineMonitoring_Review" imgUrl="/themes/portalPage/img/routineMonitoring.png" itemLinkUrl="/disinfectsystem/routineMonitoring/routineMonitoringView.jsp" />
 		<portalItem type="1" system="1" title="设备维护信息" itemId="deviceMaintenance" operationIds="SSTS_DeviceMonitoring_Create,SSTS_DeviceMonitoring_Update,SSTS_DeviceMonitoring_Select,SSTS_DeviceMonitoring_Delete,SSTS_DeviceMaintenance_Create,SSTS_DeviceMaintenance_Update,SSTS_DeviceMaintenance_Select,SSTS_DeviceMaintenance_Delete" imgUrl="/themes/portalPage/img/tabs_maintenance.png" itemLinkUrl="/disinfectsystem/deviceMaintenance/deviceMaintenanceView.jsp" />
 		<portalItem type="1" system="1" title="设备维护信息" itemId="deviceMaintenanceCustom" operationIds="SSTS_DeviceMonitoring_Create,SSTS_DeviceMonitoring_Update,SSTS_DeviceMonitoring_Select,SSTS_DeviceMonitoring_Delete,SSTS_DeviceMaintenance_Create,SSTS_DeviceMaintenance_Update,SSTS_DeviceMaintenance_Select,SSTS_DeviceMaintenance_Delete" imgUrl="/themes/portalPage/img/tabs_maintenance.png" itemLinkUrl="/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsView.jsp" />
Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js
===================================================================
diff -u -r33157 -r34965
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 33157)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementForm.js	(.../instrumentRepairManagementForm.js)	(revision 34965)
@@ -134,7 +134,7 @@
 }
 
 //获取材料的store
-function getMaterialDefinition() {
+function getMaterialDefinition(index) {
 	var materialDefinitionStore = new top.Ext4.data.Store({
 		proxy: {
 			type: 'ajax',
@@ -149,7 +149,21 @@
 			{ name: 'spelling', mapping: 'spelling' },
 			{ name: 'name', mapping: 'name' },
 			{ name: 'count', mapping: 'count' }
-		]
+		],
+		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();
+					}
+				} else {
+					if (top.Ext4.getCmp('tousseDefinitionID') && top.Ext4.getCmp('tousseDefinitionID').getValue()) {
+						materialDefinitionStore.proxy.extraParams.tousseDefinitionId = top.Ext4.getCmp('tousseDefinitionID').getValue();
+					}
+				}
+			}
+		}
 	});
 	return materialDefinitionStore;
 }
@@ -316,79 +330,10 @@
 
 //添加器械包块
 function addTousseItems(index) {
-	var item = [{
+	var item = [, {
 		columnWidth: 0.29,
 		layout: 'form',
 		border: 0,
-		style: 'margin-bottom:10px',
-		id: 'itemBox1_' + index,
-		items: [{
-			xtype: 'hidden',
-			id: 'materialDefinitionID_' + index,
-			name: 'materialDefinitionID_' + index
-		}, {
-			xtype: 'hidden',
-			id: 'hiddenMaterialDefinitionName_' + index,
-			name: 'hiddenMaterialDefinitionName_' + index
-		}, {
-			xtype: 'combo',
-			fieldLabel: '器械名称',
-			id: 'materialDefinitionName_' + index,
-			name: 'materialDefinitionName_' + index,
-			queryParam: 'spell',
-			minChars: 0,
-			valueField: 'id',
-			displayField: 'name',
-			store: getMaterialDefinition(),
-			lazyInit: true,
-			triggerAction: 'all',
-			hideTrigger: true,
-			typeAhead: false,
-			allowBlank: false,
-			anchor: '60%',
-			listeners: {
-				select: function (combo, record, zIndex) {
-					top.Ext4.getCmp('materialDefinitionID_' + index).setValue(record[0].data.id);
-					top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(record[0].data.name);
-				},
-				blur: function (field) {
-					var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).getValue();
-					var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName_' + index).getRawValue();
-					if (materialDefinitionName !== hiddenMaterialDefinitionName) {
-						top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
-						top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
-						top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
-					}
-				}
-			}
-		}]
-	}, {
-		columnWidth: 0.01,
-		layout: 'form',
-		border: 0,
-		id: 'itemBox2_' + index,
-		items: [{
-			xtype: 'displayfield',
-			fieldLabel: ''
-		}]
-	}, {
-		columnWidth: 0.03,
-		layout: 'form',
-		border: 0,
-		id: 'itemBox3_' + index,
-		items: [{
-			xtype: 'button',
-			tooltip: '删除',
-			iconCls: 'btn_ext_application_del',
-			style: 'margin-top:2px',
-			handler: function () {
-				delTousseItems(index);
-			}
-		}]
-	}, {
-		columnWidth: 0.33,
-		layout: 'form',
-		border: 0,
 		id: 'itemBox4_' + index,
 		style: 'margin-bottom:10px',
 		items: [{
@@ -420,6 +365,10 @@
 				select: function (combo, record, zIndex) {
 					top.Ext4.getCmp('tousseDefinitionID_' + index).setValue(record[0].data.id);
 					top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).setValue(record[0].data.name);
+					top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
+					top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
+					top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
+					getMaterialDefinition(index).load();
 				},
 				blur: function (field) {
 					var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName_' + index).getValue();
@@ -433,24 +382,93 @@
 			}
 		}]
 	}, {
-		columnWidth: 0.33,
-		layout: 'form',
-		border: 0,
-		id: 'itemBox5_' + index,
-		style: 'margin-bottom:10px',
-		items: [{
-			xtype: 'numberfield',
-			allowDecimals: false,
-			minValue: 1,
-			name: 'amount_' + index,
-			id: 'amount_' + index,
-			fieldLabel: "数量",
-			allowBlank: false,
-			blankText: '数量不能为空',
-			anchor: '95%',
-			value: 1
+			columnWidth: 0.01,
+			layout: 'form',
+			border: 0,
+			id: 'itemBox2_' + index,
+			items: [{
+				xtype: 'displayfield',
+				fieldLabel: ''
+			}]
+		}, {
+			columnWidth: 0.03,
+			layout: 'form',
+			border: 0,
+			id: 'itemBox3_' + index,
+			items: [{
+				xtype: 'button',
+				tooltip: '删除',
+				iconCls: 'btn_ext_application_del',
+				style: 'margin-top:2px',
+				handler: function () {
+					delTousseItems(index);
+				}
+			}]
+		}, {
+			columnWidth: 0.33,
+			layout: 'form',
+			border: 0,
+			style: 'margin-bottom:10px',
+			id: 'itemBox1_' + index,
+			items: [{
+				xtype: 'hidden',
+				id: 'materialDefinitionID_' + index,
+				name: 'materialDefinitionID_' + index
+			}, {
+				xtype: 'hidden',
+				id: 'hiddenMaterialDefinitionName_' + index,
+				name: 'hiddenMaterialDefinitionName_' + index
+			}, {
+				xtype: 'combo',
+				fieldLabel: '器械名称',
+				id: 'materialDefinitionName_' + index,
+				name: 'materialDefinitionName_' + index,
+				queryParam: 'spell',
+				minChars: 0,
+				valueField: 'id',
+				displayField: 'name',
+				store: getMaterialDefinition(index),
+				lazyInit: true,
+				triggerAction: 'all',
+				hideTrigger: true,
+				typeAhead: false,
+				allowBlank: false,
+				anchor: '60%',
+				listeners: {
+					select: function (combo, record, zIndex) {
+						top.Ext4.getCmp('materialDefinitionID_' + index).setValue(record[0].data.id);
+						top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue(record[0].data.name);
+					},
+					blur: function (field) {
+						var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).getValue();
+						var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName_' + index).getRawValue();
+						if (materialDefinitionName !== hiddenMaterialDefinitionName) {
+							top.Ext4.getCmp('materialDefinitionID_' + index).setValue('');
+							top.Ext4.getCmp('materialDefinitionName_' + index).setValue('');
+							top.Ext4.getCmp('hiddenMaterialDefinitionName_' + index).setValue('');
+						}
+					}
+				}
+			}]
+		}, {
+			columnWidth: 0.33,
+			layout: 'form',
+			border: 0,
+			id: 'itemBox5_' + index,
+			style: 'margin-bottom:10px',
+			items: [{
+				xtype: 'numberfield',
+				allowDecimals: false,
+				minValue: 1,
+				name: 'amount_' + index,
+				id: 'amount_' + index,
+				fieldLabel: "数量",
+				allowBlank: false,
+				blankText: '数量不能为空',
+				anchor: '95%',
+				value: 1
+			}]
 		}]
-	}]
 	top.Ext4.getCmp('tousseItem').add(item);
 }
 
@@ -498,10 +516,10 @@
 			if (item == '房间号') {
 				roomNumberIsHidden = true;
 			}
-			if (item == '洗手护士(发现故障)' || item == '洗手护士（发现故障）') {
+			if (item == '发现者') {
 				washHandNurseNameIsHidden = true;
 			}
-			if (item == '送修护士') {
+			if (item == '送修者') {
 				repairNurseNameIsHidden = true;
 			}
 			if (item == '工程师') {
@@ -640,40 +658,44 @@
 				style: 'margin-bottom:10px',
 				items: [{
 					xtype: 'hidden',
-					id: 'materialDefinitionID',
-					name: 'materialDefinitionID'
+					id: 'tousseDefinitionID',
+					name: 'tousseDefinitionID'
 				}, {
 					xtype: 'hidden',
-					id: 'hiddenMaterialDefinitionName',
-					name: 'hiddenMaterialDefinitionName'
+					id: 'hiddenTousseDefinitionName',
+					name: 'hiddenTousseDefinitionName'
 				}, {
 					xtype: 'combo',
-					fieldLabel: '器械名称',
-					id: 'materialDefinitionName',
-					name: 'materialDefinitionName',
+					fieldLabel: '所属器械包',
+					id: 'tousseDefinitionName',
+					name: 'tousseDefinitionName',
 					queryParam: 'spell',
 					minChars: 0,
 					valueField: 'id',
 					displayField: 'name',
-					store: getMaterialDefinition(),
+					store: getTousseDefinition(),
 					lazyInit: true,
 					triggerAction: 'all',
 					hideTrigger: true,
 					typeAhead: false,
 					allowBlank: false,
-					anchor: '60%',
+					anchor: '95%',
 					listeners: {
 						select: function (combo, record, index) {
-							top.Ext4.getCmp('materialDefinitionID').setValue(record[0].data.id);
-							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(record[0].data.name);
+							top.Ext4.getCmp('tousseDefinitionID').setValue(record[0].data.id);
+							top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(record[0].data.name);
+							top.Ext4.getCmp('materialDefinitionID').setValue('');
+							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
+							top.Ext4.getCmp('materialDefinitionName').setValue('');
+							getMaterialDefinition().load();
 						},
 						blur: function (field) {
-							var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName').getValue();
-							var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName').getRawValue();
-							if (materialDefinitionName !== hiddenMaterialDefinitionName) {
-								top.Ext4.getCmp('materialDefinitionID').setValue('');
-								top.Ext4.getCmp('materialDefinitionName').setValue('');
-								top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
+							var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName').getValue();
+							var tousseDefinitionName = top.Ext4.getCmp('tousseDefinitionName').getRawValue();
+							if (tousseDefinitionName !== hiddenTousseDefinitionName) {
+								top.Ext4.getCmp('tousseDefinitionID').setValue('');
+								top.Ext4.getCmp('tousseDefinitionName').setValue('');
+								top.Ext4.getCmp('hiddenTousseDefinitionName').setValue('');
 							}
 						}
 					}
@@ -708,40 +730,40 @@
 				style: 'margin-bottom:10px',
 				items: [{
 					xtype: 'hidden',
-					id: 'tousseDefinitionID',
-					name: 'tousseDefinitionID'
+					id: 'materialDefinitionID',
+					name: 'materialDefinitionID'
 				}, {
 					xtype: 'hidden',
-					id: 'hiddenTousseDefinitionName',
-					name: 'hiddenTousseDefinitionName'
+					id: 'hiddenMaterialDefinitionName',
+					name: 'hiddenMaterialDefinitionName'
 				}, {
 					xtype: 'combo',
-					fieldLabel: '所属器械包',
-					id: 'tousseDefinitionName',
-					name: 'tousseDefinitionName',
+					fieldLabel: '器械名称',
+					id: 'materialDefinitionName',
+					name: 'materialDefinitionName',
 					queryParam: 'spell',
 					minChars: 0,
 					valueField: 'id',
 					displayField: 'name',
-					store: getTousseDefinition(),
+					store: getMaterialDefinition(),
 					lazyInit: true,
 					triggerAction: 'all',
 					hideTrigger: true,
 					typeAhead: false,
 					allowBlank: false,
-					anchor: '95%',
+					anchor: '60%',
 					listeners: {
 						select: function (combo, record, index) {
-							top.Ext4.getCmp('tousseDefinitionID').setValue(record[0].data.id);
-							top.Ext4.getCmp('hiddenTousseDefinitionName').setValue(record[0].data.name);
+							top.Ext4.getCmp('materialDefinitionID').setValue(record[0].data.id);
+							top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue(record[0].data.name);
 						},
 						blur: function (field) {
-							var hiddenTousseDefinitionName = top.Ext4.getCmp('hiddenTousseDefinitionName').getValue();
-							var tousseDefinitionName = top.Ext4.getCmp('tousseDefinitionName').getRawValue();
-							if (tousseDefinitionName !== hiddenTousseDefinitionName) {
-								top.Ext4.getCmp('tousseDefinitionID').setValue('');
-								top.Ext4.getCmp('tousseDefinitionName').setValue('');
-								top.Ext4.getCmp('hiddenTousseDefinitionName').setValue('');
+							var hiddenMaterialDefinitionName = top.Ext4.getCmp('hiddenMaterialDefinitionName').getValue();
+							var materialDefinitionName = top.Ext4.getCmp('materialDefinitionName').getRawValue();
+							if (materialDefinitionName !== hiddenMaterialDefinitionName) {
+								top.Ext4.getCmp('materialDefinitionID').setValue('');
+								top.Ext4.getCmp('materialDefinitionName').setValue('');
+								top.Ext4.getCmp('hiddenMaterialDefinitionName').setValue('');
 							}
 						}
 					}
@@ -791,8 +813,7 @@
 				hidden: washHandNurseNameIsHidden,
 				items: [{
 					xtype: 'combo',
-					labelWidth: 140,
-					fieldLabel: '洗手护士(发现故障)',
+					fieldLabel: '发现者',
 					id: 'washHandNurseName',
 					name: 'washHandNurseName',
 					queryParam: 'spell',
@@ -815,7 +836,7 @@
 				hidden: repairNurseNameIsHidden,
 				items: [{
 					xtype: 'combo',
-					fieldLabel: '送修护士',
+					fieldLabel: '送修者',
 					id: 'repairNurseName',
 					name: 'repairNurseName',
 					queryParam: 'spell',
Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js
===================================================================
diff -u -r33450 -r34965
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 33450)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/config.js	(.../config.js)	(revision 34965)
@@ -132,6 +132,8 @@
   isMonthReportShowCustonTousseAmount:true,
   //灭菌记录里显示【PCD监测结果】字段
   displayPCDMonitoringResultsInTheSterilizationRecordInformation:true,
+  //桌面快捷图标配置
+  desktopShortcutIconsConfig:['器械维修'],
   //启用器械维修管理功能
   enableInstrumentRepairManagement:true,
 //勾选需要装配的器械包时，是否自动在界面右下角“由下往上”弹出配包注意事项提示框，【提示框有关闭按钮】，点击关闭按钮后，配包注意事项提示框“由上往下“隐藏。
Index: ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js
===================================================================
diff -u -r33128 -r34965
--- ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js	(.../instrumentRepairManagementView.js)	(revision 33128)
+++ ssts-web/src/main/webapp/disinfectsystem/instrumentRepairManagement/instrumentRepairManagementView.js	(.../instrumentRepairManagementView.js)	(revision 34965)
@@ -145,10 +145,10 @@
 			if (item == '房间号') {
 				roomNumberIsHidden = true;
 			}
-			if (item == '洗手护士(发现故障)' || item == '洗手护士（发现故障）') {
+			if (item == '发现者') {
 				washHandNurseNameIsHidden = true;
 			}
-			if (item == '送修护士') {
+			if (item == '送修者') {
 				repairNurseNameIsHidden = true;
 			}
 			if (item == '工程师') {
@@ -190,8 +190,8 @@
 		{ header: "状态", dataIndex: 'repairStatus', sortable: false, width: 80, renderer: rendererRepairStatus },
 		{ header: "器械名称", dataIndex: 'materialNameAndAmount', sortable: false, renderer: renderCallModifyFunction },
 		{ header: "房间号", dataIndex: 'roomNumber', sortable: false, hidden: roomNumberIsHidden },
-		{ header: "洗手护士(发现故障)", dataIndex: 'washHandNurseName', sortable: false, hidden: washHandNurseNameIsHidden },
-		{ header: "送修护士", dataIndex: 'repairNurseName', sortable: false, hidden: repairNurseNameIsHidden },
+		{ header: "发现者", dataIndex: 'washHandNurseName', sortable: false, hidden: washHandNurseNameIsHidden },
+		{ header: "送修者", dataIndex: 'repairNurseName', sortable: false, hidden: repairNurseNameIsHidden },
 		{ header: "工程师(现场)", dataIndex: 'engineer', sortable: false, hidden: engineerIsHidden },
 		{ header: "送修类别", dataIndex: 'repairType', sortable: false, hidden: repairTypeIsHidden },
 		{ header: "维修时间", dataIndex: 'repairDateTime', sortable: false, width: 140, hidden: repairDateTimeIsHidden },
@@ -281,7 +281,7 @@
 				xtype: 'menucheckitem',
 				name: 'repairNurseName',
 				checked: true,
-				text: '送修护士'
+				text: '送修者'
 			}, {
 				xtype: 'menucheckitem',
 				name: 'engineer',