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

modules/users/models/user_model.js

@@ -387,7 +387,7 @@ class UserModel extends BaseModel {
 
     async getContacts(userID) {
         const user = await this.model.findOne({ _id: mongoose.Types.ObjectId(userID) }, 'contacts').lean();
-        if (!user) {
+        if (!user || !user.contacts || !user.contacts.length) {
             return [];
         }
         const userIDList = user.contacts.map(item => mongoose.Types.ObjectId(item.userID));

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

@@ -349,7 +349,7 @@
                             </select>
                         </div>
                     </div>
-                    <div class="form-group row">
+                    <div class="form-group row" id="tender-engineering-group">
                         <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-engineering">

web/over_write/js/anhui_2019.js

@@ -252,7 +252,7 @@ if (typeof baseFigureTemplate !== 'undefined' && baseFigureTemplate.budget) {
         // 养护项目信息化费 算法：以{定额建筑安装工程费}为基数，采用累进办法计算。(不足20000元时按20000元计算)
         YHXMXXHF(tender) {
             const baseFee = this['DEJZAZGCF'](tender);
-            const fee = cbTools.getProgressiveFee(baseFee, '信息化费');
+            const fee = cbTools.getProgressiveFee(baseFee, '养护项目信息化费');
             return fee > 0 && fee < 20000 ? 20000 : fee;
         },
         // 工程监理费 算法：以{定额建筑安装工程费(不含专项管理费) }为基数，采用累进办法计算。(不足20000元时按20000元计算)
@@ -294,4 +294,12 @@ if (typeof baseFigureTemplate !== 'undefined' && baseFigureTemplate.budget) {
         }
 
     };
+}
+
+// 安徽养护在新建分段的时候需要隐藏养护类别和费用标准
+if (typeof $ !== 'undefined') { // 后端也有引用这个文件，后端引用时$没有定义会报错
+    $(document).ready(function() {
+        $('#tender-engineering-group').hide();
+        $('#tender-feeStandard-group').hide();
+    });
 }