Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r33209 -r33210
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 33209)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 33210)
@@ -256,7 +256,7 @@
 								header: "操作", dataIndex: 'operation', width: 70,
 								renderer: function (v, p, record) {
 									if (sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords) {
-										if (record.hasReceived == '是' && !isFirstRoomPeople) {
+										if (record.hasReceived == '是') {
 											return;
 										} else {
 											return "<a href=\"#\" target=\"_self\" onclick=\"deleteProxyDisinfectionItem('" + p.id + "');\"><img src=\"" + WWWROOT + "/images/garbage.gif\"></img></a>";
@@ -778,25 +778,28 @@
 		success: function (form, action) {
 			top.Ext.getCmp('applicationTime').setValue(formatDateYear(action.result.data.applicationTime));
 			var status = action.result.data.deliverStatus;
-			var receiveStatus = action.result.data.receiveStatus;
+			var receiveStatus = action.result.data.receiveStatus || '';
 			var editMode = action.result.editMode;
 			liststatus = receiveStatus;
-			if (isFirstRoomPeople) {
-				if ((status != '待发货' && receiveStatus != '待接收' ) || editMode == false) {
-					top.Ext.getCmp('saveBtn').disable();
-					top.Ext.getCmp('saveBtn2').disable();
-				}
-			} else {
-				if ((status == '待发货') || editMode == false) {
-					top.Ext.getCmp('saveBtn').disable();
-					top.Ext.getCmp('saveBtn2').disable();
-				}
+			if(receiveStatus == '已终止'){
+				top.Ext.getCmp('saveBtn').disable();
+			 	top.Ext.getCmp('saveBtn2').disable();
 			}
 			var rootNode = top.Ext.getCmp('proxyDisinfectionTree').getRootNode();
 			var instancesBarcodeInBasket = ';';
 			for (var i = 0; i < action.result.baskets.length; i++) {
 				var basket = action.result.baskets[i];
-				var basketNode = createNode(true, basket.id, basket.barcode, basket.name, '容器', '');
+				var parentHasReceived = '否';
+				for (var j = 0; j < basket.instances.length; j++) {
+					var instance = basket.instances[j];
+					var hasReceived = instance.hasReceived || '';
+					if(hasReceived == '否'){
+						parentHasReceived = '否';
+						continue;
+					}
+					parentHasReceived = '是';
+				}
+				var basketNode = createNode(true, basket.id, basket.barcode, basket.name, '容器', '',parentHasReceived);
 				rootNode.appendChild(basketNode);
 				for (var j = 0; j < basket.instances.length; j++) {
 					var instance = basket.instances[j];