feat(v1.2): 亮暗主题、按尾号快速完成、加急置顶、按套餐分日历、大屏升级

1) 全站亮色 / 暗色
- 管理端与大屏都提供切换按钮(顶栏 ☾/☀、大屏右上角),偏好写 cookie,服务端首屏直出,不闪
- 未选择时跟随系统(prefers-color-scheme);两套配色都改成 CSS 变量,色签、热力、表格、抽屉全部适配
- 大屏默认仍是深色记分板,浅色为纸感背景

2) 工作台 → 当日待完成:按手机尾号快速完成
- 输入尾号回车:唯一匹配直接完成并提示
- 同尾号多客户 / 一单多服务:跳到选择面板,默认全选,可多选后一次完成
- 新增 POST /checkins/quick 与 POST /checkins/batch;抽屉标题改为「未完成数 / 总单数」

3) 加急
- 每条任务右侧可勾选/取消加急;加急任务红 tag + 置顶(抽屉与大屏「今日待打」)
- 日历格子出现红点,单据色签加红边;大屏热力格也带红点
- 新增表 task_flags(sub_id, service_date, urgent),按 订阅+日期 存,避免和打卡状态耦合

4) 套餐「在日历中独立显示」
- 套餐表单新增勾选项,列表页显示「独立日历」标记
- 勾选后工作台与大屏顶部出现套餐标签页(全部 / 每日任务 / …),可只看某类委托的排单、热量与待办
- 新增列 packages.calendar_separate;老库打开时自动 ALTER,无需手工迁移

5) 大屏
- 热力默认改为「每日待完成单量」,右上角可切回「到期热力」
- 鼠标悬停任意日期格,浮出当日待办明细(客户、套餐、剩余、加急),数据来自 GET /api/screen/day
- 底部面板改为「今日到期」(左)+「今日待打」(右,加急置顶),最近追加改为最底部细条

数据库兼容性:
- 只做加法:新增 task_flags 表与 packages.calendar_separate 列,原有表结构、字段、接口与已有数据均不变
- 迁移可重复执行(CREATE TABLE IF NOT EXISTS + PRAGMA 检查后 ALTER)

