bugs

modules/main/facade/ration_facade.js

@@ -858,6 +858,14 @@ function getProjectGLJNewData(tmp,projectId,ext){
       materialCoe: tmp.materialCoe,
       base_price: tmp.basePrice,
       market_price: tmp.basePrice,
+      is_evaluate:0,
+      is_eval_material:0,
+      no_tax_eqp:0,
+      is_adjust_price:0,
+      is_main_material:0,
+      is_contractor_material:0,
+      supply_quantity:0,
+      supply:0,
       from:tmp.from?tmp.from:"std"
   };
   // 现在定额库可以引用其他费用定额的，比如广东可能套用部颁的定额，因此就算广东费用定额是多单价的，也可能会引用单个单价的人材机

modules/ration_glj/facade/ration_glj_facade.js

@@ -689,6 +689,14 @@ function getGLJSearchInfo(ration_glj) {
         materialCoe:ration_glj.materialCoe,
         materialIndexType:ration_glj.materialIndexType,
         materialIndexUnit:ration_glj.materialIndexUnit,
+        is_evaluate:ration_glj.isEstimate?ration_glj.isEstimate:0,
+        is_eval_material:0,
+        no_tax_eqp:0,
+        is_adjust_price:0,
+        is_main_material:0,
+        is_contractor_material:0,
+        supply_quantity:0,
+        supply:0,
         materialIndexCoe:ration_glj.materialIndexCoe,
         from: ration_glj.from ? ration_glj.from : 'std'//std:标准工料机库, cpt:补充工料机库
     };

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

@@ -1120,10 +1120,8 @@ var gljOprObj = {
             let projectGljs = projectObj.project.projectGLJ.datas.gljList;
             let glj = _.find(projectGljs, {'id': recode.projectGLJID});
             if(glj){
-                glj["is_evaluate"]=newval;
-                args.fromRG=true;
-                pspread.postUpdate(recode.projectGLJID,"is_evaluate",newval,args,null,successTrigger);
-            }
+              configMaterialObj.updateConfigMaterial("is_evaluate",newval,glj);
+          }
         }
     },
     showLibGLJSheetData: function () {