调价Bug

public/web/gljUtil.js

@@ -221,8 +221,14 @@ let gljUtil = {
             }
         }
         let coe = 1;
-        coe = ration.quantityCoe&&this.isNotEmpty(ration.quantityCoe[coeField])?ration.quantityCoe[coeField]:1;
-        coe = parseFloat(coe);
+        if (!calcTools.isTenderProjectGLJ(ration_glj)){
+            coe = 1;
+        }
+        else{
+            coe = ration.quantityCoe&&this.isNotEmpty(ration.quantityCoe[coeField])?ration.quantityCoe[coeField]:1;
+            coe = parseFloat(coe);
+        }
+
         if (coe == 0) coe = 1;
         let glj_quantity = scMathUtil.roundForObj(ration_glj.quantity, q_decimal);
         return scMathUtil.roundForObj(glj_quantity * coe,q_decimal);

web/building_saas/main/js/models/calc_program.js

@@ -364,7 +364,7 @@ let calcTools = {
     machineDetailFee: function (treeNode, gljArr, masterTypeFilter, detailType, isTender) {
         if (!gljArr) return 0;
         let result = 0;
-        let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 0;
+        let nodeQ = isTender ? calcTools.uiNodeTenderQty(treeNode) : calcTools.uiNodeQty(treeNode);
         for (let glj of gljArr) {
             if (baseMachineMasterTypes.includes(glj.type)){
                 // 机型不符

web/building_saas/main/js/views/options_view.js

@@ -9,6 +9,7 @@ let optionsOprObj = {
     getOptions: function () {
         let me = this;
         me.options = projectOptins;
+        if (!me.options) return;
         let gOpts = me.options[me.optionsTypes.GENERALOPTS];
         if(gljUtil.isDef(gOpts)){
             for(let attr in gOpts){