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

modules/pm/models/project_model.js

@@ -172,8 +172,8 @@ ProjectsDAO.prototype.updateUserProjects = async function (userId, compilationId
 
                     //呈现选项
                     data.updateData.property.displaySetting = displaySetting;
-
-                    data.updateData.property.billsCalcMode = 0;
+                    let defaultCalcMode = (data.updateData.property.valuationType == 'bill') ? 2 : 1;
+                    data.updateData.property.billsCalcMode = defaultCalcMode;
                     data.updateData.property.zanguCalcMode = 0;
                     //计算选项
                     data.updateData.property.calcOptions = calcOptions;
@@ -796,7 +796,8 @@ ProjectsDAO.prototype.defaultSettings = async function (userID, compilationId, p
     }
     let cloneProperty = _.cloneDeep(project.property);
     //关于计算
-    cloneProperty.billsCalcMode = 0;
+    let defaultCalcMode = (project.property.valuationType == 'bill') ? 2 : 1;
+    cloneProperty.billsCalcMode = defaultCalcMode;
     cloneProperty.zanguCalcMode = 0;
     cloneProperty.calcOptions = calcOptions;
     //清单工程量精度

web/building_saas/css/custom.css

@@ -50,11 +50,11 @@ legend.legend{
 .filterType{
     padding-left: 6px;
     padding-right: 6px;
-    width: 122px;
+    width: 98px;
 }
 
 .filterType ul{
-    width: 98px;
+    width: 86px;
 }
 .a_color{
     color: #007bff;

web/building_saas/glj/html/project_glj.html

@@ -15,7 +15,7 @@
     <div class="row">
         <div class="gl-side  filterType" id='filterType'>
             <ul class="nav flex-column nav-pills mt-2 mb-2">
-                <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有人材机</a></li>
+                <li class="nav-item"><a class="nav-link active" href="#" id="ALL">所有工料机</a></li>
 
               <!--  <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="FBFX">分部分项人材机</a></li>
                 <li class="nav-item"><a class="nav-link" href="javascript:void(0)" id="TECH">措施项目人材机</a></li>

web/building_saas/main/html/main.html

@@ -269,14 +269,14 @@
                                                   <div id="zmhs_nav" style="display: none">
                                                       <ul class="nav nav-tabs">
                                                           <li class="nav-item" data-toggle="tooltip" data-placement="left" title="收起">
-                                                              <a data-toggle="tab" href="#rnc-close" role="tab" class="zmhs-link nav-link"><i class="fa fa-arrow-right"></i></a>
+                                                              <a data-toggle="tab" href="#rnc-close" role="tab" class="zmhs-link nav-link">收起<!--<i class="fa fa-arrow-right"></i>--></a>
                                                           </li>
-                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征">
-                                                              <a data-toggle="tab" id="xm-nav" href="#rnc-xm" role="tab" class="zmhs-link nav-link"><i class="fa fa-info-circle"></i></a>
-                                                          </li>
-                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="附注条件"><a data-toggle="tab" href="#rnc-zm" role="tab"class="zmhs-link nav-link"><i class="fa fa-check-circle-o"></i></a></li>
-                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="自定义系数"><a data-toggle="tab" href="#rnc-cus" role="tab"class="zmhs-link nav-link"><i class="fa fa-wrench"></i></a></li>
-                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="增减换算"><a data-toggle="tab" href="#rnc-fz" role="tab"class="zmhs-link nav-link "><i class="fa fa-plus"></i></a></li>
+                                                          <!--<li class="nav-item" data-toggle="tooltip" data-placement="left" title="项目特征">
+                                                              <a data-toggle="tab" id="xm-nav" href="#rnc-xm" role="tab" class="zmhs-link nav-link">特征&lt;!&ndash;<i class="fa fa-info-circle"></i>&ndash;&gt;</a>
+                                                          </li>-->
+                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="附注条件"><a data-toggle="tab"  id="hs-nav" href="#rnc-zm" role="tab"class="zmhs-link nav-link">换算<!--<i class="fa fa-check-circle-o"></i>--></a></li>
+                                                          <li class="nav-item" data-toggle="tooltip" data-placement="left" title="自定义系数"><a data-toggle="tab" href="#rnc-cus" role="tab"class="zmhs-link nav-link">系数<!--<i class="fa fa-wrench"></i>--></a></li>
+                                                          <!--                     <li class="nav-item" data-toggle="tooltip" data-placement="left" title="增减换算"><a data-toggle="tab" href="#rnc-fz" role="tab"class="zmhs-link nav-link "><i class="fa fa-plus"></i></a></li>-->
                                                         <!--  <li class="nav-item"><a data-toggle="tab" href="#rnc-xm" role="tab"  class="nav-link">项目特征</a></li>
                                                           <li class="nav-item"><a data-toggle="tab" href="#rnc-zm" role="tab" class="nav-link">子目换算</a></li>
                                                           <li class="nav-item"><a data-toggle="tab" href="#rnc-fz" role="tab" class="nav-link">辅助定额</a></li>-->
@@ -287,7 +287,7 @@
                                       </div>
                                      <!-- <div class="main-data-bottom ovf-hidden" id="tabZMHS" style="display: none">
                                           <div class=" main-data-bottom ovf-hidden p-0" style="width: 60%; float: left;" id="coeSpread"></div>
-                                          <div class="main-data-bottom ovf-hidden p-0" id="assDiv" style="width: 40%; float: left">
+               hs                           <div class="main-data-bottom ovf-hidden p-0" id="assDiv" style="width: 40%; float: left">
                                               <div class="resize-x" id="zmhsResize"></div>
                                               <div class="main-data-bottom ovf-hidden" style="width: 99%; float: left;" id="assSpread"></div>
                                           </div>
@@ -794,7 +794,7 @@
                                     <div class="modal-auto-height">
                                         <fieldset class="form-group">
                                             <h5>取费方式</h5>
-                                            <div class="form-check">
+                                            <div class="form-check" style="display:none">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="rationContent" value="0" type="radio">
                                                     子目含量取费
@@ -812,14 +812,14 @@
                                                     子目单价取费（正算）：清单综合合价=∑子目综合合价
                                                 </label>
                                             </div>
-                                            <div class="form-check">
+                                            <div class="form-check" style="display:none">
                                                 <label class="form-check-label">
                                                     <input class="form-check-input" name="calcFlag" id="billsPrice" value="3" type="radio">
                                                     清单单价取费
                                                 </label>
                                             </div>
                                         </fieldset>
-                                        <fieldset class="form-group">
+                                        <fieldset class="form-group" style="display:none">
                                             <h5>暂估合价计算方式</h5>
                                             <div class="form-check">
                                                 <label class="form-check-label">
@@ -834,7 +834,7 @@
                                                 </label>
                                             </div>
                                         </fieldset>
-                                        <fieldset class="form-group">
+                                        <fieldset class="form-group"  style="display:none">
                                             <h5>计算选项</h5>
                                             <div class="form-check">
                                                 <label class="form-check-label">

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

@@ -148,29 +148,17 @@ let calcTools = {
         if (!treeNode.data.fees) {
             treeNode.data.fees = [];
             treeNode.data.feesIndex = {};
-            // treeNode.updateData.fees = [];   // 在某种未知情况下，treeNode.data.fees有值，导致这句无法执行。下同
-            // treeNode.updateData.feesIndex = {};
+             treeNode.updateData.fees = [];   // 在某种未知情况下，treeNode.data.fees有值，导致这句无法执行。下同
+             treeNode.updateData.feesIndex = {};
             treeNode.changed = true;
         }
         else if (!treeNode.data.feesIndex){
             treeNode.data.feesIndex = {};
-            // treeNode.updateData.feesIndex = {};
+             treeNode.updateData.feesIndex = {};
             for (let fee of treeNode.data.fees){
                 treeNode.data.feesIndex[fee.fieldName] = fee;
-                // treeNode.updateData.feesIndex[fee.fieldName] = fee;
-            };
-            treeNode.changed = true;
-        };
-
-        if (!treeNode.updateData.fees) {
-            treeNode.updateData.fees = [];
-            treeNode.updateData.feesIndex = {};
-            treeNode.changed = true;
-        }
-        else if (!treeNode.updateData.feesIndex){
-            treeNode.updateData.feesIndex = {};
-            for (let fee of treeNode.updateData.fees)
                 treeNode.updateData.feesIndex[fee.fieldName] = fee;
+            };
             treeNode.changed = true;
         };
     },
@@ -273,82 +261,33 @@ let calcTools = {
         else
             return 0;
     },
+
+    // 该方法已精简，不支持价差基数的计算。
     rationBaseFee: function (treeNode, gljTypes, priceType, isTender){
         if (!treeNode.data.gljList) return 0;
         let me = this, result = 0;
         let price = 0, temp = 0, temp2 = 0;
-
-        // 机械组成物价差: 机上人工、动力燃料
-        if ((priceType == priceTypes.ptDiffPrice) && (gljTypes.includes(gljType.MACHINE_LABOUR) || gljTypes.includes(gljType.FUEL_POWER_FEE))){
-            for (let glj of treeNode.data.gljList) {
-                if ([gljType.GENERAL_MACHINE, gljType.INSTRUMENT].includes(glj.type)){
-                    if (isTender){
-                        calcTools.calcGLJTenderPrice(glj);
-                        calcTools.calcGLJTenderQty(treeNode, glj);
-                    };
-                    let mds = projectObj.project.composition.getCompositionByGLJ(glj);
-                    if (!mds) mds = [];
-                    for (let md of mds){
-                        if (gljTypes.includes(md.type)){
-                            let gljQ = isTender ? me.uiGLJQty(glj["tenderQuantity"]) : me.uiGLJQty(glj["quantity"]);
-                            let mdQ = me.uiGLJQty(md.consumption);
-                            let mdMP = isTender ? md["tenderPrice"] : md["marketPrice"];
-                            let mdAP = calcTools.hasAdjustPrice() ? md["adjustPrice"] : md["basePrice"];
-                            // if (aprice != mprice){
-                            temp = (temp + (gljQ * mdQ * mdMP).toDecimal(decimalObj.process)).toDecimal(decimalObj.process);
-                            temp2 = (temp2 + (gljQ * mdQ * mdAP).toDecimal(decimalObj.process)).toDecimal(decimalObj.process);
-                            // }
-                        }
-                    }
-                }
-            }
-        }
-        // 普通基数计算（包括普通价差）
-        else{
-            for (let glj of treeNode.data.gljList) {
-                if (gljTypes.indexOf(glj.type) >= 0) {
-                    if (isTender){
-                        calcTools.calcGLJTenderPrice(glj);
-                        calcTools.calcGLJTenderQty(treeNode, glj);
-                    };
-                    let qty = isTender ? me.uiGLJQty(glj["tenderQuantity"]) : me.uiGLJQty(glj["quantity"]);
-                    let mprice = isTender ? me.uiGLJPrice(glj["tenderPrice"], glj) : me.uiGLJPrice(glj["marketPrice"], glj);
-                    let aprice = calcTools.hasAdjustPrice() ? me.uiGLJPrice(glj["adjustPrice"], glj) : me.uiGLJPrice(glj["basePrice"], glj);
-
-                    if (priceType == priceTypes.ptDiffPrice){
-                        // if (aprice != mprice){
-                        temp = (temp + (qty * mprice).toDecimal(decimalObj.process)).toDecimal(decimalObj.process);
-                        temp2 = (temp2 + (qty * aprice).toDecimal(decimalObj.process)).toDecimal(decimalObj.process);
-                        // }
-                    }
-                    else {
-                        if (priceType == priceTypes.ptBasePrice){ price = me.uiGLJPrice(glj["basePrice"], glj);}
-                        else if (priceType == priceTypes.ptAdjustPrice){price = aprice;}
-                        else if (priceType == priceTypes.ptMarketPrice){price = mprice;}
-                        temp = (qty * price).toDecimal(decimalObj.process);
-                        result = (result + temp).toDecimal(decimalObj.process);
-                    };
+        for (let glj of treeNode.data.gljList) {
+            if (gljTypes.indexOf(glj.type) >= 0) {
+                if (isTender){
+                    calcTools.calcGLJTenderPrice(glj);
+                    calcTools.calcGLJTenderQty(treeNode, glj);
                 };
-            };
-        };
 
-        if (priceType == priceTypes.ptDiffPrice){
-            if (typeof isCQ2018 != 'undefined'){
-                // 如下这一句十分重要！JS计算误差导致379.08-331.695＝47.38499999999999。如果直接取2位会变成47.38。所以先取6位47.385，再取2位47.39。
-                result = (temp - temp2).toDecimal(decimalObj.process);
-                result = result.toDecimal(decimalObj.ration.unitPrice)    // 重庆2018所有都是先汇总相减后再取舍
-            }
-            else{
-                if (gljTypes == baseMaterialTypes)
-                    result = (temp - temp2).toDecimal(decimalObj.ration.unitPrice)
-                else
-                    result = (temp.toDecimal(decimalObj.ration.unitPrice) - temp2.toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
+                let gljQ = isTender ? me.uiGLJQty(glj["tenderQuantity"]) : me.uiGLJQty(glj["quantity"]);
+                let mprice = isTender ? me.uiGLJPrice(glj["tenderPrice"], glj) : me.uiGLJPrice(glj["marketPrice"], glj);
+                let aprice = calcTools.hasAdjustPrice() ? me.uiGLJPrice(glj["adjustPrice"], glj) : me.uiGLJPrice(glj["basePrice"], glj);
+
+                if (priceType == priceTypes.ptBasePrice){ price = me.uiGLJPrice(glj["basePrice"], glj);}
+                else if (priceType == priceTypes.ptAdjustPrice){price = aprice;}
+                else if (priceType == priceTypes.ptMarketPrice){price = mprice;}
+
+                let nodeQ = calcTools.uiNodeQty(treeNode);
+                temp = (price * gljQ * nodeQ).toDecimal(decimalObj.process);
+                result = (result + temp).toDecimal(decimalObj.process);
             };
-        }
-        else{
-            result = result.toDecimal(decimalObj.ration.unitPrice);
         };
-
+        result = result.toDecimal(decimalObj.ration.totalPrice);
         return result;
     },
     // masterTypeFilter 过滤机械机型：[]全部， [1，2]特大机械  [3，4]中小机械。  detailType 如机上人工费、机械折旧费等
@@ -379,13 +318,10 @@ let calcTools = {
                         mdSum = (mdSum).toDecimal(decimalObj.glj.unitPriceHasMix);
                     }
                 }
-                if (typeof isCQ2018 != 'undefined')
-                    result = (result + (gljQ * mdSum).toDecimal(decimalObj.process)).toDecimal(decimalObj.process)
-                else
-                    result = (result + (gljQ * mdSum).toDecimal(decimalObj.ration.unitPrice)).toDecimal(decimalObj.ration.unitPrice);
+                result = (result + (gljQ * mdSum).toDecimal(decimalObj.process)).toDecimal(decimalObj.process)
             }
         }
-        result = (result).toDecimal(decimalObj.ration.unitPrice);
+        result = (result).toDecimal(decimalObj.ration.totalPrice);
         return result;
     },
     // 总造价清单、叶子清单、定额的暂估费。父清单是汇总子清单的暂估费，走计算程序逻辑，不在这里。
@@ -1387,7 +1323,7 @@ let executeObj = {
 
     at: function(ID, isTender) {
         let item = executeObj.template.compiledCalcItems[ID];
-        let rst = isTender ? item.tenderUnitFee : item.unitFee;
+        let rst = isTender ? item.tenderTotalFee : item.totalFee;
         rst = parseFloat(rst);
         return rst;
     },
@@ -1850,9 +1786,10 @@ class CalcProgram {
                     if (calcItem.feeRate != undefined)
                         feeRate = parseFloat(calcItem.feeRate).toDecimal(decimalObj.feeRate);
                     // console.log(`[${calcItem.ID}]: ${calcItem.compiledExpr}`);   // for test.
-
-                    calcItem.unitFee = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.decimal('unitPrice', treeNode));
-                    calcItem.totalFee = (calcItem.unitFee * calcTools.uiNodeQty(treeNode)).toDecimal(decimalObj.decimal('totalPrice', treeNode));
+                    let tf = (eval(calcItem.compiledExpr) * feeRate * 0.01).toDecimal(decimalObj.process);
+                    calcItem.totalFee = tf.toDecimal(decimalObj.decimal('totalPrice', treeNode));
+                    let nodeQ = calcTools.uiNodeQty(treeNode) ? calcTools.uiNodeQty(treeNode) : 1;
+                    calcItem.unitFee = (tf / nodeQ).toDecimal(decimalObj.decimal('unitPrice', treeNode));
 
                     if (tender == tenderTypes.ttCalc) {
                         let tExpr = analyzer.getCompiledTenderExpr(calcItem.compiledExpr);

web/building_saas/main/js/views/glj_col.js

@@ -4,9 +4,9 @@
 let gljCol = {
     ration_glj_setting: {
         header: [
-            {headerName: "编码", headerWidth: 110, dataCode: "code", dataType: "String", formatter: "@"},
+            {headerName: "编号", headerWidth: 110, dataCode: "code", dataType: "String", formatter: "@"},
             {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
-            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", dataType: "String", hAlign: "left",cellType:'tipsCell'},
+            {headerName: "规格", headerWidth: 120, dataCode: "specs", dataType: "String", hAlign: "left",cellType:'tipsCell'},
             {headerName: "单位", headerWidth: 45, dataCode: "unit", dataType: "String", hAlign: "center"},
             {headerName: "预算价", headerWidth: 65, dataCode: "marketPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"
             {headerName: "调整价", headerWidth: 65, dataCode: "adjustPrice", dataType: "Number", hAlign: "right"},//, decimalField: "glj.unitPrice"1
@@ -33,36 +33,29 @@ let gljCol = {
     },
     project_glj_setting:{
         header: [
-            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "编号", headerWidth: 80, dataCode: "code", dataType: "String"},
             {headerName: "名称", headerWidth: 160, dataCode: "name", dataType: "String",cellType:'tipsCell'},
-            {headerName: "规格型号", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String",cellType:'tipsCell'},
             {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
-            {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
-            {headerName: "预算价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
-            {headerName: "调整价", headerWidth: 70, dataCode: "adjustPrice", hAlign: "right", dataType: "Number"},//,decimalField:"glj.unitPrice"
-            {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",validator:"number"},//decimalField:'glj.unitPrice',
             {headerName: "总消耗量", headerWidth: 90, dataCode: "quantity", hAlign: "right", dataType: "Number",decimalField:'glj.quantity'},
-            {headerName: "暂估", headerWidth: 45, dataCode: "is_evaluate", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "定额价", headerWidth: 70, dataCode: "basePrice", hAlign: "right", dataType: "Number",validator:"number"},//decimalField:'glj.unitPrice',
+            {headerName: "预算价", headerWidth: 70, dataCode: "marketPrice", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
+            {headerName: "规格", headerWidth: 120, dataCode: "specs", hAlign: "left", dataType: "String",cellType:'tipsCell'},
             {headerName: "主要\n材料", headerWidth: 45, dataCode: "is_main_material", hAlign: "center", dataType: "String",cellType:'checkBox'},
-            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox"},
-            {headerName: "供货方式", headerWidth: 70, dataCode: "supply", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:supplyComboMap},
-            {headerName: "甲供数量", headerWidth: 90, dataCode: "supply_quantity", hAlign: "right", dataType: "Number",validator:"number",decimalField:'glj.quantity'},
-            {headerName: "三材类别", headerWidth: 70, dataCode: "materialType", hAlign: "center", dataType: "String",cellType:'comboBox',editorValueType:true,options:materialComboMap},
-            {headerName: "三材系数", headerWidth: 70, dataCode: "materialCoe", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'material'
-            {headerName: "交货方式", headerWidth: 70, dataCode: "delivery", hAlign: "left", dataType: "String"},
-            {headerName: "送达地点", headerWidth: 70, dataCode: "delivery_address", hAlign: "left", dataType: "String"},
+            {headerName: "新工料机", headerWidth: 50, dataCode: "is_add", hAlign: "center", dataType: "String",cellType:'checkBox'},
+            {headerName: "不调价", headerWidth: 55, dataCode: "is_adjust_price", dataType: "String",cellType: "checkBox",},
+            {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
             {headerName: "备注", headerWidth: 100, dataCode: "remark", hAlign: "left", dataType: "String"}
         ],
         view: {
-            lockColumns: [0,1,2,3,4,6,8]
+            lockColumns: ["code","name","specs","unit","short_name","quantity","is_add"]
         },
         frozenCols:4
     },
     mixRatio_Setting:{
         header:[
-            {headerName: "编码", headerWidth: 80, dataCode: "code", dataType: "String"},
+            {headerName: "编号", headerWidth: 80, dataCode: "code", dataType: "String"},
             {headerName: "名称", headerWidth: 240, dataCode: "name", dataType: "String"},
-            {headerName: "规格型号", headerWidth: 190, dataCode: "specs", dataType: "String"},
+            {headerName: "规格", headerWidth: 190, dataCode: "specs", dataType: "String"},
             {headerName: "单位", headerWidth: 45, dataCode: "unit", hAlign: "center", dataType: "String"},
             {headerName: "类型", headerWidth: 45, dataCode: "short_name", hAlign: "center", dataType: "String"},
             {headerName: "定额价", headerWidth: 80, dataCode: "basePrice", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:'glj.unitPrice'
@@ -95,6 +88,9 @@ let gljCol = {
             me.removeCol('adjustPrice',me.project_glj_setting);
             me.removeCol('adjustPrice',me.mixRatio_Setting);
         }
+        if(projectInfoObj.projectInfo.property && projectInfoObj.projectInfo.property.valuationType == "bill"){
+            me.removeCol('is_adjust_price',me.project_glj_setting);
+        }
         gljOprObj.setting = me.ration_glj_setting;
         projectGljObject.projectGljSetting = me.project_glj_setting;
         projectGljObject.mixRatioSetting = me.mixRatio_Setting;

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

@@ -2342,9 +2342,13 @@ $('#poj-set').on('show.bs.modal', function () {
     }
     if (projectObj.project) {
         //江西重定义了leafBillGetFeeType的内容
-        let ft = projectObj.project.property.billsCalcMode !== undefined &&
-                 projectObj.project.property.billsCalcMode !== null ? projectObj.project.property.billsCalcMode : leafBillGetFeeType.rationContent;
-        let zg = projectObj.project.property.zanguCalcMode !== undefined &&
+        // 预算：bill, 正算，rationPrice: 2,
+        // 清单：ration, 反算，rationPriceConverse: 1,
+        let defaultCalcMode = (projectObj.project.property.valuationType == 'bill') ? leafBillGetFeeType.rationPrice : leafBillGetFeeType.rationPriceConverse;
+        let ft = (projectObj.project.property.billsCalcMode !== undefined && projectObj.project.property.billsCalcMode !== null) ?
+            projectObj.project.property.billsCalcMode : defaultCalcMode;
+
+        let zg = projectObj.project.property.zanguCalcMode !== undefined &&``
                  projectObj.project.property.zanguCalcMode !== null ? projectObj.project.property.zanguCalcMode : zanguCalcType.common;
         setCalcFlag($('#rationContent'), leafBillGetFeeType.rationContent, ft);
         setCalcFlag($('#rationPriceConverse'), leafBillGetFeeType.rationPriceConverse, ft);

web/building_saas/main/js/views/sub_view.js

@@ -719,7 +719,7 @@ $('#linkAZZJF').on('shown.bs.tab', function () {
 $('#zmhs_toogle').bind('click',function (){
    $("#zmhs_nav").show();
    if(subObj.showGljSubTab == false){
-       subObj.activeTab?$(subObj.activeTab).click():$("#xm-nav").click();
+       subObj.activeTab?$(subObj.activeTab).click():$("#hs-nav").click();
    }
     $("#zmhs_toogle").hide();
 });