Index: ssts-web/src/main/webapp/homepage/supplyRoomOperate.js
===================================================================
diff -u -r17472 -r18201
--- ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 17472)
+++ ssts-web/src/main/webapp/homepage/supplyRoomOperate.js	(.../supplyRoomOperate.js)	(revision 18201)
@@ -45,7 +45,7 @@
 
 function renderCallRecyclingApplicationShowFun(v, p, record){
 	var applicationID = record.data['id'];
-	if(applicationID != null && applicationID != ""){
+	if(applicationID != null && applicationID != "" && applicationID !== 'null'){
 		if(record.data['diposable'] == '否'){
 			return "<a href=\"#\" onclick=\"showRecyclingApplication('"+applicationID+"','器械包申请单','"+record.data['applicationTime']+"','"+record.data['depart']+"','"+record.data['departCoding']+"','"+record.data['serialNumber']+"','"+record.data['applicant']+"','"+record.data['settleAccountsDepart']+"','"+record.data['remark']+"');return false;\">"+record.data['tousseName']+"</a>";
 		}else{
@@ -110,50 +110,6 @@
     loadStoreByParams(reviewStore, queryParam2);
     loadStoreByParams(sterilizationStore, queryParam2);
     loadStoreByParams(invoicePlanStore, queryParam1);
-	// applicationStore.baseParams['tousseName'] = goodName;
-	// applicationStore.baseParams['tousseType'] = tousseType;
-	// applicationStore.baseParams['department'] = department;
-	// applicationStore.baseParams['startDate'] = startDate;
-	// applicationStore.baseParams['endDate'] = endDate;
-	// applicationStore.baseParams['taskGroup'] = taskGroup;
-	// applicationStore.load({params:{start: 0, limit: 10}});
-	
-	// washStore.baseParams['tousseName'] = goodName;
-	// washStore.baseParams['tousseType'] = tousseType;
-	// washStore.baseParams['startDate'] = startDate;
-	// washStore.baseParams['endDate'] = endDate;
-	// washStore.baseParams['taskGroup'] = taskGroup;
-	// washStore.load({params:{start: 0, limit: 10}});
-
-	// packingStore.baseParams['tousseName'] = goodName;
-	// packingStore.baseParams['tousseType'] = tousseType;
-	// packingStore.baseParams['startDate'] = startDate;
-	// packingStore.baseParams['endDate'] = endDate;
-	// packingStore.baseParams['taskGroup'] = taskGroup;
-	// packingStore.load({params:{start: 0, limit: 10}});
-
-	// reviewStore.baseParams['tousseName'] = goodName;
-	// reviewStore.baseParams['tousseType'] = tousseType;
-	// reviewStore.baseParams['startDate'] = startDate;
-	// reviewStore.baseParams['endDate'] = endDate;
-	// reviewStore.baseParams['taskGroup'] = taskGroup;
-	// reviewStore.load({params:{start: 0, limit: 10}});
-
-	// sterilizationStore.baseParams['tousseName'] = goodName;
-	// sterilizationStore.baseParams['tousseType'] = tousseType;
-	// sterilizationStore.baseParams['startDate'] = startDate;
-	// sterilizationStore.baseParams['endDate'] = endDate;
-	// sterilizationStore.baseParams['taskGroup'] = taskGroup;
-	// sterilizationStore.load({params:{start: 0, limit: 10}});
-
-	// invoicePlanStore.baseParams['tousseName'] = goodName;
-	// invoicePlanStore.baseParams['tousseType'] = tousseType;
-	// invoicePlanStore.baseParams['department'] = department;
-	// invoicePlanStore.baseParams['startDate'] = startDate;
-	// invoicePlanStore.baseParams['endDate'] = endDate;
-	// invoicePlanStore.baseParams['taskGroup'] = taskGroup;
-	// invoicePlanStore.load({params:{start: 0, limit: 10}});
-	
 }
 
 /**