Merge branch 'main' into uat_us

src/views/system/user/components/UserInfo.vue

@@ -46,7 +46,7 @@
         </el-radio-group>
       </el-form-item> -->
       <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
-        <el-input v-model="user.EMail" :disabled="user.UserCode" />
+        <el-input v-model="user.EMail" :disabled="!!user.UserCode" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:Phone')" prop="Phone">
         <el-input v-model="user.Phone" />

src/views/system/user/components/roleList.vue

@@ -165,6 +165,7 @@ export default {
       this.$emit('update:visible', false)
     },
     openAdd() {
+      this.form.roles = []
       this.addVisible = true
     },
     async save() {