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

modules/all_models/bills.js

@@ -63,7 +63,8 @@ let billsSchema = new Schema({
     is_adjust_price: {type: Number,default: 0},
     installationKey:String,//用来记录安装增加费的关联字段
     deleteInfo: deleteSchema,
-    isEstimate:{type: Number,default:0},       // 1 true 0 false 是否暂估
+    isEstimate: { type: Number, default: 0 },       // 1 true 0 false 是否暂估
+    lockUnitPrice:{type:Schema.Types.Mixed,default:false},       //  true  false 锁定综合单价，true 为锁定
     mainBills:{type:Schema.Types.Mixed,default:false},//true 是，false否，null 不确定，三个状态
     //是否记取面积增加费
     areaIncreaseFee:{type:Schema.Types.Mixed,default:false},//true 是，false否，null 不确定，三个状态

web/building_saas/main/html/main.html

@@ -1869,7 +1869,7 @@
             </div>
           </div>
           <br>
-          <div class="row" style="height:400px">
+          <div class="row" style="height:130px">
             <!--sjs id设置在这个div-->
             <div class="col-12" style="overflow: hidden" id="feeDetailSheet"></div>
           </div>

web/building_saas/main/js/models/project.js

@@ -425,7 +425,7 @@ var PROJECT = {
             })
 
         };
-        project.prototype.updateCasCadeBills = function(node,newval,fieldName){
+        project.prototype.updateCasCadeBills = function(node,newval,fieldName,needSetParent = true){
             let datas = [];
             let data =  {
                 type:node.sourceType,
@@ -434,7 +434,7 @@ var PROJECT = {
             setData(data.data,newval,fieldName);
             datas.push(data);
             setChildren(node,newval,datas);//同步设置所有子项
-            setParent(node,newval,datas);//设置父节点
+            if(needSetParent) setParent(node,newval,datas);//设置父节点
             $.bootstrapLoading.start();
             this.updateNodes(datas,function () {
                 let nodes = [];
@@ -448,7 +448,9 @@ var PROJECT = {
                         nodes.push(node)
                     }
                 }
-                projectObj.mainController.refreshTreeNode(nodes);
+              projectObj.mainController.refreshTreeNode(nodes);
+              //取消锁定，则自动重新计算。
+              if(fieldName == "lockUnitPrice" && newval == false) projectObj.project.calcProgram.calcAllNodesAndSave();
                 $.bootstrapLoading.end();
             });
 

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

@@ -417,7 +417,11 @@ let MainTreeCol = {
         },
         mainBills:function (node) {
             if(MainTreeCol.mainBillsEnable(node)) return sheetCommonObj.getCheckBox(true);
-        },
+      },
+      lockUnitPrice: function (node) {
+          //仅未使用基数计算的清单有效
+          if(!(node.data.calcBase&&node.data.calcBase!="")) return sheetCommonObj.getCheckBox();
+      },
         mainNodeCheckBox:function (node,setting,field) {//分部分项、措施项目下的清单、定额
             let Bills = projectObj.project.Bills;
             if((Bills.isFBFX(node)||Bills.isMeasure(node)) && node.sourceType != ModuleNames.ration_glj){

web/building_saas/main/js/views/project_view.js

@@ -2005,7 +2005,7 @@ var projectObj = {
             projectObj.onIsEstimateClick(node,info);
         }else if(fieldName == "evaluationProject"){
             projectObj.onEvaluationProjectClic(node,info);
-        }else if(fieldName == "mainBills"||fieldName == "outPutMaxPrice"||fieldName=="areaIncreaseFee"){
+        }else if(fieldName == "mainBills"||fieldName == "outPutMaxPrice"||fieldName=="areaIncreaseFee"||fieldName == "lockUnitPrice"){
             projectObj.onCasCadeButtonClick(node,info,fieldName);
         }
     },
@@ -2057,8 +2057,8 @@ var projectObj = {
         }
         if(fieldName == "areaIncreaseFee"){
             areaIncreaseFeeObj.casCadeUpdate(node,newval,fieldName);
-        }else {
-            projectObj.project.updateCasCadeBills(node,newval,fieldName);
+        } else {
+            projectObj.project.updateCasCadeBills(node,newval,fieldName,fieldName != "lockUnitPrice");
         }
     },
     onSubcontractClick:function (node) {//点击分包费checkbox

web/users/html/index.html

@@ -33,7 +33,7 @@
       <!--banner-->
       <div class="hero bg-dark section " style="background-image: url(/web/users/images/bg_01.png);" id="home">
          <div class="container text-center">
-            <h1 class="text-white mb-4 f-50 ">市政计价免费公用版，免费的正版软件</h1>
+            <h1 class="text-white mb-4 f-50 ">市政计价免费公用版，永久免费</h1>
             <p class="lead text-white mb-5">跨平台，打开浏览器即可使用，全新在线计价体验。
             <div class="btn_hero">
                <a href="/login" class="btn btn-danger mr-2">登录软件</a>