Quellcode durchsuchen

当前材料有材料计算时,不导入预算价。

chenshilong vor 3 Jahren
Ursprung
Commit
73f2cdd70a
1 geänderte Dateien mit 6 neuen und 4 gelöschten Zeilen
  1. 6 4
      web/building_saas/main/js/views/project_glj_view.js

+ 6 - 4
web/building_saas/main/js/views/project_glj_view.js

@@ -1433,6 +1433,8 @@ projectGljObject = {
   getSheetDataRowAndPrice: function (gljIndex) {
     const pGlj = projectObj.project.projectGLJ.datas.gljMap[gljIndex];
     if (!pGlj) return null;
+    if (pGlj.unit_price.calcMaterial === 1) return null; // 计算材料不更新预算价
+
     const sheetDataArr = this.projectGljSheetData;
     for (let index = 0; index < sheetDataArr.length; index++) {
       const e = sheetDataArr[index];
@@ -1443,7 +1445,7 @@ projectGljObject = {
 
   exportToExcelFile: function () {
     const excelIO = new GC.Spread.Excel.IO();
-    console.log(this.projectGljSheetData);
+    // console.log(this.projectGljSheetData);
     let workbook = new GC.Spread.Sheets.Workbook(document.getElementById("#project_glj_sheet_Temp"));
     let sheet = workbook.sheets[0];
     workbook.commandManager().execute({ cmd: "renameSheet", sheetName: "Sheet1", name: "材料预算价" });
@@ -1553,9 +1555,9 @@ projectGljObject = {
     const changeInfo = [];
     for (const pd of priceData) {
       const idx = gljUtil.getIndex(pd, gljKeyArray);
-      const pGlj = this.getSheetDataRowAndPrice(idx);
-      if (pGlj && pGlj.price !== pd.unitPrice) {
-        changeInfo.push({ row: pGlj.row, col: priceCol, value: pd.unitPrice });
+      const pGljObj = this.getSheetDataRowAndPrice(idx);
+      if (pGljObj && pGljObj.price !== pd.unitPrice) {
+        changeInfo.push({ row: pGljObj.row, col: priceCol, value: pd.unitPrice });
       }
     }
     if (changeInfo.length > 0) this.batchUpdateProjectGLJ(changeInfo, "projectGljSheet");