Procházet zdrojové kódy

台账修订,清单对比,标红调整

MaiXinRong před 1 měsícem
rodič
revize
e180dd78c0

+ 6 - 4
app/public/js/revise_gcl_compare.js

@@ -32,7 +32,8 @@ const showTools = function (show) {
 };
 
 $(document).ready(() => {
-    let compareTag = $('input[name=compareTag]:checked').val();
+    const compareTag = [];
+    $('input[name=compareTag]:checked').each(function() { compareTag.push(this.value); });
     showTools(true);
     autoFlashHeight();
     const gclSpread = SpreadJsObj.createNewSpread($('#gcl-spread')[0]);
@@ -67,8 +68,8 @@ $(document).ready(() => {
             //     return '#f8d7da';
             // if ((col.field === 'org_quantity' || col.field === 'org_total_price') && data.differ_qty)
             //     return '#f8d7da';
-            if (compareTag === 'deal' && data.deal_differ_qty) return '#f8d7da';
-            if (compareTag === 'org' && data.differ_qty) return '#f8d7da';
+            if (compareTag.indexOf('deal') >= 0 && data.deal_differ_qty) return '#f8d7da';
+            if (compareTag.indexOf('org') >= 0 && data.differ_qty) return '#f8d7da';
             return data.differ ? '#FFE699' : '#ffffff';
         }
     };
@@ -299,7 +300,8 @@ $(document).ready(() => {
         }
     });
     $('input[name=compareTag]').change(() => {
-        compareTag = $('input[name=compareTag]:checked').val();
+        compareTag.length = 0;
+        $('input[name=compareTag]:checked').each(function() { compareTag.push(this.value);});
         SpreadJsObj.reLoadSheetData(gclSheet);
     });
 });

+ 2 - 2
app/view/revise/gcl_compare.ejs

@@ -6,13 +6,13 @@
             <div>
                 <i class="fa fa-stop text-danger-50 border-danger-50 bg-danger-50"></i>
                 <div class="form-check d-inline-block">
-                    <input class="form-check-input" type="radio" name="compareTag" id="exampleRadios1" value="deal" checked>
+                    <input class="form-check-input" type="checkbox" name="compareTag" id="exampleRadios1" value="deal" checked>
                     <label class="form-check-label" for="exampleRadios1">
                         台账修订 ≠ 签约
                     </label>
                 </div>
                 <div class="form-check d-inline-block">
-                    <input class="form-check-input" type="radio" name="compareTag" id="exampleRadios2" value="org">
+                    <input class="form-check-input" type="checkbox" name="compareTag" id="exampleRadios2" value="org">
                     <label class="form-check-label" for="exampleRadios2">
                         台账修订 ≠ 原台账
                     </label>