|
@@ -329,9 +329,20 @@ class Rpt_Data_Extractor {
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+ // console.log('before: ');
|
|
|
+ // console.log(contractorDatas.data);
|
|
|
let coeRst = gljUtil.getPriceCoeDatas(projectGLJDatas.data.gljList, contractorDatas.data, ttlFee, rawDataObj.prj.property, _, scMathUtil);
|
|
|
+ // console.log('after: ');
|
|
|
// console.log(coeRst);
|
|
|
- contractorDatas.data = coeRst;
|
|
|
+ // contractorDatas.data = coeRst;
|
|
|
+ for (const cd of contractorDatas.data) {
|
|
|
+ for (const acd of coeRst) {
|
|
|
+ if (cd.ID === acd.ID) {
|
|
|
+ cd.varWeight = acd.varWeight;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (projectGLJDatas && rationGLJDatas && labourCoeDatas) {
|
|
|
//考虑调价情况
|