From 82345cbf47f8f2b0e6cf4d707ab53995f66287fc Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 15 三月 2023 17:03:21 +0800
Subject: [PATCH] update 更新 readme 说明 更改框架定位

---
 ruoyi-ui/src/views/register.vue |   52 +++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/views/register.vue b/ruoyi-ui/src/views/register.vue
index 393f100..a1e2940 100644
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -1,7 +1,18 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">RuoYi-Vue-Plus鍚庡彴绠＄悊绯荤粺</h3>
+      <h3 class="title">RuoYi-Vue-Plus澶氱鎴风鐞嗙郴缁�</h3>
+      <el-form-item prop="tenantId">
+        <el-select v-model="registerForm.tenantId" filterable placeholder="璇烽�夋嫨/杈撳叆鍏徃鍚嶇О" style="width: 100%">
+          <el-option
+            v-for="item in tenantList"
+            :key="item.tenantId"
+            :label="item.companyName"
+            :value="item.tenantId">
+          </el-option>
+          <svg-icon slot="prefix" icon-class="company" class="el-input__icon input-icon" />
+        </el-select>
+      </el-form-item>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="璐﹀彿">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
@@ -29,7 +40,7 @@
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
-      <el-form-item prop="code" v-if="captchaOnOff">
+      <el-form-item prop="code" v-if="captchaEnabled">
         <el-input
           v-model="registerForm.code"
           auto-complete="off"
@@ -61,13 +72,13 @@
     </el-form>
     <!--  搴曢儴  -->
     <div class="el-register-footer">
-      <span>Copyright 漏 2018-2021 ruoyi.vip All Rights Reserved.</span>
+      <span>Copyright 漏 2018-2023 ruoyi.vip All Rights Reserved.</span>
     </div>
   </div>
 </template>
 
 <script>
-import { getCodeImg, register } from "@/api/login";
+import {getCodeImg, register, tenantList} from "@/api/login";
 
 export default {
   name: "Register",
@@ -82,13 +93,18 @@
     return {
       codeUrl: "",
       registerForm: {
+        tenantId: "",
         username: "",
         password: "",
         confirmPassword: "",
         code: "",
-        uuid: ""
+        uuid: "",
+        userType: "sys_user"
       },
       registerRules: {
+        tenantId: [
+          { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勭鎴风紪鍙�" }
+        ],
         username: [
           { required: true, trigger: "blur", message: "璇疯緭鍏ユ偍鐨勮处鍙�" },
           { min: 2, max: 20, message: '鐢ㄦ埛璐﹀彿闀垮害蹇呴』浠嬩簬 2 鍜� 20 涔嬮棿', trigger: 'blur' }
@@ -104,19 +120,30 @@
         code: [{ required: true, trigger: "change", message: "璇疯緭鍏ラ獙璇佺爜" }]
       },
       loading: false,
-      captchaOnOff: true
+      captchaEnabled: true,
+      // 绉熸埛鍒楄〃
+      tenantList:[]
     };
   },
   created() {
     this.getCode();
+    this.getTenantList();
   },
   methods: {
     getCode() {
       getCodeImg().then(res => {
-        this.captchaOnOff = res.data.captchaOnOff === undefined ? true : res.data.captchaOnOff;
-        if (this.captchaOnOff) {
+        this.captchaEnabled = res.data.captchaEnabled === undefined ? true : res.data.captchaEnabled;
+        if (this.captchaEnabled) {
           this.codeUrl = "data:image/gif;base64," + res.data.img;
           this.registerForm.uuid = res.data.uuid;
+        }
+      });
+    },
+    getTenantList() {
+      tenantList().then(res => {
+        this.tenantList = res.data;
+        if (this.tenantList != null && this.tenantList.length !== 0) {
+          this.loginForm.tenantId = this.tenantList[0].tenantId;
         }
       });
     },
@@ -124,16 +151,19 @@
       this.$refs.registerForm.validate(valid => {
         if (valid) {
           this.loading = true;
-          register(this.registerForm).then(res => {
+          let registerForm = this.registerForm;
+          registerForm.userType = "sys_user"
+          register(registerForm).then(res => {
             const username = this.registerForm.username;
             this.$alert("<font color='red'>鎭枩浣狅紝鎮ㄧ殑璐﹀彿 " + username + " 娉ㄥ唽鎴愬姛锛�</font>", '绯荤粺鎻愮ず', {
-              dangerouslyUseHTMLString: true
+              dangerouslyUseHTMLString: true,
+              type: 'success'
             }).then(() => {
               this.$router.push("/login");
             }).catch(() => {});
           }).catch(() => {
             this.loading = false;
-            if (this.captchaOnOff) {
+            if (this.captchaEnabled) {
               this.getCode();
             }
           })

--
Gitblit v1.9.3