修改
This commit is contained in:
@@ -92,19 +92,22 @@ const staticMainChildren = [
|
||||
{
|
||||
path: "/apps/oa/organization",
|
||||
name: "Organization",
|
||||
component: () => import("@/views/apps/oa/organization/index.vue"),
|
||||
component: () => import("@/views/apps/organization/components/OrganizationPage.vue"),
|
||||
props: { module: "oa" },
|
||||
meta: { requiresAuth: true, title: "组织架构", modulePath: "/apps/oa" }
|
||||
},
|
||||
{
|
||||
path: "/apps/oa/employee",
|
||||
name: "Employee",
|
||||
component: () => import("@/views/apps/oa/employee/index.vue"),
|
||||
component: () => import("@/views/apps/organization/components/EmployeePage.vue"),
|
||||
props: { module: "oa" },
|
||||
meta: { requiresAuth: true, title: "人员管理", modulePath: "/apps/oa" }
|
||||
},
|
||||
{
|
||||
path: "/apps/oa/position",
|
||||
name: "Position",
|
||||
component: () => import("@/views/apps/oa/position/index.vue"),
|
||||
component: () => import("@/views/apps/organization/components/PositionPage.vue"),
|
||||
props: { module: "oa" },
|
||||
meta: { requiresAuth: true, title: "职位管理", modulePath: "/apps/oa" }
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,366 +0,0 @@
|
||||
<template>
|
||||
<div class="employee-page">
|
||||
<div class="page-header">
|
||||
<div>
|
||||
<h2>人员管理</h2>
|
||||
<p>维护企业员工信息，员工变动自动同步通讯录</p>
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<el-button :icon="Refresh" @click="loadEmployees">刷新</el-button>
|
||||
<el-button type="primary" :icon="Plus" @click="openCreateEmployee">新建员工</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="employee-toolbar">
|
||||
<el-tree-select
|
||||
v-model="filterDepartmentId"
|
||||
:data="orgOptions"
|
||||
:props="treeProps"
|
||||
placeholder="按部门筛选"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 220px"
|
||||
/>
|
||||
<el-select
|
||||
v-model="filterStatus"
|
||||
placeholder="按状态筛选"
|
||||
clearable
|
||||
style="width: 140px"
|
||||
>
|
||||
<el-option label="正常" :value="1" />
|
||||
<el-option label="禁用" :value="0" />
|
||||
<el-option label="离职" :value="2" />
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="keyword"
|
||||
placeholder="搜索姓名/账号/电话/邮箱"
|
||||
clearable
|
||||
style="width: 260px"
|
||||
:prefix-icon="Search"
|
||||
/>
|
||||
<span class="toolbar-count">共 {{ filteredList.length }} 人</span>
|
||||
</div>
|
||||
|
||||
<div class="employee-table">
|
||||
<el-table :data="pagedList" v-loading="loading" stripe>
|
||||
<el-table-column prop="name" label="姓名" width="110" />
|
||||
<el-table-column prop="account" label="账号" width="140" />
|
||||
<el-table-column label="性别" width="70">
|
||||
<template #default="{ row }">
|
||||
{{ genderText(row.gender) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="部门" min-width="160">
|
||||
<template #default="{ row }">
|
||||
{{ orgNameMap[Number(row.department)] || row.department || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="position" label="职位" width="130" />
|
||||
<el-table-column prop="phone" label="电话" width="130" />
|
||||
<el-table-column prop="email" label="邮箱" min-width="160" />
|
||||
<el-table-column label="状态" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="statusTagType(row.account_status)" size="small">
|
||||
{{ statusText(row.account_status) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="editEmployee(row)">编辑</el-button>
|
||||
<el-button link type="danger" @click="deleteEmployee(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty>
|
||||
<el-empty description="暂无员工数据" />
|
||||
</template>
|
||||
</el-table>
|
||||
|
||||
<div class="table-pagination" v-if="filteredList.length > pageSize">
|
||||
<el-pagination
|
||||
v-model:current-page="currentPage"
|
||||
:page-size="pageSize"
|
||||
:total="filteredList.length"
|
||||
layout="prev, pager, next, total"
|
||||
background
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 员工编辑对话框（复用组织架构页组件） -->
|
||||
<EmployeeEditDialog
|
||||
v-model="employeeEditVisible"
|
||||
:form-data="employeeFormData"
|
||||
:is-edit="employeeEditMode"
|
||||
@save="saveEmployee"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, reactive, ref } from "vue";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { Plus, Refresh, Search } from "@element-plus/icons-vue";
|
||||
import EmployeeEditDialog from "../organization/components/employeeEditDialog.vue";
|
||||
import {
|
||||
getOrganizationList,
|
||||
getEmployeeList,
|
||||
createEmployee,
|
||||
updateEmployee,
|
||||
deleteEmployee as apiDeleteEmployee
|
||||
} from "@/api/organization";
|
||||
|
||||
const loading = ref(false);
|
||||
const employeeList = ref([]);
|
||||
const orgOptions = ref([]);
|
||||
const orgNameMap = ref({});
|
||||
const filterDepartmentId = ref(null);
|
||||
const filterStatus = ref(null);
|
||||
const keyword = ref("");
|
||||
const currentPage = ref(1);
|
||||
const pageSize = 20;
|
||||
const employeeEditVisible = ref(false);
|
||||
const employeeEditMode = ref(false);
|
||||
|
||||
const treeProps = {
|
||||
value: 'id',
|
||||
label: 'org_name',
|
||||
children: 'children'
|
||||
};
|
||||
|
||||
const emptyEmployeeForm = () => ({
|
||||
name: '',
|
||||
account: '',
|
||||
gender: 0,
|
||||
birthday: '',
|
||||
affiliate_unit: '',
|
||||
department: '',
|
||||
position: '',
|
||||
education: '',
|
||||
nation: '',
|
||||
phone: '',
|
||||
wechat: '',
|
||||
email: '',
|
||||
home_address: '',
|
||||
account_status: 1
|
||||
});
|
||||
|
||||
const employeeFormData = reactive(emptyEmployeeForm());
|
||||
|
||||
const filteredList = computed(() => {
|
||||
let list = employeeList.value;
|
||||
if (filterDepartmentId.value) {
|
||||
list = list.filter(item => Number(item.department) === filterDepartmentId.value);
|
||||
}
|
||||
if (filterStatus.value !== null && filterStatus.value !== undefined && filterStatus.value !== '') {
|
||||
list = list.filter(item => item.account_status === filterStatus.value);
|
||||
}
|
||||
const kw = keyword.value.trim().toLowerCase();
|
||||
if (kw) {
|
||||
list = list.filter(item =>
|
||||
(item.name || '').toLowerCase().includes(kw) ||
|
||||
(item.account || '').toLowerCase().includes(kw) ||
|
||||
(item.phone || '').toLowerCase().includes(kw) ||
|
||||
(item.email || '').toLowerCase().includes(kw)
|
||||
);
|
||||
}
|
||||
return list;
|
||||
});
|
||||
|
||||
const pagedList = computed(() => {
|
||||
const start = (currentPage.value - 1) * pageSize;
|
||||
return filteredList.value.slice(start, start + pageSize);
|
||||
});
|
||||
|
||||
const genderText = (gender) => {
|
||||
switch (gender) {
|
||||
case 1: return '男';
|
||||
case 2: return '女';
|
||||
default: return '未知';
|
||||
}
|
||||
};
|
||||
|
||||
const statusText = (status) => {
|
||||
switch (status) {
|
||||
case 1: return '正常';
|
||||
case 2: return '离职';
|
||||
default: return '禁用';
|
||||
}
|
||||
};
|
||||
|
||||
const statusTagType = (status) => {
|
||||
switch (status) {
|
||||
case 1: return 'success';
|
||||
case 2: return 'info';
|
||||
default: return 'danger';
|
||||
}
|
||||
};
|
||||
|
||||
const loadEmployees = async () => {
|
||||
loading.value = true;
|
||||
try {
|
||||
const res = await getEmployeeList();
|
||||
const data = res?.data || res || [];
|
||||
employeeList.value = Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载员工列表失败');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const loadOrgOptions = async () => {
|
||||
try {
|
||||
const res = await getOrganizationList();
|
||||
const data = res?.data || res || [];
|
||||
const map = {};
|
||||
const build = (items) => {
|
||||
items.forEach(item => {
|
||||
map[item.id] = item.org_name;
|
||||
if (item.children && item.children.length) build(item.children);
|
||||
});
|
||||
};
|
||||
build(data);
|
||||
orgNameMap.value = map;
|
||||
orgOptions.value = buildOrgTree(data);
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载组织列表失败');
|
||||
}
|
||||
};
|
||||
|
||||
const buildOrgTree = (data) => {
|
||||
const tree = [];
|
||||
const map = {};
|
||||
|
||||
data.forEach(item => {
|
||||
map[item.id] = { ...item, children: [] };
|
||||
});
|
||||
|
||||
data.forEach(item => {
|
||||
const node = map[item.id];
|
||||
if (item.parent_id === 0) {
|
||||
tree.push(node);
|
||||
} else {
|
||||
const parent = map[item.parent_id];
|
||||
if (parent) {
|
||||
parent.children.push(node);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return tree;
|
||||
};
|
||||
|
||||
const openCreateEmployee = () => {
|
||||
employeeEditMode.value = false;
|
||||
Object.assign(employeeFormData, emptyEmployeeForm());
|
||||
employeeEditVisible.value = true;
|
||||
};
|
||||
|
||||
const editEmployee = (data) => {
|
||||
employeeEditMode.value = true;
|
||||
Object.assign(employeeFormData, {
|
||||
id: data.id,
|
||||
name: data.name,
|
||||
account: data.account,
|
||||
gender: data.gender,
|
||||
birthday: data.birthday,
|
||||
affiliate_unit: data.affiliate_unit,
|
||||
department: data.department,
|
||||
position: data.position,
|
||||
education: data.education,
|
||||
nation: data.nation,
|
||||
phone: data.phone,
|
||||
wechat: data.wechat,
|
||||
email: data.email,
|
||||
home_address: data.home_address,
|
||||
account_status: data.account_status
|
||||
});
|
||||
employeeEditVisible.value = true;
|
||||
};
|
||||
|
||||
const deleteEmployee = async (data) => {
|
||||
try {
|
||||
await ElMessageBox.confirm(`确认删除员工「${data.name}」吗？删除后将无法恢复。`, '删除确认', {
|
||||
type: 'warning',
|
||||
});
|
||||
await apiDeleteEmployee(data.id);
|
||||
ElMessage.success('删除成功');
|
||||
await loadEmployees();
|
||||
} catch (error) {
|
||||
if (error !== 'cancel' && error !== 'close') {
|
||||
ElMessage.error(error?.message || '删除失败');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const saveEmployee = async (payload) => {
|
||||
try {
|
||||
if (employeeEditMode.value) {
|
||||
await updateEmployee(employeeFormData.id, payload);
|
||||
ElMessage.success('更新成功');
|
||||
} else {
|
||||
await createEmployee(payload);
|
||||
ElMessage.success('创建成功');
|
||||
}
|
||||
employeeEditVisible.value = false;
|
||||
await loadEmployees();
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '保存失败');
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
loadEmployees();
|
||||
loadOrgOptions();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.employee-page {
|
||||
padding: 20px;
|
||||
|
||||
.page-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
|
||||
h2 {
|
||||
margin: 0 0 4px;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
color: #909399;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
.employee-toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
|
||||
.toolbar-count {
|
||||
margin-left: auto;
|
||||
color: #909399;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
.employee-table {
|
||||
background: #fff;
|
||||
border-radius: 6px;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.table-pagination {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
margin-top: 12px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,692 +0,0 @@
|
||||
<template>
|
||||
<div class="organization-page">
|
||||
<div class="page-header">
|
||||
<div>
|
||||
<h2>组织架构</h2>
|
||||
<p>管理企业组织架构、部门设置和人员信息</p>
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<el-button :icon="Setting" @click="openOrgSettings">组织设置</el-button>
|
||||
<el-button type="primary" :icon="Plus" @click="openCreateOrg">新建组织</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="organization-container">
|
||||
<!-- 左侧树形结构 -->
|
||||
<div class="org-tree-container">
|
||||
<div class="tree-header">
|
||||
<h3>组织架构图</h3>
|
||||
<div class="tree-actions">
|
||||
<el-button :icon="Refresh" @click="loadOrgTree" circle />
|
||||
<el-button :icon="Expand" @click="expandAll" circle />
|
||||
<el-button :icon="Fold" @click="collapseAll" circle />
|
||||
</div>
|
||||
</div>
|
||||
<div class="org-tree">
|
||||
<el-tree
|
||||
ref="orgTreeRef"
|
||||
:data="orgTreeData"
|
||||
:props="treeProps"
|
||||
node-key="id"
|
||||
default-expand-all
|
||||
highlight-current
|
||||
@node-click="handleNodeClick"
|
||||
@node-expand="handleNodeExpand"
|
||||
@node-collapse="handleNodeCollapse"
|
||||
>
|
||||
<template #default="{ data }">
|
||||
<div class="tree-node">
|
||||
<div class="node-content">
|
||||
<span
|
||||
class="node-status-dot"
|
||||
:class="data.status === 1 ? 'is-active' : 'is-inactive'"
|
||||
:title="data.status === 1 ? '启用' : '停用'"
|
||||
/>
|
||||
<span class="node-label">{{ data.org_name }}</span>
|
||||
</div>
|
||||
<div class="node-actions">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
title="编辑"
|
||||
@click.stop="editOrg(data)"
|
||||
>
|
||||
<el-icon><Edit /></el-icon>
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
title="添加子组织"
|
||||
@click.stop="addChildOrg(data)"
|
||||
>
|
||||
<el-icon><Plus /></el-icon>
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
type="danger"
|
||||
size="small"
|
||||
@click.stop="deleteOrg(data)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-tree>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 右侧详情面板 -->
|
||||
<div class="org-detail-container">
|
||||
<div class="detail-header">
|
||||
<h3>组织详情</h3>
|
||||
<div class="detail-actions">
|
||||
<el-button
|
||||
v-if="selectedOrg"
|
||||
type="primary"
|
||||
:icon="Plus"
|
||||
@click="openCreateEmployee"
|
||||
>
|
||||
添加员工
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-if="selectedOrg" class="org-detail">
|
||||
<!-- 基本信息 -->
|
||||
<div class="detail-section">
|
||||
<h4>基本信息</h4>
|
||||
<el-descriptions :column="2" border>
|
||||
<el-descriptions-item label="组织名称">{{ selectedOrg.org_name }}</el-descriptions-item>
|
||||
<el-descriptions-item label="组织编码">{{ selectedOrg.org_code }}</el-descriptions-item>
|
||||
<el-descriptions-item label="上级组织">{{ selectedOrg.parent_name || '无' }}</el-descriptions-item>
|
||||
<el-descriptions-item label="排序">{{ selectedOrg.sort }}</el-descriptions-item>
|
||||
<el-descriptions-item label="组织类型">
|
||||
<el-tag :type="selectedOrg.is_company ? 'primary' : 'success'">
|
||||
{{ selectedOrg.is_company ? '企业单位' : '部门' }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="状态">
|
||||
<el-tag :type="selectedOrg.status === 1 ? 'success' : 'danger'">
|
||||
{{ selectedOrg.status === 1 ? '启用' : '禁用' }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="负责人" v-if="selectedOrg.leader_name">
|
||||
{{ selectedOrg.leader_name }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="创建时间">
|
||||
{{ formatDate(selectedOrg.create_time) }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
</div>
|
||||
|
||||
<!-- 备注信息 -->
|
||||
<div class="detail-section">
|
||||
<h4>备注信息</h4>
|
||||
<div class="remark-content">
|
||||
{{ selectedOrg.remark || '无备注' }}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 员工列表 -->
|
||||
<div class="detail-section">
|
||||
<h4>员工列表</h4>
|
||||
<div class="employee-list">
|
||||
<el-table :data="employeeList" stripe>
|
||||
<el-table-column prop="name" label="姓名" width="120" />
|
||||
<el-table-column prop="account" label="账号" width="150" />
|
||||
<el-table-column prop="department" label="部门" width="150" />
|
||||
<el-table-column prop="position" label="职位" width="150" />
|
||||
<el-table-column prop="phone" label="电话" width="120" />
|
||||
<el-table-column prop="email" label="邮箱" />
|
||||
<el-table-column label="状态" width="80">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.account_status === 1 ? 'success' : 'danger'" size="small">
|
||||
{{ row.account_status === 1 ? '正常' : '禁用' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="editEmployee(row)">编辑</el-button>
|
||||
<el-button link type="danger" @click="deleteEmployee(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div v-else class="empty-detail">
|
||||
<el-empty description="请选择一个组织查看详情" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 组织编辑对话框 -->
|
||||
<OrgEditDialog
|
||||
v-model="orgEditVisible"
|
||||
:form-data="orgFormData"
|
||||
:is-edit="orgEditMode"
|
||||
@save="saveOrg"
|
||||
/>
|
||||
|
||||
<!-- 员工编辑对话框 -->
|
||||
<EmployeeEditDialog
|
||||
v-model="employeeEditVisible"
|
||||
:form-data="employeeFormData"
|
||||
:is-edit="employeeEditMode"
|
||||
@save="saveEmployee"
|
||||
/>
|
||||
|
||||
<!-- 组织设置对话框 -->
|
||||
<OrgSettingsDialog
|
||||
v-model="orgSettingsVisible"
|
||||
@changed="loadOrgTree"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, reactive, ref } from "vue";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import {
|
||||
Plus,
|
||||
Refresh,
|
||||
Setting,
|
||||
Expand,
|
||||
Fold,
|
||||
Edit
|
||||
} from "@element-plus/icons-vue";
|
||||
import OrgEditDialog from "./components/orgEditDialog.vue";
|
||||
import EmployeeEditDialog from "./components/employeeEditDialog.vue";
|
||||
import OrgSettingsDialog from "./components/orgSettingsDialog.vue";
|
||||
import {
|
||||
getOrganizationList,
|
||||
getOrganizationDetail,
|
||||
createOrganization,
|
||||
updateOrganization,
|
||||
deleteOrganization,
|
||||
getEmployeeList,
|
||||
createEmployee,
|
||||
updateEmployee,
|
||||
deleteEmployee as apiDeleteEmployee,
|
||||
getOrgSettings
|
||||
} from "@/api/organization";
|
||||
|
||||
const orgTreeRef = ref();
|
||||
const orgTreeData = ref([]);
|
||||
const selectedOrg = ref(null);
|
||||
const employeeList = ref([]);
|
||||
const orgEditVisible = ref(false);
|
||||
const employeeEditVisible = ref(false);
|
||||
const orgSettingsVisible = ref(false);
|
||||
const orgEditMode = ref(false);
|
||||
const employeeEditMode = ref(false);
|
||||
|
||||
const treeProps = {
|
||||
children: 'children',
|
||||
label: 'org_name'
|
||||
};
|
||||
|
||||
const emptyOrgForm = () => ({
|
||||
org_name: '',
|
||||
org_code: '',
|
||||
parent_id: 0,
|
||||
leader_id: null,
|
||||
is_company: 0,
|
||||
sort: 0,
|
||||
status: 1,
|
||||
remark: ''
|
||||
});
|
||||
|
||||
const orgFormData = reactive(emptyOrgForm());
|
||||
|
||||
const emptyEmployeeForm = () => ({
|
||||
name: '',
|
||||
account: '',
|
||||
gender: 0,
|
||||
birthday: '',
|
||||
affiliate_unit: '',
|
||||
department: '',
|
||||
position: '',
|
||||
education: '',
|
||||
nation: '',
|
||||
phone: '',
|
||||
wechat: '',
|
||||
email: '',
|
||||
home_address: '',
|
||||
account_status: 1
|
||||
});
|
||||
|
||||
const employeeFormData = reactive(emptyEmployeeForm());
|
||||
|
||||
const loadOrgTree = async () => {
|
||||
try {
|
||||
const res = await getOrganizationList();
|
||||
const data = res?.data || res || [];
|
||||
orgTreeData.value = buildTreeData(Array.isArray(data) ? data : []);
|
||||
if (orgTreeData.value.length > 0 && !selectedOrg.value) {
|
||||
selectedOrg.value = orgTreeData.value[0];
|
||||
await loadEmployeeList(selectedOrg.value.id);
|
||||
}
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载组织架构失败');
|
||||
}
|
||||
};
|
||||
|
||||
const buildTreeData = (data) => {
|
||||
const tree = [];
|
||||
const map = {};
|
||||
|
||||
// 创建映射
|
||||
data.forEach(item => {
|
||||
map[item.id] = { ...item, children: [] };
|
||||
});
|
||||
|
||||
// 构建树形结构
|
||||
data.forEach(item => {
|
||||
const node = map[item.id];
|
||||
if (item.parent_id === 0) {
|
||||
tree.push(node);
|
||||
} else {
|
||||
const parent = map[item.parent_id];
|
||||
if (parent) {
|
||||
parent.children.push(node);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return tree;
|
||||
};
|
||||
|
||||
const handleNodeClick = async (data) => {
|
||||
selectedOrg.value = data;
|
||||
await loadEmployeeList(data.id);
|
||||
};
|
||||
|
||||
const handleNodeExpand = (data) => {
|
||||
console.log('Node expanded:', data);
|
||||
};
|
||||
|
||||
const handleNodeCollapse = (data) => {
|
||||
console.log('Node collapsed:', data);
|
||||
};
|
||||
|
||||
const expandAll = () => {
|
||||
orgTreeRef.value?.expandAll();
|
||||
};
|
||||
|
||||
const collapseAll = () => {
|
||||
orgTreeRef.value?.collapseAll();
|
||||
};
|
||||
|
||||
const loadEmployeeList = async (orgId) => {
|
||||
try {
|
||||
const res = await getEmployeeList({ org_id: orgId });
|
||||
const data = res?.data || res || [];
|
||||
employeeList.value = Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载员工列表失败');
|
||||
}
|
||||
};
|
||||
|
||||
const openCreateOrg = () => {
|
||||
orgEditMode.value = false;
|
||||
Object.assign(orgFormData, emptyOrgForm());
|
||||
orgFormData.parent_id = selectedOrg.value ? selectedOrg.value.id : 0;
|
||||
orgFormData.is_company = selectedOrg.value ? 0 : 1;
|
||||
orgEditVisible.value = true;
|
||||
};
|
||||
|
||||
const editOrg = (data) => {
|
||||
orgEditMode.value = true;
|
||||
Object.assign(orgFormData, {
|
||||
id: data.id,
|
||||
org_name: data.org_name,
|
||||
org_code: data.org_code,
|
||||
parent_id: data.parent_id,
|
||||
leader_id: data.leader_id,
|
||||
is_company: data.is_company,
|
||||
sort: data.sort,
|
||||
status: data.status,
|
||||
remark: data.remark
|
||||
});
|
||||
orgEditVisible.value = true;
|
||||
};
|
||||
|
||||
const addChildOrg = (data) => {
|
||||
orgEditMode.value = false;
|
||||
Object.assign(orgFormData, emptyOrgForm());
|
||||
orgFormData.parent_id = data.id;
|
||||
orgFormData.is_company = 0;
|
||||
orgEditVisible.value = true;
|
||||
};
|
||||
|
||||
const deleteOrg = async (data) => {
|
||||
try {
|
||||
await ElMessageBox.confirm('确认删除这个组织吗？删除后将无法恢复。', '删除确认', {
|
||||
type: 'warning',
|
||||
});
|
||||
await deleteOrganization(data.id);
|
||||
ElMessage.success('删除成功');
|
||||
await loadOrgTree();
|
||||
} catch (error) {
|
||||
if (error !== 'cancel' && error !== 'close') {
|
||||
ElMessage.error(error?.message || '删除失败');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const saveOrg = async (payload) => {
|
||||
try {
|
||||
if (orgEditMode.value) {
|
||||
await updateOrganization(orgFormData.id, payload);
|
||||
ElMessage.success('更新成功');
|
||||
} else {
|
||||
await createOrganization(payload);
|
||||
ElMessage.success('创建成功');
|
||||
}
|
||||
orgEditVisible.value = false;
|
||||
await loadOrgTree();
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '保存失败');
|
||||
}
|
||||
};
|
||||
|
||||
const openCreateEmployee = () => {
|
||||
employeeEditMode.value = false;
|
||||
Object.assign(employeeFormData, emptyEmployeeForm());
|
||||
employeeFormData.affiliate_unit = selectedOrg.value ? selectedOrg.value.id.toString() : '';
|
||||
employeeFormData.department = selectedOrg.value ? selectedOrg.value.id.toString() : '';
|
||||
employeeEditVisible.value = true;
|
||||
};
|
||||
|
||||
const editEmployee = (data) => {
|
||||
employeeEditMode.value = true;
|
||||
Object.assign(employeeFormData, {
|
||||
id: data.id,
|
||||
name: data.name,
|
||||
account: data.account,
|
||||
gender: data.gender,
|
||||
birthday: data.birthday,
|
||||
affiliate_unit: data.affiliate_unit,
|
||||
department: data.department,
|
||||
position: data.position,
|
||||
education: data.education,
|
||||
nation: data.nation,
|
||||
phone: data.phone,
|
||||
wechat: data.wechat,
|
||||
email: data.email,
|
||||
home_address: data.home_address,
|
||||
account_status: data.account_status
|
||||
});
|
||||
employeeEditVisible.value = true;
|
||||
};
|
||||
|
||||
const deleteEmployee = async (data) => {
|
||||
try {
|
||||
await ElMessageBox.confirm('确认删除这个员工吗？删除后将无法恢复。', '删除确认', {
|
||||
type: 'warning',
|
||||
});
|
||||
await apiDeleteEmployee(data.id);
|
||||
ElMessage.success('删除成功');
|
||||
await loadEmployeeList(selectedOrg.value.id);
|
||||
} catch (error) {
|
||||
if (error !== 'cancel' && error !== 'close') {
|
||||
ElMessage.error(error?.message || '删除失败');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const saveEmployee = async (payload) => {
|
||||
try {
|
||||
if (employeeEditMode.value) {
|
||||
await updateEmployee(employeeFormData.id, payload);
|
||||
ElMessage.success('更新成功');
|
||||
} else {
|
||||
await createEmployee(payload);
|
||||
ElMessage.success('创建成功');
|
||||
}
|
||||
employeeEditVisible.value = false;
|
||||
await loadEmployeeList(selectedOrg.value.id);
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '保存失败');
|
||||
}
|
||||
};
|
||||
|
||||
const openOrgSettings = () => {
|
||||
orgSettingsVisible.value = true;
|
||||
};
|
||||
|
||||
const formatDate = (value) => {
|
||||
if (!value) return '-';
|
||||
return new Date(value).toLocaleString('zh-CN', { hour12: false });
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
loadOrgTree();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.organization-page {
|
||||
min-height: calc(100vh - 84px);
|
||||
background: #f5f7fa;
|
||||
padding: 20px;
|
||||
}
|
||||
|
||||
.page-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.header-actions {
|
||||
display: flex;
|
||||
gap: 10px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.page-header h2 {
|
||||
margin: 0 0 8px;
|
||||
color: #303133;
|
||||
font-size: 22px;
|
||||
}
|
||||
|
||||
.page-header p {
|
||||
margin: 0;
|
||||
color: #909399;
|
||||
font-size: 13px;
|
||||
}
|
||||
|
||||
.organization-container {
|
||||
display: flex;
|
||||
gap: 16px;
|
||||
height: calc(100vh - 140px);
|
||||
background: #fff;
|
||||
border-radius: 6px;
|
||||
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05);
|
||||
}
|
||||
|
||||
.org-tree-container {
|
||||
width: 350px;
|
||||
border-right: 1px solid #e4e7ed;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.tree-header {
|
||||
padding: 16px;
|
||||
border-bottom: 1px solid #e4e7ed;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.tree-header h3 {
|
||||
margin: 0;
|
||||
color: #303133;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.tree-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.org-tree {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.tree-node {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
padding: 4px 8px;
|
||||
border-radius: 4px;
|
||||
transition: background-color 0.2s;
|
||||
}
|
||||
|
||||
.tree-node:hover {
|
||||
background-color: #f5f7fa;
|
||||
}
|
||||
|
||||
.node-content {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.node-label {
|
||||
font-weight: 500;
|
||||
color: #303133;
|
||||
}
|
||||
|
||||
.node-status-dot {
|
||||
flex-shrink: 0;
|
||||
width: 8px;
|
||||
height: 8px;
|
||||
border-radius: 50%;
|
||||
|
||||
&.is-active {
|
||||
background-color: #67c23a;
|
||||
}
|
||||
|
||||
&.is-inactive {
|
||||
background-color: #c0c4cc;
|
||||
}
|
||||
}
|
||||
|
||||
.node-actions {
|
||||
display: flex;
|
||||
gap: 4px;
|
||||
opacity: 0;
|
||||
transition: opacity 0.2s;
|
||||
}
|
||||
|
||||
.tree-node:hover .node-actions {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.org-detail-container {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.detail-header {
|
||||
padding: 16px;
|
||||
border-bottom: 1px solid #e4e7ed;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.detail-header h3 {
|
||||
margin: 0;
|
||||
color: #303133;
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
.detail-actions {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
.org-detail {
|
||||
flex: 1;
|
||||
overflow-y: auto;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
.detail-section {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.detail-section h4 {
|
||||
margin: 0 0 16px 0;
|
||||
color: #303133;
|
||||
font-size: 14px;
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.remark-content {
|
||||
padding: 12px;
|
||||
background: #f5f7fa;
|
||||
border-radius: 4px;
|
||||
color: #606266;
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.employee-list {
|
||||
margin-top: 16px;
|
||||
}
|
||||
|
||||
.empty-detail {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
@media (max-width: 768px) {
|
||||
.organization-page {
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.organization-container {
|
||||
flex-direction: column;
|
||||
height: auto;
|
||||
}
|
||||
|
||||
.org-tree-container {
|
||||
width: 100%;
|
||||
height: 300px;
|
||||
border-right: none;
|
||||
border-bottom: 1px solid #e4e7ed;
|
||||
}
|
||||
|
||||
.org-tree {
|
||||
height: 200px;
|
||||
}
|
||||
|
||||
.page-header {
|
||||
flex-direction: column;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.header-actions {
|
||||
width: 100%;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -1,219 +0,0 @@
|
||||
<template>
|
||||
<el-dialog
|
||||
v-model="visible"
|
||||
:title="title"
|
||||
width="520px"
|
||||
:close-on-click-modal="false"
|
||||
@close="handleClose"
|
||||
>
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="100px"
|
||||
label-position="right"
|
||||
>
|
||||
<el-form-item label="所属部门" prop="department_id">
|
||||
<el-tree-select
|
||||
v-model="form.department_id"
|
||||
:data="orgOptions"
|
||||
:props="treeProps"
|
||||
placeholder="请选择所属部门"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 100%"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="职位名称" prop="position_name">
|
||||
<el-input
|
||||
v-model="form.position_name"
|
||||
placeholder="请输入职位名称"
|
||||
maxlength="100"
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="职位编码" prop="position_code">
|
||||
<el-input
|
||||
v-model="form.position_code"
|
||||
placeholder="留空则自动生成"
|
||||
maxlength="50"
|
||||
show-word-limit
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="职位类型" prop="position_type">
|
||||
<el-radio-group v-model="form.position_type">
|
||||
<el-radio :label="0">普通职位</el-radio>
|
||||
<el-radio :label="1">管理职位</el-radio>
|
||||
<el-radio :label="2">技术职位</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="form.sort" :min="0" :max="9999" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="状态" prop="status">
|
||||
<el-radio-group v-model="form.status">
|
||||
<el-radio :label="1">启用</el-radio>
|
||||
<el-radio :label="2">停用</el-radio>
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button @click="handleClose">取消</el-button>
|
||||
<el-button type="primary" @click="handleSubmit" :loading="loading">
|
||||
{{ isEdit ? '保存' : '创建' }}
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref, watch } from 'vue'
|
||||
import { ElMessage } from 'element-plus'
|
||||
import { getOrganizationList } from '@/api/organization'
|
||||
|
||||
const props = defineProps({
|
||||
modelValue: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
formData: {
|
||||
type: Object,
|
||||
default: () => ({})
|
||||
},
|
||||
isEdit: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
})
|
||||
|
||||
const emit = defineEmits(['update:modelValue', 'save'])
|
||||
|
||||
const visible = computed({
|
||||
get: () => props.modelValue,
|
||||
set: (value) => emit('update:modelValue', value)
|
||||
})
|
||||
|
||||
const formRef = ref()
|
||||
const loading = ref(false)
|
||||
|
||||
const treeProps = {
|
||||
value: 'id',
|
||||
label: 'org_name',
|
||||
children: 'children'
|
||||
}
|
||||
|
||||
const orgOptions = ref([])
|
||||
|
||||
const emptyForm = () => ({
|
||||
department_id: null,
|
||||
position_name: '',
|
||||
position_code: '',
|
||||
position_type: 0,
|
||||
sort: 0,
|
||||
status: 1
|
||||
})
|
||||
|
||||
const form = ref(emptyForm())
|
||||
|
||||
const rules = {
|
||||
position_name: [
|
||||
{ required: true, message: '请输入职位名称', trigger: 'blur' },
|
||||
{ min: 2, max: 100, message: '长度在 2 到 100 个字符', trigger: 'blur' }
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: '请选择状态', trigger: 'change' }
|
||||
]
|
||||
}
|
||||
|
||||
const title = computed(() => props.isEdit ? '编辑职位' : '新建职位')
|
||||
|
||||
const loadOrgOptions = async () => {
|
||||
try {
|
||||
const res = await getOrganizationList()
|
||||
const data = res?.data || res || []
|
||||
orgOptions.value = buildOrgTree(Array.isArray(data) ? data : [])
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载组织列表失败')
|
||||
}
|
||||
}
|
||||
|
||||
const buildOrgTree = (data) => {
|
||||
const tree = []
|
||||
const map = {}
|
||||
|
||||
data.forEach(item => {
|
||||
map[item.id] = { ...item, children: [] }
|
||||
})
|
||||
|
||||
data.forEach(item => {
|
||||
const node = map[item.id]
|
||||
if (item.parent_id === 0) {
|
||||
tree.push(node)
|
||||
} else {
|
||||
const parent = map[item.parent_id]
|
||||
if (parent) {
|
||||
parent.children.push(node)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
return tree
|
||||
}
|
||||
|
||||
const handleSubmit = async () => {
|
||||
if (!formRef.value) return
|
||||
|
||||
try {
|
||||
await formRef.value.validate()
|
||||
loading.value = true
|
||||
|
||||
const formData = { ...form.value }
|
||||
emit('save', formData)
|
||||
} catch (error) {
|
||||
// 校验失败
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
const handleClose = () => {
|
||||
visible.value = false
|
||||
formRef.value?.resetFields()
|
||||
form.value = emptyForm()
|
||||
}
|
||||
|
||||
const initForm = () => {
|
||||
if (props.isEdit && props.formData) {
|
||||
form.value = {
|
||||
...emptyForm(),
|
||||
...props.formData
|
||||
}
|
||||
} else {
|
||||
form.value = emptyForm()
|
||||
}
|
||||
}
|
||||
|
||||
watch(() => props.modelValue, async (newVal) => {
|
||||
if (newVal) {
|
||||
// 先加载下拉选项再回填表单，确保已有值能正确映射label
|
||||
await loadOrgOptions()
|
||||
initForm()
|
||||
}
|
||||
}, { immediate: true })
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.dialog-footer {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
}
|
||||
</style>
|
||||
@@ -1,288 +0,0 @@
|
||||
<template>
|
||||
<div class="position-page">
|
||||
<div class="page-header">
|
||||
<div>
|
||||
<h2>职位管理</h2>
|
||||
<p>维护各部门职位信息，供人员管理、通讯录选用</p>
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<el-button :icon="Refresh" @click="loadPositions">刷新</el-button>
|
||||
<el-button type="primary" :icon="Plus" @click="openCreatePosition">新建职位</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="position-toolbar">
|
||||
<el-tree-select
|
||||
v-model="filterDepartmentId"
|
||||
:data="orgOptions"
|
||||
:props="treeProps"
|
||||
placeholder="按部门筛选"
|
||||
clearable
|
||||
check-strictly
|
||||
style="width: 240px"
|
||||
/>
|
||||
<el-input
|
||||
v-model="keyword"
|
||||
placeholder="搜索职位名称/编码"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
:prefix-icon="Search"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div class="position-table">
|
||||
<el-table :data="filteredList" v-loading="loading" stripe>
|
||||
<el-table-column prop="position_name" label="职位名称" min-width="160" />
|
||||
<el-table-column prop="position_code" label="职位编码" width="160" />
|
||||
<el-table-column label="所属部门" min-width="180">
|
||||
<template #default="{ row }">
|
||||
{{ orgNameMap[row.department_id] || '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="职位类型" width="120">
|
||||
<template #default="{ row }">
|
||||
{{ positionTypeText(row.position_type) }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="sort" label="排序" width="80" />
|
||||
<el-table-column label="状态" width="90">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="row.status === 1 ? 'success' : 'danger'" size="small">
|
||||
{{ row.status === 1 ? '启用' : '停用' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="150" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button link type="primary" @click="editPosition(row)">编辑</el-button>
|
||||
<el-button link type="danger" @click="deletePosition(row)">删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<template #empty>
|
||||
<el-empty description="暂无职位数据" />
|
||||
</template>
|
||||
</el-table>
|
||||
</div>
|
||||
|
||||
<!-- 职位编辑对话框 -->
|
||||
<PositionEditDialog
|
||||
v-model="positionEditVisible"
|
||||
:form-data="positionFormData"
|
||||
:is-edit="positionEditMode"
|
||||
@save="savePosition"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, onMounted, reactive, ref } from "vue";
|
||||
import { ElMessage, ElMessageBox } from "element-plus";
|
||||
import { Plus, Refresh, Search } from "@element-plus/icons-vue";
|
||||
import PositionEditDialog from "./components/positionEditDialog.vue";
|
||||
import {
|
||||
getOrganizationList,
|
||||
getPositionList,
|
||||
createPosition,
|
||||
updatePosition,
|
||||
deletePosition as apiDeletePosition
|
||||
} from "@/api/organization";
|
||||
|
||||
const loading = ref(false);
|
||||
const positionList = ref([]);
|
||||
const orgOptions = ref([]);
|
||||
const orgNameMap = ref({});
|
||||
const filterDepartmentId = ref(null);
|
||||
const keyword = ref("");
|
||||
const positionEditVisible = ref(false);
|
||||
const positionEditMode = ref(false);
|
||||
|
||||
const treeProps = {
|
||||
value: 'id',
|
||||
label: 'org_name',
|
||||
children: 'children'
|
||||
};
|
||||
|
||||
const emptyPositionForm = () => ({
|
||||
department_id: null,
|
||||
position_name: '',
|
||||
position_code: '',
|
||||
position_type: 0,
|
||||
sort: 0,
|
||||
status: 1
|
||||
});
|
||||
|
||||
const positionFormData = reactive(emptyPositionForm());
|
||||
|
||||
const filteredList = computed(() => {
|
||||
let list = positionList.value;
|
||||
if (filterDepartmentId.value) {
|
||||
list = list.filter(item => item.department_id === filterDepartmentId.value);
|
||||
}
|
||||
const kw = keyword.value.trim().toLowerCase();
|
||||
if (kw) {
|
||||
list = list.filter(item =>
|
||||
(item.position_name || '').toLowerCase().includes(kw) ||
|
||||
(item.position_code || '').toLowerCase().includes(kw)
|
||||
);
|
||||
}
|
||||
return list;
|
||||
});
|
||||
|
||||
const positionTypeText = (type) => {
|
||||
switch (type) {
|
||||
case 1: return '管理职位';
|
||||
case 2: return '技术职位';
|
||||
default: return '普通职位';
|
||||
}
|
||||
};
|
||||
|
||||
const loadPositions = async () => {
|
||||
loading.value = true;
|
||||
try {
|
||||
const res = await getPositionList();
|
||||
const data = res?.data || res || [];
|
||||
positionList.value = Array.isArray(data) ? data : [];
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载职位列表失败');
|
||||
} finally {
|
||||
loading.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
const loadOrgOptions = async () => {
|
||||
try {
|
||||
const res = await getOrganizationList();
|
||||
const data = res?.data || res || [];
|
||||
const map = {};
|
||||
const build = (items) => {
|
||||
items.forEach(item => {
|
||||
map[item.id] = item.org_name;
|
||||
if (item.children && item.children.length) build(item.children);
|
||||
});
|
||||
};
|
||||
build(data);
|
||||
orgNameMap.value = map;
|
||||
orgOptions.value = buildOrgTree(data);
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '加载组织列表失败');
|
||||
}
|
||||
};
|
||||
|
||||
const buildOrgTree = (data) => {
|
||||
const tree = [];
|
||||
const map = {};
|
||||
|
||||
data.forEach(item => {
|
||||
map[item.id] = { ...item, children: [] };
|
||||
});
|
||||
|
||||
data.forEach(item => {
|
||||
const node = map[item.id];
|
||||
if (item.parent_id === 0) {
|
||||
tree.push(node);
|
||||
} else {
|
||||
const parent = map[item.parent_id];
|
||||
if (parent) {
|
||||
parent.children.push(node);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
return tree;
|
||||
};
|
||||
|
||||
const openCreatePosition = () => {
|
||||
positionEditMode.value = false;
|
||||
Object.assign(positionFormData, emptyPositionForm());
|
||||
if (filterDepartmentId.value) {
|
||||
positionFormData.department_id = filterDepartmentId.value;
|
||||
}
|
||||
positionEditVisible.value = true;
|
||||
};
|
||||
|
||||
const editPosition = (data) => {
|
||||
positionEditMode.value = true;
|
||||
Object.assign(positionFormData, {
|
||||
id: data.id,
|
||||
department_id: data.department_id,
|
||||
position_name: data.position_name,
|
||||
position_code: data.position_code,
|
||||
position_type: data.position_type,
|
||||
sort: data.sort,
|
||||
status: data.status
|
||||
});
|
||||
positionEditVisible.value = true;
|
||||
};
|
||||
|
||||
const deletePosition = async (data) => {
|
||||
try {
|
||||
await ElMessageBox.confirm(`确认删除职位「${data.position_name}」吗？删除后将无法恢复。`, '删除确认', {
|
||||
type: 'warning',
|
||||
});
|
||||
await apiDeletePosition(data.id);
|
||||
ElMessage.success('删除成功');
|
||||
await loadPositions();
|
||||
} catch (error) {
|
||||
if (error !== 'cancel' && error !== 'close') {
|
||||
ElMessage.error(error?.message || '删除失败');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const savePosition = async (payload) => {
|
||||
try {
|
||||
if (positionEditMode.value) {
|
||||
await updatePosition(positionFormData.id, payload);
|
||||
ElMessage.success('更新成功');
|
||||
} else {
|
||||
await createPosition(payload);
|
||||
ElMessage.success('创建成功');
|
||||
}
|
||||
positionEditVisible.value = false;
|
||||
await loadPositions();
|
||||
} catch (error) {
|
||||
ElMessage.error(error?.message || '保存失败');
|
||||
}
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
loadPositions();
|
||||
loadOrgOptions();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.position-page {
|
||||
padding: 20px;
|
||||
|
||||
.page-header {
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
margin-bottom: 20px;
|
||||
|
||||
h2 {
|
||||
margin: 0 0 4px;
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
p {
|
||||
margin: 0;
|
||||
color: #909399;
|
||||
font-size: 13px;
|
||||
}
|
||||
}
|
||||
|
||||
.position-toolbar {
|
||||
display: flex;
|
||||
gap: 12px;
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.position-table {
|
||||
background: #fff;
|
||||
border-radius: 6px;
|
||||
padding: 12px;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -358,14 +358,14 @@ func (c *BackendErpContactController) Star() {
|
||||
func (c *BackendErpContactController) SyncAllContacts() {
|
||||
tid, _ := c.GetInt64("tid")
|
||||
|
||||
qs := models.Orm.QueryTable(new(models.BackendErpEmployee)).
|
||||
qs := models.Orm.QueryTable(new(models.BackendEmployee)).
|
||||
Filter("delete_time__isnull", true).
|
||||
Exclude("account_status", 2)
|
||||
if tid > 0 {
|
||||
qs = qs.Filter("tid", tid)
|
||||
}
|
||||
|
||||
var employees []models.BackendErpEmployee
|
||||
var employees []models.BackendEmployee
|
||||
_, err := qs.All(&employees)
|
||||
if err != nil {
|
||||
c.contactJsonError(500, "查询员工失败: "+err.Error())
|
||||
@@ -400,14 +400,14 @@ func (c *BackendErpContactController) SyncAllContacts() {
|
||||
func (c *BackendErpContactController) GetContactOrgTree() {
|
||||
tid, _ := c.GetInt64("tid")
|
||||
|
||||
qs := models.Orm.QueryTable(new(models.BackendErpOrganization)).
|
||||
qs := models.Orm.QueryTable(new(models.BackendOrganization)).
|
||||
Filter("delete_time__isnull", true).
|
||||
Exclude("status", 0)
|
||||
if tid > 0 {
|
||||
qs = qs.Filter("tid", tid)
|
||||
}
|
||||
|
||||
var orgs []models.BackendErpOrganization
|
||||
var orgs []models.BackendOrganization
|
||||
_, err := qs.OrderBy("sort", "id").All(&orgs)
|
||||
if err != nil {
|
||||
c.contactJsonError(500, "查询组织架构失败: "+err.Error())
|
||||
@@ -455,7 +455,7 @@ func (c *BackendErpContactController) GetContactOrgTree() {
|
||||
|
||||
// buildContactOrgTree 构建通讯录组织树
|
||||
func (c *BackendErpContactController) buildContactOrgTree(
|
||||
orgs []models.BackendErpOrganization,
|
||||
orgs []models.BackendOrganization,
|
||||
counts map[uint64]int64,
|
||||
totalInternal uint64,
|
||||
) []map[string]interface{} {
|
||||
@@ -495,8 +495,8 @@ func (c *BackendErpContactController) buildContactOrgTree(
|
||||
func (c *BackendErpContactController) contactDTO(row models.BackendErpContact) erpContactDTO {
|
||||
orgName := ""
|
||||
if row.OrgID != nil && *row.OrgID > 0 {
|
||||
var org models.BackendErpOrganization
|
||||
if err := models.Orm.QueryTable(new(models.BackendErpOrganization)).
|
||||
var org models.BackendOrganization
|
||||
if err := models.Orm.QueryTable(new(models.BackendOrganization)).
|
||||
Filter("id", *row.OrgID).
|
||||
One(&org); err == nil {
|
||||
orgName = org.OrgName
|
||||
@@ -533,7 +533,7 @@ func (c *BackendErpContactController) contactDTO(row models.BackendErpContact) e
|
||||
// --- Sync from Employee ---
|
||||
|
||||
// SyncContactOnEmployeeCreate 员工创建后同步到通讯录（由 ERP 控制器调用）
|
||||
func SyncContactOnEmployeeCreate(tid uint64, employeeID uint64, emp *models.BackendErpEmployee) {
|
||||
func SyncContactOnEmployeeCreate(tid uint64, employeeID uint64, emp *models.BackendEmployee) {
|
||||
syncContactFromEmployee(tid, employeeID, emp)
|
||||
}
|
||||
|
||||
@@ -622,7 +622,7 @@ func SyncContactOnEmployeeDelete(employeeID uint64) {
|
||||
}
|
||||
|
||||
// syncContactFromEmployee 内部同步函数
|
||||
func syncContactFromEmployee(tid uint64, employeeID uint64, emp *models.BackendErpEmployee) string {
|
||||
func syncContactFromEmployee(tid uint64, employeeID uint64, emp *models.BackendEmployee) string {
|
||||
var existing models.BackendErpContact
|
||||
err := models.Orm.QueryTable(new(models.BackendErpContact)).
|
||||
Filter("employee_id", employeeID).
|
||||
|
||||
@@ -2,8 +2,8 @@ package models
|
||||
|
||||
import "time"
|
||||
|
||||
// BackendErpOrganization 全局组织架构表 yz_backend_organization
|
||||
type BackendErpOrganization struct {
|
||||
// BackendOrganization 全局组织架构表 yz_backend_organization
|
||||
type BackendOrganization struct {
|
||||
ID uint64 `orm:"column(id);pk;auto" json:"id"`
|
||||
Tid uint64 `orm:"column(tid)" json:"tid"`
|
||||
OrgName string `orm:"column(org_name);size(128)" json:"org_name"`
|
||||
@@ -20,12 +20,12 @@ type BackendErpOrganization struct {
|
||||
}
|
||||
|
||||
// TableName 自定义表名
|
||||
func (m *BackendErpOrganization) TableName() string {
|
||||
return "yz_backend_erp_organization"
|
||||
func (m *BackendOrganization) TableName() string {
|
||||
return "yz_backend_organization"
|
||||
}
|
||||
|
||||
// BackendErpEmployee 员工信息表 yz_backend_erp_employee
|
||||
type BackendErpEmployee struct {
|
||||
// BackendEmployee 全局员工信息表 yz_backend_employee
|
||||
type BackendEmployee struct {
|
||||
ID uint `orm:"column(id);pk;auto" json:"id"`
|
||||
Tid *int `orm:"column(tid);null" json:"tid"`
|
||||
Account string `orm:"column(account);size(50)" json:"account"`
|
||||
@@ -49,25 +49,27 @@ type BackendErpEmployee struct {
|
||||
}
|
||||
|
||||
// TableName 自定义表名
|
||||
func (m *BackendErpEmployee) TableName() string {
|
||||
return "yz_backend_erp_employee"
|
||||
func (m *BackendEmployee) TableName() string {
|
||||
return "yz_backend_employee"
|
||||
}
|
||||
|
||||
// BackendErpPosition 职位表 yz_backend_erp_position
|
||||
type BackendErpPosition struct {
|
||||
ID uint64 `orm:"column(id);pk;auto" json:"id"`
|
||||
Tid uint64 `orm:"column(tid)" json:"tid"`
|
||||
DepartmentID uint64 `orm:"column(department_id)" json:"department_id"`
|
||||
PositionCode string `orm:"column(position_code);size(50)" json:"position_code"`
|
||||
PositionName string `orm:"column(position_name);size(100)" json:"position_name"`
|
||||
PositionType int8 `orm:"column(position_type);default(0)" json:"position_type"`
|
||||
Status int8 `orm:"column(status);default(1)" json:"status"`
|
||||
Sort uint `orm:"column(sort);default(0)" json:"sort"`
|
||||
CreateTime time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
|
||||
UpdateTime time.Time `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
|
||||
// BackendPosition 全局职位表 yz_backend_position
|
||||
type BackendPosition struct {
|
||||
ID uint64 `orm:"column(id);pk;auto" json:"id"`
|
||||
Tid uint64 `orm:"column(tid)" json:"tid"`
|
||||
DepartmentID uint64 `orm:"column(department_id)" json:"department_id"`
|
||||
PositionCode string `orm:"column(position_code);size(50)" json:"position_code"`
|
||||
PositionName string `orm:"column(position_name);size(100)" json:"position_name"`
|
||||
PositionType int8 `orm:"column(position_type);default(0)" json:"position_type"`
|
||||
Status int8 `orm:"column(status);default(1)" json:"status"`
|
||||
Sort uint `orm:"column(sort);default(0)" json:"sort"`
|
||||
Remark *string `orm:"column(remark);size(512);null" json:"remark"`
|
||||
CreateTime time.Time `orm:"column(create_time);auto_now_add;type(datetime)" json:"create_time"`
|
||||
UpdateTime time.Time `orm:"column(update_time);auto_now;type(datetime)" json:"update_time"`
|
||||
DeleteTime *time.Time `orm:"column(delete_time);type(datetime);null" json:"delete_time"`
|
||||
}
|
||||
|
||||
// TableName 自定义表名
|
||||
func (m *BackendErpPosition) TableName() string {
|
||||
return "yz_backend_erp_position"
|
||||
func (m *BackendPosition) TableName() string {
|
||||
return "yz_backend_position"
|
||||
}
|
||||
|
||||
+3
-3
@@ -35,9 +35,9 @@ func Init(_ string) {
|
||||
orm.RegisterModel(
|
||||
new(SystemTenant),
|
||||
new(SystemTenantUser),
|
||||
new(BackendErpOrganization),
|
||||
new(BackendErpEmployee),
|
||||
new(BackendErpPosition),
|
||||
new(BackendOrganization),
|
||||
new(BackendEmployee),
|
||||
new(BackendPosition),
|
||||
new(BackendErpContact),
|
||||
new(BackendApprovalFlow),
|
||||
new(BackendApprovalRecord),
|
||||
|
||||
Reference in New Issue
Block a user