Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

src/api/authority.ts

@@ -13,7 +13,7 @@ export interface User {
   createTime: string;
   status: string;
   psw: string;
-  role: string;
+  role: string[];
   roleName: string;
 }
 

src/components/navbar/index.vue

@@ -186,7 +186,7 @@
         </a-dropdown>
       </li>
       <li style="padding: 0">
-        <a-dropdown trigger="click" @select="changeLocale as any">
+        <a-dropdown trigger="click">
           <div> {{ name }}</div>
           <template #content>
             <a-doption>

src/views/authority/users/index.vue

@@ -168,7 +168,7 @@
             <a-form-item field="psw" label="密码">
               <a-input v-model="editform.psw" />
             </a-form-item>
-          </a-coladmin
+          </a-col>
           <a-col :span="10">
             <a-form-item
               required
@@ -177,6 +177,7 @@
               :rules="[{ required: true, message: '角色必选' }]"
             >
               <a-select
+                multiple
                 v-model="editform.role"
                 :options="roles"
                 :field-names="fieldNames"
@@ -354,7 +355,7 @@
     loginName: '',
     userName: '',
     psw: '',
-    role: '',
+    role: [],
   });
 
   let size = ref<SizeProps>('medium');
@@ -540,6 +541,7 @@
     if (t == 2) {
       visible.value = true;
       formRef.value?.resetFields();
+      editform.value.role=[];
       save.value = '编辑';
       editform.value.userId = record.userId;
       editform.value.userName = record.userName;
@@ -547,7 +549,10 @@
       editform.value.email = record.email;
       editform.value.phoneNumber = record.phoneNumber;
       if (record.roles?.length > 0) {
-        editform.value.role = record.roles[0].roleId;
+        //遍历record.roles
+        record.roles.forEach((val) => {
+          editform.value.role.push(val.roleId);
+        })
       }
     }
     //删除