台账修订，清单对比，标红显示相关

app/public/js/revise_gcl_compare.js

@@ -32,6 +32,7 @@ const showTools = function (show) {
 };
 
 $(document).ready(() => {
+    let compareTag = $('input[name=compareTag]:checked').val();
     showTools(true);
     autoFlashHeight();
     const gclSpread = SpreadJsObj.createNewSpread($('#gcl-spread')[0]);
@@ -61,9 +62,14 @@ $(document).ready(() => {
             colWidth: true,
         },
         getColor: function (sheet, data, row, col, defaultColor) {
-            return data
-                ? (data.differ ? '#FFE699' : '#ffffff')
-                : '#ffffff';
+            if (!data) return '#ffffff';
+            // if ((col.field === 'deal_bills_qty' || col.field === 'deal_bills_tp') && data.deal_differ_qty)
+            //     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';
+            return data.differ ? '#FFE699' : '#ffffff';
         }
     };
     if (thousandth) sjsSettingObj.setTpThousandthFormat(gclSpreadSetting);
@@ -217,4 +223,8 @@ $(document).ready(() => {
             leafXmjSpread.refresh();
         }
     });
+    $('input[name=compareTag]').change(() => {
+        compareTag = $('input[name=compareTag]:checked').val();
+        SpreadJsObj.reLoadSheetData(gclSheet);
+    });
 });

app/public/js/shares/gcl_gather_compare.js

@@ -389,6 +389,8 @@ const gclCompareModel = (function () {
             gcl.differ = false;
         }
         for (const [i, gcl] of gclList.entries()) {
+            gcl.differ_qty = ZhCalc.sub(gcl.new_quantity, gcl.org_quantity, 6);
+            gcl.deal_differ_qty = ZhCalc.sub(gcl.new_quantity, gcl.deal_bills_qty, 6);
             if (i === gclList.length - 1) continue;
             const next = gclList[i+1];
             if (gcl.b_code === next.b_code) {

app/view/revise/gcl_compare.ejs

@@ -4,7 +4,18 @@
         <div class="title-main d-flex">
             <% include ./sub_mini_menu.ejs %>
             <div>
-                工程量清单对比
+                <div class="form-check d-inline-block">
+                    <input class="form-check-input" type="radio" 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">
+                    <label class="form-check-label" for="exampleRadios2">
+                        台账修订 ≠ 原台账
+                    </label>
+                </div>
             </div>
             <div class="ml-auto">
             </div>