Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r40757 -r40781
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40757)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 40781)
@@ -309,6 +309,34 @@
 		userPasswordResetCycle = Ext.getCmp("userPasswordResetCycle").getValue();
 	}
 
+	//QYSRMYY-78:管理员登录IP地址范围
+	var adminLoginStartIP = '';
+	var adminLoginEndIP = '';
+	if (sstsConfig.enableAdministratorLoginIPRestriction) {
+		adminLoginStartIP = Ext.getCmp("adminLoginStartIP").getValue();
+		adminLoginEndIP = Ext.getCmp("adminLoginEndIP").getValue();
+		var isIP = /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/;
+		if ((adminLoginStartIP !== '' && !isIP.test(adminLoginStartIP)) || (adminLoginEndIP !== '' && !isIP.test(adminLoginEndIP))) {
+			showResult('管理员登录IP地址范围格式错误！');
+			return
+		}
+		if (adminLoginStartIP !== '' && adminLoginEndIP !== '') {
+			var ip1Parts = adminLoginStartIP.split('.');
+			var ip2Parts = adminLoginEndIP.split('.');
+			var msg = '';
+			for (var i = 0; i < 4; i++) {
+				if (parseInt(ip1Parts[i]) > parseInt(ip2Parts[i])) {
+					msg = '管理员登录IP地址范围起始IP地址不能大于结束IP地址。';
+					break;
+				}
+			}
+			if (msg !== '') {
+				showResult(msg);
+				return
+			}
+		}
+	}
+
 	//KSDQDYRMYY-13
 	var isEnableTousseOpRecipient = '否';
 	var isEnableTousseOpDestLocation = '否';
@@ -588,6 +616,8 @@
 			deviceMaintenanceUpdateMode: deviceMaintenanceUpdateMode,
 			defineFormModificationMode: defineFormModificationMode,
 			userPasswordResetCycle: userPasswordResetCycle,
+			adminLoginStartIP: adminLoginStartIP,
+			adminLoginEndIP: adminLoginEndIP,
 			borrowRemind: borrowRemind,
 			borrowRemindFrequency: borrowRemindFrequency,
 			kardexContainerHost: kardexContainerHost,
@@ -2035,10 +2065,10 @@
 							columnWidth: .25,
 							hidden: !sstsConfig.enablePeriodicLoginPasswordChange,
 							items: [{
-								xtype:'hidden',
-								id:'hiddenUserPasswordResetCycle',
-								name:'hiddenUserPasswordResetCycle'
-							},{
+								xtype: 'hidden',
+								id: 'hiddenUserPasswordResetCycle',
+								name: 'hiddenUserPasswordResetCycle'
+							}, {
 								xtype: 'numberfield',
 								fieldLabel: '密码重置周期(天)',
 								id: 'userPasswordResetCycle',
@@ -2049,6 +2079,39 @@
 								anchor: '100%',
 								allowBlank: true
 							}]
+						}, {
+							layout: 'column',
+							labelWidth: fontSize == 12 ? 180 : 210,
+							columnWidth: .5,
+							hidden: !sstsConfig.enableAdministratorLoginIPRestriction,
+							items: [{
+								layout: 'form',
+								columnWidth: .6,
+								items: [{
+									xtype: 'textfield',
+									fieldLabel: '管理员登录IP地址范围',
+									id: 'adminLoginStartIP',
+									name: 'adminLoginStartIP',
+									regex: /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/,
+									regexText: '请填写正确的IP地址',
+									anchor: '100%',
+									allowBlank: true
+								}]
+							}, {
+								layout: 'form',
+								columnWidth: .4,
+								labelWidth: 20,
+								items: [{
+									xtype: 'textfield',
+									fieldLabel: '-',
+									id: 'adminLoginEndIP',
+									name: 'adminLoginEndIP',
+									regex: /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/,
+									regexText: '请填写正确的IP地址',
+									anchor: '100%',
+									allowBlank: true
+								}]
+							}]
 						}
 					]
 				}, {
@@ -4589,13 +4652,13 @@
 					if (sstsConfig.enablePeriodicLoginPasswordChange) {
 						var hiddenUserPasswordResetCycle = Ext.getCmp('hiddenUserPasswordResetCycle').getValue();
 						var userPasswordResetCycle = Ext.getCmp('userPasswordResetCycle').getValue();
-						if(hiddenUserPasswordResetCycle != userPasswordResetCycle){
+						if (hiddenUserPasswordResetCycle != userPasswordResetCycle) {
 							top.Ext.Msg.confirm('请确认', '修改后，密码重置周期将会重新计算，是否继续？', function (btn) {
 								if (btn == 'yes') {
 									saveSupplyRoomCongfig();
 								}
 							})
-						}else {
+						} else {
 							saveSupplyRoomCongfig();
 						}
 					} else {
@@ -4926,6 +4989,12 @@
 				Ext.getCmp("hiddenUserPasswordResetCycle").setValue(supplyRoomConfig.userPasswordResetCycle || '');
 			}
 
+			//QYSRMYY-78:管理员登录IP地址范围
+			if (sstsConfig.enableAdministratorLoginIPRestriction) {
+				Ext.getCmp("adminLoginStartIP").setValue(supplyRoomConfig.adminLoginStartIP);
+				Ext.getCmp("adminLoginEndIP").setValue(supplyRoomConfig.adminLoginEndIP);
+			}
+
 			//ZSWY-233:借物单弹窗提醒
 			if (sstsConfig.enableCardinalityManagementOfBorrow) {
 				Ext.getCmp('borrowRemind').setValue(supplyRoomConfig.borrowRemind);
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js
===================================================================
diff -u -r40740 -r40781
--- ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 40740)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysrmyy/config.js	(.../config.js)	(revision 40781)
@@ -202,6 +202,8 @@
   respondModeWhenClickRecycleAmounCellOfDisinfectedItem:1,
   //启用定期修改登录密码功能
   enablePeriodicLoginPasswordChange:true,
+  //启用限制管理员登录IP的功能
+  enableAdministratorLoginIPRestriction:true,
   //定时废弃过期包的数量
   maxAutoWasteAmountOneTimeTask:10000
 }
\ No newline at end of file