Merge branch 'master' of http://smartcost.f3322.net:3000/SmartCost/ConstructionCost

public/web/sheet/sheet_common.js

@@ -435,7 +435,8 @@ var sheetCommonObj = {
                 if(sheet.getCell(-1, col).visible()){
                     let v = '';
                     if(colSettings && (colSettings[col]['data']['field'] === 'itemCharacterText' || colSettings[col]['data']['field'] === 'jobContentText')){
-                        v += sheet.getText(row, col) ? sheet.getText(row, col).replace(new RegExp('\n', 'g'), '\v') : '';
+                       // v += sheet.getText(row, col) ? sheet.getText(row, col).replace(new RegExp('\n', 'g'), '\v') : '';
+                        v += sheet.getText(row, col) ? `"${sheet.getText(row, col)}"` : '';
                         if(j !== jLen - 1){
                             v += '\t';
                         }

web/building_saas/complementary_ration_lib/html/anzhuang.html

@@ -155,7 +155,6 @@
     <script src="/lib/bootstrap/bootstrap.min.js"></script>
     <script type="text/javascript" src="/public/web/QueryParam.js"></script>
     <script src="/public/web/uuid.js"></script>
-    <script src="/public/web/scMathUtil.js"></script>
     <script src="/public/web/common_util.js"></script>
     <script src="/public/web/storageUtil.js"></script>
     <script  src="/public/web/id_tree.js"></script>

web/building_saas/complementary_ration_lib/js/installation.js

@@ -2,11 +2,11 @@
  * Created by Zhong on 2018/1/19.
  **/
 $("#gongliao").click(function(){
-    $(this).attr('href', "/complementaryRation/lmm" + "?repository=" + getQueryString("repository"))
+    $(this).attr('href', "/complementaryRation/glj" + "?repository=" + getQueryString("repository"))
 });
 
 $("#fuzhu").click(function(){
-    $(this).attr('href', "/complementaryRation/coeList" + "?repository=" + getQueryString("repository"))
+    $(this).attr('href', "/complementaryRation/coe" + "?repository=" + getQueryString("repository"))
 });
 
 $("#dinge").click(function(){

web/building_saas/main/html/main.html

@@ -761,10 +761,10 @@
                                     <a id="cb_QTXM" href="javascript:void(0)">其他项目</a>
                                 </li>
                                 <li class="py-1" style="margin-left: 50px;">
-                                    <a id="cb_FBF" href="javascript:void(0)">分包费</a>
+                                    <a id="cb_RCJ" href="javascript:void(0)">人材机</a>
                                 </li>
                                 <li class="py-1" style="margin-left: 50px;">
-                                    <a id="cb_RCJ" href="javascript:void(0)">人材机</a>
+                                    <a id="cb_FBF" href="javascript:void(0)">分包费</a>
                                 </li>
                                 <li class="py-1" style="margin-left: 50px;">
                                     <a id="cb_GF" href="javascript:void(0)">规费</a>

web/building_saas/main/js/models/bills.js

@@ -411,11 +411,11 @@ var Bills = {
                 // 说明（补注）
                 node.data.comments = stdBillsData.recharge;
                 // 工作内容
-                node.data.jobContent = stdBillsData.jobContent;
-                node.data.jobContentText = stdBillsData.jobContentText;
+               /* node.data.jobContent = stdBillsData.jobContent;
+                node.data.jobContentText = stdBillsData.jobContentText;*/
                 // 特征
-                node.data.itemCharacter = stdBillsData.itemCharacter;
-                node.data.itemCharacterText = stdBillsData.itemCharacterText;
+               /* node.data.itemCharacter = stdBillsData.itemCharacter;
+                node.data.itemCharacterText = stdBillsData.itemCharacterText;*/
                 node.data.programID = stdBillsData.engineering;
                 node.data.billsLibId = stdBillsData.billsLibId;
             }

web/building_saas/main/js/models/calc_base.js

@@ -507,7 +507,7 @@ let baseFigureTemplate = {
         return projectObj.project.calcProgram.getBeforeTaxTotalFee([node]);
     },
     'RCJJC': function () {//人材机价差
-        return (this['RGJC']() + this['CLJC']() + this['JXJC']()).toDecimal(2);
+        return (this['RGJC']() + this['CLJC']() + this['JXJC']()).toDecimal(decimalObj.bills.totalPrice);
     },
     'RGJC': function () {//人工价差
         let rst = 0;
@@ -518,7 +518,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -532,7 +532,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -546,13 +546,13 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
     },
     'FBFXRCJJC': function () {//分部分项人材机价差
-        return (this['FBFXRGJC']() + this['FBFXCLJC']() + this['FBFXJXJC']()).toDecimal(2);
+        return (this['FBFXRGJC']() + this['FBFXCLJC']() + this['FBFXJXJC']()).toDecimal(decimalObj.bills.totalPrice);
     },
     'FBFXRGJC': function () {//分部分项人工价差
         let rst = 0;
@@ -563,7 +563,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -577,7 +577,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -591,13 +591,13 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.subdivisionQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
     },
     'JSCSXMRCJJC': function () {//技术措施项目人材机价差
-        return (this['JSCSXMRGJC']() + this['JSCSXMCLJC']() + this['JSCSXMJXJC']()).toDecimal(2);
+        return (this['JSCSXMRGJC']() + this['JSCSXMCLJC']() + this['JSCSXMJXJC']()).toDecimal(decimalObj.bills.totalPrice);
     },
     'JSCSXMRGJC': function () {//技术措施项目人工价差
         let rst = 0;
@@ -608,7 +608,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -622,7 +622,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -636,7 +636,7 @@ let baseFigureTemplate = {
                 let adjPrc = calcBase.project.projectGLJ.getAdjustPrice(glj);
                 //价差
                 let dffPrc = parseFloat(glj.unit_price.market_price - adjPrc).toDecimal(decimalObj.glj.unitPrice);
-                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.techQuantity * dffPrc).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -646,7 +646,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.LABOUR){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -656,7 +656,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMaterialTypes.includes(glj.type) && glj.ratio_data.length === 0){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -666,7 +666,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMachineTypes.includes(glj.type) && glj.ratio_data.length === 0){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -676,7 +676,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.LABOUR){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -686,7 +686,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMaterialTypes.includes(glj.type) && glj.ratio_data.length === 0){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -696,7 +696,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMachineTypes.includes(glj.type) && glj.ratio_data.length === 0){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -706,7 +706,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.MAIN_MATERIAL && glj.ratio_data.length === 0){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -716,7 +716,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.EQUIPMENT){
-                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.supply_quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -726,7 +726,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.LABOUR && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -736,7 +736,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMaterialTypes.includes(glj.type) && glj.ratio_data.length === 0 && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -746,7 +746,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMachineTypes.includes(glj.type) && glj.ratio_data.length === 0 && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.basePrice).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.base_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -756,7 +756,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.LABOUR && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -766,7 +766,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMaterialTypes.includes(glj.type) && glj.ratio_data.length === 0 && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -776,7 +776,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(baseMachineTypes.includes(glj.type) && glj.ratio_data.length === 0 && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -786,7 +786,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.MAIN_MATERIAL && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;
@@ -796,7 +796,7 @@ let baseFigureTemplate = {
         let projGljs = calcBase.project.projectGLJ.datas.gljList;
         for(let glj of projGljs){
             if(glj.type === gljType.EQUIPMENT && glj.supply === supplyType.JDYG){
-                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(2)).toDecimal(2);
+                rst = (rst + parseFloat(glj.quantity * glj.unit_price.market_price).toDecimal(decimalObj.bills.totalPrice)).toDecimal(decimalObj.bills.totalPrice);
             }
         }
         return rst;

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

@@ -1436,7 +1436,7 @@ class CalcProgram {
     };
 
     // 计算多条零散的定额，并计算他们所属的清单、父级清单，然后打包存储。如：批量替换工料机后受影响的定额。
-    calcRationsAndSave(rationNodes){
+    calcRationsAndSave(rationNodes, callback){
         let me = this, leafBills = [], allChangedNodes = [];
         for (let node of rationNodes) {
             me.innerCalc(node, allChangedNodes);
@@ -1450,7 +1450,7 @@ class CalcProgram {
             mergeArr(allChangedNodes, curChangeds);
         };
 
-        me.saveNodes(allChangedNodes);
+        me.saveNodes(allChangedNodes, callback);
     };
 
     // 计算多条零散的清单，并计算他们的父清单、引用清单，然后打包存储。如：花选删除树结点(如花选清单、定额等，不区分树结点类型)。
@@ -1466,14 +1466,14 @@ class CalcProgram {
 
     // 计算并保存指定的一个树节点。修改一个树节点，实际上要计算和保存的是一批树结点：层层父结点、被其它结点(的公式)引用的公式结点。
     // 这个方法实际上封装了calculate()和saveNodes()两个方法，主要目的是为了外部调用方便，少写一点累赘代码。
-    calcAndSave(treeNode){
+    calcAndSave(treeNode, callback){
         let changedNodes = this.calculate(treeNode);
-        this.saveNodes(changedNodes);
+        this.saveNodes(changedNodes, callback);
     };
 
-    calcAllNodesAndSave(calcType = calcAllType.catAll){
+    calcAllNodesAndSave(calcType = calcAllType.catAll, callback){
         let changedNodes = this.calcAllNodes(calcType);
-        this.saveNodes(changedNodes);
+        this.saveNodes(changedNodes, callback);
     };
 
     // 排除指定项的综合合价计算（用于带循环计算的情况）

web/building_saas/main/js/models/quantity_detail.js

@@ -608,10 +608,14 @@ var quantity_detail = {
             }
             if(needUpdateChildren.length>0){
                 node.changed = true;//本身发生了改变，需要存储。
-                project.calcProgram.calcRationsAndSave(needUpdateChildren);
+                project.calcProgram.calcRationsAndSave(needUpdateChildren, function () {
+                    project.projectGLJ.loadData();
+                });
             }else {
                 node.changed = true;
-                project.calcProgram.calcAndSave(node);
+                project.calcProgram.calcAndSave(node, function () {
+                    project.projectGLJ.loadData();
+                });
             }
             if(gljNodes.length>0){
                 projectObj.mainController.refreshTreeNode(gljNodes);
@@ -630,7 +634,9 @@ var quantity_detail = {
                 node.data.contain=0;
             }
             node.changed = true;
-            project.calcProgram.calcAndSave(node);
+            project.calcProgram.calcAndSave(node, function () {
+                project.projectGLJ.loadData();
+            });
             projectObj.mainController.refreshTreeNode(node.children);//刷新子工料机总消耗量
             gljOprObj.showRationGLJSheetData();
         };

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

@@ -538,7 +538,9 @@ var Ration = {
             }
           //  node.data.quantity = projectObj.project.quantity_detail.autoTransformQuantity(node.data.quantity,node);//按单位做转换
             node.changed = true;
-            project.calcProgram.calcAndSave(node);
+            project.calcProgram.calcAndSave(node, function () {
+                project.projectGLJ.loadData();
+            });
             projectObj.mainController.refreshTreeNode(node.children);//刷新子工料机树节点总消耗量
         };
         ration.prototype.addRationChecking=function(selected){

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

@@ -200,7 +200,6 @@ let MainTreeCol = {
         forRuleText: function (node) {
             if(MainTreeCol.readOnly.bills(node)){
                 if(node.data.type === billType.FX || (node.data.type === billType.BILL && node.source.children.length === 0)){
-                    console.log('enter');
                     return false;
                 }
             }
@@ -381,6 +380,8 @@ $('#column').on('hide.bs.modal', function () {
         projectObj.project.projSetting.mainGridSetting.cols[iRow].visible = sheet.getValue(iRow, 0);
     }
     SheetDataHelper.refreshColumnVisible(projectObj.project.projSetting.mainGridSetting, projectObj.mainSpread.getActiveSheet());
+    //refresh nodes to autoFitRow
+    projectObj.mainController.refreshTreeNode(projectObj.project.mainTree.roots, true);
     projectObj.project.pushNow('editColSetting', projectObj.project.projSetting.moduleName, {
         projectID: projectObj.project.ID(),
         main_tree_col: projectObj.project.projSetting.main_tree_col

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

@@ -252,7 +252,9 @@ var projectObj = {
                 let libId = projectInfoObj.projectInfo.engineeringInfo.bill_lib[0].id;
                 CommonAjax.post('/stdBillsEditor/getStdBillsByCode', {userId: userID, billsLibId: libId, code: stdCode}, function (data) {
                     if (data) {
-                        data.itemCharacter = pageCCOprObj.safeItemCharater(data.itemCharacter);
+                        //data.itemCharacter = pageCCOprObj.safeItemCharater(data.itemCharacter);
+                        node.data.name = data.name;
+                        pageCCOprObj.setItemContentNode(node, data.jobContent, data.itemCharacter, node.data.name);
                         if (/\//.test(data.unit)) {
                             ConfirmModal.stdBillsUnit.check(data, function (std) {
                                 project.Bills.replaceBills(node.source, std, formatCode);
@@ -301,7 +303,7 @@ var projectObj = {
             alert('当前项目无定额库，请添加定额库。');
             this.mainController.refreshTreeNode([node], false);
         } else {
-            let libId = projectInfoObj.projectInfo.engineeringInfo.ration_lib[0].id;
+            let libId = parseInt($('#stdRationLibSelect').val());
             CommonAjax.post('/complementaryRation/api/getRationItem', {user_id: userID, rationRepId: libId, code: value}, function (data) {
                 if (data) {
                     projectObj.project.Ration.replaceRation(node.source, data);
@@ -443,10 +445,8 @@ var projectObj = {
         }
     },
     msClipboardChanged: function (sender, info) {
-        console.log('enterCC');
         let colSettings = projectObj.mainController.setting.cols;
         let cDatas = sheetCommonObj.getTableData(info.sheet, colSettings);
-        console.log(cDatas);
         sheetCommonObj.copyTextToClipboard(cDatas);
         return;
     },