This commit is contained in:
zlwu committed 2026-05-20 18:06:21 +08:00
1 parent 276299ff27
commit c6c3a37fa7
241 files changed
+17841 -15059

No files matched your search

@@ -145,7 +145,7 @@
</template>
</el-table-column>
<el-table-column prop="createAt" label="创建时间" width="180" align="center" header-align="center" />
<el-table-column label="操作" width="400" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="400" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"><el-icon><View /></el-icon>查看</el-button>
<el-button class="btn-op-item primary" @click="handleAddChild(row)" v-if="!row.parentId">
+1 -1
View File
@@ -71,7 +71,7 @@
<el-table-column prop="expressCode" label="快递编码" min-width="120" align="center" header-align="center" />
<el-table-column prop="expressName" label="快递名称" min-width="140" align="center" header-align="center" />
<el-table-column prop="createTime" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="320" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="320" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"
><el-icon><View /></el-icon>查看</el-button
+2 -2
View File
@@ -214,7 +214,7 @@
<el-form-item v-if="formData.menuType === 'C'" label="组件路径">
<el-input v-model="formData.component" placeholder="请输入组件路径" />
</el-form-item>
<el-form-item v-if="formData.menuType === 'F'" label="权限标识">
<el-form-item v-if="formData.menuType !== 'M'" label="权限标识">
<el-input v-model="formData.perms" placeholder="如 system:menu:list" />
</el-form-item>
<el-form-item label="显示状态">
@@ -482,7 +482,7 @@
menuType: formData.menuType,
path: formData.path?.trim() || undefined,
component: formData.menuType === 'C' ? formData.component?.trim() || undefined : undefined,
perms: formData.menuType === 'F' ? formData.perms?.trim() || undefined : undefined,
perms: formData.menuType !== 'M' ? formData.perms?.trim() || undefined : undefined,
isFrame: formData.isFrame,
visible: formData.visible,
status: formData.status,
+1 -1
View File
@@ -78,7 +78,7 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="480" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="480" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"><el-icon><View /></el-icon>查看</el-button>
<el-button class="btn-op-item primary" @click="handlePostBindUsers(row)">
+1 -1
View File
@@ -139,7 +139,7 @@
</template>
</el-table-column>
<el-table-column prop="createAt" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="320" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="320" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item primary" @click="handleView(row)">查看</el-button>
<el-button class="btn-op-item" @click="handleEdit(row)">编辑</el-button>
+219 -17
View File
@@ -291,7 +291,7 @@
v-model="dataScopeUserKeyword"
class="data-scope-user-filter"
clearable
placeholder="按姓名、账号过滤"
placeholder="按姓名、工号、联系方式过滤"
/>
<div class="data-scope-user-list-wrap">
<el-checkbox-group
@@ -358,9 +358,48 @@
v-model:visible="viewVisible"
:title="viewRow?.roleName || '角色详情'"
:icon="Stamp"
:meta="`数据权限:${dataScopeLabel(viewRow?.dataScope || '')}${viewRow?.createTime ? ' · ' + viewRow.createTime : ''}`"
width="860px"
:meta="`数据权限:${dataScopeLabel(viewDataScopeCode || viewRow?.dataScope || '')}${viewRow?.createTime ? ' · ' + viewRow.createTime : ''}`"
:sections="viewSections"
/>
>
<template #menuTree>
<div v-loading="viewDetailLoading" class="role-view-tree-block">
<div v-if="viewMenuTreeData.length" class="role-view-tree-scroll">
<el-tree
:key="'menu-' + viewTreeRenderKey"
ref="viewMenuTreeRef"
class="role-view-readonly-tree"
show-checkbox
:data="viewMenuTreeData"
node-key="id"
:props="{ label: 'menuName', children: 'children' }"
:default-checked-keys="viewMenuCheckedKeys"
default-expand-all
/>
</div>
<el-empty v-else-if="!viewDetailLoading" description="暂无菜单数据" :image-size="40" />
</div>
</template>
<template #customDeptTree>
<div v-loading="viewDetailLoading" class="role-view-tree-block">
<div v-if="viewDeptTreeData.length" class="role-view-tree-scroll">
<el-tree
:key="'dept-' + viewTreeRenderKey"
ref="viewDeptTreeRef"
class="role-view-readonly-tree"
show-checkbox
check-strictly
:data="viewDeptTreeData"
node-key="id"
:props="{ label: 'deptName', children: 'children' }"
:default-checked-keys="viewDeptCheckedKeys"
default-expand-all
/>
</div>
<el-empty v-else-if="!viewDetailLoading" description="暂无部门数据" :image-size="40" />
</div>
</template>
</SystemViewDialog>
</section>
</div>
</template>
@@ -369,7 +408,9 @@
import { ref, reactive, computed, onMounted, nextTick, watch } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Plus, Close, Check, DataAnalysis, View, Stamp, RefreshLeft, Search } from '@element-plus/icons-vue'
import SystemViewDialog from '@/components/business/system-view-dialog/index.vue'
import SystemViewDialog, {
type ViewSection
} from '@/components/business/system-view-dialog/index.vue'
import { MAX_ADMIN_LIST_PAGE_SIZE } from '@/utils/fetch-paged-list'
import { withFullscreenLoading, fullscreenLoadingText } from '@/utils/fullscreen-loading'
import { buildPathLabelMapFromTreeRoots } from '@/utils/tree-path'
@@ -433,7 +474,15 @@
const deptTreeRef = ref()
const deptTreeData = ref<Api.Dept.DeptItem[]>([])
const allUsers = ref<
Array<{ id: string; nickName: string; userNo: string; deptId: string; deptName?: string }>
Array<{
id: string
nickName: string
userNo: string
deptId: string
deptName?: string
phoneNo: string
status: string
}>
>([])
const scopeDeptCheckedKeys = ref<string[]>([])
const scopeUserCheckedKeys = ref<string[]>([])
@@ -499,7 +548,8 @@
if (!kw) return true
const name = (u.nickName || '').toLowerCase()
const no = (u.userNo || '').toLowerCase()
return name.includes(kw) || no.includes(kw)
const phone = (u.phoneNo || '').toLowerCase()
return name.includes(kw) || no.includes(kw) || phone.includes(kw)
})
})
@@ -547,10 +597,21 @@
dataScopeSelectedDeptRows.value.length > 0 || dataScopeSelectedUserSummaries.value.length > 0
)
function userOptionLabel(u: { id: string; nickName: string; userNo: string; deptName?: string }) {
const base = u.nickName || u.userNo || u.id
if (u.deptName) return `${base}(${u.deptName})`
return base
function userStatusText(status: string | undefined) {
return status === '1' ? '正常' : '停用'
}
function userOptionLabel(u: {
id: string
nickName: string
userNo: string
phoneNo?: string
status?: string
}) {
const name = u.nickName || u.userNo || u.id
const no = u.userNo || '—'
const phone = u.phoneNo || '—'
return `${name}(${no}、${phone}、${userStatusText(u.status)})`
}
function handleDataScopeDeptNodeClick(data: Api.Dept.DeptItem) {
@@ -634,7 +695,7 @@
if (isEdit.value && editingId.value) {
await fetchUpdateRole(editingId.value, payload)
} else {
await fetchCreateRole(payload)
await fetchCreateRole({ ...payload, dataScope: '4' })
}
dialogVisible.value = false
await loadData()
@@ -706,7 +767,15 @@
* 分页拉取租户用户列表供「数据权限」多选;单页 pageSize 超过 100 时接口会 422。
*/
async function fetchAllUsersForDataScope(): Promise<
Array<{ id: string; nickName: string; userNo: string; deptId: string; deptName?: string }>
Array<{
id: string
nickName: string
userNo: string
deptId: string
deptName?: string
phoneNo: string
status: string
}>
> {
const pageSize = MAX_ADMIN_LIST_PAGE_SIZE
const raw: any[] = []
@@ -724,7 +793,9 @@
deptId: u.deptId || '',
nickName: u.nickName || u.realName || '',
userNo: u.userNo || '',
deptName: u.deptName
deptName: u.deptName,
phoneNo: u.phoneNo || '',
status: u.status || '0'
}))
}
@@ -794,27 +865,127 @@
// ---- 查看弹窗 ----
const viewVisible = ref(false)
const viewRow = ref<Api.Role.RoleItem | null>(null)
const viewDetailLoading = ref(false)
const viewDataScopeCode = ref('')
const viewMenuTreeData = ref<Api.Menu.MenuItem[]>([])
const viewMenuCheckedKeys = ref<string[]>([])
const viewDeptTreeData = ref<Api.Dept.DeptItem[]>([])
const viewDeptCheckedKeys = ref<string[]>([])
const viewCustomUserLabels = ref<string[]>([])
const viewMenuTreeRef = ref()
const viewDeptTreeRef = ref()
const viewTreeRenderKey = ref(0)
const viewSections = computed(() => {
const viewSections = computed((): ViewSection[] => {
const row = viewRow.value
if (!row) return []
return [
const loadingText = '加载中…'
const scopeCode = viewDataScopeCode.value || row.dataScope
const dataFields: ViewSection['fields'] = [
{
label: '权限范围',
value: viewDetailLoading.value ? loadingText : dataScopeLabel(scopeCode),
tagType: viewDetailLoading.value ? undefined : dataScopeTagType(scopeCode)
}
]
if (scopeCode === '5') {
dataFields.push({
label: '自定义用户',
span: true,
...(viewDetailLoading.value
? { value: loadingText }
: viewCustomUserLabels.value.length
? { items: viewCustomUserLabels.value }
: { value: '—' })
})
}
const sections: ViewSection[] = [
{
title: '基本信息',
fields: [
{ label: '角色名称', value: row.roleName },
{ label: '数据权限', value: dataScopeLabel(row.dataScope) },
{ label: '状态', value: row.status === '1' ? '正常' : '停用', tagType: row.status === '1' ? 'success' : 'info' },
{
label: '状态',
value: row.status === '1' ? '正常' : '停用',
tagType: row.status === '1' ? ('success' as const) : ('info' as const)
},
{ label: '创建时间', value: row.createTime },
{ label: '备注', value: row.remark, span: true }
]
},
{
title: '菜单权限',
titleStyle: 'field',
fields: [],
slot: 'menuTree'
},
{
title: '数据权限',
fields: dataFields,
...(scopeCode === '5'
? {
slot: 'customDeptTree',
slotTitle: '自定义部门',
slotTitleStyle: 'field' as const
}
: {})
}
]
return sections
})
/** 异步灌入勾选数据后重挂载树并同步勾选态(只读展示) */
async function syncViewReadonlyTreeChecks() {
viewTreeRenderKey.value += 1
await nextTick()
viewMenuTreeRef.value?.setCheckedKeys?.(viewMenuCheckedKeys.value, true)
viewDeptTreeRef.value?.setCheckedKeys?.(viewDeptCheckedKeys.value)
}
async function loadViewDetail(row: Api.Role.RoleItem) {
viewDetailLoading.value = true
viewDataScopeCode.value = row.dataScope || ''
viewMenuTreeData.value = []
viewMenuCheckedKeys.value = []
viewDeptTreeData.value = []
viewDeptCheckedKeys.value = []
viewCustomUserLabels.value = []
try {
const [menuTree, menuRes, scopeRes] = await Promise.all([
fetchMenuTree(),
fetchRoleMenuIds(row.id),
fetchRoleDataScope(row.id)
])
viewMenuTreeData.value = menuTree || []
viewMenuCheckedKeys.value = [...(menuRes?.menuIds || [])]
const scope = scopeRes?.dataScope || row.dataScope
viewDataScopeCode.value = scope
if (scope === '5') {
const [deptTree, users] = await Promise.all([fetchDeptTree(), fetchAllUsersForDataScope()])
const details = scopeRes?.scopeDetails || []
viewDeptTreeData.value = deptTree || []
viewDeptCheckedKeys.value = details
.filter((d) => d.scopeType === 'dept')
.map((d) => d.scopeValue)
const userLabels = details
.filter((d) => d.scopeType === 'user')
.map((d) => {
const u = users.find((x) => x.id === d.scopeValue)
return u ? userOptionLabel(u) : d.scopeValue
})
viewCustomUserLabels.value = userLabels
}
await syncViewReadonlyTreeChecks()
} finally {
viewDetailLoading.value = false
}
}
function handleView(row: Api.Role.RoleItem) {
viewRow.value = row
viewVisible.value = true
loadViewDetail(row)
}
onMounted(() => {
@@ -897,6 +1068,11 @@
.data-scope-user-row {
padding: 4px 0;
:deep(.el-checkbox__label) {
line-height: 1.45;
white-space: normal;
}
}
.data-scope-selection-summary {
@@ -949,4 +1125,30 @@
line-height: 1.5;
color: var(--mint-text-muted, var(--el-text-color-secondary));
}
.role-view-tree-block {
min-height: 48px;
}
.role-view-tree-scroll {
max-height: 320px;
overflow-y: auto;
padding: 8px;
border: 1px solid var(--el-border-color-lighter);
border-radius: 8px;
}
.role-view-readonly-tree {
:deep(.el-tree-node__content) {
cursor: default;
}
:deep(.el-checkbox) {
pointer-events: none;
}
:deep(.el-tree-node__expand-icon) {
pointer-events: auto;
}
}
</style>
+1 -1
View File
@@ -86,7 +86,7 @@
<el-table-column prop="contactName" label="联系人" min-width="100" align="center" header-align="center" />
<el-table-column prop="contactPhone" label="联系电话" min-width="140" align="center" header-align="center" />
<el-table-column prop="createTime" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="320" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="320" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"><el-icon><View /></el-icon>查看</el-button>
<el-button class="btn-op-item primary" @click="handleEdit(row)">编辑</el-button>
+1 -1
View File
@@ -71,7 +71,7 @@
<el-table-column prop="unitName" label="单位名称" min-width="150" align="center" header-align="center" />
<el-table-column prop="unitCode" label="单位编码" min-width="120" align="center" header-align="center" />
<el-table-column prop="createTime" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="320" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="320" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"
><el-icon><View /></el-icon>查看</el-button
+1 -1
View File
@@ -106,7 +106,7 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" min-width="180" align="center" header-align="center" />
<el-table-column label="操作" width="400" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="400" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item" @click="handleView(row)"><el-icon><View /></el-icon>查看</el-button>
<el-button class="btn-op-item primary" @click="handleEdit(row)">编辑</el-button>
@@ -97,7 +97,7 @@
align="center"
header-align="center"
/>
<el-table-column label="操作" width="160" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="160" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item primary" @click="handleViewDetail(row)"><el-icon><View /></el-icon>查看详情</el-button>
</template>
@@ -109,7 +109,7 @@
align="center"
header-align="center"
/>
<el-table-column label="操作" width="400" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="400" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item primary" @click="handleDesign(row)"><el-icon><SetUp /></el-icon>流程设计</el-button>
<el-button class="btn-op-item" @click="handleEdit(row)"><el-icon><Edit /></el-icon>编辑</el-button>
@@ -98,7 +98,7 @@
align="center"
header-align="center"
/>
<el-table-column label="操作" width="260" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="260" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item primary" @click="handleViewDetail(row)"><el-icon><View /></el-icon>查看详情</el-button>
</template>
@@ -86,7 +86,7 @@
align="center"
header-align="center"
/>
<el-table-column label="操作" width="260" fixed="right" align="center" header-align="center">
<el-table-column label="操作" min-width="260" fixed="right" align="center" header-align="center">
<template #default="{ row }">
<el-button class="btn-op-item primary" @click="handleApprove(row)"><el-icon><EditPen /></el-icon>审批</el-button>
<el-button class="btn-op-item" @click="handleViewDetail(row)"><el-icon><View /></el-icon>查看详情</el-button>