Merge branch 'master' of http://192.168.1.41:3000/SmartCost/YangHuCost

modules/fee_rates/controllers/fee_rates_controller.js

@@ -111,7 +111,7 @@ async function changeFeeRateStandard(req, res) {
         let newFeeRateFile= await feeRateFacde.changeFeeRateStandard(data);
         result.data= newFeeRateFile;
     }catch (err){
-        console.log(err);
+        console.log(err.stack);
         result.error=1;
         result.message = err.message;
     }

modules/fee_rates/facade/fee_rates_facade.js

@@ -259,7 +259,7 @@ async function getFeeRateStandardsByProjectID(projectID) {
 
 async function changeFeeRateStandard(jdata){
     let data = JSON.parse(jdata);
-    let template = await std_fee_rate_lib_model.findOne({"ID":data.newLibID});
+    let template = await std_fee_rate_lib_model.findOne({"ID":data.newLibID}).lean();
     let newFeeRate = {};
     newFeeRate.ID =uuidV1();
     newFeeRate.rates=template.rates;

web/building_saas/main/js/models/ration.js

@@ -119,7 +119,7 @@ var Ration = {
             if(rType == rationType.ration){//空定额暂时不输入取费专业
                // newData['programID'] = projectObj.project.projectInfo.property.engineering;
             }else if(rType == rationType.volumePrice){//量价取费专业默认为费率为0
-                newData['programID'] = projectObj.project.calcProgram.compiledTemplateMaps["费率为0"];
+                newData['programID'] = projectObj.project.calcProgram.compiledTemplateMaps["量价(计利润税金)"];
             }else {
                 if(pEngineer) newData['programID'] = pEngineer;
             }

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

@@ -1192,9 +1192,10 @@ var gljOprObj = {
             mreplace == true ? $("#mreplace_next_div").modal('show'):me.doReplaceGLJ(selectCode, oldData,selected);
         }
     },
-    doReplaceGLJ: function (selectCode, oldData,selected) {
+    doReplaceGLJ: function (selectCode, oldData,selected,is) {
         let me = this;
         let project = projectObj.project;
+        let oldType = oldData.type;    
         project.ration_glj.replaceGLJ(selectCode, oldData, function (result) {
             if (result) {
                 //result.adjustState;
@@ -1216,17 +1217,28 @@ var gljOprObj = {
                 selected.data.adjustState = result.adjustState;
                 selected.data.name = result.name;
                 projectObj.mainController.refreshTreeNode(nodes);
-                project.calcProgram.calcAndSave(selected);
+                project.calcProgram.calcAndSave(selected,function(){
+                    me.replaceProgramInfo(oldType,result.projectGLJ.type);
+                });
                 gljOprObj.refreshView();
                 $.bootstrapLoading.end();
             }
         })
     },
+
+    replaceProgramInfo:function(oldType,newType){
+        //检查是否由混凝土替换为商品砼或者商品砂浆
+        if(gljUtil.isConcreteToCommercialConcrete(oldType,newType)){
+            alert("请手动修改取费类别为构造物III");
+        }
+    },
+
     doMReplaceGLJ: function () {
         let me = this;
         let project = projectObj.project;
         let oldData = me.sheetData[gljContextMenu.selectedRow];
         let selectCode = gljOprObj.GLJSelection[0];
+        let oldType = oldData.type;  
         project.ration_glj.mReplaceGLJ(selectCode, oldData, function (result,updateMap) {
             if(result == null){
                 return;
@@ -1258,7 +1270,9 @@ var gljOprObj = {
             })
             project.projectGLJ.loadNewProjectGLJToCaches([result.projectGLJ],true);
             var rationNodes = me.refreshStateAfterMreplace(stateList, nodes);
-            project.calcProgram.calcNodesAndSave(rationNodes);
+            project.calcProgram.calcNodesAndSave(rationNodes,function(){
+                me.replaceProgramInfo(oldType,result.projectGLJ.type);
+            });
             me.refreshView();
             $.bootstrapLoading.end();
 

web/building_saas/main/js/views/main_tree_col.js

@@ -222,11 +222,12 @@ let MainTreeCol = {
         },
         forQuantity: function (node) {
             if(node.sourceType === projectObj.project.Bills.getSourceType()){
+                return false  //2020-11-13 开放清单所有输入限制 
                 //如果是预算项目的，所有清单的数量1、数量2不做输入限制。
-                if(projectObj.project.projectInfo.property && projectObj.project.projectInfo.property.valuationType == "bill")  return false;
+               /*  if(projectObj.project.projectInfo.property && projectObj.project.projectInfo.property.valuationType == "bill")  return false;
                 if(node.data.type==billType.DXFY||(node.data.type==billType.BILL&&MainTreeCol.readOnly.billsParent(node))){//大项费用、清单父项行，工程量只读。
                     return true;
-                }
+                } */
             }else if(MainTreeCol.readOnly.glj(node)){
                 return true;
             }

web/over_write/js/hunan_2014.js

@@ -340,6 +340,12 @@ if (typeof gljUtil !== 'undefined') {
   }
 }
 
+if (typeof projectObj !== 'undefined') {
+  projectObj.isInsertEquipmentVisable = function (selected) {
+      return false;//山东养护(2016)和湖南养护(2014)，预算、工程量清单项目右键应隐藏“插入设备”按钮。
+  }
+}
+
 if (typeof module !== 'undefined') {
   module.exports = {
       progression,

web/over_write/js/shandong_2016.js

@@ -377,6 +377,12 @@ if (typeof electrovalenceObj !== 'undefined') {
   ]
 }
 
+if (typeof projectObj !== 'undefined') {
+  projectObj.isInsertEquipmentVisable = function (selected) {
+      return false;//山东养护(2016)和湖南养护(2014)，预算、工程量清单项目右键应隐藏“插入设备”按钮。
+  }
+}
+
 
 if (typeof module !== "undefined" && !module.nodeType) {
   module.exports = {