Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r33324 -r33331
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 33324)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 33331)
@@ -1377,7 +1377,10 @@
 }
 
 //验证审核时间
-function validReviewTime(type, time) {
+function validReviewTime(type, time, isTraceable) {
+    if (isTraceable == '否') {
+        return true;
+    }
     //兼容IE
     var newTime2 = time.replace(/-/g, '/');
     var newDate2 = newDate.replace(/-/g, '/');
@@ -1396,11 +1399,11 @@
     }
     var startDateStr = startDate.getTime();
     if (type == '今天') {
-    	var currentDate = new Date(newTime2);
+        var currentDate = new Date(newTime2);
         var currentDateStr = currentDate.getTime();
-        if(newTimeStr < startDateStr){
-            startDateStr = startDateStr - 24*60*60*1000;
-            endDateStr = endDateStr - 24*60*60*1000;
+        if (newTimeStr < startDateStr) {
+            startDateStr = startDateStr - 24 * 60 * 60 * 1000;
+            endDateStr = endDateStr - 24 * 60 * 60 * 1000;
         }
         if (currentDateStr >= startDateStr && currentDateStr <= endDateStr) {
             return true;
@@ -1410,13 +1413,13 @@
         var newEndDateStr = endDateStr - 24 * 60 * 60 * 1000;
         var currentDate = new Date(newTime2);
         var currentDateStr = currentDate.getTime();
-        if(newTimeStr < newStartDateStr){
-            newStartDateStr = newStartDateStr - 24*60*60*1000;
-            newEndDateStr = newEndDateStr - 24*60*60*1000;
+        if (newTimeStr < newStartDateStr) {
+            newStartDateStr = newStartDateStr - 24 * 60 * 60 * 1000;
+            newEndDateStr = newEndDateStr - 24 * 60 * 60 * 1000;
         }
-        if(newTimeStr < newEndDateStr){
-            newStartDateStr = newStartDateStr - 24*60*60*1000;
-            newEndDateStr = newEndDateStr - 24*60*60*1000;
+        if (newTimeStr < newEndDateStr) {
+            newStartDateStr = newStartDateStr - 24 * 60 * 60 * 1000;
+            newEndDateStr = newEndDateStr - 24 * 60 * 60 * 1000;
         }
         if (currentDateStr >= newStartDateStr && currentDateStr <= newEndDateStr) {
             return true;
@@ -1443,48 +1446,50 @@
             params.amount = item.objAmount;
             params.isParentNode = true;
             var reviewTime = item.reviewTime;
+            var isTraceable = item.isTraceable;
             var myNode = createNodeForPendingStarilizationGoods(params);
             var array = [];
             if (item.type == 'BASKET') {
                 for (var i = 0; i < item.children.length; i++) {
                     var params = item.children[i];
                     var childNode = createPendingSterilizationGoodsNodeForUrgent(params);
                     array.push(childNode);
-                    if (validReviewTime(reviewTimeName, item.children[i].reviewTime)) {
+                    if (validReviewTime(reviewTimeName, item.children[i].reviewTime, item.children[i].isTraceable)) {
                         reviewTime = item.children[i].reviewTime;
+                        isTraceable = item.children[i].isTraceable;
                     }
                 }
                 myNode.appendChild(array);
             }
             if (modeName == '全部') {
-                if (validReviewTime(reviewTimeName, reviewTime)) {
+                if (validReviewTime(reviewTimeName, reviewTime, isTraceable)) {
                     pendingSterilizationColumnTree.getRootNode().appendChild(myNode);
                 }
             } else if (modeName == '无') {
                 if (item.type == 'BASKET' && item.children && item.children.length > 0) {
                     var sterilingMode = item.children[0].sterilingMode || '';
                     if (sterilingMode == '') {
-                        if (validReviewTime(reviewTimeName, reviewTime)) {
+                        if (validReviewTime(reviewTimeName, reviewTime, isTraceable)) {
                             pendingSterilizationColumnTree.getRootNode().appendChild(myNode);
                         }
                     }
                 } else {
                     if ((item.sterilingMode || '') == '') {
-                        if (validReviewTime(reviewTimeName, reviewTime)) {
+                        if (validReviewTime(reviewTimeName, reviewTime, isTraceable)) {
                             pendingSterilizationColumnTree.getRootNode().appendChild(myNode);
                         }
                     }
                 }
             } else {
                 if (item.type == 'BASKET' && item.children && item.children.length > 0) {
                     if (item.children[0].sterilingMode == modeName) {
-                        if (validReviewTime(reviewTimeName, reviewTime)) {
+                        if (validReviewTime(reviewTimeName, reviewTime, isTraceable)) {
                             pendingSterilizationColumnTree.getRootNode().appendChild(myNode);
                         }
                     }
                 } else {
                     if (item.sterilingMode == modeName) {
-                        if (validReviewTime(reviewTimeName, reviewTime)) {
+                        if (validReviewTime(reviewTimeName, reviewTime, isTraceable)) {
                             pendingSterilizationColumnTree.getRootNode().appendChild(myNode);
                         }
                     }