|
@@ -3252,16 +3252,9 @@ $(function () {
|
|
|
vBlock_WC = JSON.parse(JSON.stringify(vBlock_WC));
|
|
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;
|
|
|
|
|
|
|
+ let code = calcTools.getCodeForBlock(node);
|
|
|
|
|
+ let unit = node.data.unit ? node.data.unit : '';
|
|
|
|
|
+ let fileName = code + ' ' + node.data.name + ' ' + unit;
|
|
|
fileName = fileName.replace(/^\s+|\s+$/g, ""); // 只去两头空格
|
|
fileName = fileName.replace(/^\s+|\s+$/g, ""); // 只去两头空格
|
|
|
|
|
|
|
|
let extN = blockLibObj.getSameNameNode(fileName, categoryID);
|
|
let extN = blockLibObj.getSameNameNode(fileName, categoryID);
|