多期比较调整

app/public/js/global.js

@@ -2,7 +2,6 @@
 /*全局自适应高度*/
 function autoFlashHeight(){
     const select = $(".scrollbar-auto .active");
-    console.log(select);
     if (select.length > 0) $(".scrollbar-auto")[0].scrollTop = select[0].offsetTop - 72;
     function getObjHeight(select) {
         return select.length > 0 ? select.height() : 0;

app/public/js/measure_compare.js

@@ -375,14 +375,14 @@ $(document).ready(() => {
     $('[name=compare-data]').click(function () {
         initSpreadSettingWithRoles(compareStages);
         SpreadJsObj.reLoadSheetHeader(billsSheet);
-        SpreadJsObj.reloadColData(billsSheet, 7, compareStages.length * 2);
+        SpreadJsObj.reloadColData(billsSheet, billsSpreadSetting.baseCols.length - 1, compareStages.length * billsSpreadSetting.extraCols.length);
         SpreadJsObj.reLoadSheetHeader(posSheet);
-        SpreadJsObj.reloadColData(posSheet, 2, compareStages.length);
+        SpreadJsObj.reloadColData(posSheet, posSpreadSetting.baseCols.length - 1, compareStages.length * posSpreadSetting.extraCols.length);
 
         SpreadJsObj.reLoadSheetHeader(gclSheet);
-        SpreadJsObj.reloadColData(billsSheet, 9, compareStages.length * 2);
+        SpreadJsObj.reloadColData(gclSheet, gclSpreadSetting.baseCols.length - 1, compareStages.length * gclSpreadSetting.extraCols.length);
         SpreadJsObj.reLoadSheetHeader(leafXmjSheet);
-        SpreadJsObj.reloadColData(posSheet, 9, compareStages.length);
+        SpreadJsObj.reloadColData(leafXmjSheet, leafXmjSpreadSetting.baseCols.length - 1, compareStages.length * leafXmjSpreadSetting.extraCols.length);
     });
     $('[name=compareType]').click(function () {
         $('[name=compareType]').removeClass('active');

app/view/measure/compare.ejs

@@ -38,19 +38,21 @@
                     <a id="exportExcel" class="btn btn-primary btn-sm" href="javascript: void(0)">导出清单汇总Excel</a>
                 </div>
                 <% } %>
-                <div class="d-inline-block ml-3">
-                    期数据来源：
-                    <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" id="radio_contract" value="contract" name="compare-data">
-                        <label class="form-check-label" for="radio_contract">合同</label>
-                    </div>
-                    <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" id="radio_qc" value="qc" name="compare-data">
-                        <label class="form-check-label" for="radio_qc">变更</label>
-                    </div>
-                    <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" id="radio_gather" value="gather" checked name="compare-data">
-                        <label class="form-check-label" for="radio_gather">完成</label>
+                <div class="d-inline-block ml-2">
+                    <span>期数据来源：</span>
+                    <div class="d-inline-block" style="vertical-align: middle">
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input pt-1" type="radio" id="radio_contract" value="contract" name="compare-data">
+                            <label class="form-check-label" for="radio_contract">合同</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="radio" id="radio_qc" value="qc" name="compare-data">
+                            <label class="form-check-label" for="radio_qc">变更</label>
+                        </div>
+                        <div class="form-check form-check-inline">
+                            <input class="form-check-input" type="radio" id="radio_gather" value="gather" checked name="compare-data">
+                            <label class="form-check-label" for="radio_gather">完成</label>
+                        </div>
                     </div>
                 </div>
             </div>