Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r30793 -r30836
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30793)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 30836)
@@ -4504,7 +4504,7 @@
 				}
 	            if(recyclingAmount > loadedAmount){
 					isPartIntheBasket = true;
-					if(tousseType == '外来器械包'){
+					if(tousseType == '外来器械包' && !sstsConfig.enableForeignToussePartRecycle){
 						tousseTypeisForeignTousseDefinition = true;
 					}
 	                return false;
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r30682 -r30836
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 30682)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 30836)
@@ -97,7 +97,7 @@
 	var fontSizeColor = "";
 	if(packageStatus == '已终止'){
 		color = "red";
-	}else if(packageStatus == '待接收'){
+	}else if(packageStatus == '待接收' || packageStatus == '部分接收'){
 		color = '#ffff00';//黄色
 	}else if(packageStatus == '已归还'){
 		color = '#7030a0';//紫色
@@ -243,7 +243,7 @@
 	    {header : "外来器械包条码",width : 150,dataIndex : 'barcodes', hidden:!sstsConfig.showForeignTousseApplicationBarcode,sortable:false},
 	    {header : "供应商",width : 150,dataIndex : 'supplierName'}, 
 	    {header : "手术名称",width : 150,dataIndex : 'surgery'}, 
-	    {header : "包状态",width : 50,dataIndex : 'packageStatus',renderer:renderPackageStatusColor}, 
+	    {header : "包状态",width : 60,dataIndex : 'packageStatus',renderer:renderPackageStatusColor}, 
 	    {header : "回收状态",width : 60,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
 	    {header : "发货状态",width : 60,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
 	    {header : "查看发货单",hidden : true,width : 70,align :'center',renderer: function(v,p,record){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp
===================================================================
diff -u -r30533 -r30836
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 30533)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp	(.../awaitForRecycleList.jsp)	(revision 30836)
@@ -465,6 +465,10 @@
 				if(confirmRecyclingAmount && recycleAmountNeedConfirm == '是' || result.data[i].recyclingStatus == '部分回收' || (haveUnRecycling && sstsConfig.enableRecyclingRecordBGColorWhenRecycleAmountLessThanApplyAmount)){
 					trColor = 'bgcolor="yellow"';
 				}
+
+				if(result.data[i].recyclingApplicationType == '外来器械包申请单' && result.data[i].recyclingStatus == '部分接收'){
+            		trColor = 'bgcolor="yellow"';
+            	}
 				
 				if(recyclingTimes == 2){//二次回收
 					trColor = 'bgcolor="#ffa500"';
@@ -477,17 +481,17 @@
             		recyclingRecordStr += '<td width="46"><div style="height:69px">' + result.data[i].packingTaskSerialNumber + '</div></td>';
             	}
             		
-            	recyclingRecordStr+='<td width="125">'
+            	recyclingRecordStr+='<td width="126">'
             		+'<div style="height:69px; overflow:hidden"><img id="img-urgent-red-'+i+'" src="'+WWWROOT+'/images/web/urgent-red.png" class="urgent-red"/>'+departName
            			+'</div></td><td width="150"><div style="height:69px">'+dateObjFormat(result.data[i].recyclingTime)
-           			+'</div></td><td width="100"><div style="height:69px">'+result.data[i].operator
-					+'</div></td><td width="130"><div style="height:69px">'+result.data[i].recyclingApplicationType
+           			+'</div></td><td width="106"><div style="height:69px">'+result.data[i].operator
+					+'</div></td><td width="115"><div style="height:69px">'+result.data[i].recyclingApplicationType
 					+'</div></td>';
 				
 				if(sstsConfig.showORRoomColumnInHistoryRecyclingRecordList){
-					recyclingRecordStr+='<td width="130"><div style="height:69px">'+result.data[i].operationRoom + '</div></td>'
+					recyclingRecordStr+='<td width="106"><div style="height:69px">'+result.data[i].operationRoom + '</div></td>'
 				}
-				recyclingRecordStr+='<td width="140"><div style="height:69px">'+dateObjFormat(result.data[i].applySubmintDateTime)
+				recyclingRecordStr+='<td width="150"><div style="height:69px">'+dateObjFormat(result.data[i].applySubmintDateTime)
            			+'</div></td><td><div>'+ result.data[i].remark +'</div></td></tr>';
            		var recyclingRecordElement = $(recyclingRecordStr);
            		recyclingRecordElement.find("td:eq(0)").hide();//隐藏并且不占用空间,visibility:collapse;没有用，visibility:hidden;会占用空间
@@ -921,6 +925,10 @@
 		if(msg[i].type == '外来器械包申请单' && msg[i].recyclingStatus == '待回收'){
 			color = '#ffa500';
 		}
+
+		if(msg[i].type == '外来器械包申请单' && msg[i].recyclingStatus == '部分接收'){
+			color = 'yellow';
+		}
 		//加急等级
 		if(sstsConfig.enableUrgentFunction){
 			if(msg[i].urgentLevel != "" && msg[i].urgentLevel != undefined){//有背景色，白色图标加急等级