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

modules/users/controllers/cld_controller.js

@@ -305,6 +305,10 @@ class CLDController {
             // 获取用户列表
             userList = await userModel.getList(condition, page, pageSize, sort);
             await online_facade.setOnlineTimes(userList,condition);
+            userList = JSON.parse(unescape(escape(JSON.stringify(userList))));
+            for (const userData of userList) {
+                userData.province = userData.province !== -1 ? userModel.province[userData.province] : '';
+            }
             response.json({error: 0, msg: 'success', data: {
                     userInfo: userList,
                     pageData: pageData,

modules/users/models/user_model.js

@@ -495,8 +495,8 @@ class UserModel extends BaseModel {
 
         // 企业所在地区
         let province = request.query.province;
-        province = province !== '' && province !== undefined ? parseInt(province) : 0;
-        if (province !== 0) {
+        province = province !== '' && province !== undefined ? parseInt(province) - 1 : -1;
+        if (province !== -1) {
             condition.province = province;
         }
 

web/building_saas/main/js/models/calc_program.js

@@ -1040,7 +1040,7 @@ let calcTools = {
         if (!commonUtil.isNumber(maxPrice)) {
             return false;
         }
-        return totalFee > maxPrice;
+        return totalFee > +maxPrice;
     },
     // 清单价格是否小于最低限价
     unitFeeLTMinPrice: function (node, feeField) {
@@ -1053,7 +1053,7 @@ let calcTools = {
         if (!commonUtil.isNumber(minPrice)) {
             return false;
         }
-        return totalFee < minPrice;
+        return totalFee < +minPrice;
     },
     
     getTenderCalcType: function () {

web/building_saas/main/js/views/main_tree_col.js

@@ -320,10 +320,13 @@ let MainTreeCol = {
             /* if(+$('#fileKind').val() === _fileKind.tender) {
                 return true;
             } */
-            return projectObj.project.projectInfo.importedByInterface ||(node.data.outPutMaxPrice === false && node.data.outPutLimitPrice === false);
+            const hasOutPutMaxPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutMaxPrice');
+            const hasOutPutLitmitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLitmitPrice');
+            return projectObj.project.projectInfo.importedByInterface || (hasOutPutMaxPriceCol && (node.data.outPutMaxPrice === undefined || node.data.outPutMaxPrice === false)) || (hasOutPutLitmitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
         },
         minPrice: function (node) {
-            return projectObj.project.projectInfo.importedByInterface || node.data.outPutLimitPrice === false;
+            const hasOutPutLitmitPriceCol = !!projectObj.project.projSetting.main_tree_col.cols.find(item => item.data.field === 'outPutLitmitPrice');
+            return projectObj.project.projectInfo.importedByInterface || (hasOutPutLitmitPriceCol && (node.data.outPutLimitPrice === undefined || node.data.outPutLimitPrice === false));
         },
         // 超高降效
         forOverHeight: function (node) {