|
|
@@ -14,7 +14,7 @@ let cbTools = {
|
|
|
return this.isDef(v) && !isNaN(v) && v !== Infinity;
|
|
|
},
|
|
|
isFlag: function (v) {
|
|
|
- return this.isDef(v) && this.isDef(v.flagsIndex) && this.isDef(v.flagsIndex.fixed);
|
|
|
+ return this.isDef(v) && this.isDef(v.flagsIndex) && this.isDef(v.flagsIndex.fixed) && this.isDef(v.flagsIndex.fixed.flag);
|
|
|
},
|
|
|
returnV: function (v, r) {
|
|
|
if(this.isDef(v)){
|
|
|
@@ -85,6 +85,7 @@ let cbTools = {
|
|
|
if(this.isUnDef(exp) || exp === ''){
|
|
|
return rst;
|
|
|
}
|
|
|
+ let findChildNodes = [];//直接引用的节点，这些节点可能存在子节点，子节点才有公式，因此获取这些节点的子公式节点
|
|
|
//获取表达式中的基数和行引用
|
|
|
let figureF = cbParser.getFigureF(cbParser.getFigure(exp), cbParser.getUID(cbParser.getFIDArr(exp)));
|
|
|
//首先提取出多处引用的进行排序
|
|
|
@@ -94,35 +95,32 @@ let cbTools = {
|
|
|
let bill = this.isDef(calcBase.baseFigures[figure.value]['fixedBill']) ? calcBase.baseFigures[figure.value]['fixedBill']['bill'] : null;
|
|
|
let figureMultiRef = calcBase.baseFigures[figure.value]['multiRef'];
|
|
|
if(this.isDef(figureMultiRef)){
|
|
|
- let findChildNodes = [];
|
|
|
for(let flag of figureMultiRef){
|
|
|
let refNode = this.findBill(flag) ? this.getNodeByID(this.findBill(flag).ID) : null;
|
|
|
- if(refNode){
|
|
|
+ if(refNode && !ids.includes(refNode.data.ID)){
|
|
|
findChildNodes.push(refNode);
|
|
|
+ ids.push(refNode.data.ID);
|
|
|
}
|
|
|
}
|
|
|
- let childrenNodes = calcTools.getChildrenFormulaNodes(node, formulaNodesArr, findChildNodes);
|
|
|
- for(let cNode of childrenNodes){
|
|
|
- ids.push(cNode.data.ID);
|
|
|
- }
|
|
|
- rst = rst.concat(childrenNodes);
|
|
|
- }
|
|
|
- else if(this.isDef(bill) && ids.indexOf(bill.ID) === -1){
|
|
|
+ } else if(this.isDef(bill) && ids.indexOf(bill.ID) === -1){
|
|
|
let node = this.getNodeByID(bill.ID);
|
|
|
- if(this.isDef(node)){
|
|
|
+ if(this.isDef(node) && !ids.includes(node.data.ID)){
|
|
|
+ findChildNodes.push(node);
|
|
|
ids.push(node.data.ID);
|
|
|
- rst.push(node);
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- else if(figure.type === 'id'){
|
|
|
+ } else if(figure.type === 'id'){
|
|
|
let node = this.getNodeByID(figure.value);
|
|
|
- if(this.isDef(node) && ids.indexOf(node.data.ID) === -1){
|
|
|
+ if (this.isDef(node) && !ids.includes(node.data.ID)) {
|
|
|
+ findChildNodes.push(node);
|
|
|
ids.push(node.data.ID);
|
|
|
- rst.push(node);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ if (findChildNodes.length > 0) {
|
|
|
+ let childrenNodes = calcTools.getChildrenFormulaNodes(node, formulaNodesArr, findChildNodes);
|
|
|
+ rst = rst.concat(childrenNodes);
|
|
|
+ }
|
|
|
return rst;
|
|
|
},
|
|
|
//需要用到计算基数的时候，先找出所有的固定清单，避免每个基数都要去遍历寻找清单
|
|
|
@@ -151,74 +149,125 @@ let cbTools = {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
- //生成清单基数计算分类模板
|
|
|
- setBaseFigureClass: function (baseFigures, mapObj) {
|
|
|
- for(let figureClass in figureClassTemplate){
|
|
|
- mapObj[figureClass] = Object.create(null);
|
|
|
- }
|
|
|
- let needFixedBillsClass = ['FBFX', 'CXSM', 'QTXM', 'GF', 'SJ'];
|
|
|
- //不需要关联节点的、但是下挂在固定清单分类下的基数
|
|
|
- let noneFixedBillsFigures = ['JZMJ'];
|
|
|
- //安全文明施工专项费用只有税金和工程造价能用
|
|
|
- for(let figure in baseFigures){
|
|
|
- if(!noneFixedBillsFigures.includes(baseFigures[figure]['base'])){
|
|
|
- //过滤相关清单固定行不存在的
|
|
|
- if(needFixedBillsClass.includes(baseFigures[figure]['class']) && !baseFigures[figure]['fixedBill']){
|
|
|
- continue;
|
|
|
+ //设置清单固定行下可用的基数映射
|
|
|
+ //@param {Object}baseFigures(当前项目可用总基数配置表) {Object}mapping(可用基数映射,初始为空object,目标:{flag: Array(baseList)}) eg: {'1': ['xx费']}
|
|
|
+ setValidBaseMapping: function (baseFigures, mapping) {
|
|
|
+ //清单固定行数组[1, 2...]
|
|
|
+ let allFlags = [];
|
|
|
+ //清单固定行与子清单固定行映射
|
|
|
+ let subFlagMapping = {};
|
|
|
+ for (let attr in fixedFlag) {
|
|
|
+ let flag = fixedFlag[attr];
|
|
|
+ allFlags.push(flag);
|
|
|
+ let subFlagList = this.getSubFlagList(flag);
|
|
|
+ subFlagMapping[flag] = subFlagList;
|
|
|
+ }
|
|
|
+ for(let baseName in baseFigures) {
|
|
|
+ let calcBase = baseFigures[baseName],
|
|
|
+ filter = calcBase.filter,
|
|
|
+ pick = calcBase.pick; //挑选或过滤
|
|
|
+ if (!filter) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ //pick为true，则filter中的清单固定行可使用此基数(及其子清单固定行)，
|
|
|
+ //pick为false除去filter中的清单固定行（及其子清单固定行），其他可使用此基数（包括新增的大项费用）
|
|
|
+ let allFilter = []; //filter及其子项
|
|
|
+ for (let flag of filter) {
|
|
|
+ if (subFlagMapping[flag].length > 0) {
|
|
|
+ allFilter = allFilter.concat(subFlagMapping[flag]);
|
|
|
}
|
|
|
}
|
|
|
- for(let figureClass in figureClassTemplate){
|
|
|
- let figureClassFilter = figureClassTemplate[figureClass]['filter'];
|
|
|
- if(!figureClassFilter.includes(baseFigures[figure]['base'])){
|
|
|
- mapObj[figureClass][figure] = baseFigures[figure];
|
|
|
+ allFilter = allFilter.concat(filter);
|
|
|
+ allFilter = Array.from(new Set(allFilter));
|
|
|
+ //获取可使用此基数的清单固定行
|
|
|
+ let validFlags = pick ? allFilter : allFlags.filter(function (flag) {
|
|
|
+ return !allFilter.includes(flag);
|
|
|
+ });
|
|
|
+ //其他节点可使用的基数（新增的大项费用）,即基数配置表中过滤条件为“只允许非固定类别是xxx”的
|
|
|
+ //允许非固定类别xx可用，则新增的大项费用也可用，新增的大项费用flag为null
|
|
|
+ if (!pick) {
|
|
|
+ if (mapping['other']) {
|
|
|
+ mapping['other'].push(baseName);
|
|
|
+ } else {
|
|
|
+ mapping['other'] = [baseName];
|
|
|
}
|
|
|
}
|
|
|
- }
|
|
|
- },
|
|
|
- getFigure: function (node) {
|
|
|
- /*
|
|
|
- * {专项暂定合计}需要特殊处理，专项暂定有值的节点不可用此基数，否则会引起循环计算
|
|
|
- * */
|
|
|
- if (node.data.specialProvisional) {
|
|
|
- let filterMap = {};
|
|
|
- for (let baseName in calcBase.baseFigures) {
|
|
|
- if (baseName !== '专项暂定合计') {
|
|
|
- filterMap[baseName] = calcBase.baseFigures[baseName];
|
|
|
+ //设置清单固定行可使用此基数
|
|
|
+ for (let flag of validFlags) {
|
|
|
+ if (mapping[flag]) {
|
|
|
+ mapping[flag].push(baseName)
|
|
|
+ } else {
|
|
|
+ mapping[flag] = [baseName];
|
|
|
}
|
|
|
}
|
|
|
- return filterMap;
|
|
|
- } else {
|
|
|
- return calcBase.baseFigures;
|
|
|
}
|
|
|
-
|
|
|
},
|
|
|
- getBaseBill: function (node) {
|
|
|
- let calcBase = projectObj.project.calcBase;
|
|
|
- let parent = node.parent;
|
|
|
- if(this.isFlag(node.data) && (node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.SUB_ENGINERRING
|
|
|
- || node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.CONSTRUCTION_TECH)){
|
|
|
- return node;
|
|
|
- }
|
|
|
- else if(this.isFlag(node.data) && node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.CONSTRUCTION_ORGANIZATION){
|
|
|
- return node;
|
|
|
+ //该节点可使用的基数列表
|
|
|
+ getValidFigures: function (node) {
|
|
|
+ let filterMap = {},
|
|
|
+ avaBaseNames = [];
|
|
|
+ //该节点所属的固定行
|
|
|
+ let belongFlag = this.getBelongFlag(node);
|
|
|
+ //没有所属固定行，则属于新增的大项费用
|
|
|
+ //获取可使用的基数
|
|
|
+ if (!belongFlag) {
|
|
|
+ avaBaseNames = calcBase.flagValidBase['other'];
|
|
|
+ } else {
|
|
|
+ avaBaseNames = calcBase.flagValidBase[belongFlag] ? calcBase.flagValidBase[belongFlag] : [];
|
|
|
}
|
|
|
- else if(this.isFlag(node.data) && node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.OTHER){
|
|
|
- return node;
|
|
|
+ for (let baseName of avaBaseNames) {
|
|
|
+ let base = calcBase.baseFigures[baseName];
|
|
|
+ if (baseName) {
|
|
|
+ filterMap[baseName] = base;
|
|
|
+ }
|
|
|
}
|
|
|
- else if(this.isFlag(node.data) && node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.CHARGE){
|
|
|
- return node;
|
|
|
+ return filterMap
|
|
|
+
|
|
|
+ },
|
|
|
+ //根据清单固定行，获取子固定行
|
|
|
+ getSubFlagList: function (flag) {
|
|
|
+ let flagList = [];
|
|
|
+ let node = this.findNodeByFlag(flag);
|
|
|
+ if (!node) {
|
|
|
+ return flagList;
|
|
|
+ }
|
|
|
+ let allChildren = [];
|
|
|
+ function getChildren(nodes) {
|
|
|
+ allChildren = allChildren.concat(nodes);
|
|
|
+ for (let node of nodes) {
|
|
|
+ if (node.children.length > 0) {
|
|
|
+ getChildren(node.children);
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
- else if(this.isFlag(node.data) && node.data.flagsIndex.fixed.flag === calcBase.fixedFlag.TAX){
|
|
|
- return node;
|
|
|
+ getChildren(node.children);
|
|
|
+ for (let child of allChildren) {
|
|
|
+ if (child.data && this.isFlag(child.data)) {
|
|
|
+ flagList.push(child.data.flagsIndex.fixed.flag);
|
|
|
+ }
|
|
|
}
|
|
|
- else {
|
|
|
- if(!parent){
|
|
|
- return node;
|
|
|
+ return flagList
|
|
|
+ },
|
|
|
+ //获取节点所属的清单固定行
|
|
|
+ getBelongFlag: function (node) {
|
|
|
+ while (node) {
|
|
|
+ if (node.data && this.isFlag(node.data)) {
|
|
|
+ return node.data.flagsIndex.fixed.flag;
|
|
|
}
|
|
|
- else {
|
|
|
- return this.getBaseBill(parent);
|
|
|
+ node = node.parent;
|
|
|
+ }
|
|
|
+ return null;
|
|
|
+ },
|
|
|
+ //获取节点所属的清单固定列表
|
|
|
+ getBelongFlagList: function (node) {
|
|
|
+ let rst = [];
|
|
|
+ while (node) {
|
|
|
+ if (node.data && this.isFlag(node.data)) {
|
|
|
+ rst.push(node.data.flagsIndex.fixed.flag);
|
|
|
}
|
|
|
+ node = node.parent;
|
|
|
}
|
|
|
+ return rst;
|
|
|
},
|
|
|
//获取清单（有基数计算）引用了的其他清单,（循环引用栈中的一块）
|
|
|
getStackBlock: function (billID) {
|
|
|
@@ -237,7 +286,6 @@ let cbTools = {
|
|
|
if(bases[i]['type'] === 'base' && cbTools.isDef(calcBase.baseFigures[bases[i]['value']])){
|
|
|
let figureMultiRef= calcBase.baseFigures[bases[i]['value']]['multiRef'];
|
|
|
let cycleCalcRef = calcBase.baseFigures[bases[i]['value']]['cycleCalcRef'];
|
|
|
- //重构后：
|
|
|
if(cbTools.isDef(figureMultiRef)){
|
|
|
if(cbTools.isDef(cycleCalcRef)){
|
|
|
figureMultiRef = cycleCalcRef;
|
|
|
@@ -429,6 +477,17 @@ let cbTools = {
|
|
|
fee += (baseFee - min) * within.feeRate * 0.01;
|
|
|
}
|
|
|
return fee.toDecimal(decimalObj.bills.totalPrice);
|
|
|
+ },
|
|
|
+ //获取清单100章下的节点（只需要找最底层的，排除了底层，父项金额即排除了子项）
|
|
|
+ //@param {Object}node(判断的节点，最底层清单节点)
|
|
|
+ //@return {Boolean}
|
|
|
+ withingOneHundred: function (node) {
|
|
|
+ if (!node || node.sourceType !== calcBase.project.Bills.getSourceType() || node.source.children.length > 0) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ //节点所属的清单固定行为第100章清单
|
|
|
+ let belongFlags = cbTools.getBelongFlagList(node);
|
|
|
+ return belongFlags.includes(fixedFlag.ONE_HUNDRED_BILLS);
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -445,13 +504,13 @@ let baseFigureTemplate = {
|
|
|
deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE, fixedFlag.SPECIAL_COST];
|
|
|
return cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, fullFeeField).toDecimal(decimalObj.bills.totalPrice);
|
|
|
},
|
|
|
- //{定额建筑安装工程（其中定额设备购置费按 40%计）} (定额建筑安装工程设备四十)
|
|
|
+ //{定额建筑安装工程（其中定额设备购置费按 40%计）} (不含专项费用) (定额建筑安装工程设备四十)
|
|
|
//扣除设备购置费，再加上设备购置费的40%，扣除汇总算法不四舍五入，相当于汇总当中定额设备购置费就按照了40%计
|
|
|
'DEJZAZGCSBSS': function (tender) {
|
|
|
let feeField = 'rationCommon',
|
|
|
subFeeField = tender ? 'tenderTotalFee' : 'totalFee',
|
|
|
- deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE];
|
|
|
- //建安费扣除定额设备购置费
|
|
|
+ deductFlags = [fixedFlag.EQUIPMENT_ACQUISITION_FEE, fixedFlag.SPECIAL_COST];
|
|
|
+ //建安费扣除定额设备购置费、专项费用
|
|
|
let afterDeductFee = cbTools.getFeeWithDeduction(fixedFlag.CONSTRUCTION_INSTALL_FEE, deductFlags, `${feeField}.${subFeeField}`);
|
|
|
//定额设备购置费
|
|
|
let equipmentAcFee = cbTools.getBillsFee(deductFlags[0], feeField, subFeeField);
|
|
|
@@ -604,33 +663,9 @@ let baseFigureTemplate = {
|
|
|
return rst.toDecimal(decimalObj.bills.totalPrice);
|
|
|
},
|
|
|
//{100章以外清单合计}
|
|
|
- // 取清单固定类别是“第100章至700章清单”的金额，但扣除清单100章下的金额。
|
|
|
+ // 取清单固定清单[第100章至700章清单]的金额，但扣除清单100章下的金额。
|
|
|
+ // 如果是固定清单[第100章至700章清单]下100章以外清单引用此基数，要排除自身(目前只允许100章的清单使用，所以暂时不需要此判断)
|
|
|
'YBZYHQDHJ': function (tender) {
|
|
|
- //获取清单100章下的节点（只需要找最底层的，排除了底层，父项金额即排除了子项）
|
|
|
- /*
|
|
|
- * 是否是100章下的节点
|
|
|
- * 判定规则：
|
|
|
- * 1.递归往上找父项，直至找到一个其父项没有编码的节点(基准节点)
|
|
|
- * 2.判断递归找到的节点编码规则：
|
|
|
- * ①其编码只有前三位是连续的数值 eg: 100s(属于) 101(属于） 10(不属于) 10001(不属于)
|
|
|
- * ②其前三位连续的数值编码在区间[100, 200)中
|
|
|
- * */
|
|
|
- function isWithin(node) {
|
|
|
- if (!node || node.sourceType !== calcBase.project.Bills.getSourceType() || node.source.children.length > 0) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- //找判断基准节点
|
|
|
- while (node.parent && node.parent.data.code) {
|
|
|
- node = node.parent;
|
|
|
- }
|
|
|
- //判断编码规则
|
|
|
- let reg = /^\d{3,}/;
|
|
|
- if (cbTools.isUnDef(node.data.code)) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- let matchCode = node.data.code.match(reg);
|
|
|
- return matchCode && matchCode[0].length === 3 && matchCode[0] >= 100 && matchCode[0] < 200;
|
|
|
- }
|
|
|
let oneToSeven = cbTools.findNodeByFlag(fixedFlag.ONE_SEVEN_BILLS);
|
|
|
if (!oneToSeven) {
|
|
|
return 0;
|
|
|
@@ -646,7 +681,8 @@ let baseFigureTemplate = {
|
|
|
}
|
|
|
}
|
|
|
getChildren(oneToSeven.children);
|
|
|
- let deductNodes = allChildren.filter(isWithin);
|
|
|
+ //扣除的节点：100章的节点[100-200)
|
|
|
+ let deductNodes = allChildren.filter(cbTools.withingOneHundred);
|
|
|
//计算金额
|
|
|
let fullFeeField = tender ? 'common.tenderTotalFee' : 'common.totalFee';
|
|
|
return projectObj.project.calcProgram.getTotalFee([oneToSeven], deductNodes, fullFeeField).toDecimal(decimalObj.bills.totalPrice);
|
|
|
@@ -654,52 +690,151 @@ let baseFigureTemplate = {
|
|
|
}
|
|
|
};
|
|
|
|
|
|
-let figureClassTemplate = {
|
|
|
-};
|
|
|
-
|
|
|
-//基数的值不是通过清单节点获得的，则该基数的fixedBill为空，如价差、甲供、分包; class:分类，用于基数选择界面分类显示
|
|
|
+//基数的值不是通过直接引用某清单节点获得的，则该基数的fixedBill为空，如价差、甲供、分包; class:分类，用于基数选择界面分类显示
|
|
|
//基数本身不与清单节点关联、但是其由与清单关联的节点四则运算得到，则拥有字段multiRef: [flags...]
|
|
|
+/*
|
|
|
+ * 基数的过滤filter ,根据这个配置最终可以转换成清单固定行可使用的相应基数
|
|
|
+ * 筛选和过滤由pick决定
|
|
|
+ * 控制基数可被哪些清单固定行下的节点使用 //挑选 pick === true
|
|
|
+ * 控制基数不可被哪些清单固定行下的节点使用 //过滤 pick === false
|
|
|
+ * */
|
|
|
+//暂时特殊处理专项费用需要引用{定额建筑安装工程费(其中定额设备购置费按40%计)}等跟专项费用父项有关联的基数：将fixedFlag设置为null
|
|
|
let baseFigureMap = {
|
|
|
/*
|
|
|
* 预算项目
|
|
|
* */
|
|
|
'budget': {
|
|
|
-//与清单直接关联=======
|
|
|
- '定额建筑安装工程费(不含定额设备购置费及专项费用)': {base: 'DEJZAZGCFBHSBZX', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE}, //设备费及专项是其子节点，所以不需要用mulRef
|
|
|
- '定额建筑安装工程(其中定额设备购置费按40%计)': {base: 'DEJZAZGCSBSS', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE},
|
|
|
- '建筑安装工程费(不含安全生产费)': {base: 'JZAZGCFBHSC', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE},
|
|
|
- '建筑安装工程费(不含设备费)': {base: 'JZAZGCFBHSB', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE},
|
|
|
- '建筑安装工程费': {base: 'JZAZGCF', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE},
|
|
|
- '土地使用及拆迁补偿费': {base: 'TDSYJCQBCF', fixedFlag: fixedFlag.LAND_USED_DEMOLITION},
|
|
|
- '养护工程其他费': {base: 'YHGCQTF', fixedFlag: fixedFlag.MAINTENANCE_EXPENSES},
|
|
|
- '预备费': {base: 'YBF', fixedFlag: fixedFlag.BUDGET_FEE},
|
|
|
- '施工场地建设费': {base: 'SGCDJSF', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE},
|
|
|
- '养护单位(业主)管理费': {base: 'YHDWYZGLF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '信息化费': {base: 'XXHF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '路线工程监理费': {base: 'LXGCJLF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '独立桥梁隧道工程监理费': {base: 'QLSDGCJLF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '设计文件审查费': {base: 'SJWJSCF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '路线勘察设计费': {base: 'LXKCSJF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '独立桥梁隧道维修加固勘察设计费': {base: 'QLSDKCSJF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '招标代理及标底(最高投标限价)编制费': {base: 'ZBDLJBDBZF',
|
|
|
- multiRef: [fixedFlag.CONSTRUCTION_INSTALL_FEE]},
|
|
|
- '价差预备费': {base: 'JCYBF', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE}
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '定额建筑安装工程费(不含定额设备购置费及专项费用)': {
|
|
|
+ base: 'DEJZAZGCFBHSBZX', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ '定额建筑安装工程费(其中定额设备购置费按40%计)': {
|
|
|
+ base: 'DEJZAZGCSBSS', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“安全生产费”
|
|
|
+ '建筑安装工程费(不含安全生产费)': {
|
|
|
+ base: 'JZAZGCFBHSC', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SAFE_COST],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '建筑安装工程费(不含设备费)': {
|
|
|
+ base: 'JZAZGCFBHSB', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
|
|
|
+ filter: [fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许非固定类别是“建筑安装工程费”下的清单引用
|
|
|
+ '建筑安装工程费': {
|
|
|
+ base: 'JZAZGCF', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
|
|
|
+ filter: [fixedFlag.CONSTRUCTION_INSTALL_FEE],
|
|
|
+ pick: false
|
|
|
+ },
|
|
|
+ //只允许非固定类别是“建筑安装工程费”、非固定类别是“土地使用及拆迁补偿费”下的清单引用
|
|
|
+ '土地使用及拆迁补偿费': {
|
|
|
+ base: 'TDSYJCQBCF', fixedFlag: fixedFlag.LAND_USED_DEMOLITION,
|
|
|
+ filter: [fixedFlag.CONSTRUCTION_INSTALL_FEE, fixedFlag.LAND_USED_DEMOLITION],
|
|
|
+ pick: false,
|
|
|
+ },
|
|
|
+ //只允许非固定类别是“建筑安装工程费”、非固定类别是“土地使用及拆迁补偿费”、非固定类别是“养护工程其他费”下的清单引用
|
|
|
+ '养护工程其他费': {
|
|
|
+ base: 'YHGCQTF', fixedFlag: fixedFlag.MAINTENANCE_EXPENSES,
|
|
|
+ filter: [fixedFlag.CONSTRUCTION_INSTALL_FEE, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: false
|
|
|
+ },
|
|
|
+ //只允许非固定类别是“建筑安装工程费”、非固定类别是“土地使用及拆迁补偿费”、非固定类别是“养护工程其他费”、非固定类别是“预备费”下的清单引用。
|
|
|
+ '预备费': {
|
|
|
+ base: 'YBF', fixedFlag: fixedFlag.BUDGET_FEE,
|
|
|
+ filter: [fixedFlag.CONSTRUCTION_INSTALL_FEE, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES, fixedFlag.BUDGET_FEE],
|
|
|
+ pick: false
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '施工场地建设费': {
|
|
|
+ base: 'SGCDJSF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '养护单位(业主)管理费': {
|
|
|
+ base: 'YHDWYZGLF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '信息化费': {
|
|
|
+ base: 'XXHF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '路线工程监理费': {
|
|
|
+ base: 'LXGCJLF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '独立桥梁隧道工程监理费': {
|
|
|
+ base: 'QLSDGCJLF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '设计文件审查费': {
|
|
|
+ base: 'SJWJSCF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '路线勘察设计费': {
|
|
|
+ base: 'LXKCSJF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“专项费用”、“土地使用及拆迁补偿费“、“养护工程其他费”下的清单使用
|
|
|
+ '独立桥梁隧道维修加固勘察设计费': {
|
|
|
+ base: 'QLSDKCSJF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ '招标代理及标底(最高投标限价)编制费': {
|
|
|
+ base: 'ZBDLJBDBZF', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.SPECIAL_COST, fixedFlag.LAND_USED_DEMOLITION, fixedFlag.MAINTENANCE_EXPENSES],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
+ //只允许固定类别是“价差预备费”的清单使用
|
|
|
+ '价差预备费': {
|
|
|
+ base: 'JCYBF', fixedFlag: fixedFlag.CONSTRUCTION_INSTALL_FEE,
|
|
|
+ filter: [fixedFlag.SPREAD_BUDGET_FEE],
|
|
|
+ pick: true
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
/*
|
|
|
* 工程量清单项目
|
|
|
* */
|
|
|
'boq': {
|
|
|
- '各章清单合计': {base: 'GZQDHJ', fixedFlag: fixedFlag.ONE_SEVEN_BILLS},
|
|
|
- '专项暂定合计': {base: 'ZXZDHJ', fixedFlag: null},
|
|
|
- '100章以外清单合计': {base: 'YBZYHQDHJ', fixedFlag: fixedFlag.ONE_SEVEN_BILLS},
|
|
|
+ //仅允许用于固定类别是“第100章至700章清单”以外的清单
|
|
|
+ '各章清单合计': {base: 'GZQDHJ', fixedFlag: fixedFlag.ONE_SEVEN_BILLS,
|
|
|
+ filter: [fixedFlag.ONE_SEVEN_BILLS],
|
|
|
+ pick: false
|
|
|
+ },
|
|
|
+ //仅允许用于固定类别是“第100章至700章清单”以外的清单
|
|
|
+ '专项暂定合计': {base: 'ZXZDHJ', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.ONE_SEVEN_BILLS],
|
|
|
+ pick: false
|
|
|
+ },
|
|
|
+ /*
|
|
|
+ * 清单固定行[第100章至700章清单]下的[第100章清单]需要允许清单可使用基数{100章以外合计}
|
|
|
+ * 因此{100章以外合计}不设置关联的清单固定行
|
|
|
+ * */
|
|
|
+ //仅允许用于固定类别为“100章清单”引用
|
|
|
+ '100章以外清单合计': {base: 'YBZYHQDHJ', fixedFlag: null,
|
|
|
+ filter: [fixedFlag.ONE_HUNDRED_BILLS],
|
|
|
+ pick: true
|
|
|
+ },
|
|
|
}
|
|
|
};
|
|
|
|
|
|
@@ -856,7 +991,7 @@ let cbAnalyzer = {
|
|
|
if(!this.arithmeticLegal(exp)){
|
|
|
throw '表达式含有无效字符';
|
|
|
}
|
|
|
- if(!this.baseLegal(cbTools.getFigure(node), exp)){
|
|
|
+ if(!this.baseLegal(cbTools.getValidFigures(node), exp)){
|
|
|
throw '清单基数不合法';
|
|
|
}
|
|
|
if(!this.fLegal(calcBase.project.mainTree.items, exp)){
|
|
|
@@ -913,7 +1048,7 @@ let cbParser = {
|
|
|
},
|
|
|
//获取表达式中的中文式
|
|
|
getCN: function(expr){
|
|
|
- let cnRex = /\d*[\u4e00-\u9fa5]{1,}\({0,}[\u4e00-\u9fa5]{0,}\){0,}[\u4e00-\u9fa5]{0,}/g;
|
|
|
+ let cnRex = /\d*[\u4e00-\u9fa5]{1,}\({0,}[\u4e00-\u9fa5]{0,}\d*%*[\u4e00-\u9fa5]{0,}\){0,}[\u4e00-\u9fa5]{0,}/g;
|
|
|
return _.filter(expr.match(cnRex), function (data) {
|
|
|
return data
|
|
|
});
|
|
|
@@ -949,14 +1084,15 @@ let cbParser = {
|
|
|
},
|
|
|
//表达式中的百分数转换成小数
|
|
|
percentToNum: function (exp) {
|
|
|
- let rex = /\d+(\.\d+)?%/g;
|
|
|
+ let rex = /[\+,\-,\*,\/]{1}\d+(\.\d+)?%[\u4e00-\u9fa5]{0}/g;
|
|
|
let percents = exp.match(rex);
|
|
|
let numRex = /\d+(\.\d+)?/g;
|
|
|
if(cbTools.isDef(percents)){
|
|
|
for(let i = 0, len = percents.length; i < len; i++){
|
|
|
- let percentNum = percents[i].match(numRex);
|
|
|
+ let percentNum = percents[i].match(numRex),
|
|
|
+ oprtor = percents[i].replace(`${percentNum}%`, '');
|
|
|
if(cbTools.isDef(percentNum) && percentNum.length === 1){
|
|
|
- exp = exp.replace(new RegExp(percents[i], 'g'), percentNum[0]/100);
|
|
|
+ exp = exp.replace(new RegExp(`\\${percents[i]}`, 'g'), `${oprtor}${percentNum[0]/100}`);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -1084,6 +1220,7 @@ let cbCalctor = {
|
|
|
};
|
|
|
|
|
|
let calcBase = {
|
|
|
+ //正在执行计算的节点(计算基数的排除本项可能会用到)
|
|
|
errMsg: '表达式不正确',
|
|
|
success: false,
|
|
|
//清单固定行
|
|
|
@@ -1091,6 +1228,8 @@ let calcBase = {
|
|
|
fixedBills: Object.create(null),
|
|
|
//清单基数
|
|
|
baseFigures: Object.create(null),
|
|
|
+ //清单固定行可用基数对应 {flag: Number, baseList: Array}
|
|
|
+ flagValidBase: Object.create(null),
|
|
|
//清单可选基数映射，分两类：组织措施项目：排除父项和计算的父项; 其他项目、规费、税金、工程造价，及新增部分：显示所有计算基数
|
|
|
baseFigureClass: Object.create(null),
|
|
|
//初始化
|
|
|
@@ -1105,17 +1244,15 @@ let calcBase = {
|
|
|
me.baseFigures = baseFigureMap.boq;
|
|
|
}
|
|
|
cbTools.setBaseBills(me.baseFigures, me.fixedBills);
|
|
|
- //cbTools.setBaseFigureClass(me.baseFigures, me.baseFigureClass);
|
|
|
+ //设置清单固定行可用基数映射
|
|
|
+ cbTools.setValidBaseMapping(me.baseFigures, me.flagValidBase);
|
|
|
},
|
|
|
getBase: function (figure) {
|
|
|
return cbCalctor.base(figure);
|
|
|
|
|
|
},
|
|
|
getBaseByClass: function (node) {
|
|
|
- return cbTools.getFigure(node);
|
|
|
- },
|
|
|
- getBaseBill: function (node) {
|
|
|
- return cbTools.getBaseBill(node);
|
|
|
+ return cbTools.getValidFigures(node);
|
|
|
},
|
|
|
calculate: function (node, reCalc = null) {
|
|
|
let me = calcBase,
|
