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

modules/users/controllers/cld_controller.js

@@ -232,6 +232,16 @@ class CLDController {
         }
     }
 
+    async provinceList(request, response) {
+        let userModel = new UserModel();
+        let responseData = {
+            error: 0,
+            msg: '',
+            data: userModel.province,
+        };
+        response.json(responseData);
+    }
+
     /**
      * 获取用户列表分页
      * @param request

modules/users/models/user_model.js

@@ -492,6 +492,13 @@ class UserModel extends BaseModel {
             condition.online_times = this.getOnlineTimestamp(onlineTimes);
         }
 
+        // 企业所在地区
+        let province = request.query.province;
+        province = province !== '' && province !== undefined ? parseInt(province) : 0;
+        if (province !== 0) {
+            condition.province = province;
+        }
+
         let keyword = request.query.keyword;
         if (keyword !== '' && keyword !== undefined) {
             condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{qq : {$regex: keyword}},{company : {$regex: keyword}}];

modules/users/routes/cld_route.js

@@ -32,5 +32,7 @@ module.exports = function (app) {
 
     router.get('/getRejectUsers', cldController.getRejectUsers);
 
+    router.get('/provinceList', cldController.provinceList);
+
     app.use('/cld',router)
 };

web/building_saas/main/js/models/ration.js

@@ -535,6 +535,7 @@ var Ration = {
         ration.prototype.insertVolumePrice = function(type,ext){
             this.addNewRation(null,rationType.volumePrice,function (newNode) {//插入人工不需要自动定位到编号列
                 projectObj.selectColAndFocus(newNode,null);
+                projectObj.refreshBaseActn(projectObj.project.mainTree);
             },true,type,true,ext);
         };
 

web/building_saas/main/js/views/glj_view.js

@@ -1129,6 +1129,7 @@ var gljOprObj = {
                 }else {
                     me.showRationGLJSheetData();
                 }
+                projectObj.refreshBaseActn(project.mainTree);
                 $.bootstrapLoading.end();
             });
 

web/building_saas/main/js/views/project_view.js

@@ -1216,6 +1216,7 @@ var projectObj = {
                 }
                 await project.Ration.addMultiRation(newData);
                 projectObj.setActiveCell('code', true);
+                projectObj.refreshBaseActn(project.mainTree);
             } catch (err) {
                 console.log(err);
                 if (!$('hintBox_form').is(':visible')) {