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

web/building_saas/main/js/models/calc_program.js

@@ -1740,7 +1740,6 @@ class CalcProgram {
 
     // 只计算treeNode自身。changedArr: 外部传来的一个数组，专门存储发生变动的节点。
     innerCalc(treeNode, changedArr, tenderType){
-        if (treeNode.data.lockUnitPrice == true) return;
         if (treeNode.sourceType === ModuleNames.ration_glj) return;             // 仅用作树节点显示的工料机不能参与计算。
 
         let me = this;

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

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

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

@@ -3579,6 +3579,7 @@ $('#calcBaseFeeRateConf').click(function () {
     if(calcBaseValue !== selected.data.calcBase){
         needToSave = true;
         selected.data.userCalcBase = calcBaseValue;
+        selected.data.lockUnitPrice = null;
         projectObj.project.calcBase.calculate(selected);
     }
     if(validateFeeRate){

web/common/html/header.html

@@ -80,7 +80,7 @@
                     <!--<a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=userGuide" target="_blank">用户手册</a>
                     <a class="dropdown-item" href="/web/common/html/pdfViewer.html?type=upgradeGuide" target="_blank">升级说明</a>-->
                     <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dsk_yhsc" target="_blank">用户手册</a>
-                    <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dhjc" target="_blank">动画教学</a>
+                    <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dhjc" target="_blank">动画教程</a>
                     <a class="dropdown-item" href="http://yun.zhzdwd.com/docs" target="_blank">常见问题解答</a>
                     <a class="dropdown-item" href="http://doc.zhzdwd.com/docs/dasikongupdate" target="_blank">升级说明</a>
                     <a class="dropdown-item" href="http://zhzdwk.com/special/detail/36" target="_blank">计价依据</a>