0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new feature

Browse Source
This commit is contained in:
JaguarJack
2022-12-14 19:25:52 +08:00
parent b63cd5d01c
commit 098463f4e1
35 changed files with 391 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/User/views/user/create.vue
View File

@@ -33,6 +33,21 @@
<el-form-item label="密码" prop="password" :rules="passwordRules">
<el-input v-model="formData.password" type="password" show-password placeholder="请输入密码" />
</el-form-item>
<el-form-item label="角色" prop="roles" v-if="hasRoles" :rules="[{ required: true, message: '请选择角色' }]">
<el-tree-select
v-model="formData.roles"
:default-expanded-keys="formData.roles"
:data="roles"
value-key="id"
check-strictly
class="w-full"
:props="{ label: 'role_name', value: 'id' }"
clearable
multiple
show-checkbox
/>
</el-form-item>
</div>
<div class="w-1/2" v-if="hasRoles">
@@ -46,9 +61,6 @@
</el-form-item>
</div>
</div>
<el-form-item label="角色" prop="role_id" :rules="[{ required: true, message: '请选择角色' }]">
<el-tree v-model="formData.role_id" empty-text="" :data="roles" check-strictly :props="{ label: 'role_name', value: 'id' }" show-checkbox class="w-full mt-1" default-checked-keys />
</el-form-item>
<div class="flex justify-end">
<el-button type="primary" @click="submitForm(form)">{{ $t('system.confirm') }}</el-button>
</div>
@@ -59,8 +71,8 @@
import { useCreate } from '/admin/composables/curd/useCreate'
import { useShow } from '/admin/composables/curd/useShow'
import { onMounted, watch, ref } from 'vue'
import http from '../../../../resources/admin/support/http'
import { onMounted, ref } from 'vue'
import http from '/admin/support/http'
const props = defineProps({
primary: String | Number,
@@ -91,20 +103,16 @@ const { formData, form, loading, submitForm, close } = useCreate(props.api, prop
if (props.primary) {
useShow(props.api, props.primary, formData)
}
const emit = defineEmits(['close'])
close(() => emit('close'))
const departments = ref()
const jobs = ref()
const roles = ref()
onMounted(() => {
close(() => emit('close'))
if (props.hasRoles) {
http.get('permissions/roles').then(r => {
roles.value = r.data.data
})
http.get('permissions/departments').then(r => {
departments.value = r.data.data
})
@@ -112,6 +120,10 @@ onMounted(() => {
http.get('permissions/jobs').then(r => {
jobs.value = r.data.data
})
http.get('permissions/roles').then(r => {
roles.value = r.data.data
})
}
})
</script>

83
modules/User/views/user/index.vue
View File

@@ -1,52 +1,52 @@
<template>
<div class="flex flex-col sm:flex-row w-full justify-between">
<Department v-model="query.department_id" @searchDepartmentUsers="search" v-if="false"/>
<div class="w-full ml-5">
<Search :search="search" :reset="reset">
<template v-slot:body>
<el-form-item label="用户名">
<el-input v-model="query.username" clearable />
</el-form-item>
<el-form-item label="邮箱">
<el-input v-model="query.email" clearable />
</el-form-item>
<el-form-item label="状态">
<Select v-model="query.status" clearable api="status" />
</el-form-item>
</template>
</Search>
<div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
<Operate :show="open" />
<el-table :data="tableData" class="mt-3" v-loading="loading">
<el-table-column prop="username" label="用户名" width="180" />
<el-table-column prop="avatar" label="头像" width="180" />
<el-table-column prop="email" label="邮箱" />
<el-table-column prop="status" label="状态">
<template #default="scope">
<Status v-model="scope.row.status" :id="scope.row.id" :api="api" />
</template>
</el-table-column>
<el-table-column prop="created_at" label="创建时间" />
<el-table-column label="操作" width="200">
<template #default="scope">
<Update @click="open(scope.row.id)" />
<Destroy @click="destroy(api, scope.row.id)" />
</template>
</el-table-column>
</el-table>
<Department v-model="query.department_id" @searchDepartmentUsers="search" v-if="false" />
<div class="w-full ml-5">
<Search :search="search" :reset="reset">
<template v-slot:body>
<el-form-item label="用户名">
<el-input v-model="query.username" clearable />
</el-form-item>
<el-form-item label="邮箱">
<el-input v-model="query.email" clearable />
</el-form-item>
<el-form-item label="状态">
<Select v-model="query.status" clearable api="status" />
</el-form-item>
</template>
</Search>
<div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4 pb-6">
<Operate :show="open" />
<el-table :data="tableData" class="mt-3" v-loading="loading">
<el-table-column prop="username" label="用户名" width="180" />
<el-table-column prop="avatar" label="头像" width="180" />
<el-table-column prop="email" label="邮箱" />
<el-table-column prop="status" label="状态">
<template #default="scope">
<Status v-model="scope.row.status" :id="scope.row.id" :api="api" />
</template>
</el-table-column>
<el-table-column prop="created_at" label="创建时间" />
<el-table-column label="操作" width="200">
<template #default="scope">
<Update @click="open(scope.row.id)" />
<Destroy @click="destroy(api, scope.row.id)" />
</template>
</el-table-column>
</el-table>
<Paginate />
<Paginate />
</div>
<Dialog v-model="visible" :title="title" destroy-on-close>
<Create @close="close(reset)" :primary="id" :api="api" />
</Dialog>
</div>
<Dialog v-model="visible" :title="title" destroy-on-close>
<Create @close="close" :primary="id" :api="api" />
</Dialog>
</div>
</div>
</template>
<script lang="ts" setup>
import { computed, onMounted } from 'vue'
import { computed, onMounted, ref } from 'vue'
import Create from './create.vue'
import { useGetList } from '/admin/composables/curd/useGetList'
import { useDestroy } from '/admin/composables/curd/useDestroy'
@@ -61,6 +61,7 @@ const { open, close, title, visible, id } = useOpen()
const tableData = computed(() => data.value?.data)
const roles = ref<Array<Object>>()
onMounted(() => {
search()