From 15ac1d9d8b08e17f6e282e8d493923f636004491 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sun, 19 Mar 2023 13:04:59 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=87=E7=94=A8ep=E9=87=8D=E5=86=99dept?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/types/auto-components.d.ts | 14 --
src/views/system/dept/dept.data.ts | 84 --------
src/views/system/dept/form.vue | 195 ++++++++++++++++++
src/views/system/dept/index.vue | 308 +++++++++++++++--------------
4 files changed, 352 insertions(+), 249 deletions(-)
delete mode 100644 src/views/system/dept/dept.data.ts
create mode 100644 src/views/system/dept/form.vue
diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts
index be71517c..8452fba6 100644
--- a/src/types/auto-components.d.ts
+++ b/src/types/auto-components.d.ts
@@ -23,8 +23,6 @@ declare module '@vue/runtime-core' {
DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default']
Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
- ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
- ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElButton: typeof import('element-plus/es')['ElButton']
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
@@ -35,7 +33,6 @@ declare module '@vue/runtime-core' {
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
- ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
@@ -54,7 +51,6 @@ declare module '@vue/runtime-core' {
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
- ElImage: typeof import('element-plus/es')['ElImage']
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@@ -62,26 +58,16 @@ declare module '@vue/runtime-core' {
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
- ElRadio: typeof import('element-plus/es')['ElRadio']
- ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
- ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
- ElSpace: typeof import('element-plus/es')['ElSpace']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
- ElTableV2: typeof import('element-plus/es')['ElTableV2']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
- ElTag: typeof import('element-plus/es')['ElTag']
- ElTimeline: typeof import('element-plus/es')['ElTimeline']
- ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
- ElTransfer: typeof import('element-plus/es')['ElTransfer']
- ElTree: typeof import('element-plus/es')['ElTree']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
ElUpload: typeof import('element-plus/es')['ElUpload']
Error: typeof import('./../components/Error/src/Error.vue')['default']
diff --git a/src/views/system/dept/dept.data.ts b/src/views/system/dept/dept.data.ts
deleted file mode 100644
index c6945841..00000000
--- a/src/views/system/dept/dept.data.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import type { VxeCrudSchema } from '@/hooks/web/useVxeCrudSchemas'
-
-const { t } = useI18n() // 国际化
-
-// 表单校验
-export const rules = reactive({
- name: [required],
- sort: [required],
- // email: [required],
- email: [
- { required: true, message: t('profile.rules.mail'), trigger: 'blur' },
- {
- type: 'email',
- message: t('profile.rules.truemail'),
- trigger: ['blur', 'change']
- }
- ],
- phone: [
- {
- len: 11,
- trigger: 'blur',
- message: '请输入正确的手机号码'
- }
- ]
-})
-
-// CrudSchema
-const crudSchemas = reactive<VxeCrudSchema>({
- primaryKey: 'id',
- primaryType: null,
- action: true,
- columns: [
- {
- title: '上级部门',
- field: 'parentId',
- isTable: false
- },
- {
- title: '部门名称',
- field: 'name',
- isSearch: true,
- table: {
- treeNode: true,
- align: 'left'
- }
- },
- {
- title: '负责人',
- field: 'leaderUserId',
- table: {
- slots: {
- default: 'leaderUserId_default'
- }
- }
- },
- {
- title: '联系电话',
- field: 'phone'
- },
- {
- title: '邮箱',
- field: 'email',
- isTable: false
- },
- {
- title: '显示排序',
- field: 'sort'
- },
- {
- title: t('common.status'),
- field: 'status',
- dictType: DICT_TYPE.COMMON_STATUS,
- dictClass: 'number',
- isSearch: true
- },
- {
- title: t('common.createTime'),
- field: 'createTime',
- formatter: 'formatDate',
- isForm: false
- }
- ]
-})
-export const { allSchemas } = useVxeCrudSchemas(crudSchemas)
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
new file mode 100644
index 00000000..fbbcab59
--- /dev/null
+++ b/src/views/system/dept/form.vue
@@ -0,0 +1,195 @@
+<template>
+ <Dialog :title="modelTitle" v-model="modelVisible" width="800">
+ <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
+ <el-row>
+ <el-col :span="24" v-if="formData.parentId !== 0">
+ <el-form-item label="上级部门" prop="parentId">
+ <el-tree-select
+ v-model="formData.parentId"
+ :data="deptOptions"
+ :props="{ value: 'id', label: 'name', children: 'children' }"
+ value-key="deptId"
+ placeholder="选择上级部门"
+ check-strictly
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="部门名称" prop="name">
+ <el-input v-model="formData.name" placeholder="请输入部门名称" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="显示排序" prop="sort">
+ <el-input-number v-model="formData.sort" controls-position="right" :min="0" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="负责人" prop="leaderUserId">
+ <el-select
+ v-model="formData.leaderUserId"
+ placeholder="请输入负责人"
+ clearable
+ style="width: 100%"
+ >
+ <el-option
+ v-for="item in props.userOption"
+ :key="item.id"
+ :label="item.nickname"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="联系电话" prop="phone">
+ <el-input v-model="formData.phone" placeholder="请输入联系电话" maxlength="11" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="邮箱" prop="email">
+ <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="状态" prop="status">
+ <el-select v-model="formData.status" placeholder="请选择状态" clearable>
+ <el-option
+ v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="parseInt(dict.value)"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">确 定</el-button>
+ <el-button @click="modelVisible = false">取 消</el-button>
+ </div>
+ </template>
+ </Dialog>
+</template>
+
+<script setup lang="ts">
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import * as DeptApi from '@/api/system/dept'
+import { UserVO } from '@/api/system/user'
+import { handleTree } from '@/utils/tree'
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const modelVisible = ref(false) // 弹窗的是否展示
+const modelTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formRef = ref() // 表单 Ref
+const deptOptions = ref() // 树形结构
+
+const formData = ref({
+ id: undefined,
+ title: '',
+ parentId: undefined,
+ name: undefined,
+ sort: undefined,
+ leaderUserId: undefined,
+ phone: undefined,
+ email: undefined,
+ status: undefined
+})
+const props = defineProps({
+ userOption: {
+ type: Array,
+ default: () => [] as UserVO[]
+ }
+})
+
+const formRules = reactive({
+ parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
+ name: [{ required: true, message: '部门名称不能为空', trigger: 'blur' }],
+ order: [{ required: true, message: '显示排序不能为空', trigger: 'blur' }],
+ email: [{ type: 'email', message: '请输入正确的邮箱地址', trigger: ['blur', 'change'] }],
+ phone: [
+ { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: '请输入正确的手机号码', trigger: 'blur' }
+ ]
+})
+
+/** 打开弹窗 */
+const openModal = async (type: string, id?: number) => {
+ modelVisible.value = true
+ modelTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+ console.log(id)
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await DeptApi.getDeptApi(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+
+defineExpose({ openModal }) // 提供 openModal 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ if (!formRef) return
+ const valid = await formRef.value.validate()
+ if (!valid) return
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as DeptApi.DeptVO
+ if (formType.value === 'create') {
+ await DeptApi.createDeptApi(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await DeptApi.updateDeptApi(data)
+ message.success(t('common.updateSuccess'))
+ }
+ modelVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ title: '',
+ parentId: undefined,
+ name: undefined,
+ sort: undefined,
+ leaderUserId: undefined,
+ phone: undefined,
+ email: undefined,
+ status: undefined
+ }
+ formRef.value?.resetFields()
+}
+
+// 获取下拉框[上级]的数据
+const getTree = async () => {
+ deptOptions.value = []
+ const res = await DeptApi.listSimpleDeptApi()
+ let dept: Tree = { id: 0, name: '顶级部门', children: [] }
+ dept.children = handleTree(res)
+ deptOptions.value.push(dept)
+}
+
+// ========== 初始化 ==========
+onMounted(async () => {
+ await getTree()
+})
+</script>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 3b182e2a..bfd12256 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,174 +1,180 @@
<template>
<ContentWrap>
- <!-- 列表 -->
- <XTable ref="xGrid" @register="registerTable" show-overflow>
- <template #toolbar_buttons>
- <!-- 操作：新增 -->
- <XButton
- type="primary"
- preIcon="ep:zoom-in"
- :title="t('action.add')"
- v-hasPermi="['system:dept:create']"
- @click="handleCreate()"
- />
- <XButton title="展开所有" @click="xGrid?.Ref.setAllTreeExpand(true)" />
- <XButton title="关闭所有" @click="xGrid?.Ref.clearTreeExpand()" />
- </template>
- <template #leaderUserId_default="{ row }">
- <span>{{ userNicknameFormat(row) }}</span>
- </template>
- <template #actionbtns_default="{ row }">
- <!-- 操作：修改 -->
- <XTextButton
- preIcon="ep:edit"
- :title="t('action.edit')"
- v-hasPermi="['system:dept:update']"
- @click="handleUpdate(row.id)"
- />
- <!-- 操作：删除 -->
- <XTextButton
- preIcon="ep:delete"
- :title="t('action.del')"
- v-hasPermi="['system:dept:delete']"
- @click="deleteData(row.id)"
- />
- </template>
- </XTable>
- </ContentWrap>
- <!-- 添加或修改菜单对话框 -->
- <XModal id="deptModel" v-model="dialogVisible" :title="dialogTitle">
- <!-- 对话框(添加 / 修改) -->
- <Form ref="formRef" :schema="allSchemas.formSchema" :rules="rules">
- <template #parentId="form">
- <el-tree-select
- node-key="id"
- v-model="form['parentId']"
- :props="defaultProps"
- :data="deptOptions"
- :default-expanded-keys="[100]"
- check-strictly
- />
- </template>
- <template #leaderUserId="form">
- <el-select v-model="form['leaderUserId']">
+ <!-- 搜索工作栏 -->
+ <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+ <el-form-item label="部门名称" prop="title">
+ <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable />
+ </el-form-item>
+ <el-form-item label="部门状态" prop="status">
+ <el-select v-model="queryParams.status" placeholder="请选择" clearable>
<el-option
- v-for="item in userOption"
- :key="item.id"
- :label="item.nickname"
- :value="item.id"
+ v-for="dict in getDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="parseInt(dict.value)"
+ :label="dict.label"
+ :value="parseInt(dict.value)"
/>
</el-select>
- </template>
- </Form>
- <template #footer>
- <!-- 按钮：保存 -->
- <XButton
- v-if="['create', 'update'].includes(actionType)"
- type="primary"
- :loading="actionLoading"
- @click="submitForm()"
- :title="t('action.save')"
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+ <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+ </el-form-item>
+ </el-form>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button
+ type="primary"
+ plain
+ @click="openModal('create')"
+ v-hasPermi="['system:dept:create']"
+ ><Icon icon="ep:plus" class="mr-5px" /> 新增</el-button
+ >
+ </el-col>
+ <el-col :span="1.5">
+ <el-button type="danger" plain @click="toggleExpandAll"
+ ><Icon icon="ep:sort" class="mr-5px" /> 展开/折叠</el-button
+ >
+ </el-col>
+ </el-row>
+ <!-- 列表 -->
+ <el-table
+ v-if="refreshTable"
+ v-loading="loading"
+ :data="deptDatas"
+ row-key="id"
+ :default-expand-all="isExpandAll"
+ :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+ >
+ <el-table-column prop="name" label="部门名称" width="260" />
+ <el-table-column prop="leader" label="负责人" :formatter="userNicknameFormat" width="120" />
+ <el-table-column prop="sort" label="排序" width="200" />
+ <el-table-column prop="status" label="状态" width="100">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ width="180"
+ :formatter="dateFormatter"
/>
- <!-- 按钮：关闭 -->
- <XButton :loading="actionLoading" @click="dialogVisible = false" :title="t('dialog.close')" />
- </template>
- </XModal>
+ <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ icon="el-icon-edit"
+ @click="openModal('update', scope.row.id)"
+ v-hasPermi="['system:dept:update']"
+ >修改</el-button
+ >
+ <el-button
+ v-if="scope.row.parentId !== 0"
+ link
+ type="danger"
+ icon="el-icon-delete"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['system:dept:delete']"
+ >删除</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ </ContentWrap>
+
+ <!-- 添加或修改部门对话框 -->
+ <dept-form ref="modalRef" @success="getList" :userOption="userOption" />
</template>
<script setup lang="ts" name="Dept">
-import { handleTree, defaultProps } from '@/utils/tree'
-import type { FormExpose } from '@/components/Form'
-import { allSchemas, rules } from './dept.data'
+import { handleTree } from '@/utils/tree'
import * as DeptApi from '@/api/system/dept'
import { getListSimpleUsersApi, UserVO } from '@/api/system/user'
-
-const { t } = useI18n() // 国际化
+import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import DeptForm from './form.vue'
+import { dateFormatter } from '@/utils/formatTime'
const message = useMessage() // 消息弹窗
-// 列表相关的变量
-const xGrid = ref<any>() // 列表 Grid Ref
-const treeConfig = {
- transform: true,
- rowField: 'id',
- parentField: 'parentId',
- expandAll: true
-}
+const { t } = useI18n() // 国际化
+// 搜索变量
+const queryParams = reactive({
+ title: '',
+ name: undefined,
+ status: undefined,
+ pageNo: 1,
+ pageSize: 100
+})
-// 弹窗相关的变量
-const dialogVisible = ref(false) // 是否显示弹出层
-const dialogTitle = ref('edit') // 弹出层标题
-const actionType = ref('') // 操作按钮的类型
-const actionLoading = ref(false) // 遮罩层
-const formRef = ref<FormExpose>() // 表单 Ref
-const deptOptions = ref() // 树形结构
+// 搜索的表单
+const queryFormRef = ref()
+// 数据变量
+const deptDatas = ref()
const userOption = ref<UserVO[]>([])
-
+// 是否展开，默认全部展开
+const isExpandAll = ref(true)
+// 重新渲染表格状态
+const refreshTable = ref(true)
+// 列表的加载中
+const loading = ref(true)
+//获取用户列表
const getUserList = async () => {
const res = await getListSimpleUsersApi()
userOption.value = res
}
-// 获取下拉框[上级]的数据
-const getTree = async () => {
- deptOptions.value = []
- const res = await DeptApi.listSimpleDeptApi()
- let dept: Tree = { id: 0, name: '顶级部门', children: [] }
- dept.children = handleTree(res)
- deptOptions.value.push(dept)
-}
-const [registerTable, { reload, deleteData }] = useXTable({
- allSchemas: allSchemas,
- treeConfig: treeConfig,
- getListApi: DeptApi.getDeptPageApi,
- deleteApi: DeptApi.deleteDeptApi
-})
-// ========== 新增/修改 ==========
-// 设置标题
-const setDialogTile = (type: string) => {
- dialogTitle.value = t('action.' + type)
- actionType.value = type
- dialogVisible.value = true
-}
-
-// 新增操作
-const handleCreate = async () => {
- setDialogTile('create')
-}
-
-// 修改操作
-const handleUpdate = async (rowId: number) => {
- setDialogTile('update')
- // 设置数据
- const res = await DeptApi.getDeptApi(rowId)
- await nextTick()
- unref(formRef)?.setValues(res)
-}
-
-// 提交新增/修改的表单
-const submitForm = async () => {
- const elForm = unref(formRef)?.getElFormRef()
- if (!elForm) return
- elForm.validate(async (valid) => {
- if (valid) {
- actionLoading.value = true
- // 提交请求
- try {
- const data = unref(formRef)?.formModel as DeptApi.DeptVO
- if (actionType.value === 'create') {
- await DeptApi.createDeptApi(data)
- message.success(t('common.createSuccess'))
- } else if (actionType.value === 'update') {
- await DeptApi.updateDeptApi(data)
- message.success(t('common.updateSuccess'))
- }
- dialogVisible.value = false
- } finally {
- actionLoading.value = false
- await getTree()
- await reload()
- }
- }
+/** 展开/折叠操作 */
+const toggleExpandAll = () => {
+ refreshTable.value = false
+ isExpandAll.value = !isExpandAll.value
+ console.log(isExpandAll.value)
+ nextTick(() => {
+ refreshTable.value = true
})
}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ getList()
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await DeptApi.deleteDeptApi(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
+/** 查询部门列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const res = await DeptApi.getDeptPageApi(queryParams)
+ deptDatas.value = handleTree(res)
+ } finally {
+ loading.value = false
+ }
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryParams.pageNo = 1
+ queryParams.name = undefined
+ queryParams.status = undefined
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
+
+/** 添加/修改操作 */
+const modalRef = ref()
+const openModal = (type: string, id?: number) => {
+ modalRef.value.openModal(type, id)
+}
+
const userNicknameFormat = (row) => {
if (!row || !row.leaderUserId) {
return '未设置'
@@ -184,6 +190,6 @@ const userNicknameFormat = (row) => {
// ========== 初始化 ==========
onMounted(async () => {
await getUserList()
- await getTree()
+ await getList()
})
</script>
From 1846ba150ebbb98fa8e6db3b0439a5dcb7a93f20 Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sun, 19 Mar 2023 21:44:13 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=8D=E6=96=B0dept=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/system/dept/form.vue | 13 ++++---------
src/views/system/dept/index.vue | 21 +++++++++------------
2 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/views/system/dept/form.vue b/src/views/system/dept/form.vue
index fbbcab59..8d9405f3 100644
--- a/src/views/system/dept/form.vue
+++ b/src/views/system/dept/form.vue
@@ -33,7 +33,7 @@
style="width: 100%"
>
<el-option
- v-for="item in props.userOption"
+ v-for="item in userList"
:key="item.id"
:label="item.nickname"
:value="item.id"
@@ -88,6 +88,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formRef = ref() // 表单 Ref
const deptOptions = ref() // 树形结构
+const userList = ref() // 负责人列表选项结构
const formData = ref({
id: undefined,
@@ -100,12 +101,6 @@ const formData = ref({
email: undefined,
status: undefined
})
-const props = defineProps({
- userOption: {
- type: Array,
- default: () => [] as UserVO[]
- }
-})
const formRules = reactive({
parentId: [{ required: true, message: '上级部门不能为空', trigger: 'blur' }],
@@ -118,12 +113,12 @@ const formRules = reactive({
})
/** 打开弹窗 */
-const openModal = async (type: string, id?: number) => {
+const openModal = async (type: string, id?: number, userOption?: UserVO[]) => {
+ userList.value = userOption
modelVisible.value = true
modelTitle.value = t('action.' + type)
formType.value = type
resetForm()
- console.log(id)
// 修改时，设置数据
if (id) {
formLoading.value = true
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index bfd12256..d5f54d19 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -85,7 +85,7 @@
</ContentWrap>
<!-- 添加或修改部门对话框 -->
- <dept-form ref="modalRef" @success="getList" :userOption="userOption" />
+ <dept-form ref="modalRef" @success="getList" />
</template>
<script setup lang="ts" name="Dept">
import { handleTree } from '@/utils/tree'
@@ -105,17 +105,14 @@ const queryParams = reactive({
pageSize: 100
})
-// 搜索的表单
-const queryFormRef = ref()
-// 数据变量
-const deptDatas = ref()
+const queryFormRef = ref() // 搜索的表单
+const deptDatas = ref() // 数据变量
const userOption = ref<UserVO[]>([])
-// 是否展开，默认全部展开
-const isExpandAll = ref(true)
-// 重新渲染表格状态
-const refreshTable = ref(true)
-// 列表的加载中
-const loading = ref(true)
+
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const loading = ref(true) // 列表的加载中
+
//获取用户列表
const getUserList = async () => {
const res = await getListSimpleUsersApi()
@@ -172,7 +169,7 @@ const resetQuery = () => {
/** 添加/修改操作 */
const modalRef = ref()
const openModal = (type: string, id?: number) => {
- modalRef.value.openModal(type, id)
+ modalRef.value.openModal(type, id, userOption.value)
}
const userNicknameFormat = (row) => {
From d034e9b2b51851e5f0497646ef4f7d5ee77d00ba Mon Sep 17 00:00:00 2001
From: admin <>
Date: Sun, 19 Mar 2023 21:56:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=8D=E5=86=99dept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 2 +-
src/types/auto-components.d.ts | 14 ++++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.gitignore b/.gitignore
index 0b05e6a6..ba12c396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ dist-ssr
*.local
/dist*
*-lock.*
-pnpm-debug
+pnpm-debug
\ No newline at end of file
diff --git a/src/types/auto-components.d.ts b/src/types/auto-components.d.ts
index 8452fba6..be71517c 100644
--- a/src/types/auto-components.d.ts
+++ b/src/types/auto-components.d.ts
@@ -23,6 +23,8 @@ declare module '@vue/runtime-core' {
DictTag: typeof import('./../components/DictTag/src/DictTag.vue')['default']
Echart: typeof import('./../components/Echart/src/Echart.vue')['default']
Editor: typeof import('./../components/Editor/src/Editor.vue')['default']
+ ElAutoResizer: typeof import('element-plus/es')['ElAutoResizer']
+ ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBadge: typeof import('element-plus/es')['ElBadge']
ElButton: typeof import('element-plus/es')['ElButton']
ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
@@ -33,6 +35,7 @@ declare module '@vue/runtime-core' {
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElCollapseTransition: typeof import('element-plus/es')['ElCollapseTransition']
ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+ ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
ElDialog: typeof import('element-plus/es')['ElDialog']
@@ -51,6 +54,7 @@ declare module '@vue/runtime-core' {
ElForm: typeof import('element-plus/es')['ElForm']
ElFormItem: typeof import('element-plus/es')['ElFormItem']
ElIcon: typeof import('element-plus/es')['ElIcon']
+ ElImage: typeof import('element-plus/es')['ElImage']
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
@@ -58,16 +62,26 @@ declare module '@vue/runtime-core' {
ElOption: typeof import('element-plus/es')['ElOption']
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopover: typeof import('element-plus/es')['ElPopover']
+ ElRadio: typeof import('element-plus/es')['ElRadio']
+ ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+ ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
+ ElSpace: typeof import('element-plus/es')['ElSpace']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+ ElTableV2: typeof import('element-plus/es')['ElTableV2']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
+ ElTag: typeof import('element-plus/es')['ElTag']
+ ElTimeline: typeof import('element-plus/es')['ElTimeline']
+ ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
+ ElTransfer: typeof import('element-plus/es')['ElTransfer']
+ ElTree: typeof import('element-plus/es')['ElTree']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
ElUpload: typeof import('element-plus/es')['ElUpload']
Error: typeof import('./../components/Error/src/Error.vue')['default']