MaiXinRong před 4 roky
rodič
revize
324a4a0542
2 změnil soubory, kde provedl 4 přidání a 4 odebrání
  1. 3 3
      app/lib/analysis_excel.js
  2. 1 1
      app/public/js/stage_gather.js

+ 3 - 3
app/lib/analysis_excel.js

@@ -205,7 +205,7 @@ class ImportBaseTree {
         }
         }
     }
     }
 
 
-    static _assignRelaField(temp, node) {
+    _assignRelaField(temp, node) {
         _.assignInWith(temp, node,
         _.assignInWith(temp, node,
             (objValue, srcValue, key) => { return ['name', 'unit'].indexOf(key) > -1 ? objValue : srcValue; });
             (objValue, srcValue, key) => { return ['name', 'unit'].indexOf(key) > -1 ? objValue : srcValue; });
     }
     }
@@ -471,13 +471,13 @@ class AnalysisExcelTree {
         };
         };
     }
     }
 
 
-    static _isMatch11(tempData) {
+    _isMatch11(tempData) {
         return _.find(tempData, x => {
         return _.find(tempData, x => {
             return x.code.indexOf('-') > 0;
             return x.code.indexOf('-') > 0;
         })
         })
     }
     }
 
 
-    static _isMatch18(tempData) {
+    _isMatch18(tempData) {
         return _.every(tempData, x => {
         return _.every(tempData, x => {
             return !x.code || !!x.code.match(mainReg);
             return !x.code || !!x.code.match(mainReg);
         });
         });

+ 1 - 1
app/public/js/stage_gather.js

@@ -91,7 +91,7 @@ $(document).ready(function () {
                     ? data.end_contract_tp > ZhCalc.mul(data[tpField], per)
                     ? data.end_contract_tp > ZhCalc.mul(data[tpField], per)
                     : data.end_contract_tp < ZhCalc.mul(data[tpField], per) || data.end_contract_tp > 0;
                     : data.end_contract_tp < ZhCalc.mul(data[tpField], per) || data.end_contract_tp > 0;
             }
             }
-        }
+        };
         const bQty = $('#customRadio1')[0].checked, bDealQty = $('#customRadio2')[0].checked;
         const bQty = $('#customRadio1')[0].checked, bDealQty = $('#customRadio2')[0].checked;
         const nPercent = Math.min(Math.max(ZhCalc.div(parseFloat($('#over-percent').val()), 100), 0.5), 1);
         const nPercent = Math.min(Math.max(ZhCalc.div(parseFloat($('#over-percent').val()), 100), 0.5), 1);
         for (const node of data) {
         for (const node of data) {