|
|
@@ -882,7 +882,7 @@ const ImportXML = (() => {
|
|
|
}
|
|
|
return map[`${feeType}-${ratioType}`] || null;
|
|
|
}
|
|
|
- //主要材料类别-三材类别映射、、
|
|
|
+ //主要材料类别-三材类别映射
|
|
|
const MaterialMap = {
|
|
|
'100': 1, //钢材钢筋认为钢材,因为文件没细分
|
|
|
'200': 4, //水泥
|
|
|
@@ -1695,11 +1695,8 @@ const ImportXML = (() => {
|
|
|
billsHasRations.forEach(bills => {
|
|
|
//处理定额
|
|
|
bills.rations.forEach(ration => {
|
|
|
- // 定额的取费专业在定额库默认为空的话,取定额取费专业
|
|
|
- // 如果是量价、与定额同级的人材机,则取单位工程取费专业
|
|
|
- ration.programID = ration.type === RationType.ration
|
|
|
- ? tenderData.property.engineering
|
|
|
- : tenderData.property.projectEngineering;
|
|
|
+ // 定额的取费专业在定额库默认为空的话,取单位工程取费专业(后台配置)
|
|
|
+ ration.programID = tenderData.property.projectEngineering;
|
|
|
ration.ID = uuid.v1();
|
|
|
ration.projectID = tenderData.ID;
|
|
|
ration.billsItemID = bills.ID;
|