|
|
@@ -160,6 +160,21 @@ let cbTools = {
|
|
|
//设置清单固定行下可用的基数映射
|
|
|
//@param {Object}baseFigures(当前项目可用总基数配置表) {Object}mapping(可用基数映射,初始为空object,目标:{flag: Array(baseList)}) eg: {'1': ['xx费']}
|
|
|
setValidBaseMapping: function (baseFigures, mapping) {
|
|
|
+ const baseFigures2 = {};
|
|
|
+ if (typeof filterByProjectKind !== "undefined") {
|
|
|
+ const engName = projectObj.project.property.engineeringName;
|
|
|
+ for (let baseName in baseFigures) {
|
|
|
+ const calcBase = baseFigures[baseName];
|
|
|
+ if (calcBase.projectKind) {
|
|
|
+ if (calcBase.projectKind.includes(engName)) baseFigures2[baseName] = calcBase;
|
|
|
+ } else {
|
|
|
+ baseFigures2[baseName] = calcBase;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ baseFigures2 = baseFigures;
|
|
|
+ }
|
|
|
+
|
|
|
//清单固定行数组[1, 2...]
|
|
|
let allFlags = [];
|
|
|
//清单固定行与子清单固定行映射
|
|
|
@@ -170,10 +185,11 @@ let cbTools = {
|
|
|
let subFlagList = this.getSubFlagList(flag);
|
|
|
subFlagMapping[flag] = subFlagList;
|
|
|
}
|
|
|
- for (let baseName in baseFigures) {
|
|
|
- let calcBase = baseFigures[baseName],
|
|
|
+ for (let baseName in baseFigures2) {
|
|
|
+ let calcBase = baseFigures2[baseName],
|
|
|
filter = calcBase.filter || Object.values(fixedFlag), // filter为空则全部部分都可用该基数
|
|
|
pick = calcBase.pick; //挑选或过滤
|
|
|
+
|
|
|
/* if (!filter) {
|
|
|
continue;
|
|
|
} */
|