Procházet zdrojové kódy

农村养护基数只能用行引用

vian před 5 roky
rodič
revize
ed79bfc9e2

+ 2 - 1
web/building_saas/main/js/models/calc_base.js

@@ -1400,7 +1400,8 @@ let calcBase = {
             node.updateData.calcBase = exp;
             node.updateData.calcBaseValue = parseFloat(calcBaseValue).toDecimal(decimalObj.decimal('totalPrice', node));
             node.updateData.tenderCalcBaseValue = parseFloat(tenderCalcBaseValue).toDecimal(decimalObj.decimal('totalPrice', node));
-            if (calculateUtil.isProgressive(exp, progression)) {
+            // progression来自overwrite里配置的全局变量
+            if (typeof progression !== 'undefined' && calculateUtil.isProgressive(exp, progression)) {
                 node.updateData.baseProgressiveFee = me.baseProgressiveFee;
             }
             node.changed = true;

+ 18 - 0
web/over_write/js/nongcun_2020.js

@@ -89,3 +89,21 @@
 
     overwrite();
 })();
+
+// 清单基数(仅能使用行引用)
+if (typeof baseFigureMap !== 'undefined') {
+    baseFigureMap.budget = {};
+    baseFigureMap.boq = {};
+}
+if (typeof baseFigureTemplate !== 'undefined') {
+    baseFigureTemplate.budget = {};
+    baseFigureTemplate.boq = {};
+}
+
+
+if (typeof module !== 'undefined') {
+    module.exports = {
+        progression: [],
+        deficiency: {}
+    };
+}