From c21362ec635a8345850fc64df7ff6bd472e0e801 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Fri, 28 Jun 2024 18:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue | 18 +++++++++++++++---
 src/views/system/user/index.vue | 17 +++++++++++------
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c703fa0..beb98af 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -263,6 +263,13 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-if="form.menuType == 'M'">
+            <el-form-item label="系统类型" prop="systemType">
+              <el-radio-group v-model="form.systemType">
+                <el-radio v-for="dict in dict.type.sys_login_type" :key="dict.value" :label="dict.value">{{dict.label}}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -281,7 +288,7 @@ import IconSelect from "@/components/IconSelect";
 
 export default {
   name: "Menu",
-  dicts: ['sys_show_hide', 'sys_normal_disable'],
+  dicts: ['sys_show_hide', 'sys_normal_disable','sys_login_type'],
   components: { Treeselect, IconSelect },
   data() {
     return {
@@ -318,7 +325,10 @@ export default {
         ],
         path: [
           { required: true, message: "路由地址不能为空", trigger: "blur" }
-        ]
+        ],
+        systemType: [
+          { required: true, message: "请选择系统类型", trigger: "change" }
+        ],
       }
     };
   },
@@ -375,7 +385,8 @@ export default {
         isFrame: "1",
         isCache: "0",
         visible: "0",
-        status: "0"
+        status: "0",
+        systemType:undefined
       };
       this.resetForm("form");
     },
@@ -390,6 +401,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
+      console.log();
       this.reset();
       this.getTreeselect();
       if (row != null && row.menuId) {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 4dda8a4..ed8cca9 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -180,10 +180,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
-              <el-select v-model="form.roleIds" multiple multiple-limit = "1" placeholder="请选择角色">
-                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"
-                  :disabled="item.status == 1"></el-option>
+            <el-form-item label="角色" prop="roleIds">
+              <el-select v-model="form.roleIds" multiple :multiple-limit = "multipleLimit" placeholder="请选择角色">
+                <el-option v-for="item in roleOptions" :key="item.roleId" :label="item.roleName" :value="item.roleId"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
@@ -280,6 +279,8 @@ export default {
       roleOptions: [],
       // 登录权限数组
       loginTypeArr:[],
+      // 角色下拉多选限制数量
+      multipleLimit:1,
       // 表单参数
       form: {},
       defaultProps: {
@@ -350,7 +351,10 @@ export default {
           { required: true, message: '密码不能为空', trigger: 'blur' },
           { min: 8, max: 20, message: '密码长度在8到20个字符', trigger: 'blur' },
           { validator: this.validatePwd, trigger: 'blur' }
-        ]
+        ],
+        roleIds: [
+          { required: true, message: "请选择角色", trigger: "change" }
+        ],
       }
     };
   },
@@ -481,6 +485,7 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.loginTypeArr.splice(0);
       getUser().then(response => {
         this.postOptions = response.posts;
         this.roleOptions = response.roles;
@@ -492,7 +497,7 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      this.loginTypeArr = this.loginTypeArr.splice(0,this.loginTypeArr.length);
+      this.loginTypeArr.splice(0);
       const userId = row.userId || this.ids;
       getUser(userId).then(response => {
         this.form = response.data;