Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js
===================================================================
diff -u -r33160 -r33209
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 33160)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionView.js	(.../proxyDisinfectionView.js)	(revision 33209)
@@ -97,8 +97,8 @@
 	}
 	var ids = null;
 	for (var i = 0, len = records.length; i < len; i++) {
-		var status = records[i].data['deliverStatus'];
-		if (status != '待发货' && status != '待接收' && status != '部分接收') {
+		var deliverStatus = records[i].data['deliverStatus'];
+		if (deliverStatus == '已发货' || deliverStatus == '部分发货') {
 			showResult("不能删除状态为已发货或部分发货的灭菌记录信息！");
 			return false;
 		}
@@ -712,7 +712,8 @@
 				return '是';
 			}
 		} },
-		{ header: "状态", width: 80, dataIndex: 'deliverStatus' },
+		{ header: "接收状态", width: 80, dataIndex: 'receiveStatus',hidden:!sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords },
+		{ header: "发货状态", width: 80, dataIndex: 'deliverStatus' },
 		{
 			header: '查看发货单', align: 'center', renderer: function (v, p, record) {
 				var status = record.data.deliverStatus;
@@ -740,15 +741,18 @@
 		{ name: 'depart' },
 		{ name: 'totalAmountOfTousses' },
 		{ name: 'remark' },
+		{ name: 'receiveStatus' },
 		{ name: 'deliverStatus' }
 	];
 
-	var optionsArray = ['待接收', '部分接收', '部分发货', '待发货', '已发货', '已终止']
+	var receiveStatusArray = ['待接收', '部分接收', '已接收'];
+	var deliverStatusArray = ['待发货', '部分发货', '已发货', '已终止'];
 
 	var filters = new Ext.grid.GridFilters({
 		filters: [
 			{ type: 'string', dataIndex: 'applicant' },
-			{ type: 'list', dataIndex: 'deliverStatus', phpMode: true, options: optionsArray },
+			{ type: 'list', dataIndex: 'receiveStatus', phpMode: true, options: receiveStatusArray },
+			{ type: 'list', dataIndex: 'deliverStatus', phpMode: true, options: deliverStatusArray },
 			{ type: 'string', dataIndex: 'depart' },
 			{ type: 'numeric', dataIndex: 'totalAmountOfTousses' },
 			{ type: 'string', dataIndex: 'remark' },
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js
===================================================================
diff -u -r33196 -r33209
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 33196)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/proxyDisinfectionForm.js	(.../proxyDisinfectionForm.js)	(revision 33209)
@@ -1,4 +1,3 @@
-var editMode = true;
 var liststatus = '';
 function addAndEditProxyDisinfection(id, selectedRecords) {
 	if (selectedRecords) {
@@ -254,7 +253,7 @@
 							{ header: 'id', dataIndex: 'id', width: 0, hidden: true },
 							{ header: '类型', dataIndex: 'type', width: 90 },
 							{
-								header: "操作", dataIndex: 'operation', hidden: !editMode, width: 70,
+								header: "操作", dataIndex: 'operation', width: 70,
 								renderer: function (v, p, record) {
 									if (sstsConfig.generateProxySterilizationFormFunctionInHistoricalAssemblyRecords) {
 										if (record.hasReceived == '是' && !isFirstRoomPeople) {
@@ -779,10 +778,11 @@
 		success: function (form, action) {
 			top.Ext.getCmp('applicationTime').setValue(formatDateYear(action.result.data.applicationTime));
 			var status = action.result.data.deliverStatus;
-			editMode = action.result.editMode;
-			liststatus = status;
+			var receiveStatus = action.result.data.receiveStatus;
+			var editMode = action.result.editMode;
+			liststatus = receiveStatus;
 			if (isFirstRoomPeople) {
-				if ((status != '待发货' && status != '待接收' && status != '部分接收') || editMode == false) {
+				if ((status != '待发货' && receiveStatus != '待接收' ) || editMode == false) {
 					top.Ext.getCmp('saveBtn').disable();
 					top.Ext.getCmp('saveBtn2').disable();
 				}