Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js
===================================================================
diff -u -r32157 -r32161
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 32157)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.js	(.../tousseGoodsStockView.js)	(revision 32161)
@@ -402,7 +402,7 @@
 			iconCls: 'icon_set',
 			handler: function () {
 				var dirOrgCode = Ext.getCmp('departCode').getValue() || top.dirOrgCode;
-				setGoodsWarnStock(dirOrgCode);
+				setGoodsWarnStock(model, dirOrgCode);
 			}
 		}, {
 			text: '导出',
@@ -412,7 +412,6 @@
 				var tousseName = Ext.getCmp('tousseName').getRawValue();
 				var stockFilter = Ext.getCmp('stockFilter').getRawValue();
 				var departCode = Ext.getCmp('departCode').getValue();
-				console.log(departCode)
 				location.href = WWWROOT + "/disinfectSystem/baseData/orgUnitGoodsWarnStockAction!exportOrgUnitGoodsStockInfo.do?tousseName="+encodeURI(tousseName)+'&stockFilter='+encodeURI(stockFilter)+'&orgUnitCode='+departCode;
 			}
 		}]
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js
===================================================================
diff -u -r32159 -r32161
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 32159)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/js/setGoodsOption.js	(.../setGoodsOption.js)	(revision 32161)
@@ -403,7 +403,7 @@
 }
 
 //最低库存设置
-function setGoodsWarnStock(orgUnitCode){
+function setGoodsWarnStock(model,orgUnitCode){
 	var store = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/orgUnitGoodsWarnStockAction!loadTousseInfoByGoodsOption.do',
@@ -427,17 +427,17 @@
 	//“选择物品combo”的数据储存器
 	var tousseAndDiposableGoodsStore2 = new top.Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/orgUnitGoodsWarnStockAction!loadTousseInfoByGoodsOption.do',
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseByTypeArr.do',
 			method : 'POST'
 		}),
 		baseParams : {
-			orgUnitCode : orgUnitCode
+			model : model
 		},
 		reader : new Ext.data.JsonReader({
 			totalProperty : 'totalCount',
 			root : 'data'
 		}, [
-		    {name : 'tousseDefinitionID',mapping : 'tousseDefinitionID'}, 
+		    {name : 'tousseDefinitionID',mapping : 'id'}, 
 		    {name : 'name',mapping : 'name'}]
 		)
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp
===================================================================
diff -u -r32157 -r32161
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp	(.../tousseGoodsStockView.jsp)	(revision 32157)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp	(.../tousseGoodsStockView.jsp)	(revision 32161)
@@ -25,6 +25,7 @@
     var newOrgUnitName = '${param.orgUnitName}';
     var newOrgUnitCoding = '${param.orgUnitCode}';
 </script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/icon.css?version=${svnRevision}"></link>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>