Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r27996 -r28047
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 27996)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 28047)
@@ -1,3 +1,10 @@
+var reviewViewText;
+if(sstsConfig.nameSchemeOfReviewModule == 2){
+	reviewViewText = "包装";
+}else{
+	reviewViewText = "审核";
+}
+
 var materialForReviewViewStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url :  WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
@@ -134,7 +141,7 @@
 if(sstsConfig.openMustScanBasketTips){
     openMustScanBasketTips = sstsConfig.openMustScanBasketTips;
 }else{
-    openMustScanBasketTips = "是否完成对下列器械包的审核？";
+    openMustScanBasketTips = "是否完成对下列器械包的"+reviewViewText+"？";
 }
 
 //定义首篮筐的label变量
@@ -145,9 +152,9 @@
 	hiddenEndBarcode = false;//显示尾篮筐
 }
 
-var reviewBtnText = "<b>审核物品</b>";
+var reviewBtnText = "<b>"+ reviewViewText +"物品</b>";
 if (sstsConfig.printLabelWhenReviewing == true){
-	reviewBtnText = "<b>审核并打印标签</b>";
+	reviewBtnText = "<b>"+ reviewViewText +"并打印标签</b>";
 }
 
 
@@ -524,7 +531,7 @@
 			}
 		}
 		if(records.length == 0){
-			showResult("所选的器械包的灭菌程序与审核确认列表的器械包灭菌程序不一致！" , null , sstsConfig.messagePauseTimeOnReviewPage);
+			showResult("所选的器械包的灭菌程序与"+reviewViewText+"确认列表的器械包灭菌程序不一致！" , null , sstsConfig.messagePauseTimeOnReviewPage);
 			return false;
 		}
 	}
@@ -552,7 +559,7 @@
 					if(jsonResult.message){
 						showResult(jsonResult.message , null , sstsConfig.messagePauseTimeOnReviewPage);
 					}else{
-						showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
+						showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入"+reviewViewText+"列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
 					}
 					sterilingTypeCanAddToReview = false;
 				}
