Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp
===================================================================
diff -u -r28833 -r28864
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp	(.../returnGoodsDetailView.jsp)	(revision 28833)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.jsp	(.../returnGoodsDetailView.jsp)	(revision 28864)
@@ -51,9 +51,9 @@
 enableSaveBtn = true;
 </c:if>
 
-var isFirstSupplyRoom = false;
+var isFirstOrSecondSupplyRoom = false;
 if(${supplyRoomType}==1 || ${supplyRoomType}==2){
-    isFirstSupplyRoom = true;
+    isFirstOrSecondSupplyRoom = true;
 }
 var orgUnitName = '${orgUnitName}';
 </script>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js
===================================================================
diff -u -r27770 -r28864
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js	(.../returnGoodsDetailView.js)	(revision 27770)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/returnGoodsDetailView.js	(.../returnGoodsDetailView.js)	(revision 28864)
@@ -183,8 +183,8 @@
 					minChars : 0,
 					valueField : 'orgUnitName',
 					displayField : 'name',
-					store : isFirstSupplyRoom ? departJsonStore : departOfUserOwnStore,
-					mode : isFirstSupplyRoom ? 'remote':'local',
+					store : isFirstOrSecondSupplyRoom ? departJsonStore : departOfUserOwnStore,
+					mode : isFirstOrSecondSupplyRoom ? 'remote':'local',
 					forceSelection : true,
 					lazyInit : true,
 					triggerAction : 'all',
@@ -262,8 +262,8 @@
 		}]
 	});
 	
-	//为一级供应室时,设置为全部,否则设置为当前科室
-	if(isFirstSupplyRoom){
+	//为一二级供应室时,设置为全部,否则设置为当前科室
+	if(isFirstOrSecondSupplyRoom){
 		Ext.getCmp('departSearch').setValue("全部");
 	}else{
 		Ext.getCmp('departSearch').setValue(orgUnitName);