build / build-and-test (push) Successful in 3m36s
1) 日历计数口径
- 工作台与大屏的格子统一改为「已完成 / 总数」(如 2/5 = 共 5 单、做完 2 单)
2) 客户详情·当月排单
- 新增客户专属月历:每天显示 已完成/总数,可翻月,点某天跳转到日历对应日期
- 没有排单的日期淡化显示
3) 套餐标签与页签合并
- packages 新增 tag 列(可空),套餐编辑页可填
- 日历/大屏页签按标签合并:同标签套餐合成一个页签;勾了「独立显示」的套餐额外再开一个自己的页签
- 大屏同样支持标签筛选,链接参数为 tag=xxx
4) 批量开通
- 新增套餐详情页 /packages/{id}:显示套餐信息 + 客户列表
- 表头「全选」置顶,已订阅该套餐的客户置灰不可选;开始日期默认今天、天数/次数默认取套餐设置,均可改
- POST /packages/{id}/subscribe 批量开通,重复的自动跳过并汇总提示
- 修复 r.PostForm 未 ParseForm 导致拿不到勾选项的问题(批量打卡同源问题一并修正)
5) 触控 / PC 模式
- 尾号输入框右侧新增切换按钮,触控模式展开 3×4 键盘、输入框只读 + inputmode=none(不唤起系统输入法),按键直接写值
- 偏好记在 localStorage,默认 PC 模式(键盘收起)
6) 按次到期
- 按次订阅的到期日保持选填;填了到期后状态显示「已到期」且不再进日历待排(复用既有 end_date,无新列)
数据库兼容性:
- 只新增 packages.tag 一列,老库启动时自动 ALTER,可重复迁移;原有表结构与接口不变
测试:
- 无头 Chrome 实拍 5 张页面(日历/触控模式/客户月历/套餐批量/大屏)
- 功能验证 18 项全过(计数口径、标签页签、标签筛选、批量开通与重复跳过、月历翻月、触控开关、按次过期不上日历)
- 119 项验收回归全绿;go vet / go test ./... 通过;版本号 1.7.0
205 lines
5.7 KiB
Go
205 lines
5.7 KiB
Go
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, tag string) ([]TaskRow, error) {
|
||
subs, pauses, checkins, urgent, err := s.loadCalendarSubs(date, date, pkgID, tag)
|
||
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))
|
||
tag := strings.TrimSpace(r.PostFormValue("tag"))
|
||
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, tag)
|
||
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)
|
||
_ = r.ParseForm()
|
||
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()
|
||
}
|