块模板库编号问题

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

@@ -1072,9 +1072,11 @@
      }
      return totalFee < minPrice;
    },
+   // 概预算项目
    isBudgetProject() {
      return projectObj.project.property.valuationType == 'bill';
    },
+   // 招投标项目
    isBillProject() {
      return projectObj.project.property.valuationType == 'ration';
    },

web/building_saas/main/js/views/project_view.js

@@ -3250,7 +3250,15 @@ $(function () {
                 vBlock_WC.datas.push(BlockController.getNodeDatas(node, ration_glj_Map));
                 vBlock_WC = JSON.parse(JSON.stringify(vBlock_WC));
                 // 块文件名称：编号要根据实际情况对父清单的编号进行拼装。
-                 let newCode = divideObj.getExeBillCode(vBlock_WC.datas[0].ID);
+                //  let newCode = divideObj.getExeBillCode(vBlock_WC.datas[0].ID);
+                let newCode = node.data.code;
+                if (calcTools.isBillProject()){
+                    let tempNode = node;
+                    while ((tempNode.data.code.indexOf('-') == 0) && (tempNode.parent != undefined)) {
+                        newCode = tempNode.parent.data.code + newCode;
+                        tempNode = tempNode.parent;
+                    }
+                };
                  let unit = node.data.unit ? node.data.unit : '';
                 let fileName = newCode + ' ' + node.data.name + ' ' + unit;
                 fileName = fileName.replace(/^\s+|\s+$/g, "");    // 只去两头空格