Browse Source

bug,暂估,评标功能

zhangweicheng 5 năm trước cách đây
mục cha
commit
f7fae9dd41

+ 1 - 1
web/building_saas/main/js/main.js

@@ -17,13 +17,13 @@ $(function () {
         $(e.relatedTarget.hash).removeClass('active');
         $("#subItems").addClass('active');
         $(gljOprObj.activeTab).addClass('active');
-        subObj.initGljSubTab();
         autoFlashHeight();
         projectObj.refreshMainSpread();
         billsGuidance.refreshWorkBook();
         billsLibObj.refreshBillsSpread();
         billsLibObj.refreshBillsRelaSpread();
         rationLibObj.refreshSpread();
+        subObj.initGljSubTab();
         if($('#linkJSCX').hasClass('active'))
             calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected, 2);
         //autoFlashHeight 里已经包含了 refreshSubSpread();

+ 2 - 2
web/building_saas/main/js/views/config_material_view.js

@@ -494,7 +494,7 @@ let configMaterialObj = {
                     alert("当前材料市场价已被锁定,修改请先返回人材机汇总界面解除锁定。");
                     return me.showBidMaterialDatas();
                 }
-                return projectObj.project.projectGLJ.updatePrice(bid,dataCode,value,'rg', null,projectGljObject.refreshViewsData);
+                return projectObj.project.projectGLJ.updatePrice(bid,dataCode,value,'rg',projectGljObject.refreshViewsData);
             }
             value =  scMathUtil.roundToString(value,getDecimal('glj.unitPrice'));
         }
@@ -570,7 +570,7 @@ let configMaterialObj = {
         if(dataCode == 'marketPrice'){
             dataCode = 'market_price';
             if(evaluate.is_related){//关联的情况下,直接修改工料机价格
-                return projectObj.project.projectGLJ.updatePrice(evaluate,dataCode,value,'rg',null,projectGljObject.refreshViewsData);
+                return projectObj.project.projectGLJ.updatePrice(evaluate,dataCode,value,'rg',projectGljObject.refreshViewsData);
             }
         }
         if(value && dataCode === 'quantity'){//修改数量需做4舍5入