Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r29741 -r29849
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29741)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 29849)
@@ -1733,6 +1733,7 @@
 		var serialNum = records[i].data['serialNumber'];
 		var hospitalNumber = records[i].data['hospitalNumber'];
 		var applicationType =  records[0].data['type'];
+		var prepareRecycleDateTime =  records[i].data['prepareRecycleDateTime'] || '';
 		if(hasPrint != unPrint){
 			showResult('流水号为【'+serialNum+"】的申请单已经打印或者部分打印，不能删除！");
 			return false;
@@ -1755,6 +1756,10 @@
 				return false;
 			}
 		}
+		if(prepareRecycleDateTime !== ''){
+			showResult('流水号为【'+serialNum+"】的单已预回收，不能删除！");
+			return false;
+		}
 		if (ids == null) {
 			ids = records[i].data['id'];
 		} else {
@@ -1817,13 +1822,13 @@
 function setRecyclingApplicationForm(tempRecyclingApplication){
 	if(tempRecyclingApplication){
 		var recyclingApplication = Ext.util.JSON.decode(tempRecyclingApplication);
+		
 		var deliverStatus = recyclingApplication.deliverStatus;
 		var recyclingStatus = recyclingApplication.recyclingStatus;
 		var committedStatus = recyclingApplication.committedStatus;
 		var endStatus = recyclingApplication.endStatus;
 		var printed = recyclingApplication.printed;
 		var type = recyclingApplication.type;
-		var oldVersion = recyclingApplication.version;
 		var isReaded = false;
 		if(recyclingApplication.readed == 1){
 			isReaded = true;
@@ -1887,7 +1892,7 @@
 				|| type == reservateionApplicationForm){
 			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,recyclingApplication.depart,hiddenCommitButton,hiddenSaveButton,
 					hiddenReturnButton,type, '', specifyDisposableTypes,recyclingApplication.committedStatus,
-					recyclingApplication.handleDepartCoding,recyclingApplication,oldVersion);
+					recyclingApplication.handleDepartCoding,recyclingApplication);
 		}
 	}else{
 		showResult('加载出错，请联系统管理员！');
@@ -2282,7 +2287,7 @@
 		beforeload: function(s,options){
 			var beginTime = top.Ext.getCmp('beginTime').getValue();
 			if(!isUndefinedOrNullOrEmpty(beginTime)){
-				var time = date2string(new Date(beginTime));
+				var time = date2string(new Date(beginTime))
 				s.baseParams.startDate = time.split(' ')[0];
 			}
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r29810 -r29849
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29810)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 29849)
@@ -2386,6 +2386,12 @@
 		top.Ext4.getCmp("applicantCode").setValue(recyclingApplication.applicantCode);
 		top.Ext4.getCmp("hospitalNumber").setValue(recyclingApplication.hospitalNumber);
 
+		var prepareRecycleDateTime = recyclingApplication.prepareRecycleDateTime || '';
+		if(prepareRecycleDateTime !== ''){
+			top.Ext4.getCmp('commitBtn').hide();
+			top.Ext4.getCmp('commitNewBtn').hide();
+		}
+
 		/*appDepartJsonStore.load({
 			params: {spell: recyclingApplication.depart, departmentCode: recyclingApplication.departCoding},
 			callback: function(records, operation, success) {