Merge remote-tracking branch 'origin/master'

yudao-ui/yudao-ui-admin-vue3-master/src/api/erp/department/index.ts

@@ -0,0 +1,48 @@
+import request from '@/config/axios'
+import type { Dayjs } from 'dayjs';
+
+/** 部门管理信息 */
+export interface PeopleDepartment {
+          id: number; // 部门唯一标识
+          parentDepartmentId: number; // 上级部门 ID
+          departmentName?: string; // 部门名称（如"人力资源部""销售部"）
+          address: string; // 部门地址
+          phone: string; // 部门电话
+          remarks: string; // 部门备注
+          status?: number; // 开启状态
+    children?: PeopleDepartment[];
+  }
+
+// 部门管理 API
+export const PeopleDepartmentApi = {
+  // 查询部门管理列表
+  getPeopleDepartmentList: async (params) => {
+    return await request.get({ url: `/erp/people-department/list`, params })
+  },
+
+  // 查询部门管理详情
+  getPeopleDepartment: async (id: number) => {
+    return await request.get({ url: `/erp/people-department/get?id=` + id })
+  },
+
+  // 新增部门管理
+  createPeopleDepartment: async (data: PeopleDepartment) => {
+    return await request.post({ url: `/erp/people-department/create`, data })
+  },
+
+  // 修改部门管理
+  updatePeopleDepartment: async (data: PeopleDepartment) => {
+    return await request.put({ url: `/erp/people-department/update`, data })
+  },
+
+  // 删除部门管理
+  deletePeopleDepartment: async (id: number) => {
+    return await request.delete({ url: `/erp/people-department/delete?id=` + id })
+  },
+
+
+  // 导出部门管理 Excel
+  exportPeopleDepartment: async (params) => {
+    return await request.download({ url: `/erp/people-department/export-excel`, params })
+  }
+}

yudao-ui/yudao-ui-admin-vue3-master/src/views/erp/department/PeopleDepartmentForm.vue

@@ -0,0 +1,139 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="上级部门 ID" prop="parentDepartmentId">
+        <el-tree-select
+          v-model="formData.parentDepartmentId"
+          :data="peopleDepartmentTree"
+          :props="{...defaultProps, label: 'departmentName'}"
+          check-strictly
+          default-expand-all
+          placeholder="请选择上级部门 ID"
+        />
+      </el-form-item>
+      <el-form-item label="部门名称"  prop="departmentName">
+        <el-input v-model="formData.departmentName" placeholder="请输入部门名称" />
+      </el-form-item>
+      <el-form-item label="部门地址" prop="address">
+        <el-input v-model="formData.address" placeholder="请输入部门地址" />
+      </el-form-item>
+      <el-form-item label="部门电话" prop="phone">
+        <el-input v-model="formData.phone" placeholder="请输入部门电话" />
+      </el-form-item>
+      <el-form-item label="部门备注" prop="remarks">
+        <el-input v-model="formData.remarks" placeholder="请输入部门备注" />
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio value="1">请选择字典生成</el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { PeopleDepartmentApi, PeopleDepartment } from '@/api/erp/department'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+/** 部门管理 表单 */
+defineOptions({ name: 'PeopleDepartmentForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  parentDepartmentId: undefined,
+  departmentName: undefined,
+  address: undefined,
+  phone: undefined,
+  remarks: undefined,
+  status: undefined
+})
+const formRules = reactive({
+  departmentName: [{ required: true, message: '部门名称（如"人力资源部""销售部"）不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '开启状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const peopleDepartmentTree = ref() // 树形结构
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await PeopleDepartmentApi.getPeopleDepartment(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  await getPeopleDepartmentTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PeopleDepartment
+    if (formType.value === 'create') {
+      await PeopleDepartmentApi.createPeopleDepartment(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PeopleDepartmentApi.updatePeopleDepartment(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    parentDepartmentId: undefined,
+    departmentName: undefined,
+    address: undefined,
+    phone: undefined,
+    remarks: undefined,
+    status: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+/** 获得部门管理树 */
+const getPeopleDepartmentTree = async () => {
+  peopleDepartmentTree.value = []
+  const data = await PeopleDepartmentApi.getPeopleDepartmentList()
+  const root: Tree = { id: 0, name: '顶级部门管理', children: [] }
+  root.children = handleTree(data, 'id', 'parentDepartmentId')
+  peopleDepartmentTree.value.push(root)
+}
+</script>

yudao-ui/yudao-ui-admin-vue3-master/src/views/erp/department/index.vue

@@ -0,0 +1,264 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="上级部门 ID" prop="parentDepartmentId">
+        <el-input
+          v-model="queryParams.parentDepartmentId"
+          placeholder="请输入上级部门 ID"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label=部门名称 prop="departmentName">
+        <el-input
+          v-model="queryParams.departmentName"
+          placeholder="请输入部门名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="部门地址" prop="address">
+        <el-input
+          v-model="queryParams.address"
+          placeholder="请输入部门地址"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="部门电话" prop="phone">
+        <el-input
+          v-model="queryParams.phone"
+          placeholder="请输入部门电话"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="部门备注" prop="remarks">
+        <el-input
+          v-model="queryParams.remarks"
+          placeholder="请输入部门备注"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-220px"
+        />
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择开启状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </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-button
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['erp:people-department:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:people-department:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button type="danger" plain @click="toggleExpandAll">
+          <Icon icon="ep:sort" class="mr-5px" /> 展开/折叠
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      row-key="id"
+      :default-expand-all="isExpandAll"
+      v-if="refreshTable"
+    >
+      <el-table-column label="部门唯一标识" align="center" prop="id" />
+      <el-table-column label="上级部门 ID" align="center" prop="parentDepartmentId" />
+      <el-table-column label="部门名称（如"人力资源部""销售部"）" align="center" prop="departmentName" />
+      <el-table-column label="部门地址" align="center" prop="address" />
+      <el-table-column label="部门电话" align="center" prop="phone" />
+      <el-table-column label="部门备注" align="center" prop="remarks" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="开启状态" align="center" prop="status" />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['erp:people-department:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:people-department:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PeopleDepartmentForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { isEmpty } from '@/utils/is'
+import { dateFormatter } from '@/utils/formatTime'
+import { handleTree } from '@/utils/tree'
+import download from '@/utils/download'
+import { PeopleDepartmentApi, PeopleDepartment } from '@/api/erp/department'
+import PeopleDepartmentForm from './PeopleDepartmentForm.vue'
+
+/** 部门管理 列表 */
+defineOptions({ name: 'PeopleDepartment' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PeopleDepartment[]>([]) // 列表的数据
+const queryParams = reactive({
+  parentDepartmentId: undefined,
+  departmentName: undefined,
+  address: undefined,
+  phone: undefined,
+  remarks: undefined,
+  createTime: [],
+  status: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PeopleDepartmentApi.getPeopleDepartmentList(queryParams)
+    list.value = handleTree(data, 'id', 'parentDepartmentId')
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PeopleDepartmentApi.deletePeopleDepartment(id)
+    message.success(t('common.delSuccess'))
+    currentRow.value = {}
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PeopleDepartmentApi.exportPeopleDepartment(queryParams)
+    download.excel(data, '部门管理.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 展开/折叠操作 */
+const isExpandAll = ref(true) // 是否展开，默认全部展开
+const refreshTable = ref(true) // 重新渲染表格状态
+const toggleExpandAll = async () => {
+  refreshTable.value = false
+  isExpandAll.value = !isExpandAll.value
+  await nextTick()
+  refreshTable.value = true
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>