从养护同步：

①跟踪项目工料机、定额工料机、计算程序等地方调后单价、调后汇总数量、调后金额显示不一致问题。
②单价调整系数输入0.5后键盘回车，“显示调价后数据”选项自动被打勾了。
③项目工料机勾选不调价，直接切换到定额工料机的计算程序，没有刷新。
④项目工料机勾选不调价，没有实时全局计算。

public/web/gljUtil.js

@@ -128,8 +128,13 @@ 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/main.js

@@ -24,6 +24,9 @@ $(function () {
         rationLibObj.refreshSpread();
         subObj.initGljSubTab();
         subObj.initQDSubTab();
+        if($('#linkJSCX').hasClass('active'))
+            calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected, 2);
+
         //refreshSubSpread();
     });
 

web/building_saas/main/js/views/project_glj_view.js

@@ -1130,7 +1130,7 @@ let projectGljObject={
             }
             info.sheet.resumeEvent();
             info.sheet.resumePaint();
-            if (dataCode === 'supply' || dataCode === 'supply_quantity'){    // basePrice、marketPrice 有自己的计算代码，无需走这里重复计算
+            if (dataCode === 'supply' || dataCode === 'supply_quantity' || dataCode === 'is_adjust_price'){    // basePrice、marketPrice 有自己的计算代码，无需走这里重复计算
                 let rations = calcTools.getRationsByProjectGLJ(recode.id);
                 projectObj.project.calcProgram.calcNodesAndSave(rations, function () {
                     projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots);

web/building_saas/main/js/views/tender_price_view.js

@@ -530,6 +530,7 @@ $(function () {
     $('#cbShowTenderFields').on('click', function () {
         let showFields = $('#cbShowTenderFields').prop("checked");
         projectObj.project.saveProperty('tenderSetting.showTenderFields', showFields);
+        projectObj.project.property.tenderSetting.showTenderFields = showFields;
         gljCol.showTenderFields(showFields, true);
     });