Index: ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js =================================================================== diff -u -r14291 -r14297 --- ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14291) +++ ssts-web/src/main/webapp/disinfectsystem/packing/reviewView.js (.../reviewView.js) (revision 14297) @@ -1153,7 +1153,7 @@ var isExist = Ext.getCmp('forReviewGrid').getStore().find('barcode', Ext.getCmp('barcode').getValue().trim()); if(isExist==-1){ var barcode = Ext.getCmp('barcode').getValue(); - BarcodeTableManager.getResultJsonStrByBarcode(barcode,'审核',function(jsonStr){ + ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode,function(jsonStr){ var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; var containerType = obj.containerType; @@ -1302,7 +1302,7 @@ } var barcode = Ext.getCmp('barcode').getValue(); var barcodeEnd = Ext.getCmp('barcodeEnd').getValue(); - BarcodeTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd,'审核',function(jsonStr){ + ForeignProxyDisinfectionTableManager.getResultJsonStrByBarcode(barcode + ";" + barcodeEnd,function(jsonStr){ var obj = Ext.util.JSON.decode(jsonStr); var returnType = obj.returnType; var containerType = obj.containerType; @@ -1322,6 +1322,10 @@ if(Ext.getCmp('forReviewGrid').getStore().find('barcode', tousseInstanceArray[i].barcode) != -1){ continue; } + if(taskGroup != tousseInstanceArray[i].taskGroup){ + //不是当前任务组的(由于后台没有做任务组限制,所以在这里限制) + continue; + } var tousseInstance = new tousseInstanceRecord({ id: tousseInstanceArray[i].tousseId, tousseDefinitionName: tousseInstanceArray[i].tousseName,