src/api/admin.js

@@ -325,12 +325,3 @@ export function useUserIDGetDoctorID(data) {
     data
   })
 }
-
-// 管理端修改用户角色
-export function updateUserRoleInfo(data) {
-  return request({
-    url: `/User/updateUserRoleInfo`,
-    method: 'put',
-    data
-  })
-}

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

@@ -85,32 +85,11 @@
             style="width: 100%"
             :disabled="user.CanEditUserType === false || type === 1"
             @change="handleChange"
-            v-if="type === 0"
           >
-            <template v-for="userType of userTypeOptions">
+            <template v-for="(userType, key) of userTypeOptions">
               <el-option
                 v-if="userType.UserTypeEnum !== 20"
-                :key="userType.Id"
+                :key="key"
-                :label="userType.UserType"
-                :value="userType.Id"
-              />
-            </template>
-          </el-select>
-          <el-select
-            ref="userType"
-            v-model="Roles"
-            size="small"
-            placeholder="Please select"
-            multiple
-            style="width: 100%"
-            :disabled="user.CanEditUserType === false || type === 1"
-            @change="handleChange"
-            v-else
-          >
-            <template v-for="userType of userTypeOptions">
-              <el-option
-                v-if="userType.UserTypeEnum !== 20"
-                :key="userType.Id"
                 :label="userType.UserType"
                 :value="userType.Id"
               />
@@ -183,10 +162,9 @@
     <roleList
       v-if="visible"
       :visible.sync="visible"
-      :userId="userId"
+      :list="user.UserRoleList"
-      :list="userRoleList"
+      :roles.sync="user.Roles"
       :userTypeOptions="userTypeOptions"
-      @getRoleList="getRoleList"
     />
   </el-form>
 </template>
@@ -215,10 +193,6 @@ export default {
   },
   methods: {
     openRoleList() {
-      this.userRoleList = []
-      this.user.UserRoleList.forEach((item) => {
-        this.userRoleList.push(Object.assign({}, item))
-      })
       this.visible = true
     },
     handleChange(val) {
@@ -300,33 +274,10 @@ export default {
         IdentityUserId: this.userId,
       }).then((res) => {
         this.user = res.Result
-        this.Roles = []
         this.user.Roles = []
         this.user.UserRoleList = []
         res.Result.AccountList.forEach((item) => {
           if (!item.IsUserRoleDisabled) {
-            this.Roles.push(item.UserTypeId)
-            this.user.Roles.push(item.UserTypeId)
-          }
-          this.user.UserRoleList.push({
-            UserTypeEnum: item.UserTypeEnum,
-            UserTypeId: item.UserTypeId,
-            IsUserRoleDisabled: item.IsUserRoleDisabled,
-            UserTypeShortName: item.UserTypeShortName,
-          })
-        })
-      })
-    },
-    getRoleList() {
-      getUser({
-        IdentityUserId: this.userId,
-      }).then((res) => {
-        this.Roles = []
-        this.user.Roles = []
-        this.user.UserRoleList = []
-        res.Result.AccountList.forEach((item) => {
-          if (!item.IsUserRoleDisabled) {
-            this.Roles.push(item.UserTypeId)
             this.user.Roles.push(item.UserTypeId)
           }
           this.user.UserRoleList.push({
@@ -364,8 +315,6 @@ export default {
       }
     }
     return {
-      userRoleList: [],
-      Roles: [],
       user: {
         Roles: [],
         UserRoleList: [],

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

@@ -7,6 +7,7 @@
     :close-on-click-modal="false"
     :close-on-press-escape="false"
     append-to-body
+    :show-close="false"
     :title="$t('system:userlist:roleList:title')"
     :before-close="cancel"
   >
@@ -18,12 +19,7 @@
     >
       {{ $t('common:button:new') }}
     </el-button>
-    <el-table
+    <el-table :data="list" style="width: 100%" max-height="300px">
-      :data="list"
-      style="width: 100%"
-      max-height="300px"
-      v-loading="loading"
-    >
       <el-table-column type="index" width="40" />
       <el-table-column
         prop="UserTypeShortName"
@@ -60,13 +56,9 @@
     </el-table>
     <div slot="footer">
       <!-- 保存 -->
-      <el-button type="primary" :loading="loading" size="small" @click="save">
+      <el-button type="primary" size="small" @click="save">
         {{ $t('common:button:confirm') }}
       </el-button>
-      <!-- 取消 -->
-      <el-button size="small" @click="cancel">
-        {{ $t('common:button:cancel') }}
-      </el-button>
     </div>
     <el-dialog
       v-if="addVisible"
@@ -111,11 +103,9 @@
   </el-dialog>
 </template>
 <script>
-import { updateUserRoleInfo } from '@/api/admin.js'
 export default {
   name: 'roleList',
   props: {
-    userId: { type: String, default: '' },
     visible: {
       type: Boolean,
       default: false,
@@ -126,6 +116,12 @@ export default {
         return []
       },
     },
+    roles: {
+      type: Array,
+      default: () => {
+        return []
+      },
+    },
     userTypeOptions: {
       type: Array,
       default: () => {
@@ -136,7 +132,6 @@ export default {
   data() {
     return {
       addVisible: false,
-      loading: false,
       form: {
         roles: [],
       },
@@ -166,24 +161,15 @@ export default {
     openAdd() {
       this.addVisible = true
     },
-    async save() {
+    save() {
-      try {
+      let roles = []
-        let data = {
+      this.list.forEach((item) => {
-          Id: this.userId,
+        if (!item.IsUserRoleDisabled) {
-          UserRoleList: this.list,
+          roles.push(item.UserTypeId)
         }
-        this.loading = true
+      })
-        let res = await updateUserRoleInfo(data)
+      this.$emit('update:roles', roles)
-        this.loading = false
+      this.$emit('update:visible', false)
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:updatedSuccessfully'))
-          this.$emit('update:visible', false)
-          this.$emit('getRoleList')
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
     },
     async saveAdd() {
       try {