bug fixed and update ration glj

modules/fee_rates/controllers/fee_rates_controller.js

@@ -86,7 +86,8 @@ async function getFeeRateStandards(req, res) {
     }
     try {
         let data = req.body.data;
-        let feeRateStandards= await feeRateFacde.getFeeRateStandardsByProjectID(data.rootProjectID);
+        data = JSON.parse(data);
+        let feeRateStandards= await feeRateFacde.getFeeRateStandardsByProjectID(data.projectID);
         result.data= feeRateStandards;
     }catch (err){
         console.log(err);

modules/fee_rates/facade/fee_rates_facade.js

@@ -213,11 +213,7 @@ async function getFeeRateData(projectID) {
 }
 
 async function getUsageProjects(feeRateID){
-   //从数据库中查，项目结构暂时还没做 todo
     let projects = await projectsModel.find({'property.feeFile':feeRateID,'deleteInfo':null});
-   /* projects.push({ID:99,name:'单价调整'});
-    projects.push({ID:100,name:'工程02'});
-    projects.push({ID:101,name:'建筑工程'});*/
     return projects;
 }
 
@@ -230,12 +226,19 @@ function commonCallback(callback,result,err) {
     }
 }
 
-async function getFeeRateStandardsByProjectID(rootProjectID) {
-    let project =  await projectsModel.findOne({ID:rootProjectID});
-
+async function getFeeRateStandardsByProjectID(projectID) {
+    logger.info("get feeRate standard, projectID:"+projectID)
     let feeRateStandards=[];
-    feeRateStandards.push({ID:t1.ID,libName:t1.libName});
-    feeRateStandards.push({ID:t2.ID,libName:t2.libName});
+    let project =  await projectsModel.findOne({ID:projectID});
+    let engineeringLibModel = new EngineeringLibModel();
+    let engineeringInfo = project !== null && project.property.engineering_id !== undefined ?
+        await engineeringLibModel.getEngineering(project.property.engineering_id) : null;
+    if(engineeringInfo!=null){
+        let fee_lib = engineeringInfo.fee_lib;
+        for(let lib of fee_lib){
+            feeRateStandards.push({ID:lib.id,libName:lib.name});
+        }
+    }
     return feeRateStandards;
 }
 

modules/ration_glj/facade/ration_glj_facade.js

@@ -83,7 +83,7 @@ function combineQuantity(results) {
 
 
 function get_lib_glj_info(ration_glj) {
-    return function (cb) {
+    return function (result,cb) {
         std_glj_lib_gljList_model.findOne({'ID':ration_glj.GLJID},(err,glj)=>{
                 if(err){
                 cb(err,'')
@@ -96,8 +96,9 @@ function get_lib_glj_info(ration_glj) {
                 ration_glj.shortName = glj.shortName;
                 ration_glj.type = glj.gljType;
                 ration_glj.repositoryId = glj.ration_glj
-                getInfoFromProjectGLJ(ration_glj).then(function (result) {
-                    if(result){
+                getInfoFromProjectGLJ(ration_glj).then(function (info) {
+                    if(info){
+                        result.datas.push(info);
                         cb(null,result);
                     }else {
                         cb(new Error('get project glj error'),null);
@@ -144,16 +145,17 @@ function create_ration_glj(user_id,datas) {
     return function (callback) {
         let ration_glj_list=datas.ration_glj_list;
         var tasks=[];
+        tasks.push(startingTask("get glj info"))
         for(let i =0;i<ration_glj_list.length;i++){
             ration_glj_list[i].ID = uuidV1();
             tasks.push(get_lib_glj_info(ration_glj_list[i]))
         }
-        async_n.parallel(tasks,(err,results)=>{
+        async_n.waterfall(tasks,(err,results)=>{
             if(err){
                 callback(err,results)
             }else {
                 let newRecords =[];
-                for (let r of results){
+                for (let r of results.datas){
                     if(r){
                         newRecords.push(r)
                     }
@@ -397,7 +399,8 @@ function  deleteByID(datas,callback){
 function startingTask(processName){
     return function(asyncCallBack){
         var result = {
-            processName : processName
+            processName : processName,
+            datas:[]
         };
         asyncCallBack(null, result);
     };

web/building_saas/main/js/views/fee_rate_view.js

@@ -236,7 +236,7 @@ var feeRateObject={
         }
     },
     getFeeRateStandards:function (callback) {
-        CommonAjax.post('/feeRates/getFeeRateStandards', {"rootProjectID": this.activateFeeRate.rootProjectID}, function (data) {
+        CommonAjax.post('/feeRates/getFeeRateStandards', {"projectID": projectObj.project.ID()}, function (data) {
             if (data) {
                 callback(data);
             }

web/building_saas/main/js/views/glj_view.js

@@ -35,7 +35,7 @@ var gljOprObj = {
             lockedCells: [{row: -1, col: 3, rowCount: -1, colCount: 1}],
             lockColumns:[0,1,2,3,4,5,7,8,9,10,12]
         },
-        notEditedType: ['混凝土','砂浆','配合比','机械']
+        notEditedType: ['砼','桨','配比','机']
     },
     coeSetting:{
         header:[