用户编辑角色限制去除

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

@@ -1,58 +1,25 @@
 <template>
-  <el-dialog
+  <el-dialog v-if="visible" :visible.sync="visible" v-dialogDrag width="540px" :close-on-click-modal="false"
-    v-if="visible"
+    :close-on-press-escape="false" append-to-body :title="$t('system:userlist:roleList:title')" :before-close="cancel">
-    :visible.sync="visible"
+    <el-button size="mini" type="primary" @click.stop="openAdd" style="float: right">
-    v-dialogDrag
-    width="540px"
-    :close-on-click-modal="false"
-    :close-on-press-escape="false"
-    append-to-body
-    :title="$t('system:userlist:roleList:title')"
-    :before-close="cancel"
-  >
-    <el-button
-      size="mini"
-      type="primary"
-      @click.stop="openAdd"
-      style="float: right"
-    >
       {{ $t('common:button:new') }}
     </el-button>
-    <el-table
+    <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading">
-      :data="list"
-      style="width: 100%"
-      max-height="300px"
-      v-loading="loading"
-    >
       <el-table-column type="index" width="40" />
-      <el-table-column
+      <el-table-column prop="UserTypeShortName" :label="$t('system:userlist:roleList:table:UserTypeShortName')" />
-        prop="UserTypeShortName"
+      <el-table-column prop="IsUserRoleDisabled" :label="$t('system:userlist:roleList:table:IsUserRoleDisabled')">
-        :label="$t('system:userlist:roleList:table:UserTypeShortName')"
-      />
-      <el-table-column
-        prop="IsUserRoleDisabled"
-        :label="$t('system:userlist:roleList:table:IsUserRoleDisabled')"
-      >
         <template slot-scope="scope">
           <span> {{ $fd('IsEnable', !scope.row.IsUserRoleDisabled) }}</span>
         </template>
       </el-table-column>
       <el-table-column :label="$t('common:action:action')" min-width="120px">
         <template slot-scope="scope">
-          <el-button
+          <el-button size="mini" type="text" :disabled="scope.row.IsUserRoleDisabled"
-            size="mini"
+            @click.stop="scope.row.IsUserRoleDisabled = true">
-            type="text"
-            :disabled="scope.row.IsUserRoleDisabled"
-            @click.stop="scope.row.IsUserRoleDisabled = true"
-          >
             {{ $fd('IsEnable', false) }}
           </el-button>
-          <el-button
+          <el-button size="mini" type="text" :disabled="!scope.row.IsUserRoleDisabled"
-            size="mini"
+            @click.stop="scope.row.IsUserRoleDisabled = false">
-            type="text"
-            :disabled="!scope.row.IsUserRoleDisabled"
-            @click.stop="scope.row.IsUserRoleDisabled = false"
-          >
             {{ $fd('IsEnable', true) }}
           </el-button>
         </template>
@@ -68,31 +35,13 @@
         {{ $t('common:button:cancel') }}
       </el-button>
     </div>
-    <el-dialog
+    <el-dialog v-if="addVisible" :visible.sync="addVisible" v-dialogDrag :close-on-click-modal="false"
-      v-if="addVisible"
+      :close-on-press-escape="false" append-to-body width="540px" :title="$t('system:userlist:roleList:addTitle')">
-      :visible.sync="addVisible"
-      v-dialogDrag
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      append-to-body
-      width="540px"
-      :title="$t('system:userlist:roleList:addTitle')"
-    >
       <el-form ref="addForm" :model="form" :rules="rule" label-width="80px">
         <el-form-item :label="$t('system:userlist:table:UserType')">
-          <el-select
+          <el-select v-model="form.roles" size="small" placeholder="" multiple style="width: 100%">
-            v-model="form.roles"
-            size="small"
-            placeholder=""
-            multiple
-            style="width: 100%"
-          >
             <template v-for="item of roleList">
-              <el-option
+              <el-option :key="item.Id" :label="item.UserType" :value="item.Id" />
-                :key="item.Id"
-                :label="item.UserType"
-                :value="item.Id"
-              />
             </template>
           </el-select>
         </el-form-item>
@@ -156,7 +105,7 @@ export default {
       let arr = this.list.map((item) => item.UserTypeId)
       return this.userTypeOptions.filter(
         (item) =>
-          !arr.includes(item.Id) && ![4, 6, 20].includes(item.UserTypeEnum)
+          !arr.includes(item.Id)
       )
     },
   },