瀏覽代碼

fix: 材料计算,运费计算重复问题

zhangweicheng 1 年之前
父節點
當前提交
06fbf76961

+ 3 - 3
web/building_saas/main/js/models/project_glj.js

@@ -777,7 +777,7 @@ ProjectGLJ.prototype.refreshEctrovalenceCache = function (updateMap) {
         }
         const conditions = [];
         for(const glj of gljList){
-            const keys = this.datas.mixRatioConnectData[gljUtil.getIndex(glj)]
+            const keys = this.datas.mixRatioConnectData[gljUtil.getIndex(glj)]||[];
             for(const key of keys){
                 conditions.push(gljOprObj.getConditionByKey(key));
             }
@@ -800,7 +800,7 @@ ProjectGLJ.prototype.refreshMaterialCalcCache = function (updateMap,isFromFeeRat
       }
       const conditions = [];
       for(const glj of gljList){
-          const keys = this.datas.mixRatioConnectData[gljUtil.getIndex(glj)]
+          const keys = this.datas.mixRatioConnectData[gljUtil.getIndex(glj)]||[];
           for(const key of keys){
               conditions.push(gljOprObj.getConditionByKey(key));
           }
@@ -809,7 +809,7 @@ ProjectGLJ.prototype.refreshMaterialCalcCache = function (updateMap,isFromFeeRat
       this.getImpactRationNodes([...gljList,...parentGljs]);//更新工料机类型的定额价格
    }
    return gljList;
-
+ 
     function updateList(list,updateMap) {
        if(updateMap["update"]){
            let map = updateMap["update"];

+ 0 - 1
web/building_saas/standard_interface/import/base.js

@@ -500,7 +500,6 @@ const INTERFACE_EXPORT_BASE = (() => {
    * @return {Promise<Object>}
    */
   async function handleImportData(importData, areaKey, onlyImportMatchBills) {
-    debugger;
     const valuationID = compilationData.ration_valuation[0].id;
     if (!Array.isArray(importData.tenders) && !importData.tenders.length) {
       throw "导入的文件中不存在有效的标段数据。";

+ 0 - 1
web/building_saas/standard_interface/import/view.js

@@ -66,7 +66,6 @@ const IMPORT_VIEW = (() => {
           areaKey = curAreaKey;
           await STD_INTERFACE.loadScriptByArea(areaKey, STD_INTERFACE.ScriptType.IMPORT);
           const onlyImportMatchBills = areaKey === '广东@中山';
-          debugger;
           importData = await INTERFACE_EXPORT_BASE.extractImportData(INTERFACE_IMPORT.entry, file, areaKey, false, onlyImportMatchBills, INTERFACE_IMPORT.handleAfterImport);
         }
         const constructionName = $('#import-rename').is(':visible') ? $('#import-rename-input').val() : importData.name;