Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r33961 -r35713
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 33961)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 35713)
@@ -310,5 +310,7 @@
   //启用包装记录功能
   enablePackagingRecordFunction:true,
   //明细核算月报是否显示材料数量列
-  showMaterialsAmountColumnOfDetailMonthReport : true
+  showMaterialsAmountColumnOfDetailMonthReport : true,
+  //外来器械包申请单扩展列
+  extendedColumnConfigOfForeignTousseApplicationForm:["packingState", "sterilizationState"]
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js
===================================================================
diff -u -r35094 -r35713
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 35094)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseApplicationView.js	(.../foreignTousseApplicationView.js)	(revision 35713)
@@ -132,6 +132,44 @@
 	return "<p style='background-color:"+color+";color:"+fontColor+"'>" + v + "</p>";
 }
 
+function renderPackingStateColor(v, p, record){
+	var color = '';
+	var fontColor = '';
+	if(v == '待装配'){
+		color = "#00b0f0";//蓝色
+		fontColor = '#fff';
+	}else if(v == '部分装配'){
+		color = "#ffa500";//橙色
+		fontColor = '#000';
+	}else if(v == '已装配'){
+		color = "#00b050";//绿色
+		fontColor = '#fff';
+	}else if(v == '已终止'){
+		color = "red";//红色
+		fontColor = '#fff';
+	}
+	return "<p style=\"background-color:"+color+";color:"+fontColor+"\">" + v + "</p>";
+}
+
+function renderSterilizationStateColor(v, p, record){
+	var color = '';
+	var fontColor = '';
+	if(v == '待灭菌'){
+		color = "#00b0f0";//蓝色
+		fontColor = '#fff';
+	}else if(v == '部分灭菌'){
+		color = "#ffa500";//橙色
+		fontColor = '#000';
+	}else if(v == '已灭菌'){
+		color = "#00b050";//绿色
+		fontColor = '#fff';
+	}else if(v == '已终止'){
+		color = "red";//红色
+		fontColor = '#fff';
+	}
+	return "<p style=\"background-color:"+color+";color:"+fontColor+"\">" + v + "</p>";
+}
+
 function renderChargeStatusColor(v, p, record){
 	var chargeStatus = record.data['chargeStatus'];
 	var color = '';
@@ -285,6 +323,19 @@
 	var returneeOfSupplierName = configureObj.returneeOfSupplier;
 	var remarkName = configureObj.remark;
 
+	var packingStateHidden = true;
+	var sterilizationStateHidden = true;
+
+	if(sstsConfig.extendedColumnConfigOfForeignTousseApplicationForm){
+		var extendedColumnConfigOfForeignTousseApplicationForm = sstsConfig.extendedColumnConfigOfForeignTousseApplicationForm;
+		if(extendedColumnConfigOfForeignTousseApplicationForm.indexOf('packingState') >= 0){
+			packingStateHidden = false;
+		}
+		if(extendedColumnConfigOfForeignTousseApplicationForm.indexOf('sterilizationState') >= 0){
+			sterilizationStateHidden = false;
+		}
+	}
+
 	var columns = [
 	    {header : "紧急度",width : 45,dataIndex : 'urgencyNum', renderer : urgencyIconRender1,hidden:true},
 		{header : applicantName,width : 70,dataIndex : 'applicant', renderer : renderModifyFun}, 
@@ -300,6 +351,8 @@
 	    {header : "供应商",width : 150,dataIndex : 'supplierName'}, 
 	    {header : surgeryName,width : 150,dataIndex : 'surgery'}, 
 	    {header : "回收状态",width : 70,dataIndex : 'recyclingStatus',renderer:renderRecyclingStatusColor},
+		{header : "装配状态",width : 70,dataIndex : 'packingState',renderer:renderPackingStateColor,sortable:false,hidden:packingStateHidden},
+		{header : "灭菌状态",width : 70,dataIndex : 'sterilizationState',renderer:renderSterilizationStateColor,sortable:false,hidden:sterilizationStateHidden},
 	    {header : "发货状态",width : 70,dataIndex : 'deliverStatus',renderer:renderDeliverStatusColor},
 		{header : "终止状态",width : 70,dataIndex : 'endStatus'},
 		{header : "已打印统计表",width : 100,dataIndex : 'printedStatisticalTable',hidden:!sstsConfig.enableTheFunctionOfPrintProcessingOfForeignTousse,renderer:function(v, p, record){
@@ -337,6 +390,8 @@
 	     {name : 'depart'},
 	     {name : 'deliverStatus'},
 	     {name : 'recyclingStatus'},
+		 {name : 'sterilizationState'},
+		 {name : 'packingState'},
 	     {name : 'packageStatus'},
 	     {name : 'hospitalNumber'},
 		 {name : 'chargeStatus'},
@@ -624,7 +679,7 @@
 		defaultSortField : 'applicationTime',
 		defaultSortDirection : 'DESC',
 		isCheckboxSelectionModel : true,
-		searchDisableIndexes : ['remark'],
+		searchDisableIndexes : ['remark','packingState','sterilizationState'],
 		rememberSelected : false,
 		isShowSearchField : true,
 		columns : columns,