|
@@ -214,7 +214,7 @@ class CompilationController extends BaseController {
|
|
|
|
|
|
// 获取清单模板数据
|
|
|
let billsTemplateModel = new BillsTemplateModel();
|
|
|
- billsTemplateData = await billsTemplateModel.getTemplateData(valuationId);
|
|
|
+ billsTemplateData = await billsTemplateModel.getTemplateData(valuationId, engineering);
|
|
|
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
@@ -233,7 +233,7 @@ class CompilationController extends BaseController {
|
|
|
artificialCoefficientList: JSON.stringify(artificialCoefficientList),
|
|
|
feeRateList: JSON.stringify(feeRateList),
|
|
|
billsTemplateData: JSON.stringify(billsTemplateData),
|
|
|
- mainTreeCol: JSON.stringify(valuationData.main_tree_col),
|
|
|
+ mainTreeCol: JSON.stringify(libData.main_tree_col),
|
|
|
layout: 'users/views/layout/layout'
|
|
|
};
|
|
|
response.render('users/views/compilation/engineering', renderData);
|
|
@@ -458,7 +458,7 @@ class CompilationController extends BaseController {
|
|
|
|
|
|
// 获取清单模板数据
|
|
|
let billsTemplateModel = new BillsTemplateModel();
|
|
|
- billsTemplateData = await billsTemplateModel.getTemplateData(valuationId);
|
|
|
+ billsTemplateData = await billsTemplateModel.getTemplateData(valuationId, engineering);
|
|
|
} catch (error) {
|
|
|
console.log(error);
|
|
|
}
|