普通用户管理功能

config/menu.js

@@ -23,7 +23,7 @@ let menuData = {
                 url: '/user',
                 name: 'index',
             },
-            'last-login' : {
+            'test-user' : {
                 title: '测试用户',
                 url: '/user/test-user',
                 name: 'test-user',

modules/all_models/user.js

@@ -42,10 +42,12 @@ let modelSchema = {
         default: -1
     },
     // 最后登录时间
-    last_login: {
+    latest_login: {
         type: Number,
         default: 0
     },
+    //最近使用编办
+    latest_used:String,
     // 创建时间
     create_time: {
         type: Number,

modules/users/controllers/user_controller.js

@@ -28,13 +28,14 @@ class UserController extends BaseController {
         let userList = [];
         let compilationList =[];
         let compilationString ='';
+        let compilationMap = {};
         let filter = request.query;
         try {
             //获取编办列表
             let  compilationModel = new CompilationModel();
             compilationList = await compilationModel.getCompilationList({_id: 1, name: 1, is_release: 1});
             compilationString = JSON.stringify(compilationList);
-            compilationList = JSON.parse(compilationString);//去除mongoose 格式
+            compilationMap = _.indexBy(compilationList,'_id');
             let condition = userModel.getFilterCondition(request);
 
             //获取注册时间
@@ -43,12 +44,12 @@ class UserController extends BaseController {
                 filter.regtimeMsg = userModel.getDayMsg(regtime);
             }
 
-            // 已升级费用定额
-            let upGrade = request.query.upGrade;
-            if(upGrade !== '' && upGrade !== undefined){
-                let com = _.find(compilationList,{'_id':upGrade});
-                if(com) filter.upgradeCompilation = com.name;
+            //获取注册时间
+            let loginTime = request.query.loginTime;
+            if(loginTime !== '' && loginTime !== undefined){
+                filter.loginMsg = userModel.getDayMsg(loginTime);
             }
+
             // 获取用户总数
             total = await userModel.count(condition);
 
@@ -70,6 +71,7 @@ class UserController extends BaseController {
         let renderData = {
             compilationList:compilationList,
             compilationString:compilationString,
+            compilationMap:compilationMap,
             adminName:request.session.managerData?request.session.managerData.real_name:'',
             userList: userList,
             pages: pageData,

modules/users/models/user_model.js

@@ -106,6 +106,13 @@ class UserModel extends BaseModel {
             condition.create_time = this.getTimestamp(regtime);
         }
 
+        //最近登录时间
+        let loginTime = request.query.loginTime;
+        loginTime = loginTime !== '' && loginTime !== undefined ? parseInt(loginTime) : 0;
+        if (loginTime !== 0) {
+            condition.latest_login = this.getTimestamp(loginTime);
+        }
+
         let version = request.query.version;
         if(version !== '' && version !== undefined) {
             condition.version = version;
@@ -116,6 +123,12 @@ class UserModel extends BaseModel {
             condition.upgrade_list = {"$elemMatch":{"compilationID":upGrade,"isUpgrade":true}};
         }
 
+        // 最近使用费用定额
+        let latestUsed = request.query.latestUsed;
+        if(latestUsed !== '' && latestUsed !== undefined){
+            condition.latest_used = latestUsed;
+        }
+
         let keyword = request.query.keyword;
         if (keyword !== '' && keyword !== undefined) {
             condition.$or = [{real_name : {$regex: keyword}},{email : {$regex: keyword}},{mobile : {$regex: keyword}},{company : {$regex: keyword}}];

modules/users/routes/user_route.js

@@ -14,6 +14,7 @@ const userController = new UserController();
 module.exports =function (app) {
     // action定义区域
     router.get('/', userController.auth, userController.init, userController.normalUsers);
+    router.get('/test-user', userController.auth, userController.init, userController.normalUsers);
     router.get('/search', userController.auth, userController.init, userController.search);
     router.post('/findByID', userController.auth, userController.init, userController.findByID);
     router.post('/getUserList', userController.auth, userController.init, userController.getUserList);

web/users/js/user.js

@@ -12,7 +12,8 @@ $(document).ready(function() {
         let string = $(this).text();
         let selector = $(this).parent().parent();
         selector.next("input:hidden").val(value);
-        selector.prev("button").html(string + ' <span class="caret"></span>');
+        selector.prev("button").children("lable").text(string);
+        //selector.prev("button").html(string + ' <span class="caret"></span>');
     });
 });
 let cacheUser = null;
@@ -81,8 +82,6 @@ async function updateUser(compilationID,type) {
             upgradeInfo.isUpgrade = false;
             upgradeInfo.remark = adminName + " "+ moment().format("YYYY-MM-DD") +" 关闭";
         }
-
-
         await ajaxPost("/user/updateUser",{ID:cacheUser._id,updateData:{upgrade_list:upgrade_list}});
         cacheUser.upgrade_list = upgrade_list;
         refreshUpgradeTabel(cacheUser);

web/users/views/user/index.html

@@ -12,9 +12,10 @@
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown"
                             aria-haspopup="true" aria-expanded="false">
-                       最近使用费用定额： <span class="caret"></span>
+                       最近使用费用定额：<lable><%= compilationMap[filter.latestUsed] === undefined ? '所有' : compilationMap[filter.latestUsed].name %></lable>  <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu selector">
+                        <li><a  data-value="">所有</a></li>
                         <% for(let compilation of compilationList){ %>
                         <li><a  data-value="<%= compilation._id.toString()%>"><%= compilation.name %></a></li>
                         <% } %>
@@ -25,7 +26,7 @@
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown"
                             aria-haspopup="true" aria-expanded="false">
-                        已升级费用定额：<%= filter.upgradeCompilation === undefined ? '所有' : filter.upgradeCompilation %>  <span class="caret"></span>
+                        已升级费用定额：<lable><%= compilationMap[filter.upGrade] === undefined ? '所有' : compilationMap[filter.upGrade].name %></lable>  <span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu selector">
                         <li><a  data-value="">所有</a></li>
@@ -39,7 +40,7 @@
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown"
                             aria-haspopup="true" aria-expanded="false">
-                        最新注册：<%= filter.regtimeMsg === undefined ? '所有' : filter.regtimeMsg %><span class="caret"></span>
+                        最新注册：<lable><%= filter.regtimeMsg === undefined ? '所有' : filter.regtimeMsg %></lable><span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu selector">
                         <li><a  data-value="0">所有</a></li>
@@ -54,7 +55,7 @@
                 <div class="btn-group">
                     <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown"
                             aria-haspopup="true" aria-expanded="false">
-                        最近登录：<%= filter.regtimeMsg === undefined ? '所有' : filter.regtimeMsg %><span class="caret"></span>
+                        最近登录：<lable><%= filter.loginMsg === undefined ? '所有' : filter.loginMsg %></lable><span class="caret"></span>
                     </button>
                     <ul class="dropdown-menu selector">
                         <li><a  data-value="0">所有</a></li>
@@ -106,8 +107,8 @@
                            data-content="企业类型：<%= model.companyType[user.company_type] %>，企业规模：<%= model.companyScale[user.company_scale] %>"><%= user.company %></a>
                     </td>
                     <td><%= model.province[user.province] %></td>
-                    <td>重庆01版</td>
-                    <td>登录时间</td>
+                    <td><%= compilationMap[user.latest_used]?compilationMap[user.latest_used].name:""%></td>
+                    <td><%= user.latest_login?moment(user.latest_login).format('YYYY-MM-DD HH:mm:ss'):"" %></td>
                     <td><%= moment(user.create_time).format('YYYY-MM-DD HH:mm:ss') %></td>
                     <td><a role="button" data-toggle="modal" data-target="#view" onclick='getUserInfo("<%= user._id.toString()%>")'>详细</a></td>
                     <td><a href="#update" data-toggle="modal" data-target="#update" onclick='getUserUpgradeInfo("<%= user._id.toString()%>")'>升级</a></td>