公路云专项暂定合计，中粗砂计算重复：去掉组成物所包含的中粗砂计算。

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

@@ -541,7 +541,8 @@ let calcTools = {
           // 不能直接用glj.tenderPrice，这个值不可靠。当调价界面删除单价系数后，tenderPrice没有实时计算，取得的值为0
           rst.eTU = rst.eTU + (me.uiGLJQty(glj.tenderQuantity) * glj.tenderPrice).toDecimal(decimalObj.process);
           rst.eTU = rst.eTU.toDecimal(decimalObj.process);
-        } else {
+        }
+        /*         } else {
           // 组成物。
           if (!compositionTypes.includes(glj.type)) continue;
           let mds = projectObj.project.composition.getCompositionByGLJ(glj);
@@ -558,7 +559,7 @@ let calcTools = {
             rst.eTU = rst.eTU + (mdTU * glj.tenderQuantity).toDecimal(decimalObj.process);
             rst.eTU = rst.eTU.toDecimal(decimalObj.process);
           }
-        }
+        } */
       }
       rst.eU = rst.eU.toDecimal(decimalObj.bills.unitPrice);
       rst.eTU = rst.eTU.toDecimal(decimalObj.bills.unitPrice);

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

@@ -1860,7 +1860,19 @@ $(function () {
 
       showAlert("正在导入预算价...", true);
       //
-      let gljList = projectObj.project.projectGLJ.datas.gljList;
+      const gljList = projectObj.project.projectGLJ.datas.gljList;
+      const priceCol = 5;
+      console.log(gljList);
+      console.log(projectGljObject.projectGljSetting);
+      const changeInfo = [];
+      for (const pd of priceData) {
+        const idx = gljUtil.getIndex(pd, gljKeyArray);
+        const pGlj = projectObj.project.projectGLJ.selected;
+        if (pGlj.unit_price.market_price !== pd.unitPrice) {
+          changeInfo.push({ row: 6, col: priceCol, value: pd.unitPrice });
+        }
+      }
+      if (changeInfo.length > 0) projectGljObject.batchUpdateProjectGLJ(changeInfo, "projectGljSheet");
     } catch (err) {
       console.log(err);
       showAlert(err);