测试:
- 新增单元测试:套餐独立日历标记、加急增删查、旧库自动加列与重复迁移
- 新增功能冒烟 33 项(主题 cookie、套餐标签、快速完成单/多匹配、加急排序、大屏接口)全部通过
- 原有 119 项验收回归全绿(3 条断言按新 UI 更新:抽屉标题、热力默认口径、今日待打数取值方式)
- go vet / go test ./... 通过;版本号 1.2.0
This commit is contained in:
subtrack
2026-10-18 22:07:25 +08:00
parent 099385e3d9
commit 85f98dff5c
23 changed files with 1771 additions and 386 deletions
+202
View File
@@ -0,0 +1,202 @@
package web
import (
"fmt"
"net/http"
"strconv"
"strings"
"daili/internal/domain"
)
// pendingTasks 返回某天“应服务”的订阅行(day 型在区间内、count 型有剩余),
// customerIDs 非空时只保留这些客户;pkgID>0 时只保留该套餐。
func (s *Server) pendingTasks(date string, customerIDs map[int64]bool, pkgID int64) ([]TaskRow, error) {
subs, pauses, checkins, urgent, err := s.loadCalendarSubs(date, date, pkgID)
if err != nil {
return nil, err
}
today := domain.Today()
warn := s.warnDays()
rows := []TaskRow{}
for _, sub := range subs {
if customerIDs != nil && !customerIDs[sub.CustomerID] {
continue
}
cs := calSub{sub: sub, pauses: pauses[sub.ID], eval: sub.Eval(today, warn)}
if sub.EndDate != "" {
cs.hasEnd = true
cs.end = domain.ParseDateOr(sub.EndDate, today)
}
if !cs.covers(date) {
continue
}
row := TaskRow{SubView: newSubView(sub, today, warn), Urgent: urgent[sub.ID][date]}
if ci, ok := checkins[sub.ID][date]; ok {
row.CheckinID = ci.ID
row.Done = ci.Status == "done"
row.Skipped = ci.Status == "skipped"
row.Note = ci.Note
row.Operator = ci.OperatorName
}
rows = append(rows, row)
}
sortTasks(rows)
return rows, nil
}
// handleQuickCheckin 输入手机尾号直接完成当日服务:
// 命中 1 项直接完成;命中多项则跳到日历的选择面板。
func (s *Server) handleQuickCheckin(w http.ResponseWriter, r *http.Request) {
tail := strings.TrimSpace(r.PostFormValue("tail"))
date := strings.TrimSpace(r.PostFormValue("date"))
pkgID := int64(s.formInt(r, "pkg", 0))
if _, err := domain.ParseDate(date); err != nil {
date = domain.Date(domain.Today())
}
back := backURL(r, "/calendar?d="+date)
if tail == "" {
s.redirect(w, r, back, "请输入手机尾号")
return
}
customers, err := s.db.CustomersByTail(tail)
if err != nil {
s.redirect(w, r, back, "查询客户失败:"+err.Error())
return
}
if len(customers) == 0 {
s.redirect(w, r, back, "没有找到尾号 "+tail+" 的客户")
return
}
ids := map[int64]bool{}
for _, c := range customers {
ids[c.ID] = true
}
rows, err := s.pendingTasks(date, ids, pkgID)
if err != nil {
s.redirect(w, r, back, "读取待完成失败:"+err.Error())
return
}
pending := make([]TaskRow, 0, len(rows))
for _, row := range rows {
if !row.Done && !row.Skipped {
pending = append(pending, row)
}
}
switch len(pending) {
case 0:
if len(rows) > 0 {
s.redirect(w, r, back, "尾号 "+tail+" 今天的服务已经处理过了")
return
}
s.redirect(w, r, back, "尾号 "+tail+" 今天没有待完成的服务")
return
case 1:
row := pending[0]
u := s.currentUser(r)
var op int64
if u != nil {
op = u.ID
}
if err := s.db.SaveCheckin(row.ID, date, "done", "", op); err != nil {
s.redirect(w, r, back, "完成失败:"+err.Error())
return
}
s.logOp(r, "快速完成", "subscription", row.ID,
fmt.Sprintf("尾号 %s:%s %s 完成 %s(%s)", tail, row.CustomerTail, row.CustomerName, row.PackageName, date))
s.redirect(w, r, back, "已为 "+row.CustomerTail+" "+row.CustomerName+" 完成「"+row.PackageName+"」")
return
default:
// 多项:回到日历并打开选择面板
target := stripParam(back, "pick")
sep := "?"
if strings.Contains(target, "?") {
sep = "&"
}
s.redirect(w, r, target+sep+"pick="+urlQueryEscape(tail), fmt.Sprintf("尾号 %s 有 %d 项待完成,请勾选", tail, len(pending)))
return
}
}
// handleCheckinBatch 批量完成选中的订阅(同日)。
func (s *Server) handleCheckinBatch(w http.ResponseWriter, r *http.Request) {
date := strings.TrimSpace(r.PostFormValue("date"))
if _, err := domain.ParseDate(date); err != nil {
date = domain.Date(domain.Today())
}
back := backURL(r, "/calendar?d="+date)
raw := r.PostForm["sub_ids"]
if len(raw) == 0 {
s.redirect(w, r, back, "没有选中任何项")
return
}
u := s.currentUser(r)
var op int64
if u != nil {
op = u.ID
}
done, failed := 0, 0
var lastErr string
for _, v := range raw {
id, err := strconv.ParseInt(strings.TrimSpace(v), 10, 64)
if err != nil {
failed++
continue
}
if err := s.db.SaveCheckin(id, date, "done", "", op); err != nil {
failed++
lastErr = err.Error()
continue
}
done++
}
if done > 0 {
s.logOp(r, "批量完成", "checkin", 0, fmt.Sprintf("%s 一次完成 %d 项", date, done))
}
msg := fmt.Sprintf("已完成 %d 项", done)
if failed > 0 {
msg += fmt.Sprintf(",%d 项失败(%s)", failed, lastErr)
}
s.redirect(w, r, stripParam(back, "pick"), msg)
}
// handleUrgentToggle 勾选/取消某天某订阅的加急。
func (s *Server) handleUrgentToggle(w http.ResponseWriter, r *http.Request) {
subID := int64(s.formInt(r, "sub_id", 0))
date := strings.TrimSpace(r.PostFormValue("date"))
urgent := r.PostFormValue("urgent") == "1"
back := backURL(r, "/calendar")
if subID <= 0 {
s.redirect(w, r, back, "参数不正确")
return
}
if err := s.db.SetUrgent(subID, date, urgent); err != nil {
s.redirect(w, r, back, "设置加急失败:"+err.Error())
return
}
word := "已取消加急"
if urgent {
word = "已标记加急"
}
if sub, err := s.db.Sub(subID); err == nil {
s.logOp(r, word, "subscription", subID, sub.SubTitle()+" "+date+" "+word)
}
s.redirect(w, r, back, word)
}
func urlQueryEscape(v string) string {
var b strings.Builder
for _, c := range []byte(v) {
if (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9') || c == '-' || c == '_' || c == '.' || c == '~' {
b.WriteByte(c)
continue
}
b.WriteString("%")
const hex = "0123456789ABCDEF"
b.WriteByte(hex[c>>4])
b.WriteByte(hex[c&15])
}
return b.String()
}