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

modules/pm/controllers/pm_controller.js

@@ -387,11 +387,9 @@ module.exports = {
             if(gc_tenderFiles.length > 0){
                 for(let i = 0, len = gc_tenderFiles.length; i < len; i++){
                     let gc_t = gc_tenderFiles[i];
-                    console.log(gc_t.ParentID);
                     let theProj = _projs[prefix + gc_t.ParentID] || null;
                     if(!theProj){
                         let tempProjs = await ProjectsData.getProjectsByIds(userID, compilatoinId, [gc_t.ParentID]);
-                        console.log(tempProjs[0]);
                         if(tempProjs.length > 0 && tempProjs[0].projType === projType.project){
                             theProj = _projs[prefix + gc_t.ParentID] = tempProjs[0]._doc;
                             buildProj(theProj);
@@ -402,7 +400,6 @@ module.exports = {
                     }
                 }
             }
-            console.log(_projs);
             for(let i in _projs){
                 rst.push(_projs[i]);
             }

web/building_saas/main/js/main.js

@@ -3,8 +3,12 @@
  */
 $(function () {
     loadMainSize();
+
     $("#header-menu").removeAttr('style');
 
+    if (projectInfoObj.projectInfo.property.valuationType == 'bill')
+        $("#tab_tender_price").css('display', 'none');
+
     $('#tab_baobiao').on('shown.bs.tab', function (e) {
         $(e.relatedTarget.hash).removeClass('active');
         // do something

web/building_saas/main/js/models/main_consts.js

@@ -277,7 +277,7 @@ let cpFeeTypes = [
     {type: 'marketLabour', name: '人工费'},
     {type: 'marketMaterial', name: '材料费'},
     {type: 'marketMachine', name: '施工机械使用费'},
-    {type: 'marketEquipment', name: '设备费'},
+    {type: 'marketEquipment', name: '设备购置费'},
     {type: 'marketDirect', name: '直接费'},
     {type: 'labour', name: '定额人工费'},
     {type: 'material', name: '定额材料费'},

web/building_saas/pm/js/pm_newMain.js

@@ -2586,8 +2586,14 @@ function AddTender() {
         // 一个项目里面，这两个文件必须得有，而界面又没有像费率、单价文件那样给出可选项。所以这里给出提示。
         if (!libs.artificial_lib)  throw '编办没有绑定人工系数标准文件';
 
-        let featureLibID = "";
-        if(libs.feature_lib && libs.feature_lib.length > 0) featureLibID = libs.feature_lib[0].id;
+        let featureLibID = "",
+            progressiveLibID = "";
+        if(libs.feature_lib && libs.feature_lib.length > 0) {
+            featureLibID = libs.feature_lib[0].id;
+        }
+        if(libs.progressive_lib && libs.progressive_lib.length > 0) {
+            progressiveLibID = libs.progressive_lib[0].id;
+        }
 
 
         let calcProgramName = $('#tender-calcProgram').children("option:selected").text();
@@ -2622,6 +2628,7 @@ function AddTender() {
             templateLibID:templateLibID,
             colLibID:colLibID,
             featureLibID:featureLibID,
+            progressiveLibID:progressiveLibID,
             region: region
         };
         AddTenderItems(selectedItem, projName, tenderName, tenderInfo, callback);