diff --git a/backend/src/api/storage.js b/backend/src/api/storage.js new file mode 100644 index 0000000..9124f9b --- /dev/null +++ b/backend/src/api/storage.js @@ -0,0 +1,43 @@ +import request from "@/utils/request"; + +/** 当前租户附件空间用量(基础额度 / 生效套餐 / 已用) */ +export function getStorageInfo() { + return request({ + url: "/backend/tenant/storageInfo", + method: "get", + }); +} + +/** 可购买的附件空间套餐 */ +export function getStoragePackages() { + return request({ + url: "/backend/tenant/storagePackages", + method: "get", + }); +} + +/** 创建附件空间订单并拉起支付 */ +export function createStorageOrder(data) { + return request({ + url: "/backend/tenant/storage/order", + method: "post", + data, + }); +} + +/** 我的购买记录 */ +export function getStorageOrders(params = {}) { + return request({ + url: "/backend/tenant/storage/orders", + method: "get", + params, + }); +} + +/** 订单详情(支付后轮询) */ +export function getStorageOrder(orderNo) { + return request({ + url: `/backend/tenant/storage/order/${orderNo}`, + method: "get", + }); +} diff --git a/backend/src/components/CommonAside.vue b/backend/src/components/CommonAside.vue index ae11032..0c94217 100644 --- a/backend/src/components/CommonAside.vue +++ b/backend/src/components/CommonAside.vue @@ -23,7 +23,7 @@ { diff --git a/backend/src/views/Main.vue b/backend/src/views/Main.vue index ce64eb3..cd3b876 100644 --- a/backend/src/views/Main.vue +++ b/backend/src/views/Main.vue @@ -620,9 +620,13 @@ const canCloseRight = computed(() => { background-color: var(--bg-color-page); transition: background-color 0.3s ease; :deep(.el-aside) { - display: block !important; + // 侧栏内部是「菜单 + 底部小程序码」的纵向布局: + // 必须是 flex 列容器,菜单才能 flex:1 收缩并在内部滚动;写成 block 会溢出裁剪。 + display: flex !important; + flex-direction: column; visibility: visible !important; height: 100vh; + min-height: 0; } .main-header { background-color: var(--header-bg-color, #3973ff); diff --git a/backend/src/views/apps/oa/attendance/index.vue b/backend/src/views/apps/oa/attendance/index.vue index fe72bd1..c2a6c1f 100644 --- a/backend/src/views/apps/oa/attendance/index.vue +++ b/backend/src/views/apps/oa/attendance/index.vue @@ -38,97 +38,23 @@ /> 查询 重置 + + +
+ + 月度 + 季度 + 年度 + +
+ + {{ summary.year }} 年 + +
+
- - - - - -
- - 月度 - 季度 - 年度 - -
- - {{ summary.year }} 年 - -
- 格子里为「已打卡 / 应出勤」,颜色按当日出勤率 -
- -
-
- 应出勤 - {{ summary.stats.scheduled || 0 }} -
-
- 已打卡 - {{ summary.stats.clocked || 0 }} -
-
- 迟到 - {{ summary.stats.late || 0 }} -
-
- 早退 - {{ summary.stats.early || 0 }} -
-
- 缺卡 - {{ summary.stats.missing || 0 }} -
-
- 无排班 - {{ summary.stats.noschedule || 0 }} -
-
- -
-
-
- {{ cal.month }} 月 - {{ cal.rate }}% -
-
- {{ week }} -
-
-
- {{ cell.day }} - - {{ cell.stat.clocked }}/{{ cell.stat.scheduled }} - -
-
-
-
- -
- 出勤率 ≥ 90% - 70% ~ 90% - 低于 70% - 无排班打卡 - 无排班 -
-
-
@@ -146,17 +72,80 @@ empty-text="当前范围内没有员工" style="width: 100%" @expand-change="onExpandChange" + @row-click="onRowClick" >