Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 root
|
971853560a | ||
|
root
|
d300fd9b96 | ||
|
root
|
1e3dc1a170 | ||
|
root
|
3bbc68b63e | ||
|
root
|
d55c768f16 |
@@ -0,0 +1,13 @@
|
||||
# v0.6.8 发布说明（2026-10-26）
|
||||
|
||||
## 确认弹窗重做
|
||||
|
||||
- 修复内容贴边（上一轮组件基座统一时确认框未获得内边距，标题/正文/按钮挤作一团）
|
||||
- 重做为标准企业级危险确认：红色警告徽标 + 标题/正文分区 + 22px 内边距 + 右对齐操作区
|
||||
- 危险操作：红色三角警告徽标 + 红色标题 + 红色实心确认按钮；普通确认保持蓝白风格
|
||||
- 移动端按钮等宽 40px；Esc/点击遮罩关闭行为不变（全部 10+ 处调用点零改动）
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`（网页端即生效）
|
||||
- 桌面 / 安卓：安装 0.6.8 安装包
|
||||
@@ -0,0 +1,13 @@
|
||||
# v0.6.9 发布说明（2026-10-26）
|
||||
|
||||
## 分类管理去原生弹窗，全部自绘
|
||||
|
||||
- **添加 / 修改分类**：不再使用浏览器原生 prompt，改为自绘「输入弹窗」——自动聚焦全选、回车提交、**内联校验**（空值 / 重名直接在弹窗内红字提示，不再 toast 打断）
|
||||
- **删除分类**：不再使用原生 confirm，改为统一的红色警告确认框（含保留提示：历史记录不受影响）
|
||||
- 新增通用 InputDialog 组件（输入类弹窗基座），后续项目改名等场景可复用
|
||||
- 全应用已无任何浏览器原生弹窗
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`（网页端即生效）
|
||||
- 桌面 / 安卓：安装 0.6.9 安装包
|
||||
@@ -0,0 +1,12 @@
|
||||
# v0.7.0 发布说明（2026-10-26）
|
||||
|
||||
## 记账：分类筛选
|
||||
|
||||
- 工具栏新增「分类」下拉：选项为本月**实际出现的分类**（自动去重排序），支持「全部分类」
|
||||
- 与类型筛选（支出/收入）、报销筛选可叠加使用；底部「当前筛选 N 条」实时联动
|
||||
- 切换月份自动重置分类筛选，避免跨月无效选项
|
||||
|
||||
## 部署
|
||||
|
||||
- 服务器：`cd /opt/daywork && git pull && cd server && docker compose up -d --build`（网页端即生效）
|
||||
- 桌面 / 安卓：安装 0.7.0 安装包
|
||||
@@ -0,0 +1,19 @@
|
||||
# v0.7.1 记账周期统计
|
||||
|
||||
## 新增
|
||||
- 记账支持按统计周期查看：按月 / 按期 / 自定义三种模式，统计卡、支出分类、表格与筛选全部跟随所选周期。
|
||||
- 按期模式：设置「账期起点」（如实习开始日 10-14）后自动切分第 1、2、3…期，第 N 期 = 起点 + (N-1) 个月，到起点 + N 个月的前一天（如 10.14 开启，第 1 期为 10.14 – 11.13）。
|
||||
- 账期起点存于设置表，随账号多端同步；设置起点后自动切换为按期视图。
|
||||
- 起点之前如有账目，期列表中提供「起点前」入口，避免数据「不见」的疑惑。
|
||||
- 自定义模式：任意起止日期区间（如 10.14 – 10.31）。
|
||||
- 新增「统计周期」选择弹窗：月份列表（仅有账目的月份）、期列表（带日期范围）、自定义区间三个页签。
|
||||
|
||||
## 优化
|
||||
- 工具栏月份标题改为可点击的周期选择按钮，‹ › 按当前模式逐周期移动。
|
||||
- 「回到本月」按钮仅在偏离当前周期时出现，减少常驻按钮。
|
||||
- 自定义模式下隐藏前后翻页箭头（无操作对象）。
|
||||
- 清除页面遗留的快速记账表单死代码（约 90 行未使用的脚本）。
|
||||
- 文案「本月」统一为「本期」（统计卡、分类、空态、计数）。
|
||||
|
||||
## 说明
|
||||
- 纯客户端功能，无 schema 变更、无服务端改动；部署后刷新网页即生效。
|
||||
@@ -0,0 +1,7 @@
|
||||
# v0.7.2 顶栏精简
|
||||
|
||||
## 优化
|
||||
- 移除右上角常驻的「上班打卡」按钮：打卡在「详情」页当日面板与日历当日抽屉中操作，顶栏不再重复。
|
||||
- 移除右上角常驻的「填写本周周记」提示按钮：改为周五至周日打开应用时 toast 提示一次，不占用常驻界面；设置页「周记提醒」开关继续有效。
|
||||
- 顶栏仅保留页面标题与搜索，移动端搜索按钮右对齐。
|
||||
- 清除相关死代码约 80 行（打卡三态、周记提示样式）。
|
||||
+2
-2
@@ -1,2 +1,2 @@
|
||||
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-CEj0vlG8.js","./index-o_Kd7ZbB.js","./index-CsewO6wh.css"])))=>i.map(i=>d[i]);
|
||||
import{r as s,_ as i}from"./index-o_Kd7ZbB.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-CEj0vlG8.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
||||
const __vite__mapDeps=(i,m=__vite__mapDeps,d=(m.f||(m.f=["./web-Deo5OtIz.js","./index-ynPmf8i8.js","./index-COwenkhO.css"])))=>i.map(i=>d[i]);
|
||||
import{r as s,_ as i}from"./index-ynPmf8i8.js";var t;(function(e){e.Documents="DOCUMENTS",e.Data="DATA",e.Library="LIBRARY",e.Cache="CACHE",e.External="EXTERNAL",e.ExternalStorage="EXTERNAL_STORAGE"})(t||(t={}));var a;(function(e){e.UTF8="utf8",e.ASCII="ascii",e.UTF16="utf16"})(a||(a={}));const E=s("Filesystem",{web:()=>i(()=>import("./web-Deo5OtIz.js"),__vite__mapDeps([0,1,2]),import.meta.url).then(e=>new e.FilesystemWeb)});export{t as Directory,a as Encoding,E as Filesystem};
|
||||
+1
File diff suppressed because one or more lines are too long
-1
File diff suppressed because one or more lines are too long
-27
File diff suppressed because one or more lines are too long
+27
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
Vendored
+2
-2
@@ -8,8 +8,8 @@
|
||||
<link rel="icon" href="./icons/icon.svg" type="image/svg+xml" />
|
||||
<link rel="apple-touch-icon" href="./icons/icon-192.png" />
|
||||
<title>实习工作日志</title>
|
||||
<script type="module" crossorigin src="./assets/index-o_Kd7ZbB.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-CsewO6wh.css">
|
||||
<script type="module" crossorigin src="./assets/index-ynPmf8i8.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="./assets/index-COwenkhO.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="app"></div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "intern-log",
|
||||
"private": true,
|
||||
"version": "0.6.7",
|
||||
"version": "0.7.2",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
|
||||
+19
-98
@@ -15,11 +15,11 @@ import UserAdminView from './views/UserAdminView.vue'
|
||||
import LoginView from './views/LoginView.vue'
|
||||
import { getSession, logoutUser, openUserDatabase, type Session } from './db/auth'
|
||||
import { autoSyncNow, enableRealtimeSync, ensureCloudBinding, stopRealtime } from './sync/engine'
|
||||
import { clockIn, getAttendance, getWorkRule, getWeeklyNote, searchLogItems, searchMemos, smartClockOut, type WorkRule } from './db/repo'
|
||||
import { addDays, hhmm, todayStr, weekStart } from './lib/date'
|
||||
import { getWorkRule, getWeeklyNote, searchLogItems, searchMemos } from './db/repo'
|
||||
import { todayStr, weekStart } from './lib/date'
|
||||
import { showToast, useToasts } from './lib/toast'
|
||||
import { attendanceChanged, focusDate, focusMemo, notifyAttendanceChanged } from './lib/bus'
|
||||
import { categoryLabel, type Attendance, type LogItem, type Memo } from './db/schema'
|
||||
import { focusDate, focusMemo } from './lib/bus'
|
||||
import { categoryLabel, type LogItem, type Memo } from './db/schema'
|
||||
|
||||
const toasts = useToasts()
|
||||
|
||||
@@ -30,8 +30,7 @@ async function onLogin(s: Session) {
|
||||
openUserDatabase(s.userId)
|
||||
location.hash = '#/calendar'
|
||||
route.value = 'calendar'
|
||||
await refreshClock()
|
||||
await refreshTip()
|
||||
await checkWeeklyReminder()
|
||||
startSyncTimer()
|
||||
try {
|
||||
await ensureCloudBinding()
|
||||
@@ -161,72 +160,24 @@ function pickLog(item: LogItem & { date: string }) { openLog(item); mobileSearch
|
||||
function pickMemo(m: Memo) { openMemo(m); mobileSearch.value = false }
|
||||
|
||||
|
||||
// ---- 工具栏打卡 ----
|
||||
const today = ref(todayStr())
|
||||
const att = ref<Attendance | undefined>(undefined)
|
||||
const yesterdayPending = ref(false)
|
||||
|
||||
async function refreshClock() {
|
||||
att.value = await getAttendance(today.value)
|
||||
yesterdayPending.value = false
|
||||
const now = new Date()
|
||||
if (now.getHours() < 4) {
|
||||
const yRec = await getAttendance(addDays(today.value, -1))
|
||||
yesterdayPending.value = !!(yRec && yRec.clock_in_at && !yRec.clock_out_at)
|
||||
}
|
||||
}
|
||||
|
||||
const hasActiveSession = computed(() => {
|
||||
const a = att.value
|
||||
if (a && a.clock_in_at && !a.clock_out_at) return true
|
||||
return yesterdayPending.value && !(a && a.clock_in_at)
|
||||
})
|
||||
const clockDone = computed(() => {
|
||||
const a = att.value
|
||||
return !!(a && a.clock_in_at && a.clock_out_at)
|
||||
})
|
||||
const clockLabel = computed(() => {
|
||||
const a = att.value
|
||||
if (hasActiveSession.value) return '下班打卡'
|
||||
if (clockDone.value) return '已打卡 ' + hhmm(a?.clock_in_at) + ' - ' + hhmm(a?.clock_out_at)
|
||||
return '上班打卡'
|
||||
})
|
||||
|
||||
async function doClock() {
|
||||
if (hasActiveSession.value) {
|
||||
try { await smartClockOut() } catch { /* 没有进行中的打卡 */ }
|
||||
} else {
|
||||
await clockIn(today.value)
|
||||
}
|
||||
await refreshClock()
|
||||
notifyAttendanceChanged()
|
||||
}
|
||||
|
||||
// 任何视图发生的考勤变更（含今日面板、日历抽屉）都实时同步到顶栏
|
||||
watch(attendanceChanged, () => {
|
||||
if (session.value) refreshClock()
|
||||
})
|
||||
|
||||
// ---- 周记提醒 ----
|
||||
const weekTip = ref(false)
|
||||
async function refreshTip() {
|
||||
const rule: WorkRule = await getWorkRule()
|
||||
if (rule.remind_weekly === 'off') { weekTip.value = false; return }
|
||||
const wd = new Date().getDay()
|
||||
if (wd === 5 || wd === 6 || wd === 0) {
|
||||
const note = await getWeeklyNote(weekStart(today.value))
|
||||
weekTip.value = !note || (!note.highlights && !note.challenges && !note.plan_next)
|
||||
} else {
|
||||
weekTip.value = false
|
||||
}
|
||||
// ---- 周记提醒：周五至周日打开应用时 toast 提示一次，不占用常驻界面 ----
|
||||
async function checkWeeklyReminder() {
|
||||
try {
|
||||
const rule = await getWorkRule()
|
||||
if (rule.remind_weekly === 'off') return
|
||||
const wd = new Date().getDay()
|
||||
if (wd !== 5 && wd !== 6 && wd !== 0) return
|
||||
const note = await getWeeklyNote(weekStart(todayStr()))
|
||||
if (note && (note.highlights || note.challenges || note.plan_next)) return
|
||||
showToast('本周周记还没写，可在「总结」页填写')
|
||||
} catch { /* 提醒检查失败不影响使用 */ }
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
window.addEventListener('keydown', onGlobalKey)
|
||||
if (session.value) {
|
||||
openUserDatabase(session.value.userId)
|
||||
await refreshClock()
|
||||
await refreshTip()
|
||||
await checkWeeklyReminder()
|
||||
startSyncTimer()
|
||||
}
|
||||
})
|
||||
@@ -287,17 +238,7 @@ onMounted(async () => {
|
||||
<div v-else class="gs-empty muted">无匹配结果</div>
|
||||
</div>
|
||||
</div>
|
||||
<span class="flex1"></span>
|
||||
<div class="topbar-actions">
|
||||
<button v-if="weekTip" class="week-tip" @click="nav('report')">
|
||||
<span class="dot" style="background: var(--warn)"></span>
|
||||
填写本周周记
|
||||
</button>
|
||||
<button class="btn btn-primary" :disabled="clockDone" @click="doClock">
|
||||
<Icon :name="clockDone ? 'check-circle' : 'clock'" :size="14" />
|
||||
<span class="num">{{ clockLabel }}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</header>
|
||||
<main class="content">
|
||||
<div class="content-inner">
|
||||
@@ -507,8 +448,6 @@ onMounted(async () => {
|
||||
}
|
||||
.title { font-size: 15px; font-weight: 600; white-space: nowrap; }
|
||||
|
||||
.topbar-actions { display: flex; align-items: center; gap: 8px; }
|
||||
|
||||
.gsearch { position: relative; width: 320px; max-width: 38vw; }
|
||||
.gs-icon { position: absolute; left: 11px; top: 50%; transform: translateY(-50%); color: var(--text-3); }
|
||||
.gs-input {
|
||||
@@ -554,21 +493,6 @@ onMounted(async () => {
|
||||
.gs-date { font-size: 12px; flex: none; }
|
||||
.gs-empty { padding: 10px; font-size: 12px; text-align: center; }
|
||||
|
||||
.week-tip {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
border: 1px solid var(--warn);
|
||||
color: var(--warn);
|
||||
background: var(--bg-page);
|
||||
border-radius: 999px;
|
||||
height: 28px;
|
||||
padding: 0 10px;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.week-tip:hover { background: #FDF4EC; }
|
||||
|
||||
.content { flex: 1; overflow: auto; }
|
||||
.content-inner { max-width: 1280px; margin: 0 auto; padding: 20px 24px 48px; }
|
||||
@@ -752,10 +676,7 @@ onMounted(async () => {
|
||||
.gsearch { display: none; }
|
||||
.gsearch .gs-panel { display: none; }
|
||||
.mob-search-btn { display: flex; }
|
||||
.topbar-actions { margin-left: auto; gap: 6px; }
|
||||
.week-tip { height: 28px; max-width: 118px; padding: 0 8px; white-space: nowrap; overflow: hidden; }
|
||||
.topbar-actions .btn { padding: 0 12px; height: 34px; }
|
||||
.topbar-actions .btn .num { font-size: 12px; }
|
||||
.mob-search-btn { margin-left: auto; }
|
||||
|
||||
.tabbar { display: flex; }
|
||||
.tab-btn { height: 56px; font-size: 11px; }
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script setup lang="ts">
|
||||
import { onUnmounted, watch } from 'vue'
|
||||
import Icon from './Icon.vue'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
open: boolean
|
||||
@@ -27,12 +28,19 @@ onUnmounted(() => window.removeEventListener('keydown', onKey))
|
||||
<teleport to="body">
|
||||
<transition name="modal">
|
||||
<div v-if="open" class="mask" @click.self="emit('cancel')">
|
||||
<div class="dialog" role="dialog" :aria-label="title">
|
||||
<div class="dialog-title" :class="{ 'is-danger': danger }">{{ title }}</div>
|
||||
<div class="dialog-msg">{{ message }}</div>
|
||||
<div class="dialog-btns">
|
||||
<button class="btn btn-sm" @click="emit('cancel')">{{ cancelText }}</button>
|
||||
<button class="btn btn-sm" :class="danger ? 'btn-danger-solid' : 'btn-primary'" @click="emit('confirm')">{{ confirmText }}</button>
|
||||
<div class="dialog confirm-dialog" role="dialog" :aria-label="title">
|
||||
<div class="confirm-body">
|
||||
<div v-if="danger" class="confirm-badge">
|
||||
<Icon name="warning" :size="22" />
|
||||
</div>
|
||||
<div class="confirm-text">
|
||||
<div class="confirm-title" :class="{ 'is-danger': danger }">{{ title }}</div>
|
||||
<div class="confirm-msg">{{ message }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="confirm-btns">
|
||||
<button class="btn" @click="emit('cancel')">{{ cancelText }}</button>
|
||||
<button class="btn" :class="danger ? 'btn-danger-solid' : 'btn-primary'" @click="emit('confirm')">{{ confirmText }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -41,8 +49,34 @@ onUnmounted(() => window.removeEventListener('keydown', onKey))
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.dialog { width: 380px; }
|
||||
.dialog-title.is-danger { color: var(--danger); }
|
||||
.dialog-msg { margin-top: 8px; color: var(--text-2); font-size: 13px; line-height: 1.7; word-break: break-all; }
|
||||
.dialog-btns { margin-top: 20px; }
|
||||
.confirm-dialog {
|
||||
width: 400px;
|
||||
padding: 22px 22px 18px;
|
||||
}
|
||||
.confirm-body { display: flex; gap: 14px; align-items: flex-start; }
|
||||
.confirm-badge {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
flex: none;
|
||||
border-radius: 50%;
|
||||
background: #FDEEEE;
|
||||
color: var(--danger);
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.confirm-text { flex: 1; min-width: 0; }
|
||||
.confirm-title { font-size: 15px; font-weight: 600; color: var(--text-1); line-height: 1.4; }
|
||||
.confirm-title.is-danger { color: var(--danger); }
|
||||
.confirm-msg { margin-top: 6px; color: var(--text-2); font-size: 13px; line-height: 1.7; word-break: break-all; }
|
||||
.confirm-btns { margin-top: 18px; display: flex; justify-content: flex-end; gap: 8px; }
|
||||
|
||||
.modal-enter-active, .modal-leave-active { transition: opacity 0.15s ease; }
|
||||
.modal-enter-from, .modal-leave-to { opacity: 0; }
|
||||
|
||||
@media (max-width: 720px) {
|
||||
.confirm-dialog { width: calc(100vw - 16px) !important; max-width: calc(100vw - 16px) !important; }
|
||||
.confirm-btns .btn { flex: 1; height: 40px; }
|
||||
.confirm-btns { margin-top: 16px; }
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -0,0 +1,89 @@
|
||||
<script setup lang="ts">
|
||||
import { nextTick, onUnmounted, ref, watch } from 'vue'
|
||||
import Icon from './Icon.vue'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
open: boolean
|
||||
title: string
|
||||
label?: string
|
||||
placeholder?: string
|
||||
initial?: string
|
||||
confirmText?: string
|
||||
validate?: (v: string) => string | null
|
||||
}>(), { label: '', placeholder: '', initial: '', confirmText: '确定' })
|
||||
|
||||
const emit = defineEmits<{ (e: 'cancel'): void; (e: 'confirm', value: string): void }>()
|
||||
|
||||
const value = ref('')
|
||||
const err = ref('')
|
||||
const input = ref<HTMLInputElement | null>(null)
|
||||
|
||||
function onKey(e: KeyboardEvent) {
|
||||
if (!props.open) return
|
||||
if (e.key === 'Escape') emit('cancel')
|
||||
}
|
||||
watch(() => props.open, async v => {
|
||||
if (v) {
|
||||
value.value = props.initial
|
||||
err.value = ''
|
||||
window.addEventListener('keydown', onKey)
|
||||
await nextTick()
|
||||
input.value?.focus()
|
||||
input.value?.select()
|
||||
} else {
|
||||
window.removeEventListener('keydown', onKey)
|
||||
}
|
||||
})
|
||||
onUnmounted(() => window.removeEventListener('keydown', onKey))
|
||||
|
||||
function confirm() {
|
||||
const v = value.value.trim()
|
||||
if (!v) { err.value = '请输入内容'; return }
|
||||
const e = props.validate ? props.validate(v) : null
|
||||
if (e) { err.value = e; return }
|
||||
emit('confirm', v)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<teleport to="body">
|
||||
<transition name="modal">
|
||||
<div v-if="open" class="mask" @click.self="emit('cancel')">
|
||||
<div class="dialog input-dialog" role="dialog" :aria-label="title">
|
||||
<div class="dialog-head">
|
||||
<span class="dialog-title">{{ title }}</span>
|
||||
<button class="icon-btn" title="关闭" @click="emit('cancel')">
|
||||
<Icon name="close" :size="16" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="dialog-body">
|
||||
<div class="field">
|
||||
<label v-if="label">{{ label }}</label>
|
||||
<input
|
||||
ref="input" class="input" :class="{ invalid: err }"
|
||||
v-model="value" :placeholder="placeholder" maxlength="20"
|
||||
@keydown.enter="confirm"
|
||||
/>
|
||||
<div v-if="err" class="form-error">{{ err }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dialog-btns">
|
||||
<button class="btn btn-sm" @click="emit('cancel')">取消</button>
|
||||
<button class="btn btn-primary btn-sm" @click="confirm">{{ confirmText }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</transition>
|
||||
</teleport>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.input-dialog { width: 400px; }
|
||||
.field label { display: block; font-size: 12px; color: var(--text-2); margin-bottom: 4px; }
|
||||
.modal-enter-active, .modal-leave-active { transition: opacity 0.15s ease; }
|
||||
.modal-enter-from, .modal-leave-to { opacity: 0; }
|
||||
@media (max-width: 720px) {
|
||||
.input-dialog { width: calc(100vw - 16px) !important; max-width: calc(100vw - 16px) !important; }
|
||||
.dialog-btns .btn { flex: 1; height: 40px; }
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,207 @@
|
||||
<script setup lang="ts">
|
||||
import { computed, onUnmounted, ref, watch } from 'vue'
|
||||
import Icon from './Icon.vue'
|
||||
import { addDays, todayStr } from '../lib/date'
|
||||
import { cycleStartOf, cycleEndOf, fmtDayRef, fmtRange } from '../lib/period'
|
||||
|
||||
const props = withDefaults(defineProps<{
|
||||
open: boolean
|
||||
mode: 'month' | 'cycle' | 'custom'
|
||||
anchor: string
|
||||
month: string
|
||||
cycleSel: number | 'before'
|
||||
customStart: string
|
||||
customEnd: string
|
||||
cycleCount: number
|
||||
hasBefore: boolean
|
||||
months: string[]
|
||||
}>(), { anchor: '', months: () => [] })
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'close'): void
|
||||
(e: 'apply', payload: { mode: 'month' | 'cycle' | 'custom'; month?: string; cycle?: number | 'before'; customStart?: string; customEnd?: string }): void
|
||||
(e: 'saveAnchor', value: string): void
|
||||
}>()
|
||||
|
||||
const dMode = ref(props.mode)
|
||||
const dMonth = ref(props.month.slice(0, 7))
|
||||
const dCycle = ref<number | 'before'>(props.cycleSel)
|
||||
const dStart = ref(props.customStart)
|
||||
const dEnd = ref(props.customEnd)
|
||||
const dAnchor = ref(props.anchor)
|
||||
const customErr = ref('')
|
||||
|
||||
function onKey(e: KeyboardEvent) {
|
||||
if (e.key === 'Escape') emit('close')
|
||||
}
|
||||
watch(() => props.open, v => {
|
||||
if (v) {
|
||||
dMode.value = props.mode
|
||||
dMonth.value = props.month.slice(0, 7)
|
||||
dCycle.value = props.cycleSel
|
||||
dStart.value = props.customStart
|
||||
dEnd.value = props.customEnd
|
||||
dAnchor.value = props.anchor
|
||||
customErr.value = ''
|
||||
window.addEventListener('keydown', onKey)
|
||||
} else {
|
||||
window.removeEventListener('keydown', onKey)
|
||||
}
|
||||
})
|
||||
watch(() => [props.anchor, props.cycleSel] as const, () => {
|
||||
dAnchor.value = props.anchor
|
||||
dCycle.value = props.cycleSel
|
||||
})
|
||||
onUnmounted(() => window.removeEventListener('keydown', onKey))
|
||||
|
||||
// 有账目的月份 ∪ 当前选中月 ∪ 本月，倒序
|
||||
const monthOptions = computed(() => {
|
||||
const set = new Set(props.months)
|
||||
set.add(dMonth.value)
|
||||
set.add(todayStr().slice(0, 7))
|
||||
return Array.from(set).sort((a, b) => (a < b ? 1 : -1))
|
||||
})
|
||||
|
||||
const beforeEndLabel = computed(() =>
|
||||
props.anchor ? fmtDayRef(addDays(props.anchor, -1), props.anchor) : ''
|
||||
)
|
||||
|
||||
function monthLabel(m: string): string {
|
||||
return m.slice(0, 4) + ' 年 ' + Number(m.slice(5, 7)) + ' 月'
|
||||
}
|
||||
function pickMonth(m: string) {
|
||||
dMonth.value = m
|
||||
emit('apply', { mode: 'month', month: m })
|
||||
emit('close')
|
||||
}
|
||||
function pickCycle(c: number | 'before') {
|
||||
dCycle.value = c
|
||||
emit('apply', { mode: 'cycle', cycle: c })
|
||||
emit('close')
|
||||
}
|
||||
function saveAnchor() {
|
||||
if (!dAnchor.value) return
|
||||
emit('saveAnchor', dAnchor.value)
|
||||
}
|
||||
function applyCustom() {
|
||||
if (!dStart.value || !dEnd.value) { customErr.value = '请选择开始和结束日期'; return }
|
||||
if (dStart.value > dEnd.value) { customErr.value = '开始日期不能晚于结束日期'; return }
|
||||
customErr.value = ''
|
||||
emit('apply', { mode: 'custom', customStart: dStart.value, customEnd: dEnd.value })
|
||||
emit('close')
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<teleport to="body">
|
||||
<transition name="modal">
|
||||
<div v-if="open" class="mask" @click.self="emit('close')">
|
||||
<div class="dialog period-dialog" role="dialog" aria-label="统计周期">
|
||||
<div class="dialog-head">
|
||||
<span class="dialog-title">统计周期</span>
|
||||
<button class="icon-btn" title="关闭" @click="emit('close')">
|
||||
<Icon name="close" :size="16" />
|
||||
</button>
|
||||
</div>
|
||||
<div class="dialog-body">
|
||||
<div class="seg seg-row">
|
||||
<button class="seg-btn" :class="{ active: dMode === 'month' }" @click="dMode = 'month'">按月</button>
|
||||
<button class="seg-btn" :class="{ active: dMode === 'cycle' }" @click="dMode = 'cycle'">按期</button>
|
||||
<button class="seg-btn" :class="{ active: dMode === 'custom' }" @click="dMode = 'custom'">自定义</button>
|
||||
</div>
|
||||
|
||||
<!-- 按月：有账目的月份列表 -->
|
||||
<div v-if="dMode === 'month'" class="pane">
|
||||
<button
|
||||
v-for="m in monthOptions" :key="m"
|
||||
class="opt" :class="{ active: m === dMonth }"
|
||||
@click="pickMonth(m)"
|
||||
>
|
||||
<span>{{ monthLabel(m) }}</span>
|
||||
<Icon v-if="m === dMonth" name="check-circle" :size="15" />
|
||||
</button>
|
||||
<div v-if="!monthOptions.length" class="hint">还没有账目记录</div>
|
||||
</div>
|
||||
|
||||
<!-- 按期：账期起点 + 期列表 -->
|
||||
<div v-else-if="dMode === 'cycle'" class="pane">
|
||||
<div class="anchor-row">
|
||||
<span class="anchor-label">账期起点</span>
|
||||
<input class="input" type="date" v-model="dAnchor" />
|
||||
<button class="btn btn-sm" :disabled="!dAnchor || dAnchor === anchor" @click="saveAnchor">保存</button>
|
||||
</div>
|
||||
<div v-if="!dAnchor" class="hint">填写实习开始日期并保存，自动切分为第 1、2、3…期（每期到下月同日前一天）</div>
|
||||
<div v-else-if="dAnchor !== anchor" class="hint">起点已修改，保存后按新起点重新切分</div>
|
||||
<template v-if="anchor">
|
||||
<button
|
||||
v-if="hasBefore" class="opt" :class="{ active: dCycle === 'before' }"
|
||||
@click="pickCycle('before')"
|
||||
>
|
||||
<span>起点前</span>
|
||||
<span class="muted num">～ {{ beforeEndLabel }}</span>
|
||||
</button>
|
||||
<button
|
||||
v-for="n in cycleCount" :key="n"
|
||||
class="opt" :class="{ active: dCycle === n }"
|
||||
@click="pickCycle(n)"
|
||||
>
|
||||
<span>第 {{ n }} 期</span>
|
||||
<span class="muted num">{{ fmtRange(cycleStartOf(anchor, n), cycleEndOf(anchor, n)) }}</span>
|
||||
</button>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
<!-- 自定义：任意起止区间 -->
|
||||
<div v-else class="pane">
|
||||
<div class="custom-grid">
|
||||
<div class="field">
|
||||
<label>开始日期</label>
|
||||
<input class="input" type="date" v-model="dStart" />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>结束日期</label>
|
||||
<input class="input" type="date" v-model="dEnd" />
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="customErr" class="form-error">{{ customErr }}</div>
|
||||
<button class="btn btn-primary apply-btn" @click="applyCustom">应用区间</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dialog-btns">
|
||||
<button class="btn btn-sm" @click="emit('close')">关闭</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</transition>
|
||||
</teleport>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.period-dialog { width: 400px; }
|
||||
.seg-row { display: flex; width: 100%; }
|
||||
.seg-row .seg-btn { flex: 1; }
|
||||
.pane { margin-top: 12px; max-height: 46vh; overflow-y: auto; display: flex; flex-direction: column; gap: 4px; }
|
||||
.opt {
|
||||
display: flex; align-items: center; justify-content: space-between; gap: 8px;
|
||||
border: none; background: transparent; cursor: pointer;
|
||||
padding: 8px 10px; border-radius: var(--radius-sm);
|
||||
font-size: 13px; color: var(--text-1); text-align: left;
|
||||
transition: background 0.12s;
|
||||
}
|
||||
.opt:hover { background: var(--bg-hover); }
|
||||
.opt.active { background: rgba(51, 112, 255, 0.08); color: var(--accent); font-weight: 600; }
|
||||
.opt.active .muted { color: var(--accent); opacity: 0.75; }
|
||||
.anchor-row { display: flex; align-items: center; gap: 8px; }
|
||||
.anchor-label { font-size: 12px; color: var(--text-2); flex: none; }
|
||||
.anchor-row .input { flex: 1; min-width: 0; }
|
||||
.hint { font-size: 12px; color: var(--text-3); padding: 4px 2px; }
|
||||
.custom-grid { display: grid; grid-template-columns: 1fr 1fr; gap: 8px; }
|
||||
.apply-btn { width: 100%; margin-top: 6px; }
|
||||
.modal-enter-active, .modal-leave-active { transition: opacity 0.15s ease; }
|
||||
.modal-enter-from, .modal-leave-to { opacity: 0; }
|
||||
@media (max-width: 720px) {
|
||||
.period-dialog { width: calc(100vw - 16px) !important; max-width: calc(100vw - 16px) !important; }
|
||||
.dialog-btns .btn { flex: 1; height: 40px; }
|
||||
.pane { max-height: 48vh; }
|
||||
}
|
||||
</style>
|
||||
@@ -25,5 +25,6 @@ export const ICONS: Record<string, string> = {
|
||||
wallet: svg('<rect x="3.5" y="6" width="17" height="12.5" rx="2"/><path d="M3.5 10h17"/><circle cx="16.4" cy="14.2" r="1.1"/>'),
|
||||
more: svg('<circle cx="5.4" cy="12" r="1.7"/><circle cx="12" cy="12" r="1.7"/><circle cx="18.6" cy="12" r="1.7"/>'),
|
||||
shield: svg('<path d="M12 3.5l7.2 2.7v5.1c0 4.7-3.1 7.8-7.2 9.4-4.1-1.6-7.2-4.7-7.2-9.4V6.2z"/><path d="M9.3 12.2l1.9 1.9 3.6-4"/>'),
|
||||
warning: svg('<path d="M12 4.2L21 19.2H3L12 4.2z"/><path d="M12 10.2v3.6M12 16.4h.01"/>'),
|
||||
plan: svg('<rect x="4.5" y="4" width="15" height="16.5" rx="2"/><path d="M8.5 9.5l1.4 1.4 2.6-2.9M8.5 15l1.4 1.4 2.6-2.9M15 9.8h.01M15 15.3h.01"/>')
|
||||
}
|
||||
|
||||
@@ -634,6 +634,19 @@ export async function setTransactionReimbursed(id: number, done: boolean): Promi
|
||||
await commit()
|
||||
}
|
||||
|
||||
// 有账目的月份列表（YYYY-MM，倒序），供周期选择弹窗使用
|
||||
export async function listTransactionMonths(): Promise<string[]> {
|
||||
const all = await db.table('transaction').toArray()
|
||||
const set = new Set<string>()
|
||||
for (const r of all) if (r && r.date) set.add(r.date.slice(0, 7))
|
||||
return Array.from(set).sort((a, b) => (a < b ? 1 : -1))
|
||||
}
|
||||
|
||||
// 某日期之前的账目条数（判断「起点前」是否有数据）
|
||||
export async function countTransactionsBefore(date: string): Promise<number> {
|
||||
return db.table('transaction').where('date').below(date).count()
|
||||
}
|
||||
|
||||
// ---------- 备份 ----------
|
||||
|
||||
export async function exportAll(): Promise<string> {
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
// 账期（统计周期）推算：全部基于 YYYY-MM-DD 字符串与整数运算，不涉及时区。
|
||||
// 第 n 期 = [起点 + (n-1) 个月, 起点 + n 个月 - 1 天]；月加法沿用 date.ts 的自然月末收敛
|
||||
//（如起点 01-31，下一期从 02-28 起）。
|
||||
import { addDays, addMonths } from './date'
|
||||
|
||||
export type CycleSel = number | 'before'
|
||||
|
||||
// 第 n 期的开始日期（n 从 1 开始）
|
||||
export function cycleStartOf(anchor: string, n: number): string {
|
||||
return addMonths(anchor, n - 1)
|
||||
}
|
||||
|
||||
// 第 n 期的结束日期
|
||||
export function cycleEndOf(anchor: string, n: number): string {
|
||||
return addDays(addMonths(anchor, n), -1)
|
||||
}
|
||||
|
||||
// 某日期落在第几期；早于起点返回 0（即「起点前」）
|
||||
export function cycleIndexOf(anchor: string, date: string): number {
|
||||
if (!anchor || date < anchor) return 0
|
||||
let n = (Number(date.slice(0, 4)) - Number(anchor.slice(0, 4))) * 12
|
||||
+ (Number(date.slice(5, 7)) - Number(anchor.slice(5, 7))) + 1
|
||||
if (n < 1) n = 1
|
||||
if (n > 1 && date < cycleStartOf(anchor, n)) n--
|
||||
return n
|
||||
}
|
||||
|
||||
// 10.14 形式的短日期
|
||||
export function fmtDay(d: string): string {
|
||||
return Number(d.slice(5, 7)) + '.' + Number(d.slice(8, 10))
|
||||
}
|
||||
|
||||
// 与参照日期同年则省略年份，跨年则带完整年月日
|
||||
export function fmtDayRef(d: string, ref: string): string {
|
||||
return d.slice(0, 4) === ref.slice(0, 4) ? fmtDay(d) : d.split('-').join('.')
|
||||
}
|
||||
|
||||
// 「10.14 – 11.13」，跨年时两侧均带年份
|
||||
export function fmtRange(start: string, end: string): string {
|
||||
return fmtDayRef(start, end) + ' – ' + fmtDayRef(end, start)
|
||||
}
|
||||
@@ -3,49 +3,130 @@ import { computed, onMounted, ref, watch } from 'vue'
|
||||
import Icon from '../components/Icon.vue'
|
||||
import ConfirmDialog from '../components/ConfirmDialog.vue'
|
||||
import TransactionDialog from '../components/TransactionDialog.vue'
|
||||
import PeriodDialog from '../components/PeriodDialog.vue'
|
||||
import {
|
||||
addTransaction, deleteTransaction, listTransactionsBetween,
|
||||
addTransaction, countTransactionsBefore, deleteTransaction, getSetting,
|
||||
listTransactionMonths, listTransactionsBetween, setSetting,
|
||||
setTransactionReimbursed, updateTransaction, type Transaction
|
||||
} from '../db/repo'
|
||||
import { getLedgerCategories } from '../db/categories'
|
||||
import { addMonths, todayStr } from '../lib/date'
|
||||
import { addDays, addMonths, todayStr } from '../lib/date'
|
||||
import { cycleEndOf, cycleIndexOf, cycleStartOf, fmtDayRef, fmtRange, type CycleSel } from '../lib/period'
|
||||
import { showToast } from '../lib/toast'
|
||||
|
||||
type TxType = 'expense' | 'income'
|
||||
type PeriodMode = 'month' | 'cycle' | 'custom'
|
||||
|
||||
// 周期偏好为设备本地习惯；账期起点存 setting 表，随账号多端同步
|
||||
const LS_MODE = 'dsh_ledger_mode'
|
||||
const LS_CYCLE = 'dsh_ledger_cycle'
|
||||
const LS_CSTART = 'dsh_ledger_cstart'
|
||||
const LS_CEND = 'dsh_ledger_cend'
|
||||
const EARLIEST = '0000-01-01'
|
||||
|
||||
const mode = ref<PeriodMode>('month')
|
||||
const monthRef = ref(todayStr())
|
||||
const cycleSel = ref<CycleSel>(1)
|
||||
const customStart = ref(todayStr().slice(0, 7) + '-01')
|
||||
const customEnd = ref(todayStr())
|
||||
const anchor = ref('')
|
||||
const hasBefore = ref(false)
|
||||
const txMonths = ref<string[]>([])
|
||||
|
||||
const rows = ref<Transaction[]>([])
|
||||
const loading = ref(true)
|
||||
|
||||
// ---- 新增表单 ----
|
||||
const fType = ref<TxType>('expense')
|
||||
const fAmount = ref('')
|
||||
const fCategory = ref('')
|
||||
const fDate = ref(todayStr())
|
||||
const fNote = ref('')
|
||||
const fReimb = ref(false)
|
||||
const fError = ref('')
|
||||
const loadError = ref('')
|
||||
const submitting = ref(false)
|
||||
|
||||
const dialogOpen = ref(false)
|
||||
const editingId = ref<number | null>(null)
|
||||
const dialogInitial = ref({ type: 'expense', category: '', amountYuan: '', date: todayStr(), note: '', reimbursable: 0, reimbursed: 0 })
|
||||
const deleteTarget = ref<Transaction | null>(null)
|
||||
const periodOpen = ref(false)
|
||||
|
||||
const monthStart = computed(() => monthRef.value.slice(0, 7) + '-01')
|
||||
const monthEnd = computed(() => {
|
||||
const y = Number(monthRef.value.slice(0, 4))
|
||||
const m0 = Number(monthRef.value.slice(5, 7)) - 1
|
||||
// ---- 统计周期 ----
|
||||
|
||||
function monthEndOf(ym: string): string {
|
||||
const y = Number(ym.slice(0, 4))
|
||||
const m0 = Number(ym.slice(5, 7)) - 1
|
||||
const last = new Date(y, m0 + 1, 0).getDate()
|
||||
return monthRef.value.slice(0, 7) + '-' + (last < 10 ? '0' + last : String(last))
|
||||
return ym + '-' + (last < 10 ? '0' + last : String(last))
|
||||
}
|
||||
|
||||
// 今天所在的期数（未设起点时按 1 处理）
|
||||
const currentCycle = computed(() => (anchor.value ? Math.max(1, cycleIndexOf(anchor.value, todayStr())) : 1))
|
||||
|
||||
const rangeStart = computed(() => {
|
||||
if (mode.value === 'month') return monthRef.value.slice(0, 7) + '-01'
|
||||
if (mode.value === 'custom') return customStart.value
|
||||
if (!anchor.value) return monthRef.value.slice(0, 7) + '-01' // 未设起点时按月兜底
|
||||
return cycleSel.value === 'before' ? EARLIEST : cycleStartOf(anchor.value, cycleSel.value)
|
||||
})
|
||||
const title = computed(() => Number(monthRef.value.slice(0, 4)) + ' 年 ' + Number(monthRef.value.slice(5, 7)) + ' 月')
|
||||
const rangeEnd = computed(() => {
|
||||
if (mode.value === 'month') return monthEndOf(monthRef.value.slice(0, 7))
|
||||
if (mode.value === 'custom') return customEnd.value
|
||||
if (!anchor.value) return monthEndOf(monthRef.value.slice(0, 7))
|
||||
return cycleSel.value === 'before' ? addDays(anchor.value, -1) : cycleEndOf(anchor.value, cycleSel.value)
|
||||
})
|
||||
|
||||
const title = computed(() => {
|
||||
if (mode.value === 'month') return Number(monthRef.value.slice(0, 4)) + ' 年 ' + Number(monthRef.value.slice(5, 7)) + ' 月'
|
||||
if (mode.value === 'custom') return fmtRange(rangeStart.value, rangeEnd.value)
|
||||
if (!anchor.value) return '按期统计 · 设置起点'
|
||||
if (cycleSel.value === 'before') return '起点前 · ～ ' + fmtDayRef(addDays(anchor.value, -1), anchor.value)
|
||||
return '第 ' + cycleSel.value + ' 期 · ' + fmtRange(rangeStart.value, rangeEnd.value)
|
||||
})
|
||||
|
||||
const canPrev = computed(() => {
|
||||
if (mode.value === 'month') return true
|
||||
if (mode.value === 'cycle' && anchor.value) {
|
||||
if (cycleSel.value === 'before') return false
|
||||
return cycleSel.value > 1 || hasBefore.value
|
||||
}
|
||||
return false
|
||||
})
|
||||
const canNext = computed(() => {
|
||||
if (mode.value === 'month') return true
|
||||
if (mode.value === 'cycle' && anchor.value) {
|
||||
return cycleSel.value === 'before' ? true : cycleSel.value < currentCycle.value
|
||||
}
|
||||
return false
|
||||
})
|
||||
function step(dir: -1 | 1) {
|
||||
if (mode.value === 'month') {
|
||||
monthRef.value = addMonths(monthRef.value, dir)
|
||||
return
|
||||
}
|
||||
if (mode.value !== 'cycle' || !anchor.value) return
|
||||
if (cycleSel.value === 'before') {
|
||||
if (dir === 1) cycleSel.value = 1
|
||||
return
|
||||
}
|
||||
const n = Number(cycleSel.value) + dir
|
||||
if (n > currentCycle.value) return
|
||||
if (n < 1) {
|
||||
if (hasBefore.value) cycleSel.value = 'before'
|
||||
return
|
||||
}
|
||||
cycleSel.value = n
|
||||
}
|
||||
|
||||
// 只有偏离当前周期时才出现「回到本期」，平时不占工具栏
|
||||
const offCurrent = computed(() => {
|
||||
if (mode.value === 'month') return monthRef.value.slice(0, 7) !== todayStr().slice(0, 7)
|
||||
if (mode.value === 'cycle') return !!anchor.value && cycleSel.value !== currentCycle.value
|
||||
return false
|
||||
})
|
||||
function goCurrent() {
|
||||
if (mode.value === 'cycle') cycleSel.value = currentCycle.value
|
||||
else monthRef.value = todayStr()
|
||||
}
|
||||
|
||||
// ---- 数据加载：全部统计共用 [rangeStart, rangeEnd] ----
|
||||
|
||||
async function load() {
|
||||
loading.value = true
|
||||
try {
|
||||
rows.value = await listTransactionsBetween(monthStart.value, monthEnd.value)
|
||||
rows.value = await listTransactionsBetween(rangeStart.value, rangeEnd.value)
|
||||
loadError.value = ''
|
||||
} catch (e) {
|
||||
loadError.value = '账目加载失败：' + (e instanceof Error ? (e.stack || e.message) : String(e))
|
||||
@@ -53,18 +134,62 @@ async function load() {
|
||||
}
|
||||
loading.value = false
|
||||
}
|
||||
onMounted(load)
|
||||
watch(monthRef, load)
|
||||
|
||||
onMounted(async () => {
|
||||
const savedMode = localStorage.getItem(LS_MODE)
|
||||
if (savedMode === 'month' || savedMode === 'cycle' || savedMode === 'custom') mode.value = savedMode
|
||||
const cs = localStorage.getItem(LS_CSTART)
|
||||
const ce = localStorage.getItem(LS_CEND)
|
||||
if (cs && ce && cs <= ce) { customStart.value = cs; customEnd.value = ce }
|
||||
const cyc = localStorage.getItem(LS_CYCLE)
|
||||
if (cyc === 'before') cycleSel.value = 'before'
|
||||
else if (cyc && Number(cyc) >= 1) cycleSel.value = Number(cyc)
|
||||
anchor.value = await getSetting('ledger.anchor', '')
|
||||
if (cycleSel.value !== 'before' && cycleSel.value > currentCycle.value) cycleSel.value = currentCycle.value
|
||||
await load()
|
||||
})
|
||||
watch([rangeStart, rangeEnd], () => {
|
||||
catFilter.value = 'all' // 切换周期时重置分类筛选（分类集合可能不同）
|
||||
void load()
|
||||
})
|
||||
watch(mode, v => localStorage.setItem(LS_MODE, v))
|
||||
watch(cycleSel, v => localStorage.setItem(LS_CYCLE, String(v)))
|
||||
watch([customStart, customEnd], ([s, e]) => {
|
||||
localStorage.setItem(LS_CSTART, s)
|
||||
localStorage.setItem(LS_CEND, e)
|
||||
})
|
||||
|
||||
async function openPeriodDialog() {
|
||||
try {
|
||||
txMonths.value = await listTransactionMonths()
|
||||
hasBefore.value = anchor.value ? (await countTransactionsBefore(anchor.value)) > 0 : false
|
||||
} catch { /* 统计失败不阻塞打开弹窗 */ }
|
||||
periodOpen.value = true
|
||||
}
|
||||
function onApply(p: { mode: PeriodMode; month?: string; cycle?: number | 'before'; customStart?: string; customEnd?: string }) {
|
||||
mode.value = p.mode
|
||||
if (p.month) monthRef.value = p.month + '-01'
|
||||
if (p.cycle !== undefined) cycleSel.value = p.cycle
|
||||
if (p.customStart) customStart.value = p.customStart
|
||||
if (p.customEnd) customEnd.value = p.customEnd
|
||||
}
|
||||
async function onSaveAnchor(v: string) {
|
||||
anchor.value = v
|
||||
await setSetting('ledger.anchor', v)
|
||||
mode.value = 'cycle'
|
||||
cycleSel.value = Math.max(1, cycleIndexOf(v, todayStr()))
|
||||
try {
|
||||
hasBefore.value = (await countTransactionsBefore(v)) > 0
|
||||
} catch { /* 忽略统计失败 */ }
|
||||
showToast('账期起点已保存，已按新起点切分期数')
|
||||
}
|
||||
|
||||
const expenseCats = ref<string[]>([])
|
||||
const incomeCats = ref<string[]>([])
|
||||
async function loadCats() {
|
||||
expenseCats.value = await getLedgerCategories('expense')
|
||||
incomeCats.value = await getLedgerCategories('income')
|
||||
}
|
||||
loadCats()
|
||||
|
||||
|
||||
const sorted = computed(() =>
|
||||
rows.value.slice().sort((a, b) => (a.date === b.date ? (b.id as number) - (a.id as number) : (a.date < b.date ? 1 : -1)))
|
||||
)
|
||||
@@ -86,9 +211,14 @@ const summary = computed(() => {
|
||||
|
||||
const typeFilter = ref<'all' | TxType>('all')
|
||||
const reimbFilter = ref<'all' | 'pending' | 'done'>('all')
|
||||
const catFilter = ref<string>('all')
|
||||
const usedCategories = computed(() =>
|
||||
Array.from(new Set(rows.value.map(r => r.category))).sort((a, b) => a.localeCompare(b, 'zh'))
|
||||
)
|
||||
const filtered = computed(() =>
|
||||
sorted.value.filter(r => {
|
||||
if (typeFilter.value !== 'all' && r.type !== typeFilter.value) return false
|
||||
if (catFilter.value !== 'all' && r.category !== catFilter.value) return false
|
||||
if (reimbFilter.value === 'pending' && !(r.type === 'expense' && r.reimbursable === 1 && r.reimbursed !== 1)) return false
|
||||
if (reimbFilter.value === 'done' && !(r.reimbursable === 1 && r.reimbursed === 1)) return false
|
||||
return true
|
||||
@@ -116,59 +246,6 @@ function amountText(r: Transaction): string {
|
||||
return (r.type === 'income' ? '+' : '-') + yuan(r.amount)
|
||||
}
|
||||
|
||||
function prevMonth() { monthRef.value = addMonths(monthRef.value, -1) }
|
||||
function nextMonth() { monthRef.value = addMonths(monthRef.value, 1) }
|
||||
function goThisMonth() { monthRef.value = todayStr() }
|
||||
|
||||
watch(fAmount, () => {
|
||||
if (fError.value) fError.value = ''
|
||||
})
|
||||
|
||||
async function submit() {
|
||||
const amountText = String(fAmount.value ?? '').trim()
|
||||
const v = Number(amountText)
|
||||
if (!amountText || !isFinite(v) || v <= 0) {
|
||||
fError.value = '请填写大于 0 的金额'
|
||||
return
|
||||
}
|
||||
if (!fDate.value) {
|
||||
fError.value = '请选择日期'
|
||||
return
|
||||
}
|
||||
if (submitting.value) return
|
||||
submitting.value = true
|
||||
try {
|
||||
await addTransaction({
|
||||
type: fType.value,
|
||||
category: fCategory.value,
|
||||
amount: Math.round(v * 100),
|
||||
date: fDate.value,
|
||||
note: String(fNote.value ?? '').trim(),
|
||||
reimbursable: fType.value === 'expense' && fReimb.value ? 1 : 0,
|
||||
reimbursed: 0
|
||||
})
|
||||
} catch (e) {
|
||||
showToast('添加失败：' + (e instanceof Error ? e.message : String(e)))
|
||||
submitting.value = false
|
||||
return
|
||||
}
|
||||
fAmount.value = ''
|
||||
fNote.value = ''
|
||||
fReimb.value = false
|
||||
fError.value = ''
|
||||
await load()
|
||||
showToast('记账已添加')
|
||||
submitting.value = false
|
||||
}
|
||||
const formDirty = computed(() => String(fAmount.value ?? '').trim() !== '' || String(fNote.value ?? '').trim() !== '')
|
||||
|
||||
function resetForm() {
|
||||
fAmount.value = ''
|
||||
fNote.value = ''
|
||||
fReimb.value = false
|
||||
fError.value = ''
|
||||
}
|
||||
|
||||
async function markReimbursed(row: Transaction) {
|
||||
await setTransactionReimbursed(row.id as number, true)
|
||||
await load()
|
||||
@@ -214,19 +291,31 @@ async function confirmDelete() {
|
||||
showToast('账目已删除')
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="ledger-page">
|
||||
<div class="ledger-toolbar">
|
||||
<button class="icon-btn" @click="prevMonth"><Icon name="chevron-left" :size="16" /></button>
|
||||
<span class="month-title num">{{ title }}</span>
|
||||
<button class="icon-btn" @click="nextMonth"><Icon name="chevron-right" :size="16" /></button>
|
||||
<button class="btn btn-sm" @click="goThisMonth">回到本月</button>
|
||||
<button v-if="mode !== 'custom'" class="icon-btn" :disabled="!canPrev" title="上一周期" @click="step(-1)">
|
||||
<Icon name="chevron-left" :size="16" />
|
||||
</button>
|
||||
<button class="period-title" title="选择统计周期" @click="openPeriodDialog">
|
||||
<span class="num">{{ title }}</span>
|
||||
<Icon name="chevron-down" :size="14" />
|
||||
</button>
|
||||
<button v-if="mode !== 'custom'" class="icon-btn" :disabled="!canNext" title="下一周期" @click="step(1)">
|
||||
<Icon name="chevron-right" :size="16" />
|
||||
</button>
|
||||
<button v-if="offCurrent" class="btn btn-sm" @click="goCurrent">{{ mode === 'cycle' ? '回到本期' : '回到本月' }}</button>
|
||||
<span class="flex1"></span>
|
||||
<select class="select w-filter" v-model="typeFilter">
|
||||
<option value="all">全部类型</option>
|
||||
<option value="expense">仅支出</option>
|
||||
<option value="income">仅收入</option>
|
||||
</select>
|
||||
<select class="select w-filter" v-model="catFilter">
|
||||
<option value="all">全部分类</option>
|
||||
<option v-for="c in usedCategories" :key="c" :value="c">{{ c }}</option>
|
||||
</select>
|
||||
<select class="select w-filter" v-model="reimbFilter">
|
||||
<option value="all">全部报销</option>
|
||||
<option value="pending">待报销</option>
|
||||
@@ -236,14 +325,14 @@ async function confirmDelete() {
|
||||
</div>
|
||||
|
||||
<div class="cards">
|
||||
<div class="card stat-card stat-income"><div class="muted">本月收入（元）</div><div class="stat-num num amt-income">{{ yuan(summary.income) }}</div></div>
|
||||
<div class="card stat-card stat-expense"><div class="muted">本月支出（元）</div><div class="stat-num num">{{ yuan(summary.expense) }}</div></div>
|
||||
<div class="card stat-card stat-balance"><div class="muted">本月结余（元）</div><div class="stat-num num" :class="{ 'amt-income': summary.balance >= 0, 'amt-expense': summary.balance < 0 }">{{ yuan(summary.balance) }}</div></div>
|
||||
<div class="card stat-card stat-income"><div class="muted">本期收入（元）</div><div class="stat-num num amt-income">{{ yuan(summary.income) }}</div></div>
|
||||
<div class="card stat-card stat-expense"><div class="muted">本期支出（元）</div><div class="stat-num num">{{ yuan(summary.expense) }}</div></div>
|
||||
<div class="card stat-card stat-balance"><div class="muted">本期结余（元）</div><div class="stat-num num" :class="{ 'amt-income': summary.balance >= 0, 'amt-expense': summary.balance < 0 }">{{ yuan(summary.balance) }}</div></div>
|
||||
<div class="card stat-card stat-pending"><div class="muted">待报销（元）</div><div class="stat-num num amt-warn">{{ yuan(summary.pending) }}</div></div>
|
||||
</div>
|
||||
|
||||
<div class="card sec" v-if="categoryStats.length">
|
||||
<div class="sec-title">本月支出分类</div>
|
||||
<div class="sec-title">本期支出分类</div>
|
||||
<div v-for="c in categoryStats" :key="c.name" class="bar-row">
|
||||
<span class="bar-label">{{ c.name }}</span>
|
||||
<span class="bar-track"><span class="bar-fill" :style="{ width: c.percent + '%' }"></span></span>
|
||||
@@ -286,13 +375,13 @@ async function confirmDelete() {
|
||||
</td>
|
||||
</tr>
|
||||
<tr v-if="!filtered.length && !loading">
|
||||
<td colspan="6" class="empty muted">本月暂无账目</td>
|
||||
<td colspan="6" class="empty muted">该周期暂无账目</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="muted table-note num">本月 {{ rows.length }} 条 · 当前筛选 {{ filtered.length }} 条</div>
|
||||
<div class="muted table-note num">本期 {{ rows.length }} 条 · 当前筛选 {{ filtered.length }} 条</div>
|
||||
|
||||
<TransactionDialog
|
||||
:open="dialogOpen"
|
||||
@@ -302,6 +391,22 @@ async function confirmDelete() {
|
||||
@save="onDialogSave"
|
||||
/>
|
||||
|
||||
<PeriodDialog
|
||||
:open="periodOpen"
|
||||
:mode="mode"
|
||||
:anchor="anchor"
|
||||
:month="monthRef"
|
||||
:cycle-sel="cycleSel"
|
||||
:custom-start="customStart"
|
||||
:custom-end="customEnd"
|
||||
:cycle-count="currentCycle"
|
||||
:has-before="hasBefore"
|
||||
:months="txMonths"
|
||||
@close="periodOpen = false"
|
||||
@apply="onApply"
|
||||
@save-anchor="onSaveAnchor"
|
||||
/>
|
||||
|
||||
<ConfirmDialog
|
||||
:open="!!deleteTarget"
|
||||
title="删除确认"
|
||||
@@ -315,8 +420,16 @@ async function confirmDelete() {
|
||||
|
||||
<style scoped>
|
||||
.ledger-toolbar { display: flex; align-items: center; gap: 8px; margin-bottom: 12px; flex-wrap: wrap; }
|
||||
.month-title { font-size: 14px; font-weight: 600; min-width: 88px; text-align: center; }
|
||||
.period-title {
|
||||
display: inline-flex; align-items: center; justify-content: center; gap: 5px;
|
||||
border: none; background: transparent; cursor: pointer;
|
||||
font-size: 14px; font-weight: 600; color: var(--text-1);
|
||||
padding: 5px 10px; border-radius: var(--radius-sm);
|
||||
transition: background 0.12s;
|
||||
}
|
||||
.period-title:hover { background: var(--bg-hover); }
|
||||
.w-filter { width: 110px; flex: none; }
|
||||
.icon-btn:disabled { opacity: 0.35; cursor: default; }
|
||||
|
||||
.cards { display: grid; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); gap: 12px; }
|
||||
.stat-card { border-left: 3px solid var(--border); }
|
||||
@@ -340,7 +453,7 @@ async function confirmDelete() {
|
||||
@media (max-width: 720px) {
|
||||
.ledger-toolbar { gap: 8px; }
|
||||
.ledger-toolbar .flex1 { display: none; }
|
||||
.month-title { min-width: 0; flex: 1; text-align: left; }
|
||||
.period-title { flex: 1; justify-content: flex-start; padding-left: 0; }
|
||||
.w-filter { flex: 1 1 calc(50% - 4px); min-width: 0; width: auto; }
|
||||
.ledger-toolbar .btn-primary { flex: 1 1 100%; order: 9; }
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
import { onMounted, ref, watch } from 'vue'
|
||||
import Icon from '../components/Icon.vue'
|
||||
import ConfirmDialog from '../components/ConfirmDialog.vue'
|
||||
import InputDialog from '../components/InputDialog.vue'
|
||||
import {
|
||||
addProject, exportAll, getLocationPresets, getSetting, getWorkRule, importAll,
|
||||
listAttendanceBetween, listLogItemsBetween, listProjects,
|
||||
@@ -39,37 +40,53 @@ async function loadCategories() {
|
||||
expenseCats.value = await getLedgerCategories('expense')
|
||||
incomeCats.value = await getLedgerCategories('income')
|
||||
}
|
||||
async function addCat(kind: 'log' | 'expense' | 'income') {
|
||||
const name = window.prompt('新分类名称')
|
||||
if (!name || !name.trim()) return
|
||||
const list = kind === 'log' ? logCats.value : kind === 'expense' ? expenseCats.value : incomeCats.value
|
||||
const clean = name.trim()
|
||||
if (list.includes(clean)) { showToast('分类已存在'); return }
|
||||
const next = [...list, clean]
|
||||
// ---- 分类编辑：自绘输入弹窗 + 危险确认框（替代浏览器原生 prompt/confirm）----
|
||||
type CatKind = 'log' | 'expense' | 'income'
|
||||
const catDialog = ref<{ open: boolean; kind: CatKind; index: number; initial: string }>({ open: false, kind: 'log', index: -1, initial: '' })
|
||||
const delCat = ref<{ kind: CatKind; index: number; name: string } | null>(null)
|
||||
|
||||
function catListOf(kind: CatKind): string[] {
|
||||
return kind === 'log' ? logCats.value : kind === 'expense' ? expenseCats.value : incomeCats.value
|
||||
}
|
||||
async function writeCats(kind: CatKind, next: string[]) {
|
||||
if (kind === 'log') { logCats.value = next; await setLogCategories(next) }
|
||||
else if (kind === 'expense') { expenseCats.value = next; await setLedgerCategories('expense', next) }
|
||||
else { incomeCats.value = next; await setLedgerCategories('income', next) }
|
||||
showToast('分类已添加')
|
||||
}
|
||||
async function renameCat(kind: 'log' | 'expense' | 'income', index: number, oldName: string) {
|
||||
const name = window.prompt('修改分类名称', oldName)
|
||||
if (!name || !name.trim() || name.trim() === oldName) return
|
||||
const list = kind === 'log' ? logCats.value : kind === 'expense' ? expenseCats.value : incomeCats.value
|
||||
const next = list.map((x, i) => (i === index ? name.trim() : x))
|
||||
if (kind === 'log') { logCats.value = next; await setLogCategories(next) }
|
||||
else if (kind === 'expense') { expenseCats.value = next; await setLedgerCategories('expense', next) }
|
||||
else { incomeCats.value = next; await setLedgerCategories('income', next) }
|
||||
showToast('分类已更新（历史记录自动跟随显示）')
|
||||
function openCatAdd(kind: CatKind) {
|
||||
catDialog.value = { open: true, kind, index: -1, initial: '' }
|
||||
}
|
||||
async function removeCat(kind: 'log' | 'expense' | 'income', index: number) {
|
||||
const list = kind === 'log' ? logCats.value : kind === 'expense' ? expenseCats.value : incomeCats.value
|
||||
function openCatRename(kind: CatKind, index: number, oldName: string) {
|
||||
catDialog.value = { open: true, kind, index, initial: oldName }
|
||||
}
|
||||
function validateCat(v: string): string | null {
|
||||
const { kind, index } = catDialog.value
|
||||
const list = catListOf(kind)
|
||||
if (list.includes(v) && !(index >= 0 && list[index] === v)) return '该分类已存在'
|
||||
return null
|
||||
}
|
||||
async function onCatDialogConfirm(v: string) {
|
||||
const { kind, index } = catDialog.value
|
||||
if (index >= 0) {
|
||||
await writeCats(kind, catListOf(kind).map((x, i) => (i === index ? v : x)))
|
||||
showToast('分类已更新（历史记录自动跟随显示）')
|
||||
} else {
|
||||
await writeCats(kind, [...catListOf(kind), v])
|
||||
showToast('分类已添加')
|
||||
}
|
||||
catDialog.value.open = false
|
||||
}
|
||||
function askRemoveCat(kind: CatKind, index: number) {
|
||||
const list = catListOf(kind)
|
||||
if (list.length <= 1) { showToast('至少保留一个分类'); return }
|
||||
if (!window.confirm('删除分类「' + list[index] + '」？历史记录不受影响。')) return
|
||||
const next = list.filter((_, i) => i !== index)
|
||||
if (kind === 'log') { logCats.value = next; await setLogCategories(next) }
|
||||
else if (kind === 'expense') { expenseCats.value = next; await setLedgerCategories('expense', next) }
|
||||
else { incomeCats.value = next; await setLedgerCategories('income', next) }
|
||||
delCat.value = { kind, index, name: list[index] }
|
||||
}
|
||||
async function confirmRemoveCat() {
|
||||
if (!delCat.value) return
|
||||
const { kind, index } = delCat.value
|
||||
await writeCats(kind, catListOf(kind).filter((_, i) => i !== index))
|
||||
showToast('分类已删除')
|
||||
delCat.value = null
|
||||
}
|
||||
|
||||
const fileInput = ref<HTMLInputElement | null>(null)
|
||||
@@ -424,32 +441,32 @@ async function doImport() {
|
||||
<div class="card section">
|
||||
<div class="section-title">工作分类</div>
|
||||
<div class="cat-block">
|
||||
<div class="cat-head"><span class="muted">工作记录分类</span><button class="btn btn-xs" @click="addCat('log')">添加</button></div>
|
||||
<div class="cat-head"><span class="muted">工作记录分类</span><button class="btn btn-xs" @click="openCatAdd('log')">添加</button></div>
|
||||
<div class="cat-chips">
|
||||
<span v-for="(c, i) in logCats" :key="c + i" class="cat-chip">
|
||||
{{ c }}
|
||||
<button class="chip-btn" title="修改" @click="renameCat('log', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="removeCat('log', i)">删</button>
|
||||
<button class="chip-btn" title="修改" @click="openCatRename('log', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="askRemoveCat('log', i)">删</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cat-block">
|
||||
<div class="cat-head"><span class="muted">记账支出分类</span><button class="btn btn-xs" @click="addCat('expense')">添加</button></div>
|
||||
<div class="cat-head"><span class="muted">记账支出分类</span><button class="btn btn-xs" @click="openCatAdd('expense')">添加</button></div>
|
||||
<div class="cat-chips">
|
||||
<span v-for="(c, i) in expenseCats" :key="c + i" class="cat-chip">
|
||||
{{ c }}
|
||||
<button class="chip-btn" title="修改" @click="renameCat('expense', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="removeCat('expense', i)">删</button>
|
||||
<button class="chip-btn" title="修改" @click="openCatRename('expense', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="askRemoveCat('expense', i)">删</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cat-block">
|
||||
<div class="cat-head"><span class="muted">记账收入分类</span><button class="btn btn-xs" @click="addCat('income')">添加</button></div>
|
||||
<div class="cat-head"><span class="muted">记账收入分类</span><button class="btn btn-xs" @click="openCatAdd('income')">添加</button></div>
|
||||
<div class="cat-chips">
|
||||
<span v-for="(c, i) in incomeCats" :key="c + i" class="cat-chip">
|
||||
{{ c }}
|
||||
<button class="chip-btn" title="修改" @click="renameCat('income', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="removeCat('income', i)">删</button>
|
||||
<button class="chip-btn" title="修改" @click="openCatRename('income', i, c)">改</button>
|
||||
<button class="chip-btn" title="删除" @click="askRemoveCat('income', i)">删</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -471,6 +488,27 @@ async function doImport() {
|
||||
<div class="muted backup-note">数据保存在云端服务器；导出的 JSON 备份用于跨设备迁移或灾后恢复。</div>
|
||||
</div>
|
||||
|
||||
<InputDialog
|
||||
:open="catDialog.open"
|
||||
:title="catDialog.index >= 0 ? '修改分类名称' : '添加分类'"
|
||||
label="分类名称"
|
||||
placeholder="如：制度学习 / 差旅交通"
|
||||
:initial="catDialog.initial"
|
||||
:validate="validateCat"
|
||||
confirm-text="保存"
|
||||
@cancel="catDialog.open = false"
|
||||
@confirm="onCatDialogConfirm"
|
||||
/>
|
||||
|
||||
<ConfirmDialog
|
||||
:open="!!delCat"
|
||||
title="删除分类"
|
||||
:message="delCat ? '将删除分类「' + delCat.name + '」。历史记录不受影响，仍按原分类展示。' : ''"
|
||||
confirm-text="删除" danger
|
||||
@cancel="delCat = null"
|
||||
@confirm="confirmRemoveCat"
|
||||
/>
|
||||
|
||||
<ConfirmDialog
|
||||
:open="!!pendingImport"
|
||||
title="导入确认"
|
||||
|
||||
Reference in New Issue
Block a user