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

web/building_saas/main/js/main.js

@@ -17,13 +17,13 @@ $(function () {
         $(e.relatedTarget.hash).removeClass('active');
         $("#subItems").addClass('active');
         $(gljOprObj.activeTab).addClass('active');
-        subObj.initGljSubTab();
         autoFlashHeight();
         projectObj.refreshMainSpread();
         billsGuidance.refreshWorkBook();
         billsLibObj.refreshBillsSpread();
         billsLibObj.refreshBillsRelaSpread();
         rationLibObj.refreshSpread();
+        subObj.initGljSubTab();
         if($('#linkJSCX').hasClass('active'))
             calcProgramObj.refreshCalcProgram(projectObj.project.mainTree.selected, 2);
         //autoFlashHeight 里已经包含了 refreshSubSpread();

web/building_saas/main/js/views/config_material_view.js

@@ -494,7 +494,7 @@ let configMaterialObj = {
                     alert("当前材料市场价已被锁定，修改请先返回人材机汇总界面解除锁定。");
                     return me.showBidMaterialDatas();
                 }
-                return projectObj.project.projectGLJ.updatePrice(bid,dataCode,value,'rg', null,projectGljObject.refreshViewsData);
+                return projectObj.project.projectGLJ.updatePrice(bid,dataCode,value,'rg',projectGljObject.refreshViewsData);
             }
             value =  scMathUtil.roundToString(value,getDecimal('glj.unitPrice'));
         }
@@ -570,7 +570,7 @@ let configMaterialObj = {
         if(dataCode == 'marketPrice'){
             dataCode = 'market_price';
             if(evaluate.is_related){//关联的情况下，直接修改工料机价格
-                return projectObj.project.projectGLJ.updatePrice(evaluate,dataCode,value,'rg',null,projectGljObject.refreshViewsData);
+                return projectObj.project.projectGLJ.updatePrice(evaluate,dataCode,value,'rg',projectGljObject.refreshViewsData);
             }
         }
         if(value && dataCode === 'quantity'){//修改数量需做4舍5入

web/over_write/js/shandong_2016.js

@@ -4,4 +4,46 @@ if (typeof module !== 'undefined') {
           return 5
       }
   };
-}
+}
+
+let isSD2016 = true;
+function overwriteRationCalcBases() {
+    if (typeof rationCalcBases == 'undefined') return;
+    for (let key in rationCalcBases) delete rationCalcBases[key];
+
+    rationCalcBases['人工费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.LABOUR], priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['材料费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMaterialTypes, priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['施工机械使用费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, baseMachineTypes, priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['商品砼费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.COMMERCIAL_CONCRETE, gljType.COMMERCIAL_MORTAR], priceTypes.ptMarketPrice, isTender);
+    };
+    rationCalcBases['外购砼构件费'] = function (node, isTender) {
+        return calcTools.rationBaseFee(node, [gljType.PURCHASE_COMPONENT], priceTypes.ptMarketPrice, isTender);
+    };
+};
+
+(function overwriteFeeTypes() {
+    if (typeof cpFeeTypes == 'undefined') return;
+    cpFeeTypes = [
+        { type: 'marketDirect', name: '直接费' },
+        { type: 'marketDirectWork', name: '直接工程费' },
+        { type: 'marketLabour', name: '人工费' },
+        { type: 'marketMaterial', name: '材料费' },
+        { type: 'marketMachine', name: '施工机械使用费' },
+        { type: 'otherFee', name: '其它工程费' },
+        { type: 'otherFee1', name: '其它工程费I' },
+        { type: 'otherFee2', name: '其它工程费II' },
+        { type: 'indirectFee', name: '间接费' },
+        { type: 'manage', name: '企业管理费' },
+        { type: 'force', name: '规费' },
+        { type: 'profit', name: '利润' },
+        { type: 'tax', name: '税金' },
+        { type: 'common', name: '建安费' }
+    ];
+})();