Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r17953 -r17997
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17953)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 17997)
@@ -1645,6 +1645,7 @@
 		}
 	},{
             text : '终止选中的物品',
+			id : 'cancelCheckedGood',
             hidden : SSTS_Invoice_End || !originalCommittedStatus || !sstsConfig.enableTerminatePartOfApplication,
             handler : function() {
                 var leftTree = top.Ext4.getCmp('tousseTreeGrid');
@@ -3220,18 +3221,18 @@
 	var cell;
 	var type = record.get('type');
 	if(type==customTousseApplicationForm) {//自定义器械包申请单
-		cell = "<a href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditCustomTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==disinfectGoodsApplicationForm){//消毒物品申请单
-		cell = "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
-		// cell = "<a href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+		// cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditUntracableTousse(" + record.data.id + ",null,'01',function(){});return false;\">" + v + "</a>";
 	} else if (type==foreignTousseApplicationForm){//外来器械包申请单
-		cell = "<a href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"openForeignTousseForm(" + record.data.id + ",'apply');return false;\">" + v + "</a>";
 	} else if(type == tousseLeaseApplicationForm){
-		cell = "<a href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditTousseLease(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else if(type == foreignPorxyApplicationForm){
-		cell = "<a href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"addAndEditForeignProxyDisinfection(" + record.data.id + ");return false;\">" + v + "</a>";
 	} else {
-		cell = "<a href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
+		cell = "<a class= \"formDetail\" href=\"#\" onclick=\"callModifyFunction();return false;\">" + v + "</a>";
 	}
 	return cell;
 }
@@ -3475,7 +3476,8 @@
  */
 function createSearchTbar(searchComboConfig) {
 	var tbar2 = [];
-    if (sstsConfig.recyclingApplicationVersion == 2){
+    if (sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3){
+    // if (sstsConfig.recyclingApplicationVersion == 2){
         tbar2.push({text: '状态筛选:'});
         tbar2.push(searchComboConfig.quickScreenCombo);
     }
@@ -3972,7 +3974,7 @@
         triggerAction: 'all',
         displayField: 'val',
         forceSelection: true,
-		hidden : sstsConfig.recyclingApplicationVersion != 2,
+		hidden : sstsConfig.recyclingApplicationVersion != 2 && sstsConfig.recyclingApplicationVersion != 3,
         value: '未完成',
         editable: false,
         listeners : {
@@ -4072,7 +4074,7 @@
 			text : '申请外来器械',
 			id : 'applyForeign',
 			iconCls : 'btn_ext_add_customTousse',
-			hidden : SSTS_ForeignTousseApplication_Create || sstsConfig.recyclingApplicationVersion == 2,
+			hidden : SSTS_ForeignTousseApplication_Create || sstsConfig.recyclingApplicationVersion == 2 || sstsConfig.recyclingApplicationVersion == 3,
 			handler : function() {
 				openForeignTousseForm("","apply");
 			}
@@ -4103,14 +4105,16 @@
 	}
 
 
-    // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2)
-	if (recyclingApplicationVersion == 2 && listType != 'all'){
+    // 省医要求:如果是科室申领,默认申请单是未提交状态(省医才有版本2和版本3)
+	if ((recyclingApplicationVersion == 2 || recyclingApplicationVersion == 3) && listType != 'all'){
+	// if (recyclingApplicationVersion == 2 && listType != 'all'){
 		document.getElementById("parm_s_status").value = 'unFinish';
 	}
 
 
-	//如果不是用版本2或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
-	if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
+	//如果不是用版本2且不是版本3或者是在高级视图的全部申请单打开或者不是临床科室则按原来的显示
+	if ((recyclingApplicationVersion != 2 && recyclingApplicationVersion != 3) || listType == 'all' || isCssdUser == "true"){
+	// if (recyclingApplicationVersion != 2 || listType == 'all' || isCssdUser == "true"){
 		grid = new Ext.ux.ForgonPageGrid({
 				title : entityName + '单列表',
 				id : 'applyGrid',