浏览代码

feat: 挂载projectObj.project.property.budgetType

vian 4 年之前
父节点
当前提交
325781ef20
共有 2 个文件被更改,包括 4 次插入1 次删除
  1. 3 0
      modules/pm/controllers/pm_controller.js
  2. 1 1
      web/building_saas/pm/html/project-management.html

+ 3 - 0
modules/pm/controllers/pm_controller.js

@@ -36,6 +36,7 @@ const multiparty = require("multiparty");
 let logger = require("../../../logs/log_helper").logger;
 let rp = require('request-promise');
 const commonUtil = require('../../../public/common_util');
+const { BudgetType } = require('../../../public/common_constants');
 //统一回调函数
 let callback = function (req, res, err, message, data) {
     res.json({ error: err, message: message, data: data });
@@ -254,6 +255,8 @@ module.exports = {
             projInfo.property.basicInformation = constructionProperty && constructionProperty.basicInformation ? constructionProperty.basicInformation : [];
             //编制说明
             projInfo.property.compilationIllustrationProject = constructionProperty && constructionProperty.compilationIllustration ? constructionProperty.compilationIllustration : '';
+            // 概算类型
+            projInfo.property.budgetType = constructionProperty && constructionProperty.budgetType || BudgetType.BUILDING;
             //获取单位工程完整目录结构
             let fullPath = await pm_facade.getFullPath(projectID);
             projInfo.fullPath = fullPath;

+ 1 - 1
web/building_saas/pm/html/project-management.html

@@ -517,7 +517,7 @@
                             </select>
                         </div>
                     </div>-->
-                    <div class="form-group row">
+                    <div class="form-group row" style="display: none;">
                         <label for="staticEmail" class="col-auto col-form-label col-form-label-sm">计算程序</label>
                         <div class="col">
                             <select class="form-control  form-control-sm" id="tender-calcProgram">