@@ -570,7 +577,7 @@
 			needValidateRecords.push(records[i]);
 		}else{
 			if(tousseWithNullSterilingTypeCanNotBatchAddReview){
-				showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入审核列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
+				showResult("条码为" + records[i].data['barcode'] + "的" + records[i].data['tousseDefinition.name'] + "的灭菌程序 " + sType + " 不能通过<进入"+reviewViewText+"列表>添加" , null , sstsConfig.messagePauseTimeOnReviewPage);
 				delete records[i];
 				continue;
 			}
@@ -585,7 +592,7 @@
 		}
 	}
 	if(rightGridVaildPass == false){
-		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌程序不一致,要继续审核吗？",function(btn){
+		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌程序不一致,要继续"+reviewViewText+"吗？",function(btn){
 			if(btn == 'yes'){
 				addTousse(needValidateRecords);
 			}else{
@@ -603,7 +610,7 @@
 			}
 		}
 		if(leftGridVaildPass == false){
-			top.Ext.MessageBox.confirm("提示","待审核的器械包灭菌程序不一致,要继续审核吗？",function(btn){
+			top.Ext.MessageBox.confirm("提示","待"+reviewViewText+"的器械包灭菌程序不一致,要继续"+reviewViewText+"吗？",function(btn){
 				if(btn == 'yes'){
 					addTousse(needValidateRecords);
 				}else{
@@ -634,7 +641,7 @@
 		}
 	}
 	if(rightGridVaildPass == false){
-		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌炉号不一致,要继续审核吗？",function(btn){
+		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌炉号不一致,要继续"+reviewViewText+"吗？",function(btn){
 			if(btn == 'yes'){
 				addTousse(records);
 			}else{
@@ -652,7 +659,7 @@
 			}
 		}
 		if(leftGridVaildPass == false){
-			top.Ext.MessageBox.confirm("提示","待审核的器械包灭菌炉号不一致,要继续审核吗？",function(btn){
+			top.Ext.MessageBox.confirm("提示","待"+reviewViewText+"的器械包灭菌炉号不一致,要继续"+reviewViewText+"吗？",function(btn){
 				if(btn == 'yes'){
 					addTousse(records);
 				}else{
@@ -679,7 +686,7 @@
 		}
 	}
 	if(rightGridVaildPass == false){
-		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌炉次不一致,要继续审核吗？",function(btn){
+		top.Ext.MessageBox.confirm("提示","所选的器械包灭菌炉次不一致,要继续"+reviewViewText+"吗？",function(btn){
 			if(btn == 'yes'){
 				addTousse(records);
 			}else{
@@ -697,7 +704,7 @@
 			}
 		}
 		if(leftGridVaildPass == false){
-			top.Ext.MessageBox.confirm("提示","待审核的器械包灭菌炉次不一致,要继续审核吗？",function(btn){
+			top.Ext.MessageBox.confirm("提示","待"+reviewViewText+"的器械包灭菌炉次不一致,要继续"+reviewViewText+"吗？",function(btn){
 				if(btn == 'yes'){
 					addTousse(records);
 				}else{
@@ -811,14 +818,14 @@
 		logItems.push({tousseId:tousseId,tousseName:tousseName,barcode:barcode});
 //			grid.getStore().remove(records[i]);
 	}
-	addDataBaseLog("A","进入审核列表:" + JSON.stringify(logItems))
+	addDataBaseLog("A","进入"+reviewViewText+"列表:" + JSON.stringify(logItems))
 	speakBasket.speakContent();	
 	onScannedTousseAmountChanged();
 }
 function addDataBaseLog(type,description){
 	Ext.Ajax.request({
 		url :  WWWROOT + '/log/saveLog.do',
-		params : {model : '审核模块',type : type,description : description}
+		params : {model : ''+reviewViewText+'模块',type : type,description : description}
 	});
 }
 function clearScanText(){
@@ -902,7 +909,7 @@
 			//如果配置为要扫描审核人,则判断审核人是否为空
 			var reviewerCode = Ext.getCmp('reviewerCode').getValue();
 			if(isUndefinedOrNullOrEmpty(reviewerCode)){
-				showResult('请先扫描审核人' , null , sstsConfig.messagePauseTimeOnReviewPage);
+				showResult('请先扫描'+reviewViewText+'人' , null , sstsConfig.messagePauseTimeOnReviewPage);
 				return;
 			}
 		}
@@ -915,7 +922,7 @@
 		}
 		
 		if(tousseIds == ''){
-			showResult('待审核器械包列表为空' , null , sstsConfig.messagePauseTimeOnReviewPage);
+			showResult('待'+reviewViewText+'器械包列表为空' , null , sstsConfig.messagePauseTimeOnReviewPage);
 		}else{
 			var confirmMessage = '';
 			// 灭菌开始日期校验,并提示
@@ -940,7 +947,7 @@
 				}
 			}
 			if(basketName != ''){
-				confirmMessage += '是否审核下列器械包并将其放入['+basketName+']中？';
+				confirmMessage += '是否'+reviewViewText+'下列器械包并将其放入['+basketName+']中？';
 			}else{
 				confirmMessage += openMustScanBasketTips;
 			}
@@ -1078,7 +1085,7 @@
 						}
 					}
 					if(count > 0){
-						showResult('有'+count+'个超时未审核的器械包,请及时处理红色标注的器械包' , null , sstsConfig.messagePauseTimeOnReviewPage);
+						showResult('有'+count+'个超时未'+reviewViewText+'的器械包,请及时处理红色标注的器械包' , null , sstsConfig.messagePauseTimeOnReviewPage);
 					}
 				}
 			}
@@ -1270,7 +1277,7 @@
 	
 	var sign = true;
 	var tbar = [{
-		text : '进入审核列表',
+		text : '进入'+reviewViewText+'列表',
 		iconCls : 'btn_ext_application_side',
 		hidden : !sstsConfig.printLabelWhenReviewing && sstsConfig.hideEnterReviewListButton,
 		handler : function() {
@@ -1328,7 +1335,7 @@
 	
 	/** 未审核器械包 **/
 	grid = new Ext.ux.ForgonPageGrid({
-		title : '待审核任务列表(双击查看图片)',
+		title : '待'+reviewViewText+'任务列表(双击查看图片)',
 		tbar : tbar,
 		pageSize : 20,
 		defaultSortField : 'id',
@@ -1510,7 +1517,7 @@
         ],
         stripeRows: true,
         autoExpandColumn: 'tousseName',
-        title:'待审核器械包',
+        title:'待'+reviewViewText+'器械包',
         header : false,
         listeners: {
         	render : function() {
@@ -1617,7 +1624,7 @@
 										showResult("无法录入篮筐，篮筐正处于[" + obj.status + "]状态" , null , sstsConfig.messagePauseTimeOnReviewPage);
 										clearBarcodeAndBasketName();
 									} else if (returnType == "erroeStatus"){
-										showResult("器械包状态异常，请录入待审核的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage);
+										showResult("器械包状态异常，请录入待"+reviewViewText+"的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage);
 										Ext.getCmp('barcode').setValue('');
 //										clearBarcodeAndBasketName();
 									} else if(returnType == "tousseInstanceSuccess"){//扫描的是包(返回结果为单个器械包,暂保留)
@@ -1717,7 +1724,7 @@
 											if(basketName!=null && basketName!='' && basketBarcode!=null && basketBarcode!=''){
 												var forReviewData = Ext.getCmp('forReviewGrid').getStore();
 												if(forReviewData!=null && forReviewData.getCount()>0){
-													Ext.Msg.confirm("审核确认","系统检测到您已扫描过["+basketName+"]，是否要审核["+basketName+"]？",function(btn){
+													Ext.Msg.confirm(""+reviewViewText+"确认","系统检测到您已扫描过["+basketName+"]，是否要"+reviewViewText+"["+basketName+"]？",function(btn){
 														if(btn=='yes'){
 															reviewTousse(basketName,basketBarcode);
 															
@@ -1730,7 +1737,7 @@
 											Ext.getCmp('barcode').setValue('');
 											speaker.speak(obj.containerName);
 										}else{
-											showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
+											showResult(""+reviewViewText+"入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 											clearBarcodeAndBasketName();
 										}
 										
@@ -1774,7 +1781,7 @@
 								var returnType = obj.returnType;
 								var containerType = obj.containerType;
 								if (returnType == "erroeStatus"){
-									showResult("器械包状态异常，请录入待审核的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage);
+									showResult("器械包状态异常，请录入待"+reviewViewText+"的器械包" , null , sstsConfig.messagePauseTimeOnReviewPage);
 								}else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留)
 									var tousseInstanceArray = obj.tousseInstances;
 									if(tousseInstanceArray && tousseInstanceArray.length > 0){
@@ -1857,7 +1864,7 @@
 										if(basketName!=null && basketName!='' && basketBarcode!=null && basketBarcode!=''){
 											var forReviewData = Ext.getCmp('forReviewGrid').getStore();
 											if(forReviewData!=null && forReviewData.getCount()>0){
-												Ext.Msg.confirm("审核确认","系统检测到您已扫描过["+basketName+"]，是否要审核["+basketName+"]？",function(btn){
+												Ext.Msg.confirm(""+reviewViewText+"确认","系统检测到您已扫描过["+basketName+"]，是否要"+reviewViewText+"["+basketName+"]？",function(btn){
 													if(btn=='yes'){
 														reviewTousse(basketName,basketBarcode);
 														
@@ -1870,7 +1877,7 @@
 										Ext.getCmp('barcode').setValue('');
 										speaker.speak(obj.containerName);
 									}else{
-										showResult("审核入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
+										showResult(""+reviewViewText+"入筐只能使用灭菌筐。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 										clearBarcodeAndBasketName();
 									}
 									
@@ -1900,7 +1907,7 @@
 			allowBlank : true,
 			anchor : '90%'
 		},{
-			text:'审核数量:'
+			text:''+reviewViewText+'数量:'
 		},{
 			xtype:'textfield',
 			readOnly :true,
@@ -2036,14 +2043,14 @@
         store: reviewedChartPanelStore,
         cm:new Ext.grid.ColumnModel([
             {id:'tousseName',header:'器械包名称',dataIndex:'tousseName', menuDisabled: true,width:400}, 
-            {header:'审核人',dataIndex:'reviewer', menuDisabled: true},   
+            {header:''+reviewViewText+'人',dataIndex:'reviewer', menuDisabled: true},   
             {header:'数量',dataIndex:'amount', menuDisabled: true,id:'amount'}   
 	    ]),
         stripeRows: true,
         autoExpandColumn: 'amount',
-        title:'今天本组已审核的器械包',
+        title:'今天本组已'+reviewViewText+'的器械包',
         tbar : [{
-			text : '已审核器械包总数:'
+			text : '已'+reviewViewText+'器械包总数:'
 		},{
 			xtype : 'textfield',
 			id : "reviewedsum",
@@ -2154,13 +2161,13 @@
         items:[{
     		id : 'reviewGridTab', 
     		layout : 'fit',
-    		title: '审核任务',
+    		title: ''+reviewViewText+'任务',
 //        	autoHeight : true,
 			items:[new Ext.Panel({
 				layout : 'border',
 				items : [ {
 					region : 'west',
-					title : '审核确认列表',
+					title : ''+reviewViewText+'确认列表',
 					margins : '0 0 0 0',
 					items : forReviewGrid,
 					layout:'fit',
@@ -2184,7 +2191,7 @@
 		},{
         	id : 'reviewedChartTab', 
         	layout : 'fit',
-        	title: '审核统计',
+        	title: ''+reviewViewText+'统计',
         	autoHeight : true,
         	items:[reviewedChartPanel]
         },{