user attach role

modules/Permissions/views/router.ts

@@ -35,4 +35,4 @@ const router: RouteRecordRaw[] = [
   },
 ]
 
-export default []
+export default router

modules/User/views/user/components/department.vue

@@ -0,0 +1,43 @@
+<template>
+  <div class="w-[28rem] min-h-[30rem] bg-white">
+    <el-tree :data="departments" :props="{ label: 'department_name', value: 'id'}" @node-click="clickDepartment" class="p-5" :expand-on-click-node="false" :highlight-current="true"/>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+import http from '/admin/support/http'
+
+const props = defineProps({
+   modelValue: {
+     type: Number,
+     default: 0
+   }
+})
+
+const departments = ref()
+
+onMounted(() => {
+  http.get('permissions/departments').then(r => {
+    departments.value = r.data.data
+  })
+})
+
+const emits = defineEmits(['update:modelValue', 'searchDepartmentUsers'])
+
+const clickDepartment = (node) => {
+  emits('update:modelValue', node.id)
+
+  emits('searchDepartmentUsers')
+}
+</script>
+
+<style scoped lang="scss">
+:deep(.el-tree .el-tree-node) {
+  @apply p-0.5
+}
+
+:deep(.el-tree .el-tree-node .el-tree-node__content) {
+  @apply h-8 rounded
+}
+</style>

modules/User/views/user/create.vue

@@ -1,35 +1,53 @@
 <template>
-  <el-form :model="formData" label-width="120px" ref="form" v-loading="loading" class="pr-4">
-    <el-form-item
-      label="昵称"
-      prop="username"
-      :rules="[
-        {
-          required: true,
-          message: '昵称必须填写',
-        },
-      ]"
-    >
-      <el-input v-model="formData.username" placeholder="请填写昵称" />
-    </el-form-item>
-    <el-form-item
-      label="邮箱"
-      prop="email"
-      :rules="[
-        {
-          required: true,
-          message: '邮箱必须填写',
-        },
-        {
-          type: 'email',
-          message: '邮箱格式不正确',
-        },
-      ]"
-    >
-      <el-input v-model="formData.email" placeholder="请填写邮箱" />
-    </el-form-item>
-    <el-form-item label="密码" prop="password" :rules="passwordRules">
-      <el-input v-model="formData.password" type="password" show-password placeholder="请输入密码" />
+  <el-form :model="formData" label-width="80px" ref="form" v-loading="loading" class="pr-4">
+    <div class="flex flex-row justify-between">
+      <div :class="hasRoles ? 'w-1/2' : 'w-full'">
+        <el-form-item
+          label="昵称"
+          prop="username"
+          :rules="[
+            {
+              required: true,
+              message: '昵称必须填写',
+            },
+          ]"
+        >
+          <el-input v-model="formData.username" placeholder="请填写昵称" />
+        </el-form-item>
+        <el-form-item
+          label="邮箱"
+          prop="email"
+          :rules="[
+            {
+              required: true,
+              message: '邮箱必须填写',
+            },
+            {
+              type: 'email',
+              message: '邮箱格式不正确',
+            },
+          ]"
+        >
+          <el-input v-model="formData.email" placeholder="请填写邮箱" />
+        </el-form-item>
+        <el-form-item label="密码" prop="password" :rules="passwordRules">
+          <el-input v-model="formData.password" type="password" show-password placeholder="请输入密码" />
+        </el-form-item>
+      </div>
+
+      <div class="w-1/2" v-if="hasRoles">
+        <el-form-item label="部门" prop="department_id">
+          <el-tree-select v-model="formData.department_id" :data="departments" check-strictly :props="{ label: 'department_name', value: 'id' }" />
+        </el-form-item>
+        <el-form-item label="岗位" prop="department_id">
+          <el-select v-model="formData.jobs" multiple>
+            <el-option v-for="item in jobs" :key="item.id" :label="item.job_name" :value="item.id" />
+          </el-select>
+        </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>
@@ -42,10 +60,15 @@ 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'
 
 const props = defineProps({
   primary: String | Number,
   api: String,
+  hasRoles: {
+    type: Boolean,
+    default: true,
+  },
 })
 
 const passwordRules = [
@@ -63,19 +86,31 @@ if (props.primary) {
   passwordRules.shift()
 }
 
-const { formData, form, loading, submitForm, isClose } = useCreate(props.api, props.primary)
+const { formData, form, loading, submitForm, close } = useCreate(props.api, props.primary)
 
+if (props.primary) {
+  useShow(props.api, props.primary, formData)
+}
 const emit = defineEmits(['close'])
-watch(isClose, function (value) {
-  if (value) {
-    emit('close')
-  }
-})
+
+const departments = ref()
+const jobs = ref()
+const roles = ref()
 
 onMounted(() => {
-  if (props.primary) {
-    useShow(props.api, props.primary).then(r => {
-      formData.value = r.data
+  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
+    })
+
+    http.get('permissions/jobs').then(r => {
+      jobs.value = r.data.data
     })
   }
 })

modules/User/views/user/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div>
+  <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="用户名">
@@ -13,8 +15,8 @@
         </el-form-item>
       </template>
     </Search>
-    <div class="pl-2 pr-2 bg-white dark:bg-regal-dark rounded-lg mt-4">
-      <Operate :show="show" />
+    <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" />
@@ -27,7 +29,7 @@
         <el-table-column prop="created_at" label="创建时间" />
         <el-table-column label="操作" width="200">
           <template #default="scope">
-            <Update @click="show(scope.row.id)" />
+            <Update @click="open(scope.row.id)" />
             <Destroy @click="destroy(api, scope.row.id)" />
           </template>
         </el-table-column>
@@ -40,36 +42,25 @@
       <Create @close="close" :primary="id" :api="api" />
     </Dialog>
   </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch } from 'vue'
+import { computed, onMounted } from 'vue'
 import Create from './create.vue'
 import { useGetList } from '/admin/composables/curd/useGetList'
 import { useDestroy } from '/admin/composables/curd/useDestroy'
-import { t } from '/admin/support/helper'
+import { useOpen } from '/admin/composables/curd/useOpen'
+import Department from './components/department.vue'
 
-const visible = ref<boolean>(false)
-const id = ref(null)
 const api = 'users'
-const title = ref<string>('')
 
 const { data, query, search, reset, loading } = useGetList(api)
 const { destroy, deleted } = useDestroy()
+const { open, close, title, visible, id } = useOpen()
 
 const tableData = computed(() => data.value?.data)
 
-const close = () => {
-  visible.value = false
-  reset()
-}
-
-const show = primary => {
-  title.value = primary ? t('system.edit') : t('system.add')
-  id.value = primary
-  visible.value = true
-}
-
 onMounted(() => {
   search()