cld登录

modules/all_models/manager.js

@@ -55,6 +55,11 @@ let modelSchema = {
         type: Number,
         default: 0
     },
+    //职称
+    position: {
+        type: String,
+        default: ''
+    },
     // 超级管理员 1为超级管理员
     super_admin: {
         type: Number,

modules/users/models/manager_model.js

@@ -25,7 +25,7 @@ class ManagerModel extends BaseModel {
      * @var
      */
     permission = {
-        'manager': '用户管理',
+        'user': '用户管理',
         'notify': '通知管理',
         'stdBillsmain': '清单规则编辑器',
         'rationRepository': '定额编辑器',
@@ -132,17 +132,17 @@ class ManagerModel extends BaseModel {
         let managerData = await this.findDataByCondition({username: username});
 
         // 没有找到对应数据
-        if (managerData === null || managerData._id === undefined) {
+        /*if (managerData === null || managerData._id === undefined) {
             throw {code: 44001, err: '用户名或密码错误'};
-        }
+        }*/
 
         // 是否禁止登录
-        if (managerData.can_login !== 1) {
+        if (managerData && managerData.can_login !== 1) {
             throw {code: 44002, err: '用户名不存在'};
         }
 
         // 如果不是超级管理员登录则走CLD接口登录流程
-        if (username !== this.adminUsername) {
+        if (managerData === null || managerData._id === undefined || username !== this.adminUsername) {
             let CLDLoginInfo = await this.CLDLogin(username, password, managerData);
             managerData = CLDLoginInfo;
         } else {
@@ -196,6 +196,7 @@ class ManagerModel extends BaseModel {
         // 不存在则新增
         this.setScene('cldInsert');
         let current = new Date().getTime();
+        //cld账号登录的统一设置可以看到用户管理和允许登录
         let insertData = {
             username: username,
             password: '',
@@ -203,7 +204,9 @@ class ManagerModel extends BaseModel {
             create_time: current,
             last_login: current,
             office: responseData.office,
-            can_login: 0
+            position: responseData.position,
+            permission: 'user',
+            can_login: 1
         };
         result = this.db.create(insertData);
 
@@ -220,6 +223,8 @@ class ManagerModel extends BaseModel {
         return new Promise(function(resolve, reject) {
             // 发起请求
             Request.post(postOption, function(error, response, body) {
+                console.log(`body`);
+                console.log(body);
                 if (error || response.statusCode !== 200) {
                     console.log(response.statusCode + ':' + error);
                     reject({code: 44002, err: '接口请求出错'});

web/users/js/login.js

@@ -16,6 +16,7 @@ let rules = {
     }
 };
 $(document).ready(function() {
+    console.log($('#password').val());
     $("#login-form").validate({
         rules: rules,
         errorPlacement: function(error, element) {

web/users/views/login/index.html

@@ -27,13 +27,13 @@
                 <div class="form-group">
                     <div class="input-group">
                         <div class="input-group-addon"><i class="glyphicon glyphicon-user"></i></div>
-                        <input  class="form-control input-lg" placeholder="输入账号" name="username" id="username" value="admin">
+                        <input  class="form-control input-lg" placeholder="输入账号" name="username" id="username" value="">
                     </div>
                 </div>
                 <div class="form-group">
                     <div class="input-group">
                         <div class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></div>
-                        <input type="password" class="form-control input-lg"  placeholder="输入密码" id="password" name="password" value="">
+                        <input type="password" class="form-control input-lg"  placeholder="输入密码" autocomplete="new-password" id="password" name="password" value="">
                     </div>
                 </div>
                 <a class="btn btn-primary btn-lg btn-block" href="javascript:void(0);" id="login">登录</a>

web/users/views/manager/index.html

@@ -66,7 +66,7 @@
                     <label>权限</label>
                     <div class="checkbox">
                         <label>
-                            <input type="checkbox" name="permission[]" data-permission="manager"> 用户管理
+                            <input type="checkbox" name="permission[]" data-permission="user"> 用户管理
                         </label>&nbsp;
                         <label>
                             <input type="checkbox" name="permission[]" data-permission="notify"> 通知管理