Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js
===================================================================
diff -u -r30726 -r30750
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30726)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js	(.../reviewView.js)	(revision 30750)
@@ -1906,7 +1906,7 @@
 //										showResult("只能扫描灭菌篮框和审核人条码。");
 //										clearBarcodeAndBasketName();
 //										return false;
-										if(taskGroup != obj.taskGroup){
+										if(taskGroup != obj.taskGroup && sstsConfig.reviewModuleVersion !== 2){
 											showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 											Ext.getCmp('barcodes').setValue('');
 											return;
@@ -1951,7 +1951,7 @@
 									} else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留)
 										var tousseInstanceArray = obj.tousseInstances;
 										if(tousseInstanceArray && tousseInstanceArray.length > 0){
-											if(taskGroup != tousseInstanceArray[0].taskGroup){
+											if(taskGroup != tousseInstanceArray[0].taskGroup && sstsConfig.reviewModuleVersion !== 2){
 												showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 												Ext.getCmp('barcodes').setValue('');
 												return;
@@ -2096,7 +2096,7 @@
 								}else if(returnType == "multiTousseInstancesSuccess"){//扫描的是虚拟篮框(单个或首尾)或首尾器械包(返回结果为单个器械包,暂保留)
 									var tousseInstanceArray = obj.tousseInstances;
 									if(tousseInstanceArray && tousseInstanceArray.length > 0){
-										if(taskGroup != tousseInstanceArray[0].taskGroup){
+										if(taskGroup != tousseInstanceArray[0].taskGroup && sstsConfig.reviewModuleVersion !== 2){
 											showResult("该条码所对应的器械包不属于当前任务组。" , null , sstsConfig.messagePauseTimeOnReviewPage);
 											Ext.getCmp('barcodeEnd').setValue('');
 											return;
@@ -2141,7 +2141,7 @@
 											if(Ext.getCmp('forReviewGrid').getStore().find('barcode', tousseInstanceArray[i].barcode) != -1){
 												continue;
 											}
-											if(taskGroup != tousseInstanceArray[i].taskGroup){
+											if(taskGroup != tousseInstanceArray[i].taskGroup && sstsConfig.reviewModuleVersion !== 2){
 												//不是当前任务组的(由于后台没有做任务组限制,所以在这里限制)
 												continue;
 											}
@@ -2370,8 +2370,36 @@
 			name : 'reviewedsum',
 			anchor : '95%',
 			readOnly : true,
+			width:50,
 			cls:'fieldReadOnlyNoRemove'
-		}]
+		},{
+			text : '装配任务组:',
+			hidden:sstsConfig.reviewModuleVersion !== 2
+		},{
+			xtype : 'combo',
+			id : 'taskGroup_review1',
+			name : 'taskGroup_review1',
+			editable:false,
+			width:100,
+			valueField : 'taskGroupName',
+			displayField : 'taskGroupName',
+			store : taskGroupStore,
+			forceSelection : true,
+			triggerAction : 'all',
+			value:$Id("parm_s_taskGroup").value,
+			hidden:sstsConfig.reviewModuleVersion !== 2,
+			anchor : '100%',
+			listeners : {
+				select: function(combo, record, index){
+					var value = combo.getValue();
+					if(value == '全部'){
+						value = '';
+					}
+					$Id("parm_s_taskGroup").value = value;
+					reviewedChartPanelStore.reload();
+				}
+			}
+		 }]
 	});
 	
 	var tabs = new Ext.TabPanel({
@@ -2443,7 +2471,37 @@
                         		}
                         		return str;
                             }
-                        }],
+						}],
+						tbar : [{
+							text : '装配任务组:',
+							hidden:sstsConfig.reviewModuleVersion !== 2
+						},{
+							xtype : 'combo',
+							id : 'taskGroup_review2',
+							name : 'taskGroup_review2',
+							editable:false,
+							width:100,
+							valueField : 'taskGroupName',
+							displayField : 'taskGroupName',
+							store : taskGroupStore,
+							forceSelection : true,
+							triggerAction : 'all',
+							value:$Id("parm_s_taskGroup").value,
+							hidden:sstsConfig.reviewModuleVersion !== 2,
+							anchor : '100%',
+							listeners : {
+								select: function(combo, record, index){
+									var value = combo.getValue();
+									if(value == '全部'){
+										value = '';
+									}
+									reviewedPanel.getLoader().on("beforeload", function(treeLoader, node){
+										treeLoader.baseParams.taskGroup = value;
+									});
+									reviewedPanel.getLoader().load(reviewedPanel.getRootNode());
+								}
+							}
+						}],
                         loader: new Ext.tree.TreeLoader({
                         	url : WWWROOT + '/disinfectSystem/tousseInstanceAction!loadAllTousseInstance.do',
                         	baseParams : {taskGroup:taskGroup},
@@ -2454,7 +2512,7 @@
                         root: new Ext.tree.AsyncTreeNode({
                             text:'objName'
                         })
-                    });
+					});
                 	reviewedPanel.on('load',function(store,node,response){
                 		reviewedPanel.expand(false);
                 	});
Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp
===================================================================
diff -u -r30713 -r30750
--- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 30713)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.jsp	(.../reviewView.jsp)	(revision 30750)
@@ -25,6 +25,9 @@
 	.x-tree-node a span{
 		display: inline-block;
 	}
+	.x-form-field-wrap {
+		min-width: 100px !important;
+	}
 </style>
 </head>
 <body>