+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+
+ {{ node.depth === 1 ? '子级' : `第${node.depth}层` }}
+
+ )[cardTitleField] || '-' }}
+
+ {{ node.children.length }} 子级
+
+
+
+ ![]()
+
+ {{ (node.row as Record
+
+
+
+ {{ columnTitle(field) }}
+
+ {{ formatCardValue(node.row as Record, field) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+
+ )[cardTitleField] || '-' }}
+
+
+ ![]()
+
+ {{ (row as Record
+
+
+
+ {{ columnTitle(field) }}
+
+ {{ formatCardValue(row as Record, field) }}
+
+
+
+
+
+
+
+
+
+
+
{
@@ -428,6 +822,26 @@ html.dark {
gap: 12px;
}
+/* 当前选中项 + 清除按钮行 */
+.entity-picker-browse-current {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 8px;
+ padding: 6px 10px;
+ border: 1px solid var(--el-border-color-light);
+ border-radius: 6px;
+ background: var(--el-fill-color-light);
+}
+
+.entity-picker-browse-current-label {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 13px;
+}
+
.entity-picker-browse-search {
flex-shrink: 0;
}
@@ -443,6 +857,42 @@ html.dark {
box-sizing: border-box;
}
+/* ===== 树分组模式：部门树 → 成员 ===== */
+.entity-picker-tree {
+ display: flex;
+ flex-direction: column;
+ gap: 2px;
+}
+
+.entity-picker-tree-branch {
+ margin: 2px 0;
+}
+
+.entity-picker-tree-dept {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ padding: 6px 10px;
+ font-size: 13px;
+ font-weight: 600;
+ color: var(--el-text-color-primary);
+ background: var(--el-fill-color-light);
+ border-radius: 4px;
+ margin-bottom: 2px;
+}
+
+.entity-picker-tree-members {
+ padding-left: 18px;
+}
+
+.entity-picker-tree-member {
+ border-bottom: 1px dashed var(--el-border-color-lighter);
+}
+
+.entity-picker-tree-member:last-child {
+ border-bottom: none;
+}
+
/* 列表项：hover 高亮 */
.entity-picker-browse-item {
display: flex;
@@ -498,4 +948,77 @@ html.dark {
flex-shrink: 0;
text-align: center;
}
+
+/* ===== 多选暂存 ===== */
+.entity-picker-browse-multi-toggle {
+ display: flex;
+ align-items: center;
+ gap: 8px;
+ font-size: 13px;
+ color: var(--el-text-color-regular);
+ flex-shrink: 0;
+}
+
+.entity-picker-browse-staged {
+ border: 1px dashed var(--el-color-primary-light-5);
+ border-radius: 6px;
+ padding: 8px;
+ background: var(--el-color-primary-light-9);
+ flex-shrink: 0;
+ max-height: 160px;
+ overflow-y: auto;
+}
+
+.entity-picker-browse-staged-title {
+ font-size: 12px;
+ font-weight: 600;
+ color: var(--el-color-primary);
+ margin-bottom: 6px;
+}
+
+.entity-picker-browse-staged-item {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 8px;
+ font-size: 13px;
+ padding: 2px 0;
+}
+
+.entity-picker-browse-staged-name {
+ flex: 1;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+}
+
+.entity-picker-browse-staged-type {
+ flex-shrink: 0;
+ width: 92px;
+}
+
+/* 深色模式：暂存区背景用半透明主色（light-9 在深色下过亮） */
+html.dark {
+ .entity-picker-browse-staged {
+ background: color-mix(in srgb, var(--el-color-primary) 10%, var(--el-fill-color-blank));
+ border-color: color-mix(in srgb, var(--el-color-primary) 45%, transparent);
+ }
+}
+
+/* 已进入暂存区的成员：主色高亮 */
+.entity-picker-browse-item.is-staged {
+ background: var(--el-color-primary-light-8);
+}
+
+html.dark {
+ .entity-picker-browse-item.is-staged {
+ background: color-mix(in srgb, var(--el-color-primary) 24%, transparent);
+ }
+}
+
+/* 多选全部提交 */
+.entity-picker-browse-multi-actions {
+ flex-shrink: 0;
+ text-align: right;
+}
diff --git a/src/components/RichTextEditor.vue b/src/components/RichTextEditor.vue
new file mode 100644
index 0000000..5db7d25
--- /dev/null
+++ b/src/components/RichTextEditor.vue
@@ -0,0 +1,74 @@
+
+
+
+
+
+ 当前选择：{{ displayLabel || modelValue }}
+
+
+
+
+
+
+
+
+
+
+
+
+
暂存区（{{ browseStaged.length }}）
+
+
+ {{ opt.label }}{{ opt.secondary ? `（${opt.secondary}）` : '' }}
+
+
+
+
+
+
+
+
- {{ opt.label }}
- {{ opt.secondary }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ opt.label }}
+ {{ opt.secondary }}
+
+
+
+
+
+
+
+
+
+ {{ opt.label }}
+ {{ opt.secondary }}
+
+
+
+
+
+
+
+
+
+ {{ opt.label }}
+ {{ opt.secondary }}
+
+
+
+
+
+
+
+
+ {{ opt.label }}
+ {{ opt.secondary }}
+
+
+ {{ opt.label }}
+ {{ opt.secondary }}
+
+
@@ -375,6 +762,13 @@ onBeforeUnmount(() => {
加载更多
+
+
+
+
+ 全部提交（{{ browseStaged.length }}）
+
+
-
-
-
-
+
+
@@ -300,7 +344,7 @@ const isFaIcon = (icon: string | undefined | null): boolean => {
diff --git a/src/router/index.ts b/src/router/index.ts
index 15e2c55..dfc214f 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -43,6 +43,12 @@ export const staticRoutes: RouteRecordRaw[] = [
component: () => import('@/views/workorder/My.vue'),
meta: { title: '我的工单', icon: 'Document', requiresAuth: true, menuGuarded: true },
},
+ {
+ path: 'workorder/detail/:id',
+ name: 'WorkorderDetail',
+ component: () => import('@/views/workorder/WorkOrderDetail.vue'),
+ meta: { title: '工单详情', requiresAuth: true },
+ },
{
path: 'system/roles',
name: 'SystemRoles',
@@ -369,6 +375,14 @@ router.beforeEach(async (to, _from, next) => {
}
}
+ // 已登录但 CheckAdmin 未加载（强刷后从 localStorage 缓存恢复会话的路径）：
+ // 补发 fetchAdminCheck，确保 adminChecked 置位、isAdmin 正确。
+ // 页面组件据此区分"加载中"与"确实无权限"（如 Database/DbTable 等管理员页）。
+ // 幂等：登录流程/restoreSession 已调用过则 adminChecked=true，这里不再重复请求。
+ if (userStore.isLoggedIn && !userStore.adminChecked) {
+ void userStore.fetchAdminCheck()
+ }
+
next()
})
diff --git a/src/stores/tabs.ts b/src/stores/tabs.ts
index 680d3d3..a6e39f6 100644
--- a/src/stores/tabs.ts
+++ b/src/stores/tabs.ts
@@ -53,6 +53,8 @@ export const useTabsStore = defineStore('tabs', () => {
const tabs = ref
-
-
-
-
- {{ asStr(companyData.CompanyUUID) || '-' }}
-
-
-
-
{{ resolvedNames.parentCompany?.[companyData.ParentCompanyUUID] || asStr(companyData.ParentCompanyUUID) || '-' }}
@@ -276,7 +304,7 @@ watch(companyUUID, () => {
-
+
+
+
+
+
+
{
margin-bottom: 20px;
}
-// 公司图标：主色淡底圆角块
+// 公司图标：主色淡底圆角块（可点击设置，悬停显示遮罩）
.company-avatar {
+ position: relative;
width: 52px;
height: 52px;
border-radius: 12px;
@@ -458,6 +512,39 @@ watch(companyUUID, () => {
color: var(--el-color-primary);
background: var(--el-color-primary-light-9);
flex-shrink: 0;
+ cursor: pointer;
+ overflow: hidden;
+ transition: box-shadow 0.2s;
+
+ &:hover {
+ box-shadow: 0 0 0 2px var(--el-color-primary-light-5);
+ }
+}
+
+// 图标图片：填充整个圆角块
+.company-avatar-img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ display: block;
+}
+
+// 悬停遮罩：提示可设置图标
+.company-avatar-mask {
+ position: absolute;
+ inset: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: rgba(0, 0, 0, 0.45);
+ color: #fff;
+ font-size: 18px;
+ opacity: 0;
+ transition: opacity 0.2s;
+}
+
+.company-avatar:hover .company-avatar-mask {
+ opacity: 1;
}
.company-hero-main {
@@ -492,20 +579,71 @@ watch(companyUUID, () => {
}
}
-// UUID 单元格：等宽字体 + 复制按钮
-.uuid-cell {
- display: inline-flex;
- align-items: center;
- gap: 6px;
-}
-
-.uuid-text {
- font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, monospace;
- font-size: 12px;
- color: var(--el-text-color-regular);
- word-break: break-all;
-}
-
// ===== 子表卡片 =====
// 使用全局 .detail-card / .detail-card-header（见 global.scss），此处无需重复定义
+
+// ===== 编辑弹窗图标上传 =====
+.edit-icon-row {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+}
+
+// 预览块：可点击上传，悬停显示遮罩
+.edit-icon-preview {
+ position: relative;
+ width: 56px;
+ height: 56px;
+ border-radius: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: var(--el-color-primary);
+ background: var(--el-color-primary-light-9);
+ cursor: pointer;
+ overflow: hidden;
+ border: 1px dashed var(--el-border-color);
+ flex-shrink: 0;
+
+ &:hover {
+ border-color: var(--el-color-primary);
+ }
+
+ &:hover .edit-icon-mask {
+ opacity: 1;
+ }
+}
+
+.edit-icon-img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ display: block;
+}
+
+.edit-icon-mask {
+ position: absolute;
+ inset: 0;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background: rgba(0, 0, 0, 0.45);
+ color: #fff;
+ font-size: 16px;
+ opacity: 0;
+ transition: opacity 0.2s;
+}
+
+.edit-icon-tips {
+ display: flex;
+ flex-direction: column;
+ gap: 4px;
+ align-items: flex-start;
+}
+
+.edit-icon-hint {
+ margin: 0;
+ font-size: 12px;
+ color: var(--el-text-color-secondary);
+}
diff --git a/src/views/company/DepartmentDetail.vue b/src/views/company/DepartmentDetail.vue
index 43d3f4b..d652930 100644
--- a/src/views/company/DepartmentDetail.vue
+++ b/src/views/company/DepartmentDetail.vue
@@ -27,6 +27,7 @@ import EntityPicker from '@/components/EntityPicker.vue'
import { formApi } from '@/api/form'
import { useResolveUUIDs } from '@/composables/useResolveUUIDs'
import { setPageTitle } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
import type { ColumnSchema } from '@/types/api'
const route = useRoute()
@@ -64,20 +65,13 @@ function deptStatusTag(v: unknown): { text: string; type: 'success' | 'danger' |
return { text: String(v ?? '-'), type: 'info' }
}
-/** 时间格式化 */
-function formatTime(v: unknown): string {
- if (!v) return '-'
- const d = new Date(v as string)
- if (isNaN(d.getTime())) return String(v)
- const pad = (n: number) => String(n).padStart(2, '0')
- return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
-}
-
// === 数据加载 ===
async function loadData(): Promise {
if (!deptUUID.value) {
- ElMessage.warning('缺少 DeptUUID 参数，无法加载部门详情')
+ // 无 DeptUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ data.value = null
+ setPageTitle('部门详情')
return
}
loading.value = true
@@ -165,23 +159,29 @@ onMounted(async () => {
})
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧部门数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadData 幂等）；
+// 空值场景静默显示空态（loadData 内处理），不再弹警告
watch(deptUUID, () => {
- if (!deptUUID.value) {
- ElMessage.warning('缺少 DeptUUID 参数，无法加载部门详情')
- return
- }
void loadData()
-})
+}, { immediate: true })
-
+
+
+
{{ data?.DeptName || '-' }}
@@ -194,10 +194,10 @@ watch(deptUUID, () => {
{{ parentDeptName || data?.ParentDeptUUID || '-' }}
{{ data?.DeptSort ?? '-' }}
- {{ formatTime(data?.DeptCreateTime) }}
+ {{ formatTime(data?.DeptCreateTime, false) }}
-
+
+
+ ![公司图标]()
+
+
@@ -249,22 +283,16 @@ watch(companyUUID, () => {
+
+
+ ![公司图标]()
+
+
+
@@ -207,16 +207,17 @@ watch(deptUUID, () => {
diff --git a/src/views/company/EmployeeDetail.vue b/src/views/company/EmployeeDetail.vue
index b857e56..5af11ab 100644
--- a/src/views/company/EmployeeDetail.vue
+++ b/src/views/company/EmployeeDetail.vue
@@ -30,6 +30,7 @@ import CrudTable from '@/components/CrudTable.vue'
import { formApi } from '@/api/form'
import { get } from '@/api/request'
import { setPageTitle, getServerScopeParams } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
import type { ColumnSchema } from '@/types/api'
/** 用户记录类型（仅声明详情页用到的字段） */
@@ -69,8 +70,6 @@ const loading = ref(false)
const userData = ref(null)
/** 2FA 信息（null 表示未获取或未配置） */
const twoFaData = ref(null)
-/** 错误信息 */
-const errorMsg = ref('')
/** 从路由 query 读取用户 UUID（computed 响应式：同一 tab 复用且 query 变化时自动更新） */
const userUUID = computed(() => (route.query.UserUUID as string) || '')
@@ -119,16 +118,6 @@ function asStr(val: unknown): string {
return val == null || val === '' ? '' : String(val)
}
-/** 格式化时间（空值返回 -） */
-function formatTime(val: unknown): string {
- if (!val) return '-'
- const s = String(val)
- const d = new Date(s)
- if (isNaN(d.getTime())) return s
- const pad = (n: number) => String(n).padStart(2, '0')
- return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
-}
-
/** 提取分页响应中的列表（兼容数组和 PagedData） */
function pickList(res: unknown): T[] {
if (Array.isArray(res)) return res as T[]
@@ -144,18 +133,18 @@ function isTruthy(val: unknown): boolean {
/** 拉取用户主数据 + 2FA 信息（2FA 失败不阻塞） */
async function loadUser(): Promise {
if (!userUUID.value) {
- errorMsg.value = '缺少 UserUUID 参数，无法加载员工详情。'
+ // 无 UserUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ userData.value = null
+ setPageTitle('员工详情')
return
}
loading.value = true
- errorMsg.value = ''
twoFaData.value = null
try {
const res = await formApi.list('User', { UserUUID: userUUID.value, pageSize: 1 })
const list = pickList(res)
const data = list.find((u) => u.UserUUID === userUUID.value) || list[0]
if (!data) {
- errorMsg.value = '未找到用户数据'
return
}
userData.value = data
@@ -169,8 +158,8 @@ async function loadUser(): Promise {
} catch {
twoFaData.value = null
}
- } catch (e) {
- errorMsg.value = `加载失败: ${e instanceof Error ? e.message : String(e)}`
+ } catch {
+ // 错误提示已由响应拦截器统一弹出，数据未加载成功时展示空态
} finally {
loading.value = false
}
@@ -235,13 +224,11 @@ async function saveEdit(): Promise {
onMounted(loadUser)
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧员工数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadUser 幂等）；
+// 空值场景静默显示空态（loadUser 内处理），不再弹警告
watch(userUUID, () => {
- if (!userUUID.value) {
- errorMsg.value = '缺少 UserUUID 参数，无法加载员工详情。'
- return
- }
void loadUser()
-})
+}, { immediate: true })
@@ -253,11 +240,16 @@ watch(userUUID, () => {
-
-
+
-
+
{{ twoFaData.IsEnabled === 1 ? '已启用' : '未启用' }}
@@ -317,7 +309,7 @@ watch(userUUID, () => {
-
+
+
diff --git a/src/views/company/RoleDetail.vue b/src/views/company/RoleDetail.vue
index 0da38d1..7d3a741 100644
--- a/src/views/company/RoleDetail.vue
+++ b/src/views/company/RoleDetail.vue
@@ -29,6 +29,7 @@ import InfoGrid from '@/components/InfoGrid.vue'
import CrudTable from '@/components/CrudTable.vue'
import { formApi } from '@/api/form'
import { setPageTitle, isDefaultServer, hasAdminVerifyArg } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
import type { ColumnSchema } from '@/types/api'
/** 角色记录类型（仅声明详情页用到的字段） */
@@ -52,8 +53,6 @@ const route = useRoute()
const loading = ref(false)
/** 角色主数据 */
const roleData = ref(null)
-/** 错误信息 */
-const errorMsg = ref('')
/** 从路由 query 读取角色 UUID（computed 响应式：同一 tab 复用且 query 变化时自动更新） */
const roleUUID = computed(() => (route.query.RoleUUID as string) || '')
@@ -88,16 +87,6 @@ function asStr(val: unknown): string {
return val == null || val === '' ? '' : String(val)
}
-/** 格式化时间（空值返回 -） */
-function formatTime(val: unknown): string {
- if (!val) return '-'
- const s = String(val)
- const d = new Date(s)
- if (isNaN(d.getTime())) return s
- const pad = (n: number) => String(n).padStart(2, '0')
- return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}:${pad(d.getSeconds())}`
-}
-
/** 提取分页响应中的列表（兼容数组和 PagedData） */
function pickList(res: unknown): T[] {
if (Array.isArray(res)) return res as T[]
@@ -108,23 +97,23 @@ function pickList(res: unknown): T[] {
/** 拉取角色主数据 */
async function loadRole(): Promise {
if (!roleUUID.value) {
- errorMsg.value = '缺少 RoleUUID 参数，无法加载角色详情。'
+ // 无 RoleUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ roleData.value = null
+ setPageTitle('角色详情')
return
}
loading.value = true
- errorMsg.value = ''
try {
const res = await formApi.list('Role', { RoleUUID: roleUUID.value, pageSize: 1 })
const list = pickList(res)
const data = list.find((r) => r.RoleUUID === roleUUID.value) || list[0]
if (!data) {
- errorMsg.value = '未找到角色数据'
return
}
roleData.value = data
setPageTitle(asStr(data.RoleName) || '角色详情')
- } catch (e) {
- errorMsg.value = `加载失败: ${e instanceof Error ? e.message : String(e)}`
+ } catch {
+ // 错误提示已由响应拦截器统一弹出，数据未加载成功时展示空态
} finally {
loading.value = false
}
@@ -183,13 +172,11 @@ async function saveEdit(): Promise {
onMounted(loadRole)
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧角色数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadRole 幂等）；
+// 空值场景静默显示空态（loadRole 内处理），不再弹警告
watch(roleUUID, () => {
- if (!roleUUID.value) {
- errorMsg.value = '缺少 RoleUUID 参数，无法加载角色详情。'
- return
- }
void loadRole()
-})
+}, { immediate: true })
@@ -201,11 +188,16 @@ watch(roleUUID, () => {
-
-
+
{{ asStr(roleData.RoleName) || '-' }}
{{ roleTypeMap[String(roleData.RoleType)] ?? '-' }}
@@ -220,7 +212,6 @@ watch(roleUUID, () => {
{
-
+
{
-
+
{
pk-field="UserRoleUUID"
/>
+
diff --git a/src/views/company/Tenant.vue b/src/views/company/Tenant.vue
index 6af2176..58b6bcb 100644
--- a/src/views/company/Tenant.vue
+++ b/src/views/company/Tenant.vue
@@ -57,6 +57,13 @@ function handleView(row: TenantRow): void {
pageable
stretch
selectable
+ card-mode
+ card-title-field="TenantName"
+ :card-fields="['TenantStatus', 'ReviewStatus', 'ReviewRemark', 'TenantExpireTime', 'CreateTime']"
+ :card-value-maps="{
+ TenantStatus: { 0: '禁用', 1: '启用' },
+ ReviewStatus: { 0: '待审核', 1: '已通过', 2: '已拒绝' },
+ }"
:on-view="handleView"
/>
diff --git a/src/views/company/TenantDetail.vue b/src/views/company/TenantDetail.vue
index e106248..b3fb93b 100644
--- a/src/views/company/TenantDetail.vue
+++ b/src/views/company/TenantDetail.vue
@@ -26,6 +26,7 @@ import CrudTable from '@/components/CrudTable.vue'
import EntityPicker from '@/components/EntityPicker.vue'
import { formApi } from '@/api/form'
import { setPageTitle } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
import type { ColumnSchema } from '@/types/api'
const route = useRoute()
@@ -67,15 +68,6 @@ function reviewStatusTag(v: unknown): { text: string; type: 'success' | 'danger'
return { text: String(v ?? '-'), type: 'info' }
}
-/** 时间格式化 */
-function formatTime(v: unknown): string {
- if (!v) return '-'
- const d = new Date(v as string)
- if (isNaN(d.getTime())) return String(v)
- const pad = (n: number) => String(n).padStart(2, '0')
- return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
-}
-
// 编辑弹窗可见列
const formColumns = computed(() =>
columns.value.filter(
@@ -93,7 +85,9 @@ const formColumns = computed(() =>
async function loadData(): Promise {
if (!tenantUUID.value) {
- ElMessage.warning('缺少 TenantUUID 参数，无法加载租户详情')
+ // 无 TenantUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ data.value = null
+ setPageTitle('租户详情')
return
}
loading.value = true
@@ -153,13 +147,11 @@ onMounted(async () => {
})
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧租户数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadData 幂等）；
+// 空值场景静默显示空态（loadData 内处理），不再弹警告
watch(tenantUUID, () => {
- if (!tenantUUID.value) {
- ElMessage.warning('缺少 TenantUUID 参数，无法加载租户详情')
- return
- }
void loadData()
-})
+}, { immediate: true })
@@ -170,6 +162,14 @@ watch(tenantUUID, () => {
+
+
{{ data?.TenantName || '-' }}
@@ -178,8 +178,8 @@ watch(tenantUUID, () => {
{{ tenantStatusTag(data?.TenantStatus).text }}
- {{ formatTime(data?.TenantExpireTime) }}
- {{ formatTime(data?.CreateTime) }}
+ {{ formatTime(data?.TenantExpireTime, false) }}
+ {{ formatTime(data?.CreateTime, false) }}
@@ -189,7 +189,7 @@ watch(tenantUUID, () => {
{{ reviewStatusTag(data?.ReviewStatus).text }}
- {{ formatTime(data?.ReviewTime) }}
+ {{ formatTime(data?.ReviewTime, false) }}
{{ data?.ReviewRemark || '-' }}
@@ -213,6 +213,7 @@ watch(tenantUUID, () => {
:on-view="goCompanyDetail"
/>
+
diff --git a/src/views/company/WorkgroupDetail.vue b/src/views/company/WorkgroupDetail.vue
index 6906312..811ffd8 100644
--- a/src/views/company/WorkgroupDetail.vue
+++ b/src/views/company/WorkgroupDetail.vue
@@ -50,6 +50,15 @@ const editForm = reactive>({})
// 主键字段
const PK_FIELD = 'WorkgroupUUID'
+// tags 表单：逗号分隔字符串 ↔ 多选数组互转（工作组标签 WorkgroupTags）
+function splitTags(value: unknown, separator = ','): string[] {
+ if (!value) return []
+ return String(value).split(separator).map((s) => s.trim()).filter(Boolean)
+}
+function joinTags(values: string[], separator = ','): string {
+ return (values || []).filter(Boolean).join(separator)
+}
+
// 页面标题
const title = computed(() => data.value?.WorkgroupName || '工作组详情')
@@ -57,7 +66,9 @@ const title = computed(() => data.value?.WorkgroupName || '工作组详情')
async function loadData(): Promise {
if (!workgroupUUID.value) {
- ElMessage.warning('缺少 WorkgroupUUID 参数，无法加载工作组详情')
+ // 无 WorkgroupUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ data.value = null
+ setPageTitle('工作组详情')
return
}
loading.value = true
@@ -135,9 +146,9 @@ async function handleSubmit(): Promise {
// === 子表跳转 ===
-/** WorkgroupRole 子表查看 → 角色详情 */
-function goRoleDetail(row: Record): void {
- router.push({ path: '/system/role-detail', query: { RoleUUID: row.RoleUUID || '' } })
+/** UserRole 子表查看 → 用户详情 */
+function goUserDetail(row: Record): void {
+ router.push({ path: '/system/user-detail', query: { UserUUID: row.UserUUID || '' } })
}
onMounted(async () => {
@@ -145,13 +156,11 @@ onMounted(async () => {
})
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧工作组数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadData 幂等）；
+// 空值场景静默显示空态（loadData 内处理），不再弹警告
watch(workgroupUUID, () => {
- if (!workgroupUUID.value) {
- ElMessage.warning('缺少 WorkgroupUUID 参数，无法加载工作组详情')
- return
- }
void loadData()
-})
+}, { immediate: true })
@@ -162,6 +171,14 @@ watch(workgroupUUID, () => {
+
+
{{ data?.WorkgroupName || '-' }}
@@ -172,26 +189,27 @@ watch(workgroupUUID, () => {
{{ data?.WorkgroupIntroduction || '-' }}
-
+
+
@@ -247,6 +265,26 @@ watch(workgroupUUID, () => {
:value="opt.value"
/>
+
+
+
userStore.isAdmin)
-/** 无权访问标记：非管理员进入时置 true */
-const denied = ref(false)
+/** 无权访问：CheckAdmin 加载完成且确认非管理员（加载中不显示无权访问，避免刷新后闪误判） */
+const denied = computed(() => userStore.adminChecked && !isAdmin.value)
/** 审计日志记录（对齐后端字段，PascalCase） */
interface AuditLogRow {
@@ -93,12 +94,6 @@ function actionTagType(action?: string): 'success' | 'warning' | 'danger' | 'inf
return (action && map[action]) || 'info'
}
-/** 时间格式化：去掉 T，截取到秒 */
-function formatTime(t?: string): string {
- if (!t) return '-'
- return String(t).replace('T', ' ').substring(0, 19)
-}
-
/** 安全 JSON 解析：字符串解析失败时原样返回 */
function safeJsonParse(str: unknown): unknown {
if (typeof str !== 'string') return str
@@ -213,13 +208,24 @@ function prettyJson(data: unknown): string {
}
onMounted(() => {
- // 非管理员直接拦截，展示无权访问
- if (!isAdmin.value) {
- denied.value = true
- return
+ // 等 CheckAdmin 加载完成后确认管理员再加载日志（刷新后 adminChecked 异步恢复）
+ if (userStore.adminChecked) {
+ loadIfAdmin()
+ } else {
+ watch(
+ () => userStore.adminChecked,
+ (checked) => {
+ if (checked) loadIfAdmin()
+ },
+ )
}
- loadAuditLogs()
})
+
+/** CheckAdmin 确认管理员后加载数据（非管理员不加载，展示无权访问） */
+function loadIfAdmin(): void {
+ if (!isAdmin.value) return
+ loadAuditLogs()
+}
diff --git a/src/views/system/Database.vue b/src/views/system/Database.vue
index 0be8277..403b6e4 100644
--- a/src/views/system/Database.vue
+++ b/src/views/system/Database.vue
@@ -18,7 +18,7 @@
* - 跳转改用 vue-router：/system/dbtable?table=xxx&title=xxx（子服务器追加 server）
* - 返回服务器列表改用 router.push（替代 GERP.Navigate）
*/
-import { ref, computed, onMounted } from 'vue'
+import { ref, computed, onMounted, watch } from 'vue'
import { useRouter } from 'vue-router'
import { get } from '@/api/request'
import { setPageTitle, getServer, isDefaultServer } from '@/utils/serverScope'
@@ -28,7 +28,8 @@ import AdminBadge from '@/components/AdminBadge.vue'
const router = useRouter()
const userStore = useUserStore()
const isAdmin = computed(() => userStore.isAdmin)
-const denied = ref(false)
+// 无权访问：CheckAdmin 加载完成且确认非管理员（加载中不显示无权访问，避免刷新后闪误判）
+const denied = computed(() => userStore.adminChecked && !isAdmin.value)
/** 服务器标识（主实例为 gvsds-master） */
const serverName = getServer()
@@ -111,16 +112,28 @@ function tableMeta(table: TableItem): string {
}
onMounted(() => {
- if (!isAdmin.value) {
- denied.value = true
- return
+ // 等 CheckAdmin 加载完成后确认管理员再加载表列表（刷新后 adminChecked 异步恢复）
+ if (userStore.adminChecked) {
+ loadIfAdmin()
+ } else {
+ watch(
+ () => userStore.adminChecked,
+ (checked) => {
+ if (checked) loadIfAdmin()
+ },
+ )
}
+})
+
+/** CheckAdmin 确认管理员后加载数据（非管理员不加载，展示无权访问） */
+function loadIfAdmin(): void {
+ if (!isAdmin.value) return
if (isMain) {
loadMainTables()
} else {
loadSubTables()
}
-})
+}
diff --git a/src/views/system/DbTable.vue b/src/views/system/DbTable.vue
index 3cd3fa9..2933971 100644
--- a/src/views/system/DbTable.vue
+++ b/src/views/system/DbTable.vue
@@ -20,7 +20,7 @@
* - 子服务器 subproxy 模式 CrudTable 暂不支持，标 TODO 待 DbTableHelper 迁移
* - TODO: 完整迁移 DbTableHelper（列定义动态渲染、子服务器代理、表结构编辑等高级能力）
*/
-import { computed, ref, onMounted } from 'vue'
+import { computed, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { setPageTitle, getServer, isDefaultServer } from '@/utils/serverScope'
import { useUserStore } from '@/stores/user'
@@ -31,21 +31,28 @@ const route = useRoute()
const router = useRouter()
const userStore = useUserStore()
const isAdmin = computed(() => userStore.isAdmin)
-const denied = ref(false)
+// 无权访问：CheckAdmin 加载完成且确认非管理员（加载中不显示无权访问，避免刷新后闪误判）
+const denied = computed(() => userStore.adminChecked && !isAdmin.value)
/** 服务器标识（主实例为 gvsds-master） */
const serverName = getServer()
/** 是否主实例 */
const isMain = isDefaultServer()
-/** 表名（路由 query） */
-const tableName = (route.query.table as string) || ''
+/** 表名（路由 query，computed 响应式：同一 tab 复用且 query 变化时自动更新） */
+const tableName = computed(() => (route.query.table as string) || '')
/** 表标题（路由 query，缺省回退表名） */
-const tableTitle = (route.query.title as string) || tableName
+const tableTitle = computed(() => (route.query.title as string) || tableName.value)
/** 页面标题 */
-const pageTitle = computed(() => (isMain ? tableTitle : `${serverName} — ${tableTitle}`))
+const pageTitle = computed(() => (isMain ? tableTitle.value : `${serverName} — ${tableTitle.value}`))
setPageTitle(pageTitle.value)
+/** 表格最大高度：视口高度 60%（窗口尺寸变化时响应式更新） */
+const tableMaxHeight = ref(Math.floor(window.innerHeight * 0.6))
+window.addEventListener('resize', () => {
+ tableMaxHeight.value = Math.floor(window.innerHeight * 0.6)
+})
+
/** 返回数据库管理页 */
function goBack(): void {
const query: Record = {}
@@ -53,12 +60,7 @@ function goBack(): void {
router.push({ path: '/system/database', query })
}
-onMounted(() => {
- // 非管理员直接拦截，展示无权访问
- if (!isAdmin.value) {
- denied.value = true
- }
-})
+// denied 已改为 computed（adminChecked && !isAdmin），无需 onMounted 拦截
@@ -109,12 +111,14 @@ onMounted(() => {
-->
{{ data?.RoleName || '-' }}
@@ -223,7 +220,7 @@ watch(roleUUID, () => {
{{ data?.RoleDesc || '-' }}
- {{ formatTime(data?.CreateTime) }}
+ {{ formatTime(data?.CreateTime, false) }}
@@ -270,6 +267,7 @@ watch(roleUUID, () => {
添加
+
diff --git a/src/views/system/RolePermissions.vue b/src/views/system/RolePermissions.vue
index 88f3752..91f395f 100644
--- a/src/views/system/RolePermissions.vue
+++ b/src/views/system/RolePermissions.vue
@@ -21,7 +21,7 @@
* - GET /API/Role/PermissionsTree?RoleUUID=&CompanyUUID= → { Groups: [{ Category, Permissions: [{ PermUUID, PermName, PermCode, PermDesc, Checked }] }] }
* - POST /API/Role/SavePermissions { RoleUUID, CompanyUUID, PermUUIDs } → { Added, Removed, Kept }
*/
-import { ref, computed, onMounted, onBeforeUnmount, nextTick } from 'vue'
+import { ref, computed, onMounted, onBeforeUnmount, nextTick, watch } from 'vue'
import { useRoute, onBeforeRouteLeave } from 'vue-router'
import { ElMessage } from 'element-plus'
import DetailPage from '@/components/DetailPage.vue'
@@ -47,7 +47,8 @@ const companies = ref>>([])
const permissionTree = ref([])
const loading = ref(false)
const saving = ref(false)
-const denied = ref(false)
+// 无权访问：CheckAdmin 加载完成且确认非管理员（加载中不显示无权访问，避免刷新后闪误判）
+const denied = computed(() => userStore.adminChecked && !isAdmin.value)
const hasChanges = ref(false)
// 原始勾选集合（用于变更检测）
@@ -251,14 +252,28 @@ onBeforeRouteLeave((_to, _from, next) => {
}
})
+/** CheckAdmin 确认管理员后加载数据（非管理员不加载，展示无权访问） */
+async function loadIfAdmin(): Promise {
+ if (!isAdmin.value) return
+ await Promise.all([loadRoles(), loadCompanies()])
+}
+
onMounted(async () => {
setPageTitle('角色权限分配')
- // 入口校验：仅管理员可访问
- if (!isAdmin.value) {
- denied.value = true
- return
+ // 等 CheckAdmin 加载完成后确认管理员再加载（刷新后 adminChecked 异步恢复）
+ if (userStore.adminChecked) {
+ await loadIfAdmin()
+ } else {
+ await new Promise((resolve) => {
+ watch(
+ () => userStore.adminChecked,
+ (checked) => {
+ if (checked) resolve()
+ },
+ )
+ })
+ await loadIfAdmin()
}
- await Promise.all([loadRoles(), loadCompanies()])
// 自动选中初始角色 / 公司
if (initRoleUUID) selectedRoleUUID.value = initRoleUUID
if (initCompanyUUID) selectedCompanyUUID.value = initCompanyUUID
diff --git a/src/views/system/Settings.vue b/src/views/system/Settings.vue
index 909360d..dd068bc 100644
--- a/src/views/system/Settings.vue
+++ b/src/views/system/Settings.vue
@@ -241,10 +241,25 @@ watch(
onMounted(async () => {
const s = await loadSettings()
+ // 主题一致性：右上角"一键切换深/浅"是运行时最直接的意图，
+ // 若当前已有运行时主题则优先采用，避免后端持久化的 themeMode 在打开设置页时
+ // 回写覆盖用户刚切换的主题（两处状态源分叉导致"疑似冲突"的根因）。
+ if (appStore.theme !== 'default') {
+ s.themeMode = appStore.theme
+ }
Object.assign(settings, s)
applySettingsToRuntime(settings)
initialized.value = true
})
+
+// 顶栏一键切换（appStore.toggleTheme）后，设置页主题下拉实时跟随，
+// 保证两处状态始终一致（不触发保存，避免与 onThemeChange 的即时保存互相干扰）
+watch(
+ () => appStore.theme,
+ (val) => {
+ settings.themeMode = val
+ },
+)
diff --git a/src/views/system/TenantReview.vue b/src/views/system/TenantReview.vue
index b83cf83..0804abd 100644
--- a/src/views/system/TenantReview.vue
+++ b/src/views/system/TenantReview.vue
@@ -25,6 +25,7 @@ import { ref, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { get, post } from '@/api/request'
import { setPageTitle } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
// === 类型定义 ===
@@ -57,14 +58,6 @@ const rejectReason = ref('')
/** 拒绝提交中 */
const rejecting = ref(false)
-// === 工具函数 ===
-
-/** 时间格式化：去掉 T 分隔，截取到秒 */
-function formatTime(t: string): string {
- if (!t) return '-'
- return t.replace('T', ' ').substring(0, 19)
-}
-
// === 数据加载 ===
/** 加载待审核租户列表 */
diff --git a/src/views/system/UserDetail.vue b/src/views/system/UserDetail.vue
index a84137e..a664163 100644
--- a/src/views/system/UserDetail.vue
+++ b/src/views/system/UserDetail.vue
@@ -31,6 +31,7 @@ import { formApi } from '@/api/form'
import { get } from '@/api/request'
import { useUserStore } from '@/stores/user'
import { setPageTitle } from '@/utils/serverScope'
+import { formatUtcTime as formatTime } from '@/utils/dateTime'
import type { ColumnSchema } from '@/types/api'
const route = useRoute()
@@ -102,15 +103,6 @@ function accountLicenseTag(v: unknown): { text: string; type: 'success' | 'dange
return { text: String(v ?? '-'), type: 'warning' }
}
-/** 时间格式化：ISO/时间戳 → YYYY-MM-DD HH:mm，无法解析则原样返回 */
-function formatTime(v: unknown): string {
- if (!v) return '-'
- const d = new Date(v as string)
- if (isNaN(d.getTime())) return String(v)
- const pad = (n: number) => String(n).padStart(2, '0')
- return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
-}
-
// 编辑弹窗可见列：排除隐藏 / 主键 / 不可编辑 / 非表单类型
const formColumns = computed(() =>
columns.value.filter(
@@ -129,7 +121,9 @@ const formColumns = computed(() =>
/** 加载用户主表单条数据 */
async function loadData(): Promise {
if (!userUUID.value) {
- ElMessage.warning('缺少 UserUUID 参数，无法加载用户详情')
+ // 无 UserUUID 参数：不弹警告（首次无参进入/菜单误入均静默），显示空态引导
+ data.value = null
+ setPageTitle('用户详情')
return
}
loading.value = true
@@ -210,13 +204,11 @@ onMounted(async () => {
})
// 同一 tab 复用（v-show 常驻）时 query 变化：重新加载（防展示旧用户数据 / 缺参报错）
+// immediate 使首次挂载也走统一逻辑（与 onMounted 的 loadData 幂等）；
+// 空值场景静默显示空态（loadData 内处理），不再弹警告
watch(userUUID, () => {
- if (!userUUID.value) {
- ElMessage.warning('缺少 UserUUID 参数，无法加载用户详情')
- return
- }
void loadData()
-})
+}, { immediate: true })
@@ -232,6 +224,14 @@ watch(userUUID, () => {
{{ isolationHint }}
+
+
{{ data?.UserName || '-' }}
@@ -255,8 +255,8 @@ watch(userUUID, () => {
{{ yesNoText(data?.IsStaff) }}
{{ yesNoText(data?.IsSuperuser) }}
- {{ formatTime(data?.UserCreateTime) }}
- {{ formatTime(data?.UserLastLoginDate) }}
+ {{ formatTime(data?.UserCreateTime, false) }}
+ {{ formatTime(data?.UserLastLoginDate, false) }}
@@ -312,6 +312,7 @@ watch(userUUID, () => {
:on-view="goDeptDetail"
/>
+
diff --git a/src/views/workorder/Admin.vue b/src/views/workorder/Admin.vue
index d0b079d..3887159 100644
--- a/src/views/workorder/Admin.vue
+++ b/src/views/workorder/Admin.vue
@@ -2,21 +2,149 @@
/**
* 工单管理（管理员视图）
*
- * 迁移自 TempLate/GERP/pages/workorder/admin.html（55 行）
- * 原生实现：拉取 /API/FormAPI/Columns/WorkOrder 后实例化 TableEngine，全权委托 CRUD
- *
- * Vue 版：直接挂载 CrudTable，表名 WorkOrder，开启分页/搜索/行选择
- * server / admin_verify 由 request.ts 拦截器统一注入，无需页面关心
+ * 迁移自 TempLate/GERP/pages/workorder/admin.html（55 行），并补充工单中心专属能力：
+ * - 统计仪表盘：总工单 + 按状态/优先级/分类计数卡片（数据来自 /API/FormAPI/WorkOrderStats）
+ * - 状态筛选：点击状态卡片按 Status 过滤列表（CrudTable query 联动）
+ * - 详情跳转：点"查看"进入工单详情页（状态流转/富文本展示）
+ * - 底层表格：CrudTable（搜索/分页/新增/编辑/删除）
*/
+import { computed, onMounted, ref } from 'vue'
+import { useRouter } from 'vue-router'
import CrudTable from '@/components/CrudTable.vue'
+import { get } from '@/api/request'
import { setPageTitle } from '@/utils/serverScope'
setPageTitle('工单管理')
+
+const router = useRouter()
+
+/** 状态卡片配置（0 待处理 / 1 处理中 / 2 已完成 / 3 已关闭） */
+const STATUS_CARDS = [
+ { status: null, label: '全部', key: 'total', type: 'primary' as const },
+ { status: 0, label: '待处理', key: 'byStatus', code: 0, type: 'warning' as const },
+ { status: 1, label: '处理中', key: 'byStatus', code: 1, type: 'primary' as const },
+ { status: 2, label: '已完成', key: 'byStatus', code: 2, type: 'success' as const },
+ { status: 3, label: '已关闭', key: 'byStatus', code: 3, type: 'info' as const },
+]
+
+/** 优先级卡片配置（0 普通 / 1 重要 / 2 紧急） */
+const PRIORITY_CARDS = [
+ { status: 0, label: '普通', code: 0, type: 'info' as const },
+ { status: 1, label: '重要', code: 1, type: 'warning' as const },
+ { status: 2, label: '紧急', code: 2, type: 'danger' as const },
+]
+
+/** 统计接口返回结构 */
+interface WorkOrderStats {
+ total: number
+ byStatus: Record
+ byPriority: Record
+ byCategory: Record
+ statusOptions?: Array<{ value: number; label: string }>
+ priorityOptions?: Array<{ value: number; label: string }>
+ categoryOptions?: Array<{ value: string; label: string }>
+}
+
+/** 统计结果 */
+const stats = ref({ total: 0, byStatus: {}, byPriority: {}, byCategory: {} })
+/** 统计加载态 */
+const statsLoading = ref(false)
+
+/** 当前状态筛选（null=全部），驱动 CrudTable query */
+const activeStatus = ref(null)
+
+/** CrudTable 查询条件：状态筛选透传给后端精确过滤 */
+const query = computed(() => (activeStatus.value === null ? {} : { Status: activeStatus.value }))
+
+/** 加载统计 */
+async function loadStats(): Promise {
+ statsLoading.value = true
+ try {
+ const data = await get('/API/FormAPI/WorkOrderStats')
+ stats.value = data || { total: 0, byStatus: {}, byPriority: {}, byCategory: {} }
+ } catch {
+ stats.value = { total: 0, byStatus: {}, byPriority: {}, byCategory: {} }
+ } finally {
+ statsLoading.value = false
+ }
+}
+
+/** 状态卡片数字 */
+function statusCardCount(card: (typeof STATUS_CARDS)[number]): number {
+ if (card.status === null) return stats.value.total
+ return stats.value.byStatus[card.code as number] ?? 0
+}
+
+/** 优先级卡片数字 */
+function priorityCardCount(card: (typeof PRIORITY_CARDS)[number]): number {
+ return stats.value.byPriority[card.code] ?? 0
+}
+
+/** 分类标签：后端统计可能含历史 'other' 之外的自定义值，原样展示 */
+const categoryEntries = computed(() => Object.entries(stats.value.byCategory).sort((a, b) => b[1] - a[1]))
+
+/** 点击状态卡片：切换筛选 */
+function selectStatus(status: number | null): void {
+ activeStatus.value = status
+}
+
+/** 查看 → 工单详情页 */
+function goDetail(row: Record): void {
+ router.push(`/workorder/detail/${String(row.OrderUUID ?? '')}`)
+}
+
+onMounted(() => {
+ void loadStats()
+})
): void {
+ router.push(`/workorder/detail/${String(row.OrderUUID ?? '')}`)
+}
admin:super 权限可使该角色成为超级管理员
-
@@ -26,6 +154,76 @@ setPageTitle('工单管理')
height: 100%;
display: flex;
flex-direction: column;
+ gap: 14px;
box-sizing: border-box;
+
+ // 统计区撑满后 CrudTable 用 flex:1 吃掉剩余空间
+ .wo-stats {
+ flex-shrink: 0;
+ }
+}
+
+.wo-stats {
+ display: flex;
+ flex-direction: column;
+ gap: 10px;
+}
+
+.wo-stats-row {
+ display: flex;
+ gap: 12px;
+ align-items: center;
+ flex-wrap: wrap;
+
+ &--secondary {
+ font-size: 13px;
+ }
+}
+
+// 状态统计卡片：可点击筛选，选中态主色描边
+.wo-stat-card {
+ min-width: 110px;
+ padding: 14px 18px;
+ border-radius: 10px;
+ cursor: pointer;
+ text-align: center;
+ background: var(--el-bg-color);
+ border: 2px solid var(--el-border-color-light);
+ transition:
+ transform 0.15s ease,
+ border-color 0.15s ease,
+ box-shadow 0.15s ease;
+
+ &:hover {
+ transform: translateY(-2px);
+ }
+
+ &.active {
+ border-color: var(--el-color-primary);
+ box-shadow: 0 0 0 1px var(--el-color-primary) inset;
+ }
+
+ .wo-stat-num {
+ font-size: 26px;
+ font-weight: 700;
+ line-height: 1.2;
+ }
+
+ .wo-stat-label {
+ font-size: 13px;
+ color: var(--el-text-color-secondary);
+ margin-top: 2px;
+ }
+
+ &--primary .wo-stat-num { color: var(--el-color-primary); }
+ &--warning .wo-stat-num { color: var(--el-color-warning); }
+ &--success .wo-stat-num { color: var(--el-color-success); }
+ &--info .wo-stat-num { color: var(--el-text-color-regular); }
+}
+
+.wo-stats-divider {
+ width: 1px;
+ height: 20px;
+ background: var(--el-border-color);
}
diff --git a/src/views/workorder/My.vue b/src/views/workorder/My.vue
index c77ed4f..123457c 100644
--- a/src/views/workorder/My.vue
+++ b/src/views/workorder/My.vue
@@ -13,11 +13,13 @@
* - 不开启行选择（个人工单无需批量删除）
*/
import { computed } from 'vue'
+import { useRouter } from 'vue-router'
import CrudTable from '@/components/CrudTable.vue'
import { useUserStore } from '@/stores/user'
import { setPageTitle } from '@/utils/serverScope'
const userStore = useUserStore()
+const router = useRouter()
setPageTitle('我的工单')
// 以当前用户 UUID 作为过滤条件；未登录时为空对象（CrudTable 会拉全部，但路由守卫已保证登录）
@@ -25,11 +27,16 @@ const query = computed(() => {
const uuid = userStore.userInfo?.UserUUID
return uuid ? { CreatorUUID: uuid } : {}
})
+
+// 查看 → 工单详情页
+function goDetail(row: Record
+
+
+
+
+
+
+
+
+
+
+ {{ statusCardCount(card) }}
+ {{ card.label }}
+
+
+ {{ card.label }} {{ priorityCardCount(card) }}
+
+
+
+ {{ cat }} {{ count }}
+
+
+
-
diff --git a/src/views/workorder/WorkOrderDetail.vue b/src/views/workorder/WorkOrderDetail.vue
new file mode 100644
index 0000000..7b0f676
--- /dev/null
+++ b/src/views/workorder/WorkOrderDetail.vue
@@ -0,0 +1,407 @@
+
+
+
+
+
+
+ 工单信息
+
+
+
+
+
+ 描述
+
+
+
+
+
+ 解决方案
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+ 保存
+
+
+
+
+
+
diff --git a/vite.config.ts b/vite.config.ts
index a23f701..f937c8a 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -65,6 +65,30 @@ export default defineConfig({
build: {
outDir: 'dist',
sourcemap: false,
- chunkSizeWarningLimit: 1500,
+ chunkSizeWarningLimit: 2000,
+ // 合并全部 CSS 为单个文件：消灭按需组件产生的零碎 .css 与 css-*.js（可省约 90 个请求）
+ cssCodeSplit: false,
+ rollupOptions: {
+ output: {
+ // 归并 node_modules 公共依赖，消灭 0.1-10kB 的细碎 chunk（lodash 工具 / element-plus 小组件等）
+ manualChunks(id: string) {
+ if (!id.includes('node_modules')) return undefined
+ if (id.includes('element-plus') || id.includes('@element-plus')) return 'element-plus'
+ if (id.includes('vxe-table')) return 'vxe-table'
+ if (id.includes('@formkit') || id.includes('formkit')) return 'formkit'
+ if (id.includes('lodash') || id.includes('xe-utils')) return 'utils'
+ if (
+ id.includes('/node_modules/vue') ||
+ id.includes('/node_modules/vue-router') ||
+ id.includes('/node_modules/pinia') ||
+ id.includes('/node_modules/@vue') ||
+ id.includes('/node_modules/@vueuse')
+ ) {
+ return 'vue-vendor'
+ }
+ return 'vendor'
+ },
+ },
+ },
},
})
+
+
+
+
+
+
+
+ {{ record.Title || '（无标题）' }}
+ +
+
+
+
+
+ 流转：
+
+ {{ act.label }}
+
+
+
+
+