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

modules/pm/controllers/pm_controller.js

@@ -222,10 +222,11 @@ module.exports = {
                 }
                 projInfo.engineeringInfo = engineeringInfo;
             }
-            //读取建设项目的基本信息
-            let basicInfo = await ProjectsData.getBasicInfo(projectID);
-            if(basicInfo !== null){
-                projInfo.property.basicInformation = basicInfo;
+            // 获取建设项目相关信息
+            const constructionProject = await pm_facade.getConstructionProject(projectID);
+            if (constructionProject) {
+                projInfo.property.basicInformation = constructionProject.property && constructionProject.property.basicInformation || null;
+                projInfo.property.projectValuationType = constructionProject.property && constructionProject.property.valuationType || null;
             }
             //获取单位工程完整目录结构
             let fullPath = await pm_facade.getFullPath(projectID);

public/common_constants.js

@@ -109,8 +109,8 @@
 
     // 工程量清单类型
     const BOQType = {
-        TENDER: 1, // 招标
-        BIDDER: 2, // 投标
+        BID_INVITATION: 1, // 招标
+        BID_SUBMISSION: 2, // 投标
     };
 
     const SourceType = {

web/building_saas/main/js/views/project_info.js

@@ -82,8 +82,8 @@ var projectInfoObj = {
             //init decimal
             setDecimal(decimalObj, data.property.decimal);
             billsQuanDecimal.datas = data.property.billsQuantityDecimal || [billsDecimalView.angleDecimal];
-            // 工程量清单项目显示基本信息，预算项目不显示
-            if (data.property.valuationType === BUDGET) {
+            // 建设项目为工程量清单项目显示基本信息，预算项目不显示
+            if (data.property.projectValuationType === BUDGET) {
                 // 隐藏基本信息
                 $('#tab_poj-settings-basicInfo').removeClass('active');
                 $('#tab_poj-settings-basicInfo').hide();

web/building_saas/pm/js/pm_newMain.js

@@ -37,7 +37,7 @@ let regions = [];
 
 const { 
     ValuationType: { BUDGET, BOQ },
-    BOQType: { TENDER, BIDDER },
+    BOQType: { BID_INVITATION, BID_SUBMISSION },
 } = window.commonConstants;
 const { 
     similarEqual,
@@ -2497,11 +2497,11 @@ function initProjectOptSet($target) {
                         <label for="staticEmail" class="col-auto col-form-label col-form-label-sm">清单类型</label>
                         <div class="col">
                             <div class="custom-control custom-radio custom-control-inline">
-                                <input type="radio" value="${TENDER}" name="boq-type-input" checked id="boq-type-tender" class="custom-control-input">
+                                <input type="radio" value="${BID_INVITATION}" name="boq-type-input" checked id="boq-type-tender" class="custom-control-input">
                                 <label class="custom-control-label" for="boq-type-tender">招标</label>
                             </div>
                             <div class="custom-control custom-radio custom-control-inline">
-                                <input type="radio" value="${BIDDER}" name="boq-type-input" id="boq-type-bidder" class="custom-control-input">
+                                <input type="radio" value="${BID_SUBMISSION}" name="boq-type-input" id="boq-type-bidder" class="custom-control-input">
                                 <label class="custom-control-label" checked for="boq-type-bidder">投标</label>
                             </div>
                         </div>