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
214 lines
10 KiB
HTML
214 lines
10 KiB
HTML
{{define "content"}}
|
||
<div class="cal-page">
|
||
<header class="cal-head">
|
||
<div class="cal-title">
|
||
<a class="btn btn-ghost btn-square" href="/calendar?y={{.D.PrevY}}&m={{.D.PrevM}}&pkg={{.D.PkgID}}" aria-label="上个月">‹</a>
|
||
<h1>{{.D.Title}}</h1>
|
||
<a class="btn btn-ghost btn-square" href="/calendar?y={{.D.NextY}}&m={{.D.NextM}}&pkg={{.D.PkgID}}" aria-label="下个月">›</a>
|
||
<a class="btn btn-sm" href="/calendar?pkg={{.D.PkgID}}">回到今天</a>
|
||
</div>
|
||
<div class="cal-stats">
|
||
<span><em>{{.D.MonthDue}}</em>本月到期</span>
|
||
<span><em>{{.D.MonthTasks}}</em>本月待打</span>
|
||
<span><em>{{.D.MonthDone}}</em>已完成</span>
|
||
{{if gt .D.MonthUrgent 0}}<span class="text-urgent"><em>{{.D.MonthUrgent}}</em>加急</span>{{end}}
|
||
<a class="btn btn-primary btn-sm" href="/customers/new">+ 新建客户</a>
|
||
</div>
|
||
</header>
|
||
|
||
{{if .D.HasTabs}}
|
||
<nav class="pkg-tabs">
|
||
{{range .D.Tabs}}
|
||
<a class="{{if eq .ID $.D.PkgID}}on{{end}}" style="--tab:{{.Color}}"
|
||
href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&pkg={{.ID}}">
|
||
<i></i>{{.Name}}{{if gt .Count 0}}<em>{{.Count}}</em>{{end}}
|
||
</a>
|
||
{{end}}
|
||
</nav>
|
||
{{end}}
|
||
|
||
{{if .D.NoPackages}}
|
||
<div class="notice">还没有服务套餐,先去 <a href="/packages/new">新建套餐</a>,再给客户开通。</div>
|
||
{{else if .D.NoCustomers}}
|
||
<div class="notice">还没有客户,<a href="/customers/new">新建第一位客户</a>。</div>
|
||
{{end}}
|
||
|
||
<div class="cal-body">
|
||
<div class="cal-grid" role="grid">
|
||
<div class="cal-dow" role="row">
|
||
{{range .D.Weekdays}}<span>{{.}}</span>{{end}}
|
||
</div>
|
||
{{range .D.Weeks}}
|
||
<div class="cal-week" role="row">
|
||
{{range .}}
|
||
<a class="cal-cell heat-{{.Heat}}{{if not .InMonth}} out{{end}}{{if .IsToday}} today{{end}}{{if .IsSelected}} sel{{end}}{{if .IsWeekend}} weekend{{end}}{{if .DueCount}} has-due{{end}}"
|
||
href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{.Date}}&pkg={{$.D.PkgID}}" role="gridcell">
|
||
<div class="cell-top">
|
||
<span class="dnum">{{.Day}}</span>
|
||
<span class="cell-badges">
|
||
{{if gt .UrgentCnt 0}}<span class="urgent-dot" title="{{.UrgentCnt}} 项加急"></span>{{end}}
|
||
{{if .DueCount}}<span class="due-badge"><em>到期</em>{{.DueCount}}</span>{{end}}
|
||
</span>
|
||
</div>
|
||
{{if .TaskCount}}
|
||
<div class="cell-load">{{.DoneCount}}/{{.TaskCount}} 单</div>
|
||
{{end}}
|
||
<div class="cell-tickets">
|
||
{{range .Tickets}}
|
||
<span class="ticket{{if .Done}} done{{end}}{{if .Skipped}} skipped{{end}}{{if .Urgent}} urgent{{end}}" style="--tag:{{.Color}}"><b>{{.Tail}}</b><span class="tk-name">{{.Name}}</span><i>{{.Pkg}}</i></span>
|
||
{{end}}
|
||
{{if gt .More 0}}<span class="ticket more">+{{.More}}</span>{{end}}
|
||
</div>
|
||
</a>
|
||
{{end}}
|
||
</div>
|
||
{{end}}
|
||
</div>
|
||
|
||
<aside class="drawer">
|
||
<header class="drawer-head">
|
||
<h2>{{.D.SelectedLabel}}</h2>
|
||
<div class="drawer-tags">
|
||
{{if .D.SelectedIsToday}}<span class="chip chip-active">今天</span>{{end}}
|
||
{{if .D.SelectedIsPast}}<span class="chip chip-closed">已过去</span>{{end}}
|
||
<span class="chip chip-plain">{{.D.TaskPending}} 待完成</span>
|
||
</div>
|
||
</header>
|
||
|
||
<section class="drawer-block">
|
||
<h3>当日待完成 <em>{{.D.TaskPending}}</em><span class="muted small">/ {{len .D.Tasks}} 单</span></h3>
|
||
<form class="quick-form" method="post" action="/checkins/quick">
|
||
<input type="hidden" name="date" value="{{.D.Selected}}">
|
||
<input type="hidden" name="pkg" value="{{.D.PkgID}}">
|
||
<input type="hidden" name="back" value="{{.D.Back}}">
|
||
<input type="text" name="tail" placeholder="输入手机尾号,回车即可完成" maxlength="8" autocomplete="off" inputmode="numeric" aria-label="手机尾号快速完成">
|
||
<button class="btn btn-sm btn-primary" type="submit">完成</button>
|
||
</form>
|
||
<p class="muted small quick-hint">唯一匹配直接完成;同尾号多人 / 一单多服务会列出让你勾选。</p>
|
||
|
||
{{if .D.PickTail}}
|
||
<section class="picker">
|
||
<header class="picker-head">
|
||
<h4>尾号 {{.D.PickTail}} 的待完成项</h4>
|
||
<a class="btn btn-sm btn-ghost" href="{{.D.Back}}">收起</a>
|
||
</header>
|
||
{{if .D.PickRows}}
|
||
<form method="post" action="/checkins/batch">
|
||
<input type="hidden" name="date" value="{{.D.Selected}}">
|
||
<input type="hidden" name="back" value="{{.D.Back}}">
|
||
<ul class="pick-list">
|
||
{{range .D.PickRows}}
|
||
<li>
|
||
<label>
|
||
<input type="checkbox" name="sub_ids" value="{{.ID}}"{{if not .Done}}{{if not .Skipped}} checked{{end}}{{end}}>
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pick-pkg">{{.PackageName}}</span>
|
||
<span class="pick-remain">{{.RemainShort}}</span>
|
||
{{if .Done}}<span class="chip chip-active">已完成</span>{{end}}
|
||
{{if .Skipped}}<span class="chip chip-paused">已跳过</span>{{end}}
|
||
</label>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
<div class="actions">
|
||
<button class="btn btn-primary btn-sm" type="submit">确认完成选中项</button>
|
||
<a class="btn btn-sm" href="{{.D.Back}}">取消</a>
|
||
</div>
|
||
</form>
|
||
{{else}}
|
||
<p class="muted">{{.D.PickMsg}}</p>
|
||
{{end}}
|
||
</section>
|
||
{{end}}
|
||
|
||
{{if .D.Tasks}}
|
||
<ul class="task-list">
|
||
{{range .D.Tasks}}
|
||
<li class="task{{if .Done}} done{{end}}{{if .Skipped}} skipped{{end}}{{if .Urgent}} urgent{{end}}">
|
||
<div class="task-main">
|
||
<a class="task-title" href="/customers/{{.CustomerID}}">
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pkg">{{.PackageName}}</span>
|
||
{{if .Urgent}}<span class="tag-urgent">加急</span>{{end}}
|
||
</a>
|
||
<div class="task-meta">
|
||
<span>{{.RemainText}}</span>
|
||
{{if .DueText}}<span class="due due-{{.Eval.Level}}">{{.DueText}}</span>{{end}}
|
||
</div>
|
||
{{if .Note}}<div class="task-note">{{.Note}}{{if .Operator}} · {{.Operator}}{{end}}</div>{{end}}
|
||
</div>
|
||
<div class="task-actions">
|
||
{{if or .Done .Skipped}}
|
||
<span class="chip {{if .Done}}chip-active{{else}}chip-paused{{end}}">{{if .Done}}已完成{{else}}已跳过{{end}}</span>
|
||
<form method="post" action="/checkins/{{.CheckinID}}/delete">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-ghost">撤销</button>
|
||
</form>
|
||
{{else}}
|
||
<form method="post" action="/subscriptions/{{.ID}}/checkin">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="status" value="done">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-primary">完成</button>
|
||
</form>
|
||
<form method="post" action="/subscriptions/{{.ID}}/checkin">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="status" value="skipped">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm btn-ghost">跳过</button>
|
||
</form>
|
||
{{end}}
|
||
<form method="post" action="/tasks/urgent">
|
||
<input type="hidden" name="sub_id" value="{{.ID}}">
|
||
<input type="hidden" name="date" value="{{$.D.Selected}}">
|
||
<input type="hidden" name="urgent" value="{{if .Urgent}}0{{else}}1{{end}}">
|
||
<input type="hidden" name="back" value="{{$.D.Back}}">
|
||
<button class="btn btn-sm {{if .Urgent}}btn-urgent{{else}}btn-ghost{{end}}">{{if .Urgent}}取消加急{{else}}加急{{end}}</button>
|
||
</form>
|
||
<a class="btn btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&pkg={{$.D.PkgID}}&extend={{.ID}}#extend">追加</a>
|
||
</div>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">这天没有待打任务。</p>{{end}}
|
||
</section>
|
||
|
||
{{if .D.Extend}}{{template "extend-panel" .D.Extend}}{{end}}
|
||
|
||
<section class="drawer-block">
|
||
<h3>这天到期 <em>{{len .D.Due}}</em></h3>
|
||
{{if .D.Due}}
|
||
<ul class="due-list">
|
||
{{range .D.Due}}
|
||
<li>
|
||
<a class="due-main" href="/customers/{{.CustomerID}}">
|
||
<span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span>
|
||
<span class="pkg">{{.PackageName}}</span>
|
||
<span class="rem">{{.RemainShort}}</span>
|
||
</a>
|
||
<a class="btn btn-sm" href="/calendar?y={{$.D.Year}}&m={{$.D.Month}}&d={{$.D.Selected}}&pkg={{$.D.PkgID}}&extend={{.ID}}#extend">追加</a>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">没有到期订阅。</p>{{end}}
|
||
</section>
|
||
|
||
<section class="drawer-block">
|
||
<h3>近 7 天到期</h3>
|
||
{{if .D.OtherDue}}
|
||
<ul class="mini-due">
|
||
{{range .D.OtherDue}}
|
||
<li>
|
||
<a href="/customers/{{.CustomerID}}"><span class="ticket" style="--tag:{{.PackageColor}}"><b>{{.CustomerTail}}</b>{{.CustomerName}}</span></a>
|
||
<span class="muted">{{.PackageName}}</span>
|
||
<span class="sm-date">{{.EndDate}}</span>
|
||
</li>
|
||
{{end}}
|
||
</ul>
|
||
{{else}}<p class="muted">7 天内没有其它到期。</p>{{end}}
|
||
</section>
|
||
</aside>
|
||
</div>
|
||
</div>
|
||
{{end}}
|