1. 开发登录界面根据用户名获取到对应仓库，选取仓库后再登录

肖超群
1 parent b1b89d35
Showing 5 changed files with 49 additions and 33 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/api/api.js
jeecg-boot-master/ant-design-vue-jeecg/src/views/user/Login.vue
jeecg-boot-master/ant-design-vue-jeecg/src/views/user/LoginAccount.vue
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/LoginController.java
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/model/SysLoginModel.java
@@ -45,6 +45,7 @@ const searchByKeywords   = (params)=&gt;getAction(&quot;/sys/sysDepart/searchBy&quot;,params)
 const deleteByDepartId   = (params)=>deleteAction("/sys/sysDepart/delete",params);
  
 //二级部门管理
+export const getWarehouseByUserCode = (params)=>postAction('/sys/getWarehouseByUserCode', params);
 const queryDepartPermission = (params)=>getAction("/sys/permission/queryDepartPermission",params);
 const saveDepartPermission = (params)=>postAction("/sys/permission/saveDepartPermission",params);
 const queryTreeListForDeptRole = (params)=>getAction("/sys/sysDepartPermission/queryTreeListForDeptRole",params);
@@ -92,6 +93,7 @@ const checkRuleByCode = (params) =&gt; getAction(&#39;/sys/checkRule/checkByCode&#39;, para
 //加载我的通告信息
 const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params);
 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}`
+
 // 中转HTTP请求
 export const transitRESTful = {
   get: (url, parameter) => getAction(getTransitURL(url), parameter),
@@ -3,7 +3,7 @@
     <a-form-model class="user-layout-login" @keyup.enter.native="handleSubmit">
       <a-tabs :activeKey="customActiveKey" :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"  @change="handleTabClick">
         <a-tab-pane key="tab1" tab="账号密码登录">
-          <login-account ref="alogin" @validateFail="validateFail" @success="requestSuccess" @fail="requestFailed"></login-account>
+          <login-account ref="alogin" @validateFail="validateFail"   @success="requestSuccess"  @fail="requestFailed"></login-account>
         </a-tab-pane>
  
 <!--        <a-tab-pane key="tab2" tab="手机号登录">-->
@@ -21,6 +21,7 @@
 <!--        </router-link>-->
 <!--      </a-form-model-item>-->
  
+
       <a-form-item style="margin-top:24px">
         <a-button size="large"  type="primary"  htmlType="submit"  class="login-button"  :loading="loginBtn"  @click.stop.prevent="handleSubmit" :disabled="loginBtn">确定
         </a-button>
@@ -61,6 +62,7 @@ export default {
         loginBtn: false,
         requiredTwoStepCaptcha: false,
         stepCaptchaVisible: false,
+        querySource:{},
         encryptedString:{
           key:"",
           iv:"",
@@ -89,6 +91,7 @@ export default {
         })
       },
  
+
       //登录
       handleSubmit () {
         this.loginBtn = true;
@@ -2,7 +2,7 @@
     <div>
       <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-form-model-item required prop="username">
-          <a-input v-model="model.username" size="large" placeholder="请输入帐户名 / admin">
+          <a-input v-model="model.username" size="large" placeholder="请输入帐户名 / admin"  @keyup="getWarehouse">
             <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
           </a-input>
         </a-form-model-item>
@@ -12,6 +12,18 @@
           </a-input>
         </a-form-model-item>
  
+        <a-form-item>
+          <a-select
+            show-search
+            prop="warehouseCode"
+            v-model="model.warehouseCode"
+            placeholder="请选择仓库"
+            option-filter-prop="children"
+          >
+            <a-select-option  v-for="item in warehouseList" :key="item.name" :value="item.code">{{ item.name }}</a-select-option>
+          </a-select>
+        </a-form-item>
+
 <!--        <a-row :gutter="0">-->
 <!--          <a-col :span="16">-->
 <!--            <a-form-model-item required prop="inputCode">-->
@@ -33,6 +45,7 @@
   import { getAction } from '@/api/manage'
   import Vue from 'vue'
   import { mapActions } from 'vuex'
+  import {getWarehouseByUserCode} from '@/api/api'
  
   export default {
     name: 'LoginAccount',
@@ -42,9 +55,12 @@
         randCodeImage: '',
         currdatetime: '',
         loginType: 0,
+        warehouseList: {},
+        querySource:{},
         model:{
           username: '',
           password: '',
+          warehouseCode: '',
           // inputCode: ''
         },
         validatorRules:{
@@ -55,6 +71,7 @@
           password: [{
             required: true, message: '请输入密码!', validator: 'click'
           }],
+          warehouseCode:  [{ required: true, message: '请选择职级' }] ,
           // inputCode: [{
           //   required: true, message: '请输入验证码!'
           // }]
@@ -64,7 +81,9 @@
     },
     created() {
       this.handleChangeCheckCode();
+      this.getWarehouse();
     },
+
     methods:{
       ...mapActions(['Login']),
       /**刷新验证码*/
@@ -83,6 +102,20 @@
           this.requestCodeSuccess=false
         })
       },
+
+
+      getWarehouse() {
+        const that = this;
+        this.querySource.username = that.model.username;
+        let obj = getWarehouseByUserCode(that.querySource);
+        obj.then((res) => {
+          that.warehouseList = res.result;
+          if (res.code != 200) {
+            that.warehouseList = {};
+          }
+        })
+      },
+
       // 判断登录类型
       handleUsernameOrEmail (rule, value, callback) {
         const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
@@ -128,6 +161,7 @@
             let loginParams = {
               username: this.model.username,
               password: this.model.password,
+              warehouseCode: this.model.warehouseCode,
               checkKey: this.currdatetime,
               remember_me: rememberMe,
             }
@@ -66,6 +66,7 @@ public class LoginController {
 		Result<JSONObject> result = new Result<JSONObject>();
 		String username = sysLoginModel.getUsername();
 		String password = sysLoginModel.getPassword();
+		String warehouseCode = sysLoginModel.getWarehouseCode();
 		//update-begin--Author:scott  Date:20190805 for：暂时注释掉密码加密逻辑，有点问题
 		//前端密码加密，后端进行密码解密
 		//password = AesEncryptUtil.desEncrypt(sysLoginModel.getPassword().replaceAll("%2B", "\\+")).trim();//密码解密
@@ -615,8 +616,9 @@ public class LoginController {
 	 */
 	@PostMapping("/getWarehouseByUserCode")
 	@ResponseBody
-	public Result getWarehouseByUserCode(@RequestBody String loginName)
+	public Result getWarehouseByUserCode(@RequestBody SysUser sysUser)
 	{
+		String loginName = sysUser.getUsername();
 		if (StringUtils.isNotEmpty(loginName))
 		{
 			List<Map<String, Object>> list = sysUserService.getWarehouseByUserCode(loginName);
@@ -2,6 +2,7 @@ package org.jeecg.modules.system.model;
  
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
  
 /**
  * 登录表单
@@ -9,47 +10,21 @@ import io.swagger.annotations.ApiModelProperty;
  * @Author scott
  * @since  2019-01-18
  */
+@Data
 @ApiModel(value="登录对象", description="登录对象")
 public class SysLoginModel {
 	@ApiModelProperty(value = "账号")
     private String username;
 	@ApiModelProperty(value = "密码")
     private String password;
+    @ApiModelProperty(value = "仓库编码")
+    private String warehouseCode;
 	@ApiModelProperty(value = "验证码")
     private String captcha;
 	@ApiModelProperty(value = "验证码key")
     private String checkKey;
  
-    public String getUsername() {
-        return username;
-    }
  
-    public void setUsername(String username) {
-        this.username = username;
-    }
  
-    public String getPassword() {
-        return password;
-    }
  
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getCaptcha() {
-        return captcha;
-    }
-
-    public void setCaptcha(String captcha) {
-        this.captcha = captcha;
-    }
-
-	public String getCheckKey() {
-		return checkKey;
-	}
-
-	public void setCheckKey(String checkKey) {
-		this.checkKey = checkKey;
-	}
-    
-}
 \ No newline at end of file
+}