Browse Source

bills template & main tree col setting

MaiXinRong 8 years ago
parent
commit
39bbbb73ef
1 changed files with 3 additions and 3 deletions
  1. 3 3
      modules/users/controllers/compilation_controller.js

+ 3 - 3
modules/users/controllers/compilation_controller.js

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