Browse Source

Merge branch 'hella_online_20240913' into master_hella

hella_online_20240919
陈薪名 2 months ago
parent
commit
2196dc0d13
  1. 11
      src/views/system/user/index.vue

11
src/views/system/user/index.vue

@ -77,11 +77,11 @@
v-hasPermi="['system:user:update-password']">
<Icon icon="ep:key" />重置密码
</el-button>
<el-button type="primary" link @click="handleRole(scope.row)"
v-hasPermi="['system:permission:assign-user-role']">
<Icon icon="ep:circle-check" />分配角色
</el-button>
<el-button type="primary" link @click="handleFree(scope.row.id)" v-hasPermi="['system:user:update-password']" v-if="useUserStore().userSelfInfo.userType=='MASTER'">
<el-button type="primary" link @click="handleRole(scope.row)"
v-hasPermi="['system:permission:assign-user-role']">
<Icon icon="ep:circle-check" />分配角色
</el-button>
<el-button type="primary" link @click="handleFree(scope.row.id)" v-hasPermi="['system:user:update-password']" v-if="userStore.getUser.userType=='MASTER'">
<Icon icon="ep:edit" />解冻
</el-button>
<el-button type="danger" link @click="handleDelete(scope.row.id)" v-hasPermi="['system:user:delete']">
@ -119,6 +119,7 @@ import UserAssignRoleForm from './UserAssignRoleForm.vue'
import DeptTree from './DeptTree.vue'
import { useUserStore } from '@/store/modules/user'
const userStore = useUserStore()
import { usePageLoading } from '@/hooks/web/usePageLoading'
const { loadStart, loadDone } = usePageLoading()
defineOptions({ name: 'SystemUser' })

Loading…
Cancel
Save