Browse Source

审核比较,比较空值和0,判断为相等

MaiXinRong 5 years ago
parent
commit
c286583e6b
1 changed files with 4 additions and 2 deletions
  1. 4 2
      app/public/js/stage_compare.js

+ 4 - 2
app/public/js/stage_compare.js

@@ -64,7 +64,8 @@ $(document).ready(function () {
             const field = data.quantity ? 'gather_qty' : 'gather_tp';
             const field = data.quantity ? 'gather_qty' : 'gather_tp';
             const base = data[field + fieldSufs[0]];
             const base = data[field + fieldSufs[0]];
             for (let i = 1; i< fieldSufs.length; i++) {
             for (let i = 1; i< fieldSufs.length; i++) {
-                if (data[field + fieldSufs[i]] !== base) return true;
+                const compare = data[field + fieldSufs[i]];
+                if ((base || compare) && (compare !== base)) return true;
             }
             }
         }
         }
         return data.children.length === 0 && checkDiffer(data) ? '#F2DEDE' : defaultColor;
         return data.children.length === 0 && checkDiffer(data) ? '#F2DEDE' : defaultColor;
@@ -75,7 +76,8 @@ $(document).ready(function () {
             if (fieldSufs.length <= 1) return false;
             if (fieldSufs.length <= 1) return false;
             const base = data['gather_qty' + fieldSufs[0]];
             const base = data['gather_qty' + fieldSufs[0]];
             for (let i = 1; i< fieldSufs.length; i++) {
             for (let i = 1; i< fieldSufs.length; i++) {
-                if (data['gather_qty' + fieldSufs[i]] !== base) return true;
+                const compare = data['gather_qty' + fieldSufs[i]];
+                if ((base || compare) && (compare!== base)) return true;
             }
             }
         }
         }
         return checkDiffer(data) ? '#F2DEDE' : defaultColor;
         return checkDiffer(data) ? '#F2DEDE' : defaultColor;