Compare commits
79 Commits
52fb508e03
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 01e86e6856 | |||
| 3bee3c47b6 | |||
| 96c5fa4c90 | |||
| 1a1892cfb4 | |||
| 06ea496eb7 | |||
| de0013e329 | |||
| dabb71d8ab | |||
| 0f85422e82 | |||
| 053e27fd40 | |||
| a4c2d14c41 | |||
| c40cbcac11 | |||
| eb838f5a7e | |||
| 0bdcb220e5 | |||
| 642659ce3e | |||
| 19d6734b68 | |||
| 8ffb940bdb | |||
| 2a4db54b94 | |||
| 6979614aeb | |||
| eb0f58912e | |||
| 38410b1185 | |||
| ee39e98418 | |||
| 3713ddd1aa | |||
| 31052625ba | |||
| b66b8d4d78 | |||
| 650b9b917a | |||
| 85d65068e7 | |||
| e490637179 | |||
| bcc89addba | |||
| 7e8fa275d5 | |||
| 8a17659bdf | |||
| 98783714a3 | |||
| 9d8fb3db6b | |||
| c026ef7ebe | |||
| dc27897ea4 | |||
| 654f41fa40 | |||
| 05cf27f112 | |||
| b643fda99c | |||
| 1c1039ae0e | |||
| 0d0bdf20d5 | |||
| 6961193857 | |||
| 8c60c35444 | |||
| a720c05c9d | |||
| d0cf00309f | |||
| 2d07c92a88 | |||
| 38ef98b06b | |||
| a067c1d020 | |||
| 6c977632c0 | |||
| a09683b82d | |||
| 7a4797021b | |||
| a1adf4d6ab | |||
| 300e23c93c | |||
| 2e200842c9 | |||
| 31aed4835e | |||
| 464566a5e0 | |||
| 99d9d862b7 | |||
| 9f718ab154 | |||
| 1e930597b1 | |||
| a9bb06f732 | |||
| a8c3fde95a | |||
| 14fcfc2578 | |||
| 89b5263352 | |||
| 0eb6349021 | |||
| a95fdcbb93 | |||
| 1543a7df99 | |||
| 86106459c4 | |||
| 06f905e792 | |||
| 1f758cc29f | |||
| b5e7121c35 | |||
| fda768d4ce | |||
| a44864309c | |||
| 8e4264589d | |||
| 273e429d9e | |||
| 435c9f3f97 | |||
| 9ab3f5ff46 | |||
| 9346e7a18a | |||
| 0b3246ae8a | |||
| a50c6afdbe | |||
| d6bb9ccb1e | |||
| 44af0ee155 |
@@ -19,8 +19,8 @@
|
|||||||
## 目录
|
## 目录
|
||||||
|
|
||||||
- `backend/`:Fastify + TypeScript 后端 API;若实际后端位于仓库根目录,以 `docs/repository-map.md` 为准
|
- `backend/`:Fastify + TypeScript 后端 API;若实际后端位于仓库根目录,以 `docs/repository-map.md` 为准
|
||||||
- `admin/`:Vue3 后台管理端,已接入 M08-B 保洁运营工作台、运营待处理入口、待验收任务批量验收/驳回、协作者管理、任务详情照片预览、任务操作流水、任务详情协作分账、结算详情、待结算候选预览与导出、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、微信转账预检资料展示与导出、统计明细、每日趋势、保洁员资料管理、微信绑定状态、保洁员选择器和任务/结算/统计筛选,必须适配桌面、平板和手机
|
- `admin/`:Vue3 后台管理端,已接入 M08-B 保洁运营工作台、运营待处理入口、运营待处理导出、待验收任务批量验收/驳回、免清洁标记、批量免清洁与统计展示、协作者管理、任务成员导出、任务详情照片预览、任务操作流水、任务流水导出、任务详情协作分账、任务列表导出、任务详情导出、结算详情、结算详情导出、待结算候选预览与导出、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、微信转账预检资料展示与导出、真实转账前自动预检拦截、统计明细、每日趋势、保洁员绩效排行、统计导出、保洁员资料管理、保洁员列表导出、保洁员待补资料导出、微信绑定状态、保洁员选择器、任务/结算/统计筛选、联调检查项搜索、联调筛选结果导出与筛选清除、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、联调风险清单导出和联调归档包导出,必须适配桌面、平板和手机
|
||||||
- `miniapp/`:微信原生小程序
|
- `miniapp/`:微信原生小程序,已接入顾客端主链路与保洁端任务大厅、我的任务、照片上传、驳回补做和保洁员统计看板
|
||||||
- `database/`:迁移、种子和兼容 SQL
|
- `database/`:迁移、种子和兼容 SQL
|
||||||
- `deploy/`:Nginx、PM2、EMQX 模板与部署版本
|
- `deploy/`:Nginx、PM2、EMQX 模板与部署版本
|
||||||
- `scripts/`:Windows、WSL 和 Ubuntu 辅助脚本
|
- `scripts/`:Windows、WSL 和 Ubuntu 辅助脚本
|
||||||
@@ -121,8 +121,8 @@ WSL 已验证:EMQX `5.8.9`、MQTTX CLI `1.13.0`、EMQX 服务 `active (running
|
|||||||
项目已开发部分模块。具体完成度不得从 README 猜测,必须以现有代码、测试、数据库迁移、Git 历史以及 `docs/current-baseline.md`、`docs/module-status.md`、`docs/feature-status.md` 为准。
|
项目已开发部分模块。具体完成度不得从 README 猜测,必须以现有代码、测试、数据库迁移、Git 历史以及 `docs/current-baseline.md`、`docs/module-status.md`、`docs/feature-status.md` 为准。
|
||||||
|
|
||||||
- 当前执行游标:`M08-B`(PARTIAL)
|
- 当前执行游标:`M08-B`(PARTIAL)
|
||||||
- 最近工程提交:`8fae70e` / `M08-B微信预检导出增量`,本轮补齐微信转账预检结果 CSV 导出,便于真实商户现场联调时留存前置条件和检查项证据。
|
- 最近工程提交:`96c5fa4` / `M08-B联调筛选清除增量`,本轮补齐现场联调分类、状态、负责人和关键字筛选的一键清除,不会重置已填写的联调草稿。
|
||||||
- 下一工程目标:继续 M08-B,补更完整保洁运营管理界面和真实商户现场联调清单。
|
- 下一工程目标:继续 M08-B,补更完整保洁运营管理界面和真实商户现场执行记录。
|
||||||
|
|
||||||
## 版本递进
|
## 版本递进
|
||||||
|
|
||||||
@@ -141,3 +141,6 @@ WSL 已验证:EMQX `5.8.9`、MQTTX CLI `1.13.0`、EMQX 服务 `active (running
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -90,6 +90,11 @@
|
|||||||
<span>待发放金额</span>
|
<span>待发放金额</span>
|
||||||
<strong>{{ money(statistics.summary.confirmedSettlementCents) }}</strong>
|
<strong>{{ money(statistics.summary.confirmedSettlementCents) }}</strong>
|
||||||
</button>
|
</button>
|
||||||
|
<button class="action-tile" type="button" @click="exportOperationalQueue">
|
||||||
|
<Download :size="20" />
|
||||||
|
<span>导出待处理</span>
|
||||||
|
<strong>{{ operationalQueueTotal }}</strong>
|
||||||
|
</button>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<el-alert
|
<el-alert
|
||||||
@@ -132,6 +137,8 @@
|
|||||||
@complete-many="handleCompleteMany"
|
@complete-many="handleCompleteMany"
|
||||||
@reject="handleReject"
|
@reject="handleReject"
|
||||||
@reject-many="handleRejectMany"
|
@reject-many="handleRejectMany"
|
||||||
|
@exempt="handleExempt"
|
||||||
|
@exempt-many="handleExemptMany"
|
||||||
@reclaim="handleReclaim"
|
@reclaim="handleReclaim"
|
||||||
/>
|
/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
@@ -187,6 +194,9 @@
|
|||||||
@reset-sessions="handleResetCleanerSessions"
|
@reset-sessions="handleResetCleanerSessions"
|
||||||
/>
|
/>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
|
<el-tab-pane label="联调" name="handoff">
|
||||||
|
<CleaningFieldHandoffPanel />
|
||||||
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</section>
|
</section>
|
||||||
</main>
|
</main>
|
||||||
@@ -198,6 +208,7 @@ import { computed, onMounted, reactive, ref } from 'vue';
|
|||||||
import { ElMessage } from 'element-plus';
|
import { ElMessage } from 'element-plus';
|
||||||
import {
|
import {
|
||||||
ClipboardCheck,
|
ClipboardCheck,
|
||||||
|
Download,
|
||||||
ListTodo,
|
ListTodo,
|
||||||
RadioTower,
|
RadioTower,
|
||||||
RotateCcw,
|
RotateCcw,
|
||||||
@@ -211,12 +222,14 @@ import CleaningTasksPanel from './components/CleaningTasksPanel.vue';
|
|||||||
import CleaningSettlementsPanel from './components/CleaningSettlementsPanel.vue';
|
import CleaningSettlementsPanel from './components/CleaningSettlementsPanel.vue';
|
||||||
import CleaningStatisticsPanel from './components/CleaningStatisticsPanel.vue';
|
import CleaningStatisticsPanel from './components/CleaningStatisticsPanel.vue';
|
||||||
import CleanersPanel from './components/CleanersPanel.vue';
|
import CleanersPanel from './components/CleanersPanel.vue';
|
||||||
|
import CleaningFieldHandoffPanel from './components/CleaningFieldHandoffPanel.vue';
|
||||||
import {
|
import {
|
||||||
ApiError,
|
ApiError,
|
||||||
assignCleaningTask,
|
assignCleaningTask,
|
||||||
completeCleaningTask,
|
completeCleaningTask,
|
||||||
confirmCleaningSettlement,
|
confirmCleaningSettlement,
|
||||||
createStaffUser,
|
createStaffUser,
|
||||||
|
exemptCleaningTask,
|
||||||
executeWechatTransfer,
|
executeWechatTransfer,
|
||||||
generateCleaningSettlement,
|
generateCleaningSettlement,
|
||||||
getCleaningStatistics,
|
getCleaningStatistics,
|
||||||
@@ -275,6 +288,7 @@ const statistics = reactive<CleaningStatistics>({
|
|||||||
pendingReview: 0,
|
pendingReview: 0,
|
||||||
active: 0,
|
active: 0,
|
||||||
rejected: 0,
|
rejected: 0,
|
||||||
|
exempted: 0,
|
||||||
completed: 0,
|
completed: 0,
|
||||||
rewardCents: 0,
|
rewardCents: 0,
|
||||||
pendingSettlementCents: 0,
|
pendingSettlementCents: 0,
|
||||||
@@ -289,6 +303,11 @@ const statistics = reactive<CleaningStatistics>({
|
|||||||
});
|
});
|
||||||
const draftSettlementTotal = computed(() => statistics.settlements
|
const draftSettlementTotal = computed(() => statistics.settlements
|
||||||
.find((item) => item.status === 'DRAFT')?.total || 0);
|
.find((item) => item.status === 'DRAFT')?.total || 0);
|
||||||
|
const operationalQueueTotal = computed(() => (
|
||||||
|
statistics.summary.pendingReview
|
||||||
|
+ statistics.summary.rejected
|
||||||
|
+ draftSettlementTotal.value
|
||||||
|
));
|
||||||
|
|
||||||
function saveToken() {
|
function saveToken() {
|
||||||
localStorage.setItem('qipai.admin.token', tokenDraft.value.trim());
|
localStorage.setItem('qipai.admin.token', tokenDraft.value.trim());
|
||||||
@@ -412,6 +431,34 @@ function jumpToSettlementStatus(status: SettlementStatus) {
|
|||||||
void loadSettlements();
|
void loadSettlements();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function exportOperationalQueue() {
|
||||||
|
downloadCsv(`cleaning-operational-queue-${Date.now()}.csv`, [
|
||||||
|
['队列', '数量', '金额', '入口'],
|
||||||
|
['待验收任务', String(statistics.summary.pendingReview), '', '任务/SUBMITTED'],
|
||||||
|
['驳回补做', String(statistics.summary.rejected), '', '任务/REJECTED'],
|
||||||
|
['待确认结算', String(draftSettlementTotal.value), '', '结算/DRAFT'],
|
||||||
|
['待发放金额', '', money(statistics.summary.confirmedSettlementCents), '结算/CONFIRMED'],
|
||||||
|
['待结算金额', '', money(statistics.summary.pendingSettlementCents), '统计/待结算'],
|
||||||
|
['已完成任务', String(statistics.summary.completed), '', '统计/已完成']
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadCsv(filename: string, rows: string[][]) {
|
||||||
|
const content = rows.map((row) => row.map(csvCell).join(',')).join('\r\n');
|
||||||
|
const blob = new Blob([`\uFEFF${content}`], { type: 'text/csv;charset=utf-8' });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url;
|
||||||
|
link.download = filename;
|
||||||
|
link.click();
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
function csvCell(value: string) {
|
||||||
|
const normalized = value.replace(/\r?\n/g, ' ');
|
||||||
|
return /[",\r\n]/.test(normalized) ? `"${normalized.replace(/"/g, '""')}"` : normalized;
|
||||||
|
}
|
||||||
|
|
||||||
function changeSettlementFilters(input: { storeId: string; cleanerUserId: string; payoutState: PayoutStateFilter | '' }) {
|
function changeSettlementFilters(input: { storeId: string; cleanerUserId: string; payoutState: PayoutStateFilter | '' }) {
|
||||||
Object.assign(settlementFilters, input);
|
Object.assign(settlementFilters, input);
|
||||||
settlements.page = 1;
|
settlements.page = 1;
|
||||||
@@ -489,6 +536,22 @@ async function handleRejectMany(input: { taskIds: string[]; reason: string }) {
|
|||||||
}, `已批量驳回 ${input.taskIds.length} 个任务`);
|
}, `已批量驳回 ${input.taskIds.length} 个任务`);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function handleExempt(input: { taskId: string; note?: string }) {
|
||||||
|
await runAction(async () => {
|
||||||
|
await exemptCleaningTask(session.value, input.taskId, input.note);
|
||||||
|
await Promise.all([loadTasks(), loadStatistics()]);
|
||||||
|
}, '宸叉爣璁板厤娓呮磥');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleExemptMany(input: { taskIds: string[]; note?: string }) {
|
||||||
|
await runAction(async () => {
|
||||||
|
for (const taskId of input.taskIds) {
|
||||||
|
await exemptCleaningTask(session.value, taskId, input.note);
|
||||||
|
}
|
||||||
|
await Promise.all([loadTasks(), loadStatistics()]);
|
||||||
|
}, `\u5df2\u6279\u91cf\u6807\u8bb0\u514d\u6e05\u6d01 ${input.taskIds.length} \u4e2a\u4efb\u52a1`);
|
||||||
|
}
|
||||||
|
|
||||||
async function handleReclaim(input: { olderThanMinutes: number; limit: number }) {
|
async function handleReclaim(input: { olderThanMinutes: number; limit: number }) {
|
||||||
await runAction(async () => {
|
await runAction(async () => {
|
||||||
await reclaimCleaningTimeouts(session.value, input);
|
await reclaimCleaningTimeouts(session.value, input);
|
||||||
|
|||||||
@@ -165,6 +165,13 @@ export function rejectCleaningTask(session: ApiSession, taskId: string, reason:
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function exemptCleaningTask(session: ApiSession, taskId: string, note?: string) {
|
||||||
|
return request<CleaningTask>(session, `/cleaning/tasks/${encodeURIComponent(taskId)}/exempt`, {
|
||||||
|
method: 'POST',
|
||||||
|
body: JSON.stringify({ note })
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
export function listCleaningTaskMembers(session: ApiSession, taskId: string) {
|
export function listCleaningTaskMembers(session: ApiSession, taskId: string) {
|
||||||
return request<CleaningTaskMember[]>(
|
return request<CleaningTaskMember[]>(
|
||||||
session,
|
session,
|
||||||
|
|||||||
@@ -16,6 +16,12 @@
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="toolbar-actions">
|
<div class="toolbar-actions">
|
||||||
|
<el-button :icon="Download" :disabled="items.length === 0" @click="exportCleaners">
|
||||||
|
导出
|
||||||
|
</el-button>
|
||||||
|
<el-button :icon="FileWarning" :disabled="incompleteCleaners.length === 0" @click="exportCleanerProfileIssues">
|
||||||
|
导出待补
|
||||||
|
</el-button>
|
||||||
<el-button type="primary" :icon="UserPlus" @click="createDialog.open = true">
|
<el-button type="primary" :icon="UserPlus" @click="createDialog.open = true">
|
||||||
新增
|
新增
|
||||||
</el-button>
|
</el-button>
|
||||||
@@ -138,8 +144,10 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { reactive, ref, watch } from 'vue';
|
import { computed, reactive, ref, watch } from 'vue';
|
||||||
import {
|
import {
|
||||||
|
Download,
|
||||||
|
FileWarning,
|
||||||
Pencil,
|
Pencil,
|
||||||
RefreshCw,
|
RefreshCw,
|
||||||
ShieldX,
|
ShieldX,
|
||||||
@@ -192,6 +200,7 @@ const editDialog = reactive({
|
|||||||
storeIdsText: '',
|
storeIdsText: '',
|
||||||
note: ''
|
note: ''
|
||||||
});
|
});
|
||||||
|
const incompleteCleaners = computed(() => props.items.filter((row) => !profileComplete(row)));
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => props.search,
|
() => props.search,
|
||||||
@@ -239,4 +248,63 @@ function submitEdit() {
|
|||||||
function profileComplete(row: ManagedUser) {
|
function profileComplete(row: ManagedUser) {
|
||||||
return row.wechatMiniappBound && row.storeIds.length > 0 && Boolean(row.nickname);
|
return row.wechatMiniappBound && row.storeIds.length > 0 && Boolean(row.nickname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function profileIssues(row: ManagedUser) {
|
||||||
|
const issues: string[] = [];
|
||||||
|
if (!row.wechatMiniappBound) issues.push('未绑定微信');
|
||||||
|
if (!row.storeIds.length) issues.push('未配置门店范围');
|
||||||
|
if (!row.nickname) issues.push('缺姓名');
|
||||||
|
return issues;
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportCleaners() {
|
||||||
|
downloadCsv(`cleaning-cleaners-${Date.now()}.csv`, [
|
||||||
|
['ID', '姓名', '状态', '微信绑定', '资料完整度', '门店范围', '手机号', '最近登录', '最近 IP', '注册时间', '备注'],
|
||||||
|
...props.items.map((row) => [
|
||||||
|
row.id,
|
||||||
|
row.nickname || '',
|
||||||
|
row.status,
|
||||||
|
row.wechatMiniappBound ? '已绑定微信' : '未绑定微信',
|
||||||
|
profileComplete(row) ? '资料完整' : '待补资料',
|
||||||
|
row.storeIds.join(' / '),
|
||||||
|
row.maskedPhone,
|
||||||
|
row.lastLoginAt || '',
|
||||||
|
row.maskedLastIp,
|
||||||
|
row.registeredAt,
|
||||||
|
row.note
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportCleanerProfileIssues() {
|
||||||
|
downloadCsv(`cleaning-cleaner-profile-issues-${Date.now()}.csv`, [
|
||||||
|
['ID', '姓名', '状态', '待补项目', '微信绑定', '门店范围', '手机号', '最近登录', '备注'],
|
||||||
|
...incompleteCleaners.value.map((row) => [
|
||||||
|
row.id,
|
||||||
|
row.nickname || '',
|
||||||
|
row.status,
|
||||||
|
profileIssues(row).join(' / '),
|
||||||
|
row.wechatMiniappBound ? '已绑定微信' : '未绑定微信',
|
||||||
|
row.storeIds.join(' / '),
|
||||||
|
row.maskedPhone,
|
||||||
|
row.lastLoginAt || '',
|
||||||
|
row.note
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadCsv(filename: string, rows: string[][]) {
|
||||||
|
const content = rows.map((row) => row.map(csvCell).join(',')).join('\r\n');
|
||||||
|
const blob = new Blob([`\uFEFF${content}`], { type: 'text/csv;charset=utf-8;' });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url;
|
||||||
|
link.download = filename;
|
||||||
|
link.click();
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
function csvCell(value: string) {
|
||||||
|
return `"${String(value ?? '').replace(/"/g, '""')}"`;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -268,13 +268,43 @@
|
|||||||
<el-radio-button label="MOCK">MOCK</el-radio-button>
|
<el-radio-button label="MOCK">MOCK</el-radio-button>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<el-alert
|
||||||
|
v-if="transferDialog.mode === 'API'"
|
||||||
|
class="transfer-preflight-alert"
|
||||||
|
:title="transferPreflightTitle"
|
||||||
|
:type="transferDialog.preflight?.ready ? 'success' : 'warning'"
|
||||||
|
show-icon
|
||||||
|
:closable="false"
|
||||||
|
/>
|
||||||
|
<el-table
|
||||||
|
v-if="transferDialog.mode === 'API' && transferDialog.preflight"
|
||||||
|
:data="transferDialog.preflight.checks"
|
||||||
|
size="small"
|
||||||
|
class="preflight-table"
|
||||||
|
max-height="220"
|
||||||
|
>
|
||||||
|
<el-table-column prop="key" label="检查项" width="160" />
|
||||||
|
<el-table-column prop="status" label="状态" width="90">
|
||||||
|
<template #default="{ row }">
|
||||||
|
<el-tag :type="preflightTag(row.status)" effect="light">{{ row.status }}</el-tag>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column prop="message" label="说明" min-width="220" />
|
||||||
|
</el-table>
|
||||||
<el-form-item label="备注">
|
<el-form-item label="备注">
|
||||||
<el-input v-model="transferDialog.note" type="textarea" :rows="3" />
|
<el-input v-model="transferDialog.note" type="textarea" :rows="3" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</el-form>
|
</el-form>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
<el-button @click="transferDialog.open = false">取消</el-button>
|
<el-button @click="transferDialog.open = false">取消</el-button>
|
||||||
<el-button type="primary" @click="submitTransfer">发起</el-button>
|
<el-button
|
||||||
|
type="primary"
|
||||||
|
:loading="transferDialog.preflightLoading"
|
||||||
|
:disabled="!transferCanSubmit"
|
||||||
|
@click="submitTransfer"
|
||||||
|
>
|
||||||
|
发起
|
||||||
|
</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
|
|
||||||
@@ -409,6 +439,9 @@
|
|||||||
</el-descriptions>
|
</el-descriptions>
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<el-button :icon="Download" :disabled="!detailDialog.detail" @click="exportSettlementDetail">
|
||||||
|
导出详情
|
||||||
|
</el-button>
|
||||||
<el-button @click="detailDialog.open = false">关闭</el-button>
|
<el-button @click="detailDialog.open = false">关闭</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@@ -496,7 +529,9 @@ const transferDialog = reactive({
|
|||||||
open: false,
|
open: false,
|
||||||
settlementId: '',
|
settlementId: '',
|
||||||
mode: 'API' as TransferMode,
|
mode: 'API' as TransferMode,
|
||||||
note: ''
|
note: '',
|
||||||
|
preflightLoading: false,
|
||||||
|
preflight: null as WechatTransferPreflight | null
|
||||||
});
|
});
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
@@ -547,6 +582,18 @@ const candidatePageRewardCents = computed(() => candidateDialog.items
|
|||||||
const selectedSyncableSettlements = computed(() => selectedSettlements.value
|
const selectedSyncableSettlements = computed(() => selectedSettlements.value
|
||||||
.filter((settlement) => settlement.status === 'CONFIRMED'));
|
.filter((settlement) => settlement.status === 'CONFIRMED'));
|
||||||
const selectedSyncableCount = computed(() => selectedSyncableSettlements.value.length);
|
const selectedSyncableCount = computed(() => selectedSyncableSettlements.value.length);
|
||||||
|
const transferCanSubmit = computed(() => {
|
||||||
|
if (transferDialog.mode === 'MOCK') return true;
|
||||||
|
return !transferDialog.preflightLoading && Boolean(transferDialog.preflight?.ready);
|
||||||
|
});
|
||||||
|
const transferPreflightTitle = computed(() => {
|
||||||
|
if (transferDialog.preflightLoading) return '正在执行真实转账预检';
|
||||||
|
if (!transferDialog.preflight) return '请等待预检完成后再发起真实转账';
|
||||||
|
if (transferDialog.preflight.ready) return '真实转账前置条件已通过';
|
||||||
|
const failedCount = transferDialog.preflight.checks
|
||||||
|
.filter((check) => check.status === 'FAIL').length;
|
||||||
|
return `仍有 ${failedCount} 个阻断项需要处理`;
|
||||||
|
});
|
||||||
|
|
||||||
function settlementTag(status: SettlementStatus) {
|
function settlementTag(status: SettlementStatus) {
|
||||||
if (status === 'PAID') return 'success';
|
if (status === 'PAID') return 'success';
|
||||||
@@ -601,11 +648,20 @@ function submitGenerate() {
|
|||||||
generateDialog.open = false;
|
generateDialog.open = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
function openTransfer(row: CleaningSettlement) {
|
async function openTransfer(row: CleaningSettlement) {
|
||||||
transferDialog.open = true;
|
transferDialog.open = true;
|
||||||
transferDialog.settlementId = row.id;
|
transferDialog.settlementId = row.id;
|
||||||
transferDialog.mode = 'API';
|
transferDialog.mode = 'API';
|
||||||
transferDialog.note = '';
|
transferDialog.note = '';
|
||||||
|
transferDialog.preflight = null;
|
||||||
|
transferDialog.preflightLoading = true;
|
||||||
|
try {
|
||||||
|
transferDialog.preflight = await preflightWechatTransfer(props.session, row.id);
|
||||||
|
} catch (error) {
|
||||||
|
ElMessage.error(error instanceof Error ? error.message : '微信转账预检失败');
|
||||||
|
} finally {
|
||||||
|
transferDialog.preflightLoading = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function submitTransfer() {
|
function submitTransfer() {
|
||||||
@@ -738,6 +794,32 @@ function exportCandidates() {
|
|||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function exportSettlementDetail() {
|
||||||
|
const detail = detailDialog.detail;
|
||||||
|
if (!detail) return;
|
||||||
|
const settlement = detail.settlement;
|
||||||
|
downloadCsv(`cleaning-settlement-detail-${settlement.settlementNo}-${Date.now()}.csv`, [
|
||||||
|
['类别', '字段', '值'],
|
||||||
|
['settlement', '结算单号', settlement.settlementNo],
|
||||||
|
['settlement', '状态', settlement.status],
|
||||||
|
['settlement', '保洁员', settlement.cleanerName],
|
||||||
|
['settlement', '门店', settlement.storeName || ''],
|
||||||
|
['settlement', '任务数', String(settlement.taskCount)],
|
||||||
|
['settlement', '金额', money(settlement.totalRewardCents)],
|
||||||
|
['settlement', '转账状态', settlement.payoutState],
|
||||||
|
['settlement', '外部流水', settlement.payoutReference],
|
||||||
|
['settlement', '微信确认参数', settlement.payoutPackageInfo],
|
||||||
|
['settlement', '失败原因', settlement.payoutError],
|
||||||
|
['settlement', '备注', settlement.note],
|
||||||
|
['settlement', '创建时间', shortDate(settlement.createdAt)],
|
||||||
|
...detail.items.map((item) => [
|
||||||
|
'item',
|
||||||
|
item.taskNo,
|
||||||
|
`${item.storeName} ${item.roomName || item.roomNo} ${item.cleanerName} ${money(item.rewardCents)} ${shortDate(item.completedAt)}`
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
function exportPreflight() {
|
function exportPreflight() {
|
||||||
const result = preflightDialog.result;
|
const result = preflightDialog.result;
|
||||||
if (!result) return;
|
if (!result) return;
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-button type="primary" :icon="Search" @click="emitFilter">查询</el-button>
|
<el-button type="primary" :icon="Search" @click="emitFilter">查询</el-button>
|
||||||
</el-form>
|
</el-form>
|
||||||
|
<el-button :icon="Download" @click="exportStatistics">导出</el-button>
|
||||||
<el-tooltip content="刷新统计">
|
<el-tooltip content="刷新统计">
|
||||||
<el-button :icon="RefreshCw" :loading="loading" circle @click="$emit('refresh')" />
|
<el-button :icon="RefreshCw" :loading="loading" circle @click="$emit('refresh')" />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
@@ -56,12 +57,43 @@
|
|||||||
<span>待结算</span>
|
<span>待结算</span>
|
||||||
<strong>{{ money(statistics.summary.pendingSettlementCents) }}</strong>
|
<strong>{{ money(statistics.summary.pendingSettlementCents) }}</strong>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="metric">
|
||||||
|
<span>{{ '\u514d\u6e05\u6d01' }}</span>
|
||||||
|
<strong>{{ statistics.summary.exempted }}</strong>
|
||||||
|
</div>
|
||||||
<div class="metric">
|
<div class="metric">
|
||||||
<span>已发放</span>
|
<span>已发放</span>
|
||||||
<strong>{{ money(statistics.summary.paidSettlementCents) }}</strong>
|
<strong>{{ money(statistics.summary.paidSettlementCents) }}</strong>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section class="stat-block cleaner-performance-board">
|
||||||
|
<header>
|
||||||
|
<div>
|
||||||
|
<h3>保洁员绩效排行</h3>
|
||||||
|
<span>任务 / 完成率 / 驳回 / 结算</span>
|
||||||
|
</div>
|
||||||
|
<el-button :icon="Download" :disabled="cleanerPerformanceRows.length === 0" @click="exportCleanerPerformance">
|
||||||
|
导出排行
|
||||||
|
</el-button>
|
||||||
|
</header>
|
||||||
|
<div class="cleaner-performance-grid">
|
||||||
|
<button
|
||||||
|
v-for="row in cleanerPerformanceRows"
|
||||||
|
:key="row.cleanerUserId"
|
||||||
|
type="button"
|
||||||
|
class="cleaner-performance-card"
|
||||||
|
@click="filterByCleaner(row.cleanerUserId)"
|
||||||
|
>
|
||||||
|
<span>第 {{ row.rank }} 名</span>
|
||||||
|
<strong>{{ row.cleanerName || compactText(row.cleanerUserId) }}</strong>
|
||||||
|
<em>任务 {{ row.taskCount }} · 完成 {{ row.completedTaskCount }} · 驳回 {{ row.rejectedTaskCount }}</em>
|
||||||
|
<small>完成率 {{ row.completionRate }}% · 待结算 {{ money(row.pendingSettlementCents) }} · 已结算 {{ money(row.settledRewardCents) }}</small>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<el-empty v-if="cleanerPerformanceRows.length === 0" description="暂无保洁员绩效数据" :image-size="72" />
|
||||||
|
</section>
|
||||||
|
|
||||||
<div class="stats-grid">
|
<div class="stats-grid">
|
||||||
<section class="stat-block">
|
<section class="stat-block">
|
||||||
<header>
|
<header>
|
||||||
@@ -108,6 +140,7 @@
|
|||||||
<span>待验 {{ row.pendingReview }}</span>
|
<span>待验 {{ row.pendingReview }}</span>
|
||||||
<span>完成 {{ row.completed }}</span>
|
<span>完成 {{ row.completed }}</span>
|
||||||
<span>驳回 {{ row.rejected }}</span>
|
<span>驳回 {{ row.rejected }}</span>
|
||||||
|
<span>{{ '\u514d\u6e05\u6d01' }} {{ row.exempted }}</span>
|
||||||
<span>奖励 {{ money(row.rewardCents) }}</span>
|
<span>奖励 {{ money(row.rewardCents) }}</span>
|
||||||
<span>发放 {{ money(row.paidSettlementCents) }}</span>
|
<span>发放 {{ money(row.paidSettlementCents) }}</span>
|
||||||
</div>
|
</div>
|
||||||
@@ -127,6 +160,7 @@
|
|||||||
<el-table-column prop="pendingReview" label="待验" width="90" />
|
<el-table-column prop="pendingReview" label="待验" width="90" />
|
||||||
<el-table-column prop="completed" label="完成" width="90" />
|
<el-table-column prop="completed" label="完成" width="90" />
|
||||||
<el-table-column prop="rejected" label="驳回" width="90" />
|
<el-table-column prop="rejected" label="驳回" width="90" />
|
||||||
|
<el-table-column prop="exempted" :label="'\u514d\u6e05\u6d01'" width="90" />
|
||||||
<el-table-column prop="rewardCents" label="奖励" width="120">
|
<el-table-column prop="rewardCents" label="奖励" width="120">
|
||||||
<template #default="{ row }">{{ money(row.rewardCents) }}</template>
|
<template #default="{ row }">{{ money(row.rewardCents) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -148,6 +182,8 @@
|
|||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column prop="taskCount" label="任务" width="90" />
|
<el-table-column prop="taskCount" label="任务" width="90" />
|
||||||
|
<el-table-column prop="completedTaskCount" label="完成" width="90" />
|
||||||
|
<el-table-column prop="rejectedTaskCount" label="驳回" width="90" />
|
||||||
<el-table-column prop="pendingSettlementCents" label="待结算" width="130">
|
<el-table-column prop="pendingSettlementCents" label="待结算" width="130">
|
||||||
<template #default="{ row }">{{ money(row.pendingSettlementCents) }}</template>
|
<template #default="{ row }">{{ money(row.pendingSettlementCents) }}</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -162,7 +198,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, reactive, watch } from 'vue';
|
import { computed, reactive, watch } from 'vue';
|
||||||
import { RefreshCw, Search } from '@lucide/vue';
|
import { Download, RefreshCw, Search } from '@lucide/vue';
|
||||||
import { compactText, money } from '../format';
|
import { compactText, money } from '../format';
|
||||||
import type { CleaningStatistics, ManagedUser } from '../types';
|
import type { CleaningStatistics, ManagedUser } from '../types';
|
||||||
|
|
||||||
@@ -185,6 +221,20 @@ const quickOptions = [
|
|||||||
{ label: '本月', value: 'month' }
|
{ label: '本月', value: 'month' }
|
||||||
];
|
];
|
||||||
const maxTrendTotal = computed(() => Math.max(1, ...props.statistics.trend.map((row) => row.taskTotal)));
|
const maxTrendTotal = computed(() => Math.max(1, ...props.statistics.trend.map((row) => row.taskTotal)));
|
||||||
|
const cleanerPerformanceRows = computed(() => props.statistics.members
|
||||||
|
.map((row) => ({
|
||||||
|
...row,
|
||||||
|
completionRate: row.taskCount ? Math.round((row.completedTaskCount / row.taskCount) * 100) : 0,
|
||||||
|
settlementTotalCents: row.pendingSettlementCents + row.settledRewardCents
|
||||||
|
}))
|
||||||
|
.sort((a, b) => (
|
||||||
|
b.taskCount - a.taskCount
|
||||||
|
|| b.completedTaskCount - a.completedTaskCount
|
||||||
|
|| a.rejectedTaskCount - b.rejectedTaskCount
|
||||||
|
|| b.settlementTotalCents - a.settlementTotalCents
|
||||||
|
))
|
||||||
|
.slice(0, 8)
|
||||||
|
.map((row, index) => ({ ...row, rank: index + 1 })));
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => props.filters,
|
() => props.filters,
|
||||||
@@ -230,4 +280,108 @@ function formatDate(date: Date) {
|
|||||||
function trendWidth(total: number) {
|
function trendWidth(total: number) {
|
||||||
return `${Math.max(6, Math.round((total / maxTrendTotal.value) * 100))}%`;
|
return `${Math.max(6, Math.round((total / maxTrendTotal.value) * 100))}%`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function filterByCleaner(cleanerUserId: string) {
|
||||||
|
filterDraft.cleanerUserId = cleanerUserId;
|
||||||
|
emitFilter();
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportCleanerPerformance() {
|
||||||
|
downloadCsv(`cleaning-cleaner-performance-${Date.now()}.csv`, [
|
||||||
|
['排名', '保洁员', '保洁员ID', '任务', '完成', '驳回', '完成率', '待结算', '已结算'],
|
||||||
|
...cleanerPerformanceRows.value.map((row) => [
|
||||||
|
String(row.rank),
|
||||||
|
row.cleanerName || '',
|
||||||
|
row.cleanerUserId,
|
||||||
|
String(row.taskCount),
|
||||||
|
String(row.completedTaskCount),
|
||||||
|
String(row.rejectedTaskCount),
|
||||||
|
`${row.completionRate}%`,
|
||||||
|
money(row.pendingSettlementCents),
|
||||||
|
money(row.settledRewardCents)
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportStatistics() {
|
||||||
|
downloadCsv(`cleaning-statistics-${Date.now()}.csv`, [
|
||||||
|
['section', 'key', 'value', 'extra1', 'extra2', 'extra3', 'extra4'],
|
||||||
|
['filter', 'from', filterDraft.from || '\u672a\u8bbe\u7f6e', '', '', '', ''],
|
||||||
|
['filter', 'to', filterDraft.to || '\u672a\u8bbe\u7f6e', '', '', '', ''],
|
||||||
|
['filter', 'storeId', filterDraft.storeId || '\u5168\u90e8\u95e8\u5e97', '', '', '', ''],
|
||||||
|
['filter', 'cleanerUserId', filterDraft.cleanerUserId || '\u5168\u90e8\u4fdd\u6d01\u5458', '', '', '', ''],
|
||||||
|
['summary', '\u4efb\u52a1\u603b\u6570', String(props.statistics.summary.taskTotal), '', '', '', ''],
|
||||||
|
['summary', '\u5f85\u9a8c\u6536', String(props.statistics.summary.pendingReview), '', '', '', ''],
|
||||||
|
['summary', '\u8fdb\u884c\u4e2d', String(props.statistics.summary.active), '', '', '', ''],
|
||||||
|
['summary', '\u9a73\u56de', String(props.statistics.summary.rejected), '', '', '', ''],
|
||||||
|
['summary', '\u514d\u6e05\u6d01', String(props.statistics.summary.exempted), '', '', '', ''],
|
||||||
|
['summary', '\u5df2\u5b8c\u6210', String(props.statistics.summary.completed), '', '', '', ''],
|
||||||
|
['summary', '\u5956\u52b1\u5408\u8ba1', money(props.statistics.summary.rewardCents), '', '', '', ''],
|
||||||
|
['summary', '\u5f85\u7ed3\u7b97', money(props.statistics.summary.pendingSettlementCents), '', '', '', ''],
|
||||||
|
['summary', '\u5f85\u53d1\u653e', money(props.statistics.summary.confirmedSettlementCents), '', '', '', ''],
|
||||||
|
['summary', '\u5df2\u53d1\u653e', money(props.statistics.summary.paidSettlementCents), '', '', '', ''],
|
||||||
|
['\u4efb\u52a1\u72b6\u6001', '\u72b6\u6001', '\u6570\u91cf', '\u5956\u52b1', '', '', ''],
|
||||||
|
...props.statistics.byStatus.map((row) => ['\u4efb\u52a1\u72b6\u6001', row.status, String(row.total), money(row.rewardCents), '', '', '']),
|
||||||
|
['\u7ed3\u7b97\u53e3\u5f84', '\u72b6\u6001', '\u5355\u6570', '\u91d1\u989d', '', '', ''],
|
||||||
|
...props.statistics.settlements.map((row) => ['\u7ed3\u7b97\u53e3\u5f84', row.status, String(row.total), money(row.rewardCents), '', '', '']),
|
||||||
|
['\u6bcf\u65e5\u8d8b\u52bf', '\u65e5\u671f', '\u4efb\u52a1', '\u5f85\u9a8c', '\u5b8c\u6210', '\u9a73\u56de', '\u514d\u6e05\u6d01'],
|
||||||
|
...props.statistics.trend.map((row) => [
|
||||||
|
'\u6bcf\u65e5\u8d8b\u52bf',
|
||||||
|
row.date,
|
||||||
|
String(row.taskTotal),
|
||||||
|
String(row.pendingReview),
|
||||||
|
String(row.completed),
|
||||||
|
String(row.rejected),
|
||||||
|
String(row.exempted)
|
||||||
|
]),
|
||||||
|
['\u6bcf\u65e5\u53d1\u653e', '\u65e5\u671f', '\u5df2\u53d1\u653e', '', '', '', ''],
|
||||||
|
...props.statistics.trend.map((row) => ['\u6bcf\u65e5\u53d1\u653e', row.date, money(row.paidSettlementCents), '', '', '', '']),
|
||||||
|
['\u95e8\u5e97\u660e\u7ec6', '\u95e8\u5e97', '\u4efb\u52a1', '\u5f85\u9a8c', '\u5b8c\u6210', '\u9a73\u56de', '\u514d\u6e05\u6d01'],
|
||||||
|
...props.statistics.byStore.map((row) => [
|
||||||
|
'\u95e8\u5e97\u660e\u7ec6',
|
||||||
|
`${row.storeName || ''}(${row.storeId})`,
|
||||||
|
String(row.taskTotal),
|
||||||
|
String(row.pendingReview),
|
||||||
|
String(row.completed),
|
||||||
|
String(row.rejected),
|
||||||
|
String(row.exempted)
|
||||||
|
]),
|
||||||
|
['\u95e8\u5e97\u5956\u52b1', '\u95e8\u5e97', '\u5956\u52b1', '', '', '', ''],
|
||||||
|
...props.statistics.byStore.map((row) => ['\u95e8\u5e97\u5956\u52b1', `${row.storeName || ''}(${row.storeId})`, money(row.rewardCents), '', '', '', '']),
|
||||||
|
['\u6210\u5458\u5206\u8d26', '\u4fdd\u6d01\u5458', '\u4efb\u52a1', '\u5b8c\u6210', '\u9a73\u56de', '\u5f85\u7ed3\u7b97', '\u5df2\u7ed3\u7b97'],
|
||||||
|
...props.statistics.members.map((row) => [
|
||||||
|
'\u6210\u5458\u5206\u8d26',
|
||||||
|
`${row.cleanerName || ''}(${row.cleanerUserId})`,
|
||||||
|
String(row.taskCount),
|
||||||
|
String(row.completedTaskCount),
|
||||||
|
String(row.rejectedTaskCount),
|
||||||
|
money(row.pendingSettlementCents),
|
||||||
|
money(row.settledRewardCents)
|
||||||
|
]),
|
||||||
|
['\u7ee9\u6548\u6392\u884c', '\u6392\u540d', '\u4fdd\u6d01\u5458', '\u4efb\u52a1', '\u5b8c\u6210\u7387', '\u9a73\u56de', '\u7ed3\u7b97\u5408\u8ba1'],
|
||||||
|
...cleanerPerformanceRows.value.map((row) => [
|
||||||
|
'\u7ee9\u6548\u6392\u884c',
|
||||||
|
String(row.rank),
|
||||||
|
`${row.cleanerName || ''}(${row.cleanerUserId})`,
|
||||||
|
String(row.taskCount),
|
||||||
|
`${row.completionRate}%`,
|
||||||
|
String(row.rejectedTaskCount),
|
||||||
|
money(row.settlementTotalCents)
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
function downloadCsv(filename: string, rows: string[][]) {
|
||||||
|
const content = rows.map((row) => row.map(csvCell).join(',')).join('\r\n');
|
||||||
|
const blob = new Blob([`\uFEFF${content}`], { type: 'text/csv;charset=utf-8;' });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url;
|
||||||
|
link.download = filename;
|
||||||
|
link.click();
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
function csvCell(value: string) {
|
||||||
|
return `"${String(value ?? '').replace(/"/g, '""')}"`;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -34,6 +34,9 @@
|
|||||||
<el-button :icon="Search" @click="submitFilters">筛选</el-button>
|
<el-button :icon="Search" @click="submitFilters">筛选</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div class="toolbar-actions">
|
<div class="toolbar-actions">
|
||||||
|
<el-button :icon="Download" :disabled="items.length === 0" @click="exportTasks">
|
||||||
|
导出
|
||||||
|
</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
type="success"
|
type="success"
|
||||||
:icon="BadgeCheck"
|
:icon="BadgeCheck"
|
||||||
@@ -50,6 +53,14 @@
|
|||||||
>
|
>
|
||||||
批量驳回
|
批量驳回
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
type="warning"
|
||||||
|
:icon="Ban"
|
||||||
|
:disabled="selectedExemptableCount === 0"
|
||||||
|
@click="submitBatchExempt"
|
||||||
|
>
|
||||||
|
{{ '\u6279\u91cf\u514d\u6e05\u6d01' }}
|
||||||
|
</el-button>
|
||||||
<el-popover trigger="click" width="280">
|
<el-popover trigger="click" width="280">
|
||||||
<template #reference>
|
<template #reference>
|
||||||
<el-button :icon="RotateCcw">回收</el-button>
|
<el-button :icon="RotateCcw">回收</el-button>
|
||||||
@@ -110,7 +121,7 @@
|
|||||||
</el-badge>
|
</el-badge>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="操作" width="270" fixed="right">
|
<el-table-column label="操作" width="340" fixed="right">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
<div class="row-actions">
|
<div class="row-actions">
|
||||||
<el-button size="small" :icon="ListChecks" @click="openDetail(row)">详情</el-button>
|
<el-button size="small" :icon="ListChecks" @click="openDetail(row)">详情</el-button>
|
||||||
@@ -134,6 +145,15 @@
|
|||||||
>
|
>
|
||||||
驳回
|
驳回
|
||||||
</el-button>
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
size="small"
|
||||||
|
type="warning"
|
||||||
|
:icon="Ban"
|
||||||
|
:disabled="!canExempt(row.status)"
|
||||||
|
@click="$emit('exempt', { taskId: row.id, note: '\u540e\u53f0\u6807\u8bb0\u514d\u6e05\u6d01' })"
|
||||||
|
>
|
||||||
|
{{ '\u514d\u6e05\u6d01' }}
|
||||||
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
@@ -223,6 +243,11 @@
|
|||||||
<strong>{{ memberDialog.taskNo }}</strong>
|
<strong>{{ memberDialog.taskNo }}</strong>
|
||||||
<span>任务奖励 {{ money(memberDialog.taskRewardCents) }}</span>
|
<span>任务奖励 {{ money(memberDialog.taskRewardCents) }}</span>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="row-actions">
|
||||||
|
<el-button size="small" :icon="Download" :disabled="!memberDialog.members.length" @click="exportTaskMembers">
|
||||||
|
导出成员
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
<el-table :data="memberDialog.members" size="small" v-loading="memberDialog.loading">
|
<el-table :data="memberDialog.members" size="small" v-loading="memberDialog.loading">
|
||||||
<el-table-column prop="nickname" label="成员" min-width="140">
|
<el-table-column prop="nickname" label="成员" min-width="140">
|
||||||
<template #default="{ row }">
|
<template #default="{ row }">
|
||||||
@@ -331,6 +356,11 @@
|
|||||||
<h3>操作流水</h3>
|
<h3>操作流水</h3>
|
||||||
<span>最近 {{ detailDialog.events.length }} 条</span>
|
<span>最近 {{ detailDialog.events.length }} 条</span>
|
||||||
</header>
|
</header>
|
||||||
|
<div class="row-actions">
|
||||||
|
<el-button size="small" :icon="Download" :disabled="!detailDialog.events.length" @click="exportTaskEvents">
|
||||||
|
导出流水
|
||||||
|
</el-button>
|
||||||
|
</div>
|
||||||
<el-table :data="detailDialog.events" size="small" v-loading="detailDialog.loadingEvents">
|
<el-table :data="detailDialog.events" size="small" v-loading="detailDialog.loadingEvents">
|
||||||
<el-table-column prop="action" label="动作" width="130" />
|
<el-table-column prop="action" label="动作" width="130" />
|
||||||
<el-table-column label="状态" width="150">
|
<el-table-column label="状态" width="150">
|
||||||
@@ -391,6 +421,9 @@
|
|||||||
<el-empty v-else description="暂无保洁照片" :image-size="80" />
|
<el-empty v-else description="暂无保洁照片" :image-size="80" />
|
||||||
</div>
|
</div>
|
||||||
<template #footer>
|
<template #footer>
|
||||||
|
<el-button :icon="Download" :disabled="!detailDialog.task" @click="exportTaskDetail">
|
||||||
|
导出详情
|
||||||
|
</el-button>
|
||||||
<el-button @click="detailDialog.open = false">关闭</el-button>
|
<el-button @click="detailDialog.open = false">关闭</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
@@ -400,7 +433,9 @@
|
|||||||
import { computed, reactive, ref, watch } from 'vue';
|
import { computed, reactive, ref, watch } from 'vue';
|
||||||
import {
|
import {
|
||||||
BadgeCheck,
|
BadgeCheck,
|
||||||
|
Ban,
|
||||||
Check,
|
Check,
|
||||||
|
Download,
|
||||||
Image,
|
Image,
|
||||||
ListChecks,
|
ListChecks,
|
||||||
RefreshCw,
|
RefreshCw,
|
||||||
@@ -450,6 +485,8 @@ const emit = defineEmits<{
|
|||||||
'complete-many': [{ taskIds: string[]; note?: string }];
|
'complete-many': [{ taskIds: string[]; note?: string }];
|
||||||
reject: [{ taskId: string; reason: string }];
|
reject: [{ taskId: string; reason: string }];
|
||||||
'reject-many': [{ taskIds: string[]; reason: string }];
|
'reject-many': [{ taskIds: string[]; reason: string }];
|
||||||
|
exempt: [{ taskId: string; note?: string }];
|
||||||
|
'exempt-many': [{ taskIds: string[]; note?: string }];
|
||||||
reclaim: [{ olderThanMinutes: number; limit: number }];
|
reclaim: [{ olderThanMinutes: number; limit: number }];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
@@ -460,7 +497,8 @@ const statusOptions = [
|
|||||||
{ label: '进行', value: 'STARTED' },
|
{ label: '进行', value: 'STARTED' },
|
||||||
{ label: '待验', value: 'SUBMITTED' },
|
{ label: '待验', value: 'SUBMITTED' },
|
||||||
{ label: '完成', value: 'COMPLETED' },
|
{ label: '完成', value: 'COMPLETED' },
|
||||||
{ label: '驳回', value: 'REJECTED' }
|
{ label: '\u9a73\u56de', value: 'REJECTED' },
|
||||||
|
{ label: '\u514d\u6e05\u6d01', value: 'EXEMPT' }
|
||||||
];
|
];
|
||||||
const filterDraft = reactive({ storeId: props.filters.storeId, cleanerUserId: props.filters.cleanerUserId });
|
const filterDraft = reactive({ storeId: props.filters.storeId, cleanerUserId: props.filters.cleanerUserId });
|
||||||
const reclaimForm = reactive({ olderThanMinutes: 60, limit: 20 });
|
const reclaimForm = reactive({ olderThanMinutes: 60, limit: 20 });
|
||||||
@@ -497,6 +535,9 @@ const memberDialog = reactive({
|
|||||||
const selectedSubmittedTasks = computed(() => selectedTasks.value
|
const selectedSubmittedTasks = computed(() => selectedTasks.value
|
||||||
.filter((task) => task.status === 'SUBMITTED'));
|
.filter((task) => task.status === 'SUBMITTED'));
|
||||||
const selectedSubmittedCount = computed(() => selectedSubmittedTasks.value.length);
|
const selectedSubmittedCount = computed(() => selectedSubmittedTasks.value.length);
|
||||||
|
const selectedExemptableTasks = computed(() => selectedTasks.value
|
||||||
|
.filter((task) => canExempt(task.status)));
|
||||||
|
const selectedExemptableCount = computed(() => selectedExemptableTasks.value.length);
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
() => props.filters,
|
() => props.filters,
|
||||||
@@ -512,7 +553,11 @@ function taskTag(status: TaskStatus) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function canSelectTask(row: CleaningTask) {
|
function canSelectTask(row: CleaningTask) {
|
||||||
return row.status === 'SUBMITTED';
|
return row.status === 'SUBMITTED' || canExempt(row.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
function canExempt(status: TaskStatus) {
|
||||||
|
return ['WAITING', 'CLAIMED', 'STARTED', 'SUBMITTED', 'REJECTED'].includes(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleSelectionChange(rows: CleaningTask[]) {
|
function handleSelectionChange(rows: CleaningTask[]) {
|
||||||
@@ -615,6 +660,18 @@ function submitBatchReject() {
|
|||||||
batchRejectDialog.open = false;
|
batchRejectDialog.open = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function submitBatchExempt() {
|
||||||
|
const taskIds = selectedExemptableTasks.value.map((task) => task.id);
|
||||||
|
if (!taskIds.length) {
|
||||||
|
ElMessage.warning('\u8bf7\u9009\u62e9\u53ef\u514d\u6e05\u6d01\u4efb\u52a1');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
emit('exempt-many', {
|
||||||
|
taskIds,
|
||||||
|
note: '\u540e\u53f0\u6279\u91cf\u6807\u8bb0\u514d\u6e05\u6d01'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async function loadMembers() {
|
async function loadMembers() {
|
||||||
memberDialog.loading = true;
|
memberDialog.loading = true;
|
||||||
try {
|
try {
|
||||||
@@ -672,4 +729,109 @@ async function removeMember(cleanerUserId: string) {
|
|||||||
ElMessage.error(error instanceof Error ? error.message : '协作者移除失败');
|
ElMessage.error(error instanceof Error ? error.message : '协作者移除失败');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function exportTasks() {
|
||||||
|
downloadCsv(`cleaning-tasks-${Date.now()}.csv`, [
|
||||||
|
['任务号', '状态', '门店', '房间', '订单号', '保洁员ID', '协作人数', '奖励金额', '照片数', '提交时间', '完成时间', '驳回原因'],
|
||||||
|
...props.items.map((item) => [
|
||||||
|
item.taskNo,
|
||||||
|
item.status,
|
||||||
|
item.storeName,
|
||||||
|
item.roomName || item.roomNo,
|
||||||
|
item.orderNo || '',
|
||||||
|
item.cleanerUserId || '',
|
||||||
|
String(item.memberCount || 0),
|
||||||
|
money(item.rewardCents),
|
||||||
|
String(item.photoUrls?.length || 0),
|
||||||
|
shortDate(item.submittedAt),
|
||||||
|
shortDate(item.completedAt),
|
||||||
|
item.rejectReason || ''
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportTaskDetail() {
|
||||||
|
const task = detailDialog.task;
|
||||||
|
if (!task) return;
|
||||||
|
downloadCsv(`cleaning-task-detail-${task.taskNo}-${Date.now()}.csv`, [
|
||||||
|
['类别', '字段', '值'],
|
||||||
|
['task', '任务号', task.taskNo],
|
||||||
|
['task', '状态', task.status],
|
||||||
|
['task', '门店', task.storeName],
|
||||||
|
['task', '房间', task.roomName || task.roomNo],
|
||||||
|
['task', '订单号', task.orderNo || ''],
|
||||||
|
['task', '保洁员ID', task.cleanerUserId || ''],
|
||||||
|
['task', '奖励金额', money(task.rewardCents)],
|
||||||
|
['task', '照片数', String(task.photoUrls?.length || 0)],
|
||||||
|
['task', '领取时间', shortDate(task.claimedAt)],
|
||||||
|
['task', '开始时间', shortDate(task.startedAt)],
|
||||||
|
['task', '提交时间', shortDate(task.submittedAt)],
|
||||||
|
['task', '完成时间', shortDate(task.completedAt)],
|
||||||
|
['task', '保洁要求', task.requirement || ''],
|
||||||
|
['task', '驳回原因', task.rejectReason || ''],
|
||||||
|
...detailDialog.members.map((member) => [
|
||||||
|
'member',
|
||||||
|
`${member.memberRole}:${member.userId}`,
|
||||||
|
`${member.nickname || ''} ${money(member.rewardCents)} ${member.settledAt ? shortDate(member.settledAt) : '未结算'}`
|
||||||
|
]),
|
||||||
|
...detailDialog.events.map((event) => [
|
||||||
|
'event',
|
||||||
|
`${event.action}:${shortDate(event.createdAt)}`,
|
||||||
|
`${compactText(event.fromStatus)} -> ${event.toStatus} ${compactText(event.actorId)} ${compactText(event.note)}`
|
||||||
|
]),
|
||||||
|
...task.photoUrls.map((url, index) => [
|
||||||
|
'photo',
|
||||||
|
`photo_${index + 1}`,
|
||||||
|
url
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportTaskEvents() {
|
||||||
|
const task = detailDialog.task;
|
||||||
|
if (!task) return;
|
||||||
|
downloadCsv(`cleaning-task-events-${task.taskNo}-${Date.now()}.csv`, [
|
||||||
|
['任务号', '动作', '原状态', '新状态', '操作人', 'TraceId', '备注', '时间'],
|
||||||
|
...detailDialog.events.map((event) => [
|
||||||
|
task.taskNo,
|
||||||
|
event.action,
|
||||||
|
event.fromStatus || '',
|
||||||
|
event.toStatus,
|
||||||
|
event.actorId,
|
||||||
|
event.traceId,
|
||||||
|
event.note,
|
||||||
|
shortDate(event.createdAt)
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function exportTaskMembers() {
|
||||||
|
downloadCsv(`cleaning-task-members-${memberDialog.taskNo}-${Date.now()}.csv`, [
|
||||||
|
['任务号', '成员ID', '昵称', '角色', '分账金额', '结算时间'],
|
||||||
|
...memberDialog.members.map((member) => [
|
||||||
|
memberDialog.taskNo,
|
||||||
|
member.userId,
|
||||||
|
member.nickname || '',
|
||||||
|
member.memberRole,
|
||||||
|
money(member.rewardCents),
|
||||||
|
shortDate(member.settledAt)
|
||||||
|
])
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
function downloadCsv(filename: string, rows: string[][]) {
|
||||||
|
const content = rows.map((row) => row.map(csvCell).join(',')).join('\r\n');
|
||||||
|
const blob = new Blob([`\uFEFF${content}`], { type: 'text/csv;charset=utf-8' });
|
||||||
|
const url = URL.createObjectURL(blob);
|
||||||
|
const link = document.createElement('a');
|
||||||
|
link.href = url;
|
||||||
|
link.download = filename;
|
||||||
|
link.click();
|
||||||
|
URL.revokeObjectURL(url);
|
||||||
|
}
|
||||||
|
|
||||||
|
function csvCell(value: string) {
|
||||||
|
const normalized = value.replace(/\r?\n/g, ' ');
|
||||||
|
return /[",\r\n]/.test(normalized) ? `"${normalized.replace(/"/g, '""')}"` : normalized;
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -342,6 +342,10 @@ textarea {
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.transfer-preflight-alert {
|
||||||
|
margin-bottom: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
.dialog-stack {
|
.dialog-stack {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 14px;
|
gap: 14px;
|
||||||
@@ -489,6 +493,292 @@ textarea {
|
|||||||
padding: 14px;
|
padding: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.handoff-summary {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-summary span {
|
||||||
|
display: inline-flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 6px;
|
||||||
|
min-height: 32px;
|
||||||
|
padding: 0 10px;
|
||||||
|
color: #52657f;
|
||||||
|
font-size: 13px;
|
||||||
|
border: 1px solid #e1e8f0;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #f5f8fb;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-summary strong {
|
||||||
|
color: #18212f;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-body {
|
||||||
|
display: grid;
|
||||||
|
gap: 14px;
|
||||||
|
padding: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-session {
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid #e1e8f0;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #f8fafc;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-session .el-form {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-session .el-form-item {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-category-progress {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-category-row {
|
||||||
|
display: grid;
|
||||||
|
gap: 8px;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid #e1e8f0;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-category-title,
|
||||||
|
.handoff-category-meta {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-category-title span,
|
||||||
|
.handoff-category-meta {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-board {
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid #d6e4dc;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #f8fcfa;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-board header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-board h3 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-board header span {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 5px;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #d6e4dc;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #172033;
|
||||||
|
text-align: left;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-card.blocked {
|
||||||
|
border-color: #f0c7c7;
|
||||||
|
background: #fff7f7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-card.ready {
|
||||||
|
border-color: #b8dec4;
|
||||||
|
background: #f3fbf5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-card span,
|
||||||
|
.handoff-stage-card em,
|
||||||
|
.handoff-stage-card small {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-card strong {
|
||||||
|
font-size: 15px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-board {
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid #d8e2ef;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #f8fbff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-board header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-board h3 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-board header span {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 5px;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #d8e2ef;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #172033;
|
||||||
|
text-align: left;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-card.active {
|
||||||
|
border-color: #2f6fed;
|
||||||
|
background: #f2f6ff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-owner-card span {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-verdict {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 12px;
|
||||||
|
border: 1px solid #f0c7c7;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #fff7f7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-verdict.ready {
|
||||||
|
border-color: #b8dec4;
|
||||||
|
background: #f3fbf5;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-verdict h3,
|
||||||
|
.handoff-verdict p {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-verdict h3 {
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-verdict p {
|
||||||
|
margin-top: 4px;
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 13px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-status-select {
|
||||||
|
width: 130px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-search {
|
||||||
|
width: 260px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-bulk-form {
|
||||||
|
display: grid;
|
||||||
|
gap: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-bulk-form .el-form-item {
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers {
|
||||||
|
border: 1px solid #f0c7c7;
|
||||||
|
border-radius: 8px;
|
||||||
|
overflow: hidden;
|
||||||
|
background: #fff7f7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers header {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
padding: 10px 12px;
|
||||||
|
border-bottom: 1px solid #f0c7c7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers h3 {
|
||||||
|
margin: 0;
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers header span,
|
||||||
|
.handoff-blockers li span {
|
||||||
|
color: #7f4b4b;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers ul {
|
||||||
|
display: grid;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 10px 12px;
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-blockers li {
|
||||||
|
display: grid;
|
||||||
|
gap: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.stats-grid {
|
.stats-grid {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
@@ -522,6 +812,49 @@ textarea {
|
|||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-board {
|
||||||
|
background: #fbfcfe;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-board header > div {
|
||||||
|
display: grid;
|
||||||
|
gap: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-grid {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(4, minmax(0, 1fr));
|
||||||
|
gap: 10px;
|
||||||
|
padding: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 5px;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #d8e2ef;
|
||||||
|
border-radius: 8px;
|
||||||
|
background: #ffffff;
|
||||||
|
color: #172033;
|
||||||
|
text-align: left;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-card span,
|
||||||
|
.cleaner-performance-card em,
|
||||||
|
.cleaner-performance-card small {
|
||||||
|
color: #60708a;
|
||||||
|
font-size: 12px;
|
||||||
|
font-style: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-card strong {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.el-button {
|
.el-button {
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
@@ -531,6 +864,10 @@ textarea {
|
|||||||
background: #d8e0ea;
|
background: #d8e0ea;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.hidden-file-input {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
@media (max-width: 980px) {
|
@media (max-width: 980px) {
|
||||||
.app-shell {
|
.app-shell {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
@@ -576,6 +913,18 @@ textarea {
|
|||||||
grid-template-columns: repeat(2, minmax(0, 1fr));
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.handoff-owner-grid {
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-grid {
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-grid {
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
}
|
||||||
|
|
||||||
.trend-row {
|
.trend-row {
|
||||||
grid-template-columns: 92px minmax(80px, 1fr);
|
grid-template-columns: 92px minmax(80px, 1fr);
|
||||||
}
|
}
|
||||||
@@ -595,6 +944,18 @@ textarea {
|
|||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.handoff-owner-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.handoff-stage-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cleaner-performance-grid {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
|
||||||
.action-board {
|
.action-board {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
@@ -608,6 +969,10 @@ textarea {
|
|||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.handoff-search {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.preflight-meta {
|
.preflight-meta {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
}
|
}
|
||||||
@@ -617,6 +982,8 @@ textarea {
|
|||||||
.timeline-grid,
|
.timeline-grid,
|
||||||
.photo-grid,
|
.photo-grid,
|
||||||
.trend-row,
|
.trend-row,
|
||||||
|
.handoff-session .el-form,
|
||||||
|
.handoff-category-progress,
|
||||||
.stats-filter,
|
.stats-filter,
|
||||||
.stats-grid {
|
.stats-grid {
|
||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ export interface CleaningStatistics {
|
|||||||
pendingReview: number;
|
pendingReview: number;
|
||||||
active: number;
|
active: number;
|
||||||
rejected: number;
|
rejected: number;
|
||||||
|
exempted: number;
|
||||||
completed: number;
|
completed: number;
|
||||||
rewardCents: number;
|
rewardCents: number;
|
||||||
pendingSettlementCents: number;
|
pendingSettlementCents: number;
|
||||||
@@ -157,6 +158,7 @@ export interface CleaningStatistics {
|
|||||||
pendingReview: number;
|
pendingReview: number;
|
||||||
completed: number;
|
completed: number;
|
||||||
rejected: number;
|
rejected: number;
|
||||||
|
exempted: number;
|
||||||
rewardCents: number;
|
rewardCents: number;
|
||||||
}>;
|
}>;
|
||||||
settlements: Array<{
|
settlements: Array<{
|
||||||
@@ -168,6 +170,8 @@ export interface CleaningStatistics {
|
|||||||
cleanerUserId: string;
|
cleanerUserId: string;
|
||||||
cleanerName: string;
|
cleanerName: string;
|
||||||
taskCount: number;
|
taskCount: number;
|
||||||
|
completedTaskCount: number;
|
||||||
|
rejectedTaskCount: number;
|
||||||
pendingSettlementCents: number;
|
pendingSettlementCents: number;
|
||||||
settledRewardCents: number;
|
settledRewardCents: number;
|
||||||
}>;
|
}>;
|
||||||
@@ -177,6 +181,7 @@ export interface CleaningStatistics {
|
|||||||
pendingReview: number;
|
pendingReview: number;
|
||||||
completed: number;
|
completed: number;
|
||||||
rejected: number;
|
rejected: number;
|
||||||
|
exempted: number;
|
||||||
rewardCents: number;
|
rewardCents: number;
|
||||||
paidSettlementCents: number;
|
paidSettlementCents: number;
|
||||||
}>;
|
}>;
|
||||||
|
|||||||
@@ -135,6 +135,7 @@ interface ManagerStoreStatsRow extends RowDataPacket {
|
|||||||
pendingReview: number;
|
pendingReview: number;
|
||||||
completed: number;
|
completed: number;
|
||||||
rejected: number;
|
rejected: number;
|
||||||
|
exempted: number;
|
||||||
rewardCents: number | null;
|
rewardCents: number | null;
|
||||||
}
|
}
|
||||||
interface ManagerSettlementStatsRow extends RowDataPacket {
|
interface ManagerSettlementStatsRow extends RowDataPacket {
|
||||||
@@ -146,6 +147,8 @@ interface ManagerMemberStatsRow extends RowDataPacket {
|
|||||||
cleanerUserId: string;
|
cleanerUserId: string;
|
||||||
cleanerName: string;
|
cleanerName: string;
|
||||||
taskCount: number;
|
taskCount: number;
|
||||||
|
completedTaskCount: number;
|
||||||
|
rejectedTaskCount: number;
|
||||||
pendingSettlementCents: number | null;
|
pendingSettlementCents: number | null;
|
||||||
settledRewardCents: number | null;
|
settledRewardCents: number | null;
|
||||||
}
|
}
|
||||||
@@ -155,6 +158,7 @@ interface ManagerDailyTrendRow extends RowDataPacket {
|
|||||||
pendingReview: number;
|
pendingReview: number;
|
||||||
completed: number;
|
completed: number;
|
||||||
rejected: number;
|
rejected: number;
|
||||||
|
exempted: number;
|
||||||
rewardCents: number | null;
|
rewardCents: number | null;
|
||||||
paidSettlementCents: number | null;
|
paidSettlementCents: number | null;
|
||||||
}
|
}
|
||||||
@@ -290,6 +294,52 @@ export class CleaningTaskRepository {
|
|||||||
return this.getTask(input, input.taskId);
|
return this.getTask(input, input.taskId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async exempt(input: CleaningActor & { taskId: string; note?: string }) {
|
||||||
|
this.assertCleaner(input.access, 'write');
|
||||||
|
await this.assertStoreVisible(input, input.taskId);
|
||||||
|
await this.transaction(async (connection) => {
|
||||||
|
const [currentRows] = await connection.execute<CurrentStatusRow[]>(
|
||||||
|
`SELECT status, cleaner_user_id AS cleanerUserId
|
||||||
|
FROM qipai_cleaning_tasks
|
||||||
|
WHERE tenant_id = ? AND id = ? AND deleted_at IS NULL
|
||||||
|
FOR UPDATE`,
|
||||||
|
[input.tenantId, input.taskId]
|
||||||
|
);
|
||||||
|
const current = currentRows[0];
|
||||||
|
if (!current) throw new CleaningTaskError('CLEANING_TASK_NOT_FOUND');
|
||||||
|
const [result] = await connection.execute<ResultSetHeader>(
|
||||||
|
`UPDATE qipai_cleaning_tasks
|
||||||
|
SET status = 'EXEMPT',
|
||||||
|
cleaner_user_id = NULL,
|
||||||
|
reward_cents = 0,
|
||||||
|
reject_reason = '',
|
||||||
|
completed_at = NULL,
|
||||||
|
settled_at = NULL
|
||||||
|
WHERE tenant_id = ? AND id = ?
|
||||||
|
AND status IN ('WAITING', 'CLAIMED', 'STARTED', 'SUBMITTED', 'REJECTED')
|
||||||
|
AND deleted_at IS NULL`,
|
||||||
|
[input.tenantId, input.taskId]
|
||||||
|
);
|
||||||
|
if (result.affectedRows !== 1) throw new CleaningTaskError('CLEANING_TASK_STATUS_CONFLICT');
|
||||||
|
await connection.execute(
|
||||||
|
`UPDATE qipai_cleaning_task_members
|
||||||
|
SET removed_at = UTC_TIMESTAMP(3), reward_cents = 0
|
||||||
|
WHERE tenant_id = ? AND task_id = ? AND removed_at IS NULL AND settled_at IS NULL`,
|
||||||
|
[input.tenantId, input.taskId]
|
||||||
|
);
|
||||||
|
await this.recordEventWithConnection(
|
||||||
|
connection,
|
||||||
|
input,
|
||||||
|
input.taskId,
|
||||||
|
current.status,
|
||||||
|
'EXEMPT',
|
||||||
|
'EXEMPT',
|
||||||
|
input.note ?? '免清洁'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
return this.getTask(input, input.taskId);
|
||||||
|
}
|
||||||
|
|
||||||
async listMembers(input: CleaningActor & { taskId: string }) {
|
async listMembers(input: CleaningActor & { taskId: string }) {
|
||||||
this.assertCleaner(input.access, 'read');
|
this.assertCleaner(input.access, 'read');
|
||||||
await this.assertStoreVisible(input, input.taskId);
|
await this.assertStoreVisible(input, input.taskId);
|
||||||
@@ -822,9 +872,27 @@ export class CleaningTaskRepository {
|
|||||||
AND t.status IN ('SUBMITTED', 'COMPLETED') AND t.deleted_at IS NULL`,
|
AND t.status IN ('SUBMITTED', 'COMPLETED') AND t.deleted_at IS NULL`,
|
||||||
[input.tenantId, input.userId]
|
[input.tenantId, input.userId]
|
||||||
);
|
);
|
||||||
|
const [settledRows] = await this.pool.execute<AmountRow[]>(
|
||||||
|
`SELECT COALESCE(SUM(m.reward_cents), 0) AS amount
|
||||||
|
FROM qipai_cleaning_task_members m
|
||||||
|
INNER JOIN qipai_cleaning_tasks t ON t.tenant_id = m.tenant_id AND t.id = m.task_id
|
||||||
|
WHERE m.tenant_id = ? AND m.user_id = ? AND m.removed_at IS NULL
|
||||||
|
AND m.settled_at IS NOT NULL AND m.reward_cents > 0
|
||||||
|
AND t.deleted_at IS NULL`,
|
||||||
|
[input.tenantId, input.userId]
|
||||||
|
);
|
||||||
|
const byStatus = Object.fromEntries(counts.map((row) => [row.status, Number(row.total)]));
|
||||||
|
const taskTotal = Object.values(byStatus).reduce((sum, total) => sum + total, 0);
|
||||||
|
const completed = (byStatus.COMPLETED ?? 0) + (byStatus.SETTLED ?? 0);
|
||||||
|
const rejected = byStatus.REJECTED ?? 0;
|
||||||
return {
|
return {
|
||||||
byStatus: Object.fromEntries(counts.map((row) => [row.status, Number(row.total)])),
|
byStatus,
|
||||||
pendingSettlementCents: Number(amountRows[0]?.amount ?? 0)
|
taskTotal,
|
||||||
|
completed,
|
||||||
|
rejected,
|
||||||
|
completionRate: taskTotal ? Math.round((completed / taskTotal) * 100) : 0,
|
||||||
|
pendingSettlementCents: Number(amountRows[0]?.amount ?? 0),
|
||||||
|
settledRewardCents: Number(settledRows[0]?.amount ?? 0)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -877,6 +945,7 @@ export class CleaningTaskRepository {
|
|||||||
SUM(CASE WHEN t.status = 'SUBMITTED' THEN 1 ELSE 0 END) AS pendingReview,
|
SUM(CASE WHEN t.status = 'SUBMITTED' THEN 1 ELSE 0 END) AS pendingReview,
|
||||||
SUM(CASE WHEN t.status IN ('COMPLETED', 'SETTLED') THEN 1 ELSE 0 END) AS completed,
|
SUM(CASE WHEN t.status IN ('COMPLETED', 'SETTLED') THEN 1 ELSE 0 END) AS completed,
|
||||||
SUM(CASE WHEN t.status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected,
|
SUM(CASE WHEN t.status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected,
|
||||||
|
SUM(CASE WHEN t.status = 'EXEMPT' THEN 1 ELSE 0 END) AS exempted,
|
||||||
COALESCE(SUM(t.reward_cents), 0) AS rewardCents
|
COALESCE(SUM(t.reward_cents), 0) AS rewardCents
|
||||||
FROM qipai_cleaning_tasks t
|
FROM qipai_cleaning_tasks t
|
||||||
INNER JOIN qipai_stores s ON s.tenant_id = t.tenant_id AND s.id = t.store_id
|
INNER JOIN qipai_stores s ON s.tenant_id = t.tenant_id AND s.id = t.store_id
|
||||||
@@ -920,6 +989,8 @@ export class CleaningTaskRepository {
|
|||||||
const [memberRows] = await this.pool.execute<ManagerMemberStatsRow[]>(
|
const [memberRows] = await this.pool.execute<ManagerMemberStatsRow[]>(
|
||||||
`SELECT m.user_id AS cleanerUserId, u.nickname AS cleanerName,
|
`SELECT m.user_id AS cleanerUserId, u.nickname AS cleanerName,
|
||||||
COUNT(DISTINCT m.task_id) AS taskCount,
|
COUNT(DISTINCT m.task_id) AS taskCount,
|
||||||
|
SUM(CASE WHEN t.status IN ('COMPLETED', 'SETTLED') THEN 1 ELSE 0 END) AS completedTaskCount,
|
||||||
|
SUM(CASE WHEN t.status = 'REJECTED' THEN 1 ELSE 0 END) AS rejectedTaskCount,
|
||||||
COALESCE(SUM(CASE
|
COALESCE(SUM(CASE
|
||||||
WHEN m.removed_at IS NULL AND m.settled_at IS NULL AND t.status IN ('SUBMITTED', 'COMPLETED')
|
WHEN m.removed_at IS NULL AND m.settled_at IS NULL AND t.status IN ('SUBMITTED', 'COMPLETED')
|
||||||
THEN m.reward_cents ELSE 0 END), 0) AS pendingSettlementCents,
|
THEN m.reward_cents ELSE 0 END), 0) AS pendingSettlementCents,
|
||||||
@@ -940,6 +1011,7 @@ export class CleaningTaskRepository {
|
|||||||
SUM(CASE WHEN t.status = 'SUBMITTED' THEN 1 ELSE 0 END) AS pendingReview,
|
SUM(CASE WHEN t.status = 'SUBMITTED' THEN 1 ELSE 0 END) AS pendingReview,
|
||||||
SUM(CASE WHEN t.status IN ('COMPLETED', 'SETTLED') THEN 1 ELSE 0 END) AS completed,
|
SUM(CASE WHEN t.status IN ('COMPLETED', 'SETTLED') THEN 1 ELSE 0 END) AS completed,
|
||||||
SUM(CASE WHEN t.status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected,
|
SUM(CASE WHEN t.status = 'REJECTED' THEN 1 ELSE 0 END) AS rejected,
|
||||||
|
SUM(CASE WHEN t.status = 'EXEMPT' THEN 1 ELSE 0 END) AS exempted,
|
||||||
COALESCE(SUM(t.reward_cents), 0) AS rewardCents,
|
COALESCE(SUM(t.reward_cents), 0) AS rewardCents,
|
||||||
COALESCE((
|
COALESCE((
|
||||||
SELECT SUM(s.total_reward_cents)
|
SELECT SUM(s.total_reward_cents)
|
||||||
@@ -1425,6 +1497,7 @@ function publicManagerStatistics(
|
|||||||
pendingReview: countStatus(byStatus, 'SUBMITTED'),
|
pendingReview: countStatus(byStatus, 'SUBMITTED'),
|
||||||
active: countStatus(byStatus, 'WAITING') + countStatus(byStatus, 'CLAIMED') + countStatus(byStatus, 'STARTED'),
|
active: countStatus(byStatus, 'WAITING') + countStatus(byStatus, 'CLAIMED') + countStatus(byStatus, 'STARTED'),
|
||||||
rejected: countStatus(byStatus, 'REJECTED'),
|
rejected: countStatus(byStatus, 'REJECTED'),
|
||||||
|
exempted: countStatus(byStatus, 'EXEMPT'),
|
||||||
completed: countStatus(byStatus, 'COMPLETED') + countStatus(byStatus, 'SETTLED'),
|
completed: countStatus(byStatus, 'COMPLETED') + countStatus(byStatus, 'SETTLED'),
|
||||||
rewardCents: byStatus.reduce((sum, row) => sum + row.rewardCents, 0),
|
rewardCents: byStatus.reduce((sum, row) => sum + row.rewardCents, 0),
|
||||||
pendingSettlementCents: memberRows.reduce((sum, row) => sum + Number(row.pendingSettlementCents ?? 0), 0),
|
pendingSettlementCents: memberRows.reduce((sum, row) => sum + Number(row.pendingSettlementCents ?? 0), 0),
|
||||||
@@ -1443,6 +1516,7 @@ function publicManagerStatistics(
|
|||||||
pendingReview: Number(row.pendingReview),
|
pendingReview: Number(row.pendingReview),
|
||||||
completed: Number(row.completed),
|
completed: Number(row.completed),
|
||||||
rejected: Number(row.rejected),
|
rejected: Number(row.rejected),
|
||||||
|
exempted: Number(row.exempted ?? 0),
|
||||||
rewardCents: Number(row.rewardCents ?? 0)
|
rewardCents: Number(row.rewardCents ?? 0)
|
||||||
})),
|
})),
|
||||||
settlements: settlementByStatus,
|
settlements: settlementByStatus,
|
||||||
@@ -1450,6 +1524,8 @@ function publicManagerStatistics(
|
|||||||
cleanerUserId: String(row.cleanerUserId),
|
cleanerUserId: String(row.cleanerUserId),
|
||||||
cleanerName: row.cleanerName,
|
cleanerName: row.cleanerName,
|
||||||
taskCount: Number(row.taskCount),
|
taskCount: Number(row.taskCount),
|
||||||
|
completedTaskCount: Number(row.completedTaskCount ?? 0),
|
||||||
|
rejectedTaskCount: Number(row.rejectedTaskCount ?? 0),
|
||||||
pendingSettlementCents: Number(row.pendingSettlementCents ?? 0),
|
pendingSettlementCents: Number(row.pendingSettlementCents ?? 0),
|
||||||
settledRewardCents: Number(row.settledRewardCents ?? 0)
|
settledRewardCents: Number(row.settledRewardCents ?? 0)
|
||||||
})),
|
})),
|
||||||
@@ -1459,6 +1535,7 @@ function publicManagerStatistics(
|
|||||||
pendingReview: Number(row.pendingReview),
|
pendingReview: Number(row.pendingReview),
|
||||||
completed: Number(row.completed),
|
completed: Number(row.completed),
|
||||||
rejected: Number(row.rejected),
|
rejected: Number(row.rejected),
|
||||||
|
exempted: Number(row.exempted ?? 0),
|
||||||
rewardCents: Number(row.rewardCents ?? 0),
|
rewardCents: Number(row.rewardCents ?? 0),
|
||||||
paidSettlementCents: Number(row.paidSettlementCents ?? 0)
|
paidSettlementCents: Number(row.paidSettlementCents ?? 0)
|
||||||
}))
|
}))
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ const memberRemoveSchema = z.object({
|
|||||||
}).strict();
|
}).strict();
|
||||||
const completeSchema = z.object({ note: z.string().trim().max(512).optional() }).strict();
|
const completeSchema = z.object({ note: z.string().trim().max(512).optional() }).strict();
|
||||||
const rejectSchema = z.object({ reason: z.string().trim().min(1).max(512) }).strict();
|
const rejectSchema = z.object({ reason: z.string().trim().min(1).max(512) }).strict();
|
||||||
|
const exemptSchema = z.object({ note: z.string().trim().max(512).optional() }).strict();
|
||||||
const settlementStatusSchema = z.enum(['DRAFT', 'CONFIRMED', 'PAID', 'CANCELLED']);
|
const settlementStatusSchema = z.enum(['DRAFT', 'CONFIRMED', 'PAID', 'CANCELLED']);
|
||||||
const settlementPayoutStateSchema = z.enum([
|
const settlementPayoutStateSchema = z.enum([
|
||||||
'NONE', 'SUCCESS', 'FAIL', 'PROCESSING', 'WAIT_USER_CONFIRM'
|
'NONE', 'SUCCESS', 'FAIL', 'PROCESSING', 'WAIT_USER_CONFIRM'
|
||||||
@@ -104,7 +105,7 @@ const reclaimSchema = z.object({
|
|||||||
export interface CleaningRouteOptions {
|
export interface CleaningRouteOptions {
|
||||||
repository: Pick<CleaningTaskRepository,
|
repository: Pick<CleaningTaskRepository,
|
||||||
'listHall' | 'listMine' | 'listManage' | 'claim' | 'start' | 'rework' | 'submit'
|
'listHall' | 'listMine' | 'listManage' | 'claim' | 'start' | 'rework' | 'submit'
|
||||||
| 'assign' | 'complete' | 'reject' | 'listMembers' | 'listEvents' | 'addMember' | 'removeMember' | 'settlementCandidates'
|
| 'assign' | 'complete' | 'reject' | 'exempt' | 'listMembers' | 'listEvents' | 'addMember' | 'removeMember' | 'settlementCandidates'
|
||||||
| 'listSettlements' | 'getSettlementDetail' | 'generateSettlement' | 'confirmSettlement' | 'markSettlementPaid'
|
| 'listSettlements' | 'getSettlementDetail' | 'generateSettlement' | 'confirmSettlement' | 'markSettlementPaid'
|
||||||
| 'recordSettlementPayoutFailure' | 'reclaimTimeouts'
|
| 'recordSettlementPayoutFailure' | 'reclaimTimeouts'
|
||||||
| 'assertCanUploadPhoto' | 'stats' | 'managerStatistics'>;
|
| 'assertCanUploadPhoto' | 'stats' | 'managerStatistics'>;
|
||||||
@@ -418,6 +419,23 @@ export async function registerCleaningRoutes(
|
|||||||
}));
|
}));
|
||||||
});
|
});
|
||||||
|
|
||||||
|
app.post('/admin-api/cleaning/tasks/:taskId/exempt', async (request, reply) => {
|
||||||
|
const actor = await requireActor(request, reply, options, 'write');
|
||||||
|
if (!actor) return;
|
||||||
|
const params = paramsSchema.safeParse(request.params);
|
||||||
|
const body = exemptSchema.safeParse(request.body ?? {});
|
||||||
|
if (!params.success || !body.success) return invalid(reply, request.traceId);
|
||||||
|
return handle(reply, request.traceId, async () => ({
|
||||||
|
code: 0,
|
||||||
|
data: await options.repository.exempt({
|
||||||
|
...actor,
|
||||||
|
taskId: params.data.taskId,
|
||||||
|
note: body.data.note
|
||||||
|
}),
|
||||||
|
traceId: request.traceId
|
||||||
|
}));
|
||||||
|
});
|
||||||
|
|
||||||
app.post('/admin-api/cleaning/reclaim-timeouts', async (request, reply) => {
|
app.post('/admin-api/cleaning/reclaim-timeouts', async (request, reply) => {
|
||||||
const actor = await requireActor(request, reply, options, 'write');
|
const actor = await requireActor(request, reply, options, 'write');
|
||||||
if (!actor) return;
|
if (!actor) return;
|
||||||
|
|||||||
@@ -94,6 +94,10 @@ const app = await buildApp({
|
|||||||
calls.push(['reject', input]);
|
calls.push(['reject', input]);
|
||||||
return { ...task('REJECTED'), rejectReason: input.reason };
|
return { ...task('REJECTED'), rejectReason: input.reason };
|
||||||
},
|
},
|
||||||
|
async exempt(input) {
|
||||||
|
calls.push(['exempt', input]);
|
||||||
|
return { ...task('EXEMPT'), rewardCents: 0 };
|
||||||
|
},
|
||||||
async listMembers(input) {
|
async listMembers(input) {
|
||||||
calls.push(['listMembers', input]);
|
calls.push(['listMembers', input]);
|
||||||
return [member('LEAD', '31', 500), member('ASSIST', '33', 100)];
|
return [member('LEAD', '31', 500), member('ASSIST', '33', 100)];
|
||||||
@@ -169,7 +173,15 @@ const app = await buildApp({
|
|||||||
},
|
},
|
||||||
async stats(input) {
|
async stats(input) {
|
||||||
calls.push(['stats', input]);
|
calls.push(['stats', input]);
|
||||||
return { byStatus: { SUBMITTED: 2 }, pendingSettlementCents: 1200 };
|
return {
|
||||||
|
byStatus: { SUBMITTED: 2, COMPLETED: 1, REJECTED: 1 },
|
||||||
|
taskTotal: 4,
|
||||||
|
completed: 1,
|
||||||
|
rejected: 1,
|
||||||
|
completionRate: 25,
|
||||||
|
pendingSettlementCents: 1200,
|
||||||
|
settledRewardCents: 600
|
||||||
|
};
|
||||||
},
|
},
|
||||||
async managerStatistics(input) {
|
async managerStatistics(input) {
|
||||||
calls.push(['managerStatistics', input]);
|
calls.push(['managerStatistics', input]);
|
||||||
@@ -179,6 +191,7 @@ const app = await buildApp({
|
|||||||
pendingReview: 2,
|
pendingReview: 2,
|
||||||
active: 1,
|
active: 1,
|
||||||
rejected: 1,
|
rejected: 1,
|
||||||
|
exempted: 1,
|
||||||
completed: 1,
|
completed: 1,
|
||||||
rewardCents: 3000,
|
rewardCents: 3000,
|
||||||
pendingSettlementCents: 1200,
|
pendingSettlementCents: 1200,
|
||||||
@@ -193,6 +206,7 @@ const app = await buildApp({
|
|||||||
pendingReview: 2,
|
pendingReview: 2,
|
||||||
completed: 1,
|
completed: 1,
|
||||||
rejected: 1,
|
rejected: 1,
|
||||||
|
exempted: 1,
|
||||||
rewardCents: 3000
|
rewardCents: 3000
|
||||||
}],
|
}],
|
||||||
settlements: [{ status: 'CONFIRMED', total: 1, rewardCents: 800 }],
|
settlements: [{ status: 'CONFIRMED', total: 1, rewardCents: 800 }],
|
||||||
@@ -200,6 +214,8 @@ const app = await buildApp({
|
|||||||
cleanerUserId: '31',
|
cleanerUserId: '31',
|
||||||
cleanerName: 'Cleaner',
|
cleanerName: 'Cleaner',
|
||||||
taskCount: 3,
|
taskCount: 3,
|
||||||
|
completedTaskCount: 2,
|
||||||
|
rejectedTaskCount: 1,
|
||||||
pendingSettlementCents: 1200,
|
pendingSettlementCents: 1200,
|
||||||
settledRewardCents: 600
|
settledRewardCents: 600
|
||||||
}],
|
}],
|
||||||
@@ -209,6 +225,7 @@ const app = await buildApp({
|
|||||||
pendingReview: 2,
|
pendingReview: 2,
|
||||||
completed: 1,
|
completed: 1,
|
||||||
rejected: 1,
|
rejected: 1,
|
||||||
|
exempted: 1,
|
||||||
rewardCents: 3000,
|
rewardCents: 3000,
|
||||||
paidSettlementCents: 600
|
paidSettlementCents: 600
|
||||||
}]
|
}]
|
||||||
@@ -317,6 +334,11 @@ assert.equal(calls.at(-1)[0], 'managerStatistics');
|
|||||||
assert.equal(calls.at(-1)[1].storeId, '11');
|
assert.equal(calls.at(-1)[1].storeId, '11');
|
||||||
assert.equal(calls.at(-1)[1].cleanerUserId, '31');
|
assert.equal(calls.at(-1)[1].cleanerUserId, '31');
|
||||||
assert.equal(managerStats.json().data.summary.pendingSettlementCents, 1200);
|
assert.equal(managerStats.json().data.summary.pendingSettlementCents, 1200);
|
||||||
|
assert.equal(managerStats.json().data.summary.exempted, 1);
|
||||||
|
assert.equal(managerStats.json().data.byStore[0].exempted, 1);
|
||||||
|
assert.equal(managerStats.json().data.members[0].completedTaskCount, 2);
|
||||||
|
assert.equal(managerStats.json().data.members[0].rejectedTaskCount, 1);
|
||||||
|
assert.equal(managerStats.json().data.trend[0].exempted, 1);
|
||||||
assert.equal(managerStats.json().data.trend[0].paidSettlementCents, 600);
|
assert.equal(managerStats.json().data.trend[0].paidSettlementCents, 600);
|
||||||
|
|
||||||
const claim = await app.inject({
|
const claim = await app.inject({
|
||||||
@@ -398,6 +420,17 @@ assert.equal(reject.statusCode, 200);
|
|||||||
assert.equal(calls.at(-1)[0], 'reject');
|
assert.equal(calls.at(-1)[0], 'reject');
|
||||||
assert.equal(calls.at(-1)[1].reason, 'photo is unclear');
|
assert.equal(calls.at(-1)[1].reason, 'photo is unclear');
|
||||||
|
|
||||||
|
const exempt = await app.inject({
|
||||||
|
method: 'POST',
|
||||||
|
url: '/admin-api/cleaning/tasks/101/exempt',
|
||||||
|
headers: { authorization: `Bearer ${token}` },
|
||||||
|
payload: { note: 'no cleaning required' }
|
||||||
|
});
|
||||||
|
assert.equal(exempt.statusCode, 200);
|
||||||
|
assert.equal(exempt.json().data.status, 'EXEMPT');
|
||||||
|
assert.equal(calls.at(-1)[0], 'exempt');
|
||||||
|
assert.equal(calls.at(-1)[1].note, 'no cleaning required');
|
||||||
|
|
||||||
const members = await app.inject({
|
const members = await app.inject({
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
url: '/admin-api/cleaning/tasks/101/members',
|
url: '/admin-api/cleaning/tasks/101/members',
|
||||||
@@ -590,6 +623,8 @@ const stats = await app.inject({
|
|||||||
});
|
});
|
||||||
assert.equal(stats.statusCode, 200);
|
assert.equal(stats.statusCode, 200);
|
||||||
assert.equal(stats.json().data.pendingSettlementCents, 1200);
|
assert.equal(stats.json().data.pendingSettlementCents, 1200);
|
||||||
|
assert.equal(stats.json().data.settledRewardCents, 600);
|
||||||
|
assert.equal(stats.json().data.completionRate, 25);
|
||||||
|
|
||||||
const unauthorized = await app.inject({ method: 'GET', url: '/app-api/cleaning/tasks/hall' });
|
const unauthorized = await app.inject({ method: 'GET', url: '/app-api/cleaning/tasks/hall' });
|
||||||
assert.equal(unauthorized.statusCode, 401);
|
assert.equal(unauthorized.statusCode, 401);
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
| 总纲版本 | V5.4 已成为当前权威总纲,旧版已保留为历史备份 | 根目录存在 `V5.4.md` 及旧版总纲 | 可继续按 V5.4 的执行游标开发 |
|
| 总纲版本 | V5.4 已成为当前权威总纲,旧版已保留为历史备份 | 根目录存在 `V5.4.md` 及旧版总纲 | 可继续按 V5.4 的执行游标开发 |
|
||||||
| Git 远端 | `origin=ssh://git@git.txyundm.cn:2222/panda/qipai.git`,分支 `main` | `git rev-list main...origin/main` 为 `0 0` | 本地与远端同步 |
|
| Git 远端 | `origin=ssh://git@git.txyundm.cn:2222/panda/qipai.git`,分支 `main` | `git rev-list main...origin/main` 为 `0 0` | 本地与远端同步 |
|
||||||
| 正式后端 | 已完成 Fastify、迁移兼容、outbox/worker、多应用租户、微信身份/会话,以及六角色 RBAC 和门店范围 | `backend/src/auth/**`、`database/migrations/2026061805_m02c_rbac.*.sql`、`backend/tests/**` | M01、M02-A/B/C DONE;MySQL 已验证 capability 和跨租户门店授权拒绝;下一阶段 M02-D |
|
| 正式后端 | 已完成 Fastify、迁移兼容、outbox/worker、多应用租户、微信身份/会话,以及六角色 RBAC 和门店范围 | `backend/src/auth/**`、`database/migrations/2026061805_m02c_rbac.*.sql`、`backend/tests/**` | M01、M02-A/B/C DONE;MySQL 已验证 capability 和跨租户门店授权拒绝;下一阶段 M02-D |
|
||||||
| 后台管理端 | 已建立 Vue3 + Vite + TypeScript + Element Plus 工程,并接入 M08-B 保洁任务、协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护、微信绑定状态和微信转账预检界面 | `admin/src/App.vue`、`admin/src/components/CleaningTasksPanel.vue`、`admin/src/components/CleaningSettlementsPanel.vue`、`admin/src/components/CleaningStatisticsPanel.vue`、`admin/src/components/CleanersPanel.vue`、`scripts/check-admin-m08-b.mjs` | M08-B 后台起点已具备,可维护任务成员、查看结算详情、统计明细、每日趋势、管理保洁员资料完整度和结算微信转账前置条件;M09 完整后台仍未开始,不能标记 DONE |
|
| 后台管理端 | 已建立 Vue3 + Vite + TypeScript + Element Plus 工程,并接入 M08-B 保洁任务、免清洁标记、批量免清洁、免清洁统计展示、协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护、微信绑定状态、微信转账预检界面、现场联调检查项搜索、筛选结果导出和筛选清除 | `admin/src/App.vue`、`admin/src/components/CleaningTasksPanel.vue`、`admin/src/components/CleaningSettlementsPanel.vue`、`admin/src/components/CleaningStatisticsPanel.vue`、`admin/src/components/CleanersPanel.vue`、`admin/src/components/CleaningFieldHandoffPanel.vue`、`scripts/check-admin-m08-b.mjs` | M08-B 后台起点已具备,可维护任务成员、单条或批量标记任务免清洁、查看免清洁汇总/门店/趋势统计、查看结算详情、统计明细、每日趋势、管理保洁员资料完整度、检索现场联调检查项、导出或清除当前筛选联调结果和查看结算微信转账前置条件;M09 完整后台仍未开始,不能标记 DONE |
|
||||||
| 微信小程序 | 已纳管微信原生模板,并完成顾客端订单、充值、权益明细、下单抵扣主体链路和保洁任务端照片上传/补做主体链路 | `miniapp/pages/index`、`miniapp/pages/store/detail`、`miniapp/pages/room/detail`、`miniapp/pages/orders/*`、`miniapp/pages/recharge/*`、`miniapp/pages/profile/*`、`miniapp/pages/cleaner/*`、`miniapp/utils/api.js`、`scripts/check-miniapp-m08-a.mjs` | M08 PARTIAL;M08-A 顾客端工程闭环按外部阻塞旁路,M08-B 已支持保洁任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理侧查询/指派/验收/驳回、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、发放记录、微信转账预检、主动同步、通知回调、后台协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护和微信绑定状态,仍不能标记 DONE |
|
| 微信小程序 | 已纳管微信原生模板,并完成顾客端订单、充值、权益明细、下单抵扣主体链路和保洁任务端照片上传/补做主体链路 | `miniapp/pages/index`、`miniapp/pages/store/detail`、`miniapp/pages/room/detail`、`miniapp/pages/orders/*`、`miniapp/pages/recharge/*`、`miniapp/pages/profile/*`、`miniapp/pages/cleaner/*`、`miniapp/utils/api.js`、`scripts/check-miniapp-m08-a.mjs` | M08 PARTIAL;M08-A 顾客端工程闭环按外部阻塞旁路,M08-B 已支持保洁任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理侧查询/指派/验收/驳回/免清洁、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、发放记录、微信转账预检、主动同步、通知回调、后台协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护和微信绑定状态,仍不能标记 DONE |
|
||||||
| 数据库迁移 | 已新增 M01-B 核心 schema up/down/verify SQL、最小脱敏 seed、旧库结构 fixture、迁移计划/执行 CLI、验证结果数量门禁和 MySQL 8 集成测试 | `database/migrations/2026061601_m01b_core_schema.*.sql`、`database/seeds/2026061601_m01b_minimal_seed.sql`、`database/fixtures/2026061801_m01b_legacy_schema.sql`、`backend/src/db/migration-runner.ts`、`backend/tests/mysql-migration-roundtrip.test.mjs` | M01-B DONE;WSL MySQL 8.4.9 已验证 8 条旧库 fixture、11 条 up、3 条 verify、10 条 down,并验证租户隔离和旧金额整数分转换;不导入真实旧数据 |
|
| 数据库迁移 | 已新增 M01-B 核心 schema up/down/verify SQL、最小脱敏 seed、旧库结构 fixture、迁移计划/执行 CLI、验证结果数量门禁和 MySQL 8 集成测试 | `database/migrations/2026061601_m01b_core_schema.*.sql`、`database/seeds/2026061601_m01b_minimal_seed.sql`、`database/fixtures/2026061801_m01b_legacy_schema.sql`、`backend/src/db/migration-runner.ts`、`backend/tests/mysql-migration-roundtrip.test.mjs` | M01-B DONE;WSL MySQL 8.4.9 已验证 8 条旧库 fixture、11 条 up、3 条 verify、10 条 down,并验证租户隔离和旧金额整数分转换;不导入真实旧数据 |
|
||||||
| M00 部署脚本 | 已有菜单、状态、HTTPS、Certbot、EMQX、备份检查模板 | `setup.sh`、`scripts/setup/`、`deploy/` | PARTIAL,生产未执行 |
|
| M00 部署脚本 | 已有菜单、状态、HTTPS、Certbot、EMQX、备份检查模板 | `setup.sh`、`scripts/setup/`、`deploy/` | PARTIAL,生产未执行 |
|
||||||
| 发布清单 dry-run | 可基于当前 HEAD 输出 `deployed=false` 的 release manifest,记录后端/后台/迁移尚未生成而跳过 | `scripts/setup/deploy-business.sh --dry-run .`、`scripts/dev/windows/check-release-manifest.ps1` | 可在 M00 验证结构;真实构建与生产发布待 M01/M09 后接入 |
|
| 发布清单 dry-run | 可基于当前 HEAD 输出 `deployed=false` 的 release manifest,记录后端/后台/迁移尚未生成而跳过 | `scripts/setup/deploy-business.sh --dry-run .`、`scripts/dev/windows/check-release-manifest.ps1` | 可在 M00 验证结构;真实构建与生产发布待 M01/M09 后接入 |
|
||||||
@@ -35,6 +35,6 @@
|
|||||||
|
|
||||||
## 下一步
|
## 下一步
|
||||||
|
|
||||||
1. 继续 M08-B:在已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理侧查询/指派/验收/驳回、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、微信转账预检、主动同步、通知回调、后台协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护和微信绑定状态基础上,补更完整保洁运营管理界面。
|
1. 继续 M08-B:在已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理侧查询/指派/验收/驳回/免清洁/批量免清洁、免清洁统计展示、超时回收、协作者查看/添加/移除、待结算候选、正式结算单生成/确认、微信转账预检、主动同步、通知回调、后台协作者管理、结算详情、统计明细、每日趋势、保洁员资料管理、手机号维护、微信绑定状态、联调检查项搜索和联调筛选结果导出和筛选清除基础上,补更完整保洁运营管理界面。
|
||||||
2. 继续复用 M03 门店发现、M04 订单、M05 支付、M06 设备联动和 M07 会员营销后端能力,不重复初始化小程序。
|
2. 继续复用 M03 门店发现、M04 订单、M05 支付、M06 设备联动和 M07 会员营销后端能力,不重复初始化小程序。
|
||||||
3. M06-G 真实硬件联调仍等待生产 MQTT 账号/ACL、DeviceID 和现场实物配线。
|
3. M06-G 真实硬件联调仍等待生产 MQTT 账号/ACL、DeviceID 和现场实物配线。
|
||||||
|
|||||||
@@ -313,14 +313,326 @@
|
|||||||
- 本增量未新增后端路由、数据库字段或第三方依赖,继续复用既有 `preflightWechatTransfer` 结果。
|
- 本增量未新增后端路由、数据库字段或第三方依赖,继续复用既有 `preflightWechatTransfer` 结果。
|
||||||
- `scripts/check-admin-m08-b.mjs` 扩展检查“导出预检”、`exportPreflight` 和导出文件名前缀,避免后续结算面板丢失现场联调证据导出能力。
|
- `scripts/check-admin-m08-b.mjs` 扩展检查“导出预检”、`exportPreflight` 和导出文件名前缀,避免后续结算面板丢失现场联调证据导出能力。
|
||||||
|
|
||||||
|
## 2026-07-05 微信转账预检拦截增量
|
||||||
|
|
||||||
|
- 后台点击“微信转账”时会自动调用 `preflightWechatTransfer`,在转账弹窗内展示当前真实转账前置条件检查结果。
|
||||||
|
- API 模式下预检未完成或存在 `FAIL` 阻断项时禁用“发起”按钮;Mock 模式仍可用于非生产演练,避免真实商户现场误触发不可满足条件的转账请求。
|
||||||
|
- 新增 `transferCanSubmit`、`transferPreflightTitle` 和 `transfer-preflight-alert`,将阻断项数量直接展示在转账弹窗里,减少管理员在预检弹窗和转账弹窗之间来回切换。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查转账前预检标题、禁用条件、loading 状态和弹窗样式,避免后续回退为无前置拦截的直接发起。
|
||||||
|
|
||||||
|
## 2026-07-05 任务列表导出增量
|
||||||
|
|
||||||
|
- 后台任务列表新增当前筛选页 CSV 导出入口,管理员可导出任务号、状态、门店、房间、订单号、保洁员 ID、协作人数、奖励金额、照片数、提交/完成时间和驳回原因。
|
||||||
|
- 导出使用浏览器 Blob 和 UTF-8 BOM,不新增第三方依赖;文件名使用 `cleaning-tasks-{timestamp}.csv`,便于运营按当前筛选结果留存待验收、驳回补做或异常任务证据。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查任务导出按钮、`exportTasks`、CSV 文件名前缀和照片数量字段,避免后续后台改动丢失任务导出能力。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-status-docs.ps1` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 任务详情导出增量
|
||||||
|
|
||||||
|
- 后台任务详情弹窗新增“导出详情”,可将单个任务摘要、协作成员分账、最近操作流水和保洁照片链接导出为 CSV。
|
||||||
|
- 导出文件名使用 `cleaning-task-detail-{taskNo}-{timestamp}.csv`,便于管理员在验收、驳回、协作分账争议或现场复盘时留存单任务证据。
|
||||||
|
- 本增量复用任务详情已加载的成员、流水和照片数据,未新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查任务详情导出入口、`exportTaskDetail` 和详情导出文件名前缀。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 现场联调清单增量
|
||||||
|
|
||||||
|
- 后台新增“联调”标签页,提供真实商户、微信合法域名、保洁转账和硬件开门/控电的现场联调检查项,覆盖 M08-B 当前真实商户和现场硬件阻塞项。
|
||||||
|
- 联调面板支持按商户、微信、转账、硬件分类筛选,记录每项状态、负责人和结果备注,并在浏览器本地保存,不把未完成的现场结果写入生产状态。
|
||||||
|
- 联调清单可导出为 `cleaning-field-handoff-{timestamp}.csv`,包含检查项、期望、状态、负责人、结果记录和证据要求,便于现场联调留痕和转交排查。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查联调标签页、本地状态键、关键检查项和导出入口。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 联调状态筛选增量
|
||||||
|
|
||||||
|
- 后台联调面板新增状态筛选,支持按全部、待处理、通过、阻断和不适用过滤现场检查项。
|
||||||
|
- 现场联调人员可在商户/微信/转账/硬件分类之外快速聚焦阻断项或待处理项,减少真实商户和硬件现场排查时的人工翻找。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `statusFilter`、全部状态选项和 `.handoff-status-select` 样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 联调批量标记增量
|
||||||
|
|
||||||
|
- 后台联调面板新增“批量标记”,可对当前分类和状态筛选出的检查项统一设置待处理、通过、阻断或不适用。
|
||||||
|
- 批量标记支持填写负责人和结果记录;留空时不覆盖原负责人或原备注,便于现场把一组阻断项统一分派,或把一批已验项统一标记通过。
|
||||||
|
- 本增量继续使用浏览器本地存储,不把未完成现场结果写入生产状态,也不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查批量标记入口、`bulkForm`、`applyBulkMark` 和批量表单样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 联调阻断摘要增量
|
||||||
|
|
||||||
|
- 后台联调面板新增“阻断摘要”,当现场检查项被标记为 `BLOCKED` 时自动汇总类别、检查项、负责人和阻断备注。
|
||||||
|
- 新增“复制摘要”按钮,使用浏览器剪贴板把阻断项整理成多行文本,便于发送给微信商户、硬件厂商或现场负责人;浏览器禁用剪贴板时提示改用 CSV 导出。
|
||||||
|
- 本增量继续使用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查阻断摘要、`blockedItems`、`copyBlockedSummary` 和剪贴板调用。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 联调场次信息增量
|
||||||
|
|
||||||
|
- 后台联调面板新增联调批次、现场/门店、现场负责人和执行时间字段,记录一次真实商户或硬件现场执行的基本场次信息。
|
||||||
|
- 场次信息使用浏览器本地存储独立保存,并随联调 CSV 一起导出;复制阻断摘要时也会带上批次、现场、负责人和执行时间,便于跨团队转交排查。
|
||||||
|
- 本增量不新增后端路由、数据库字段或第三方依赖,仍避免把未完成现场结果写入生产状态。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查场次本地存储键、`sessionMeta`、`persistSessionMeta` 和场次表单样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-05 联调快照增量
|
||||||
|
|
||||||
|
- 后台联调面板新增 JSON 快照导出,包含联调场次信息和全部检查项状态、负责人、结果记录,文件名使用 `cleaning-field-handoff-snapshot-{timestamp}.json`。
|
||||||
|
- 新增 JSON 快照导入,校验固定 schema `qipai.cleaning.field-handoff.snapshot.v1` 后恢复本地联调场次和检查项记录;未知检查项会被忽略,避免旧快照污染新清单。
|
||||||
|
- 本增量继续仅使用浏览器本地状态,不新增后端路由、数据库字段或第三方依赖,便于现场换电脑、复盘和转交联调记录。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查快照导出、导入、schema 和隐藏文件输入样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调分类进度增量
|
||||||
|
|
||||||
|
- 后台联调面板新增分类进度视图,按商户、微信、转账和硬件分别展示通过数、总数、阻断、待处理、不适用以及通过率进度条。
|
||||||
|
- 分类中存在阻断项时进度条显示异常状态,全部通过时显示成功状态,便于现场负责人快速判断是哪一类外部条件仍未满足。
|
||||||
|
- 本增量复用既有本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `categoryProgress`、`passPercent` 和分类进度样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调验收结论增量
|
||||||
|
|
||||||
|
- 后台联调面板新增自动验收结论:当所有检查项均为通过或不适用时显示“可进入现场验收收口”,否则显示仍有多少待处理和阻断项。
|
||||||
|
- 新增“复制结论”按钮,将联调批次、现场、负责人、执行时间、结论和统计复制为文本,便于现场验收前后快速同步。
|
||||||
|
- 本增量继续复用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `handoffReady`、`copyVerdict`、结论提示和样式。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调更新时间增量
|
||||||
|
|
||||||
|
- 后台联调面板新增“最后更新”展示,场次信息变更、单项状态/负责人/备注编辑、批量标记、重置和快照导入都会刷新更新时间。
|
||||||
|
- CSV 导出、阻断摘要、验收结论和 JSON 快照均带出最后更新时间,便于现场判断当前记录是否来自最新一轮联调。
|
||||||
|
- 本增量继续复用浏览器本地状态,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `updatedAt`、最后更新字段和本地时间格式化函数。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调证据记录增量
|
||||||
|
|
||||||
|
- 后台联调面板为每个真实商户、微信、转账和硬件检查项新增“证据记录”输入,可单独登记截图编号、流水号、设备回包或文件链接,不再只能混入结果备注。
|
||||||
|
- 顶部进度新增证据记录数,验收结论复制、阻断摘要复制、CSV 导出和 JSON 快照均带出实际证据记录,便于现场复盘和交接。
|
||||||
|
- 快照导入和本地草稿读取兼容旧数据,缺少 `evidenceRef` 时自动补空,不影响既有联调记录恢复。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `evidenceRef`、证据记录字段、证据计数和草稿归一化函数。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调待补证据增量
|
||||||
|
|
||||||
|
- 后台联调面板新增“待补证据”统计和清单,自动汇总除“不适用”外尚未填写证据记录的现场检查项。
|
||||||
|
- 新增“复制证据清单”按钮,将联调批次、现场、负责人、执行时间、最后更新和每个缺证据项的应留证据复制为文本,便于现场负责人集中追补。
|
||||||
|
- 验收结论复制和 CSV 导出同步带出待补证据数,避免状态已处理但证据未归档时误判为可交接。
|
||||||
|
- 本增量继续复用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `evidenceMissingItems`、`evidenceMissingCount`、`copyEvidenceSummary` 和复制成功提示。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调交接报告增量
|
||||||
|
|
||||||
|
- 后台联调面板新增“复制报告”和“报告”导出按钮,生成保洁现场联调交接报告文本。
|
||||||
|
- 报告汇总联调场次、负责人、执行时间、最后更新、验收结论、总进度、分类进度、阻断项、待补证据和全部检查项明细。
|
||||||
|
- 报告明细会同时带出状态、负责人、结果记录、应留证据和证据记录,方便真实商户/硬件现场收口后直接归档。
|
||||||
|
- 本增量继续复用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `copyHandoffReport`、`exportHandoffReport`、`buildHandoffReport`、`formatReportItem`、`statusText` 和导出文件名前缀。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调收口签署增量
|
||||||
|
|
||||||
|
- 后台联调场次信息新增验收人、收口结论和下一步字段,用于记录真实商户或硬件现场执行后的确认人与后续动作。
|
||||||
|
- 阻断摘要、待补证据清单、验收结论、CSV 导出、JSON 快照和交接报告均带出新增签署字段,便于现场交接后追责和复盘。
|
||||||
|
- 快照导入和本地场次读取兼容旧数据,缺少新增签署字段时自动补空。
|
||||||
|
- 本增量继续复用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `acceptor`、`closeoutVerdict`、`nextAction` 和 `createEmptySessionMeta`。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 联调收口门禁增量
|
||||||
|
|
||||||
|
- 后台联调面板新增收口归档门禁,基于检查项状态、待补证据、验收人和收口结论自动判断“可归档”或“待补齐”。
|
||||||
|
- 新增“复制门禁”按钮,单独复制联调批次、现场、归档门禁、缺口、验收人、收口结论、下一步和最后更新时间,便于现场收口前同步。
|
||||||
|
- 验收结论、CSV 导出和交接报告同步带出归档门禁,避免检查项已处理但证据或签署信息未补齐时误归档。
|
||||||
|
- 本增量继续复用本地联调记录,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `closeoutReady`、`missingCloseoutFields`、`copyCloseoutGate`、门禁提示和复制成功提示。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 保洁员列表导出增量
|
||||||
|
|
||||||
|
- 后台保洁员管理面板新增“导出”按钮,可将当前已加载筛选页导出为 `cleaning-cleaners-{timestamp}.csv`。
|
||||||
|
- 导出字段包含保洁员 ID、姓名、状态、微信绑定、资料完整度、门店范围、脱敏手机号、最近登录、最近 IP、注册时间和备注,便于运营核对人员资料与门店授权。
|
||||||
|
- CSV 导出复用前端本地数据和 BOM 编码,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportCleaners`、导出文件名前缀、`downloadCsv` 和 `csvCell`。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 保洁统计导出增量
|
||||||
|
|
||||||
|
- 后台统计页新增“导出”按钮,可将当前筛选条件下的统计结果导出为 `cleaning-statistics-{timestamp}.csv`。
|
||||||
|
- 导出内容按筛选条件、汇总、任务状态、结算口径、每日趋势、门店明细和成员分账分区,便于运营离线复核统计口径。
|
||||||
|
- CSV 导出复用前端统计接口返回的数据和 BOM 编码,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportStatistics`、导出文件名前缀、`downloadCsv` 和 `csvCell`。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 任务流水导出增量
|
||||||
|
|
||||||
|
- 后台任务详情的操作流水区块新增“导出流水”按钮,可将当前任务最近操作流水导出为 `cleaning-task-events-{taskNo}-{timestamp}.csv`。
|
||||||
|
- 导出字段包含任务号、动作、原状态、新状态、操作人、TraceId、备注和时间,便于运营单独复盘验收、驳回、回收和协作变更记录。
|
||||||
|
- 本增量复用任务详情已加载的事件流水数据,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportTaskEvents` 和任务流水导出文件名前缀。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 任务成员导出增量
|
||||||
|
|
||||||
|
- 后台任务“协作者管理”弹窗新增“导出成员”按钮,可将当前任务已加载成员分账导出为 `cleaning-task-members-{taskNo}-{timestamp}.csv`。
|
||||||
|
- 导出字段包含任务号、成员 ID、昵称、角色、分账金额和结算时间,便于运营在协作分账调整、结算争议和现场复盘时单独留存成员口径。
|
||||||
|
- 本增量复用协作者管理弹窗已加载的成员数据,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportTaskMembers`、任务成员导出文件名前缀和“导出成员”入口。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 结算详情导出增量
|
||||||
|
|
||||||
|
- 后台结算单详情弹窗新增“导出详情”按钮,可将单张结算单导出为 `cleaning-settlement-detail-{settlementNo}-{timestamp}.csv`。
|
||||||
|
- 导出内容包含结算单摘要、状态、保洁员、门店、任务数、金额、转账状态、外部流水、微信确认参数、失败原因、备注、创建时间和任务明细。
|
||||||
|
- 本增量复用结算详情接口已加载的数据,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportSettlementDetail` 和结算详情导出文件名前缀。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-06 运营待处理导出增量
|
||||||
|
|
||||||
|
- 后台保洁运营首屏“运营待处理”区新增“导出待处理”入口,可将当前已加载的待处理队列摘要导出为 `cleaning-operational-queue-{timestamp}.csv`。
|
||||||
|
- 导出字段包含队列、数量、金额和对应入口,覆盖待验收任务、驳回补做、待确认结算、待发放金额、待结算金额和已完成任务。
|
||||||
|
- 本增量复用统计接口已加载的首屏数据,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `operationalQueueTotal`、`exportOperationalQueue`、导出文件名前缀和“导出待处理”入口。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 保洁员待补资料导出增量
|
||||||
|
|
||||||
|
- 后台保洁员管理页新增“导出待补”按钮,可将当前已加载筛选页中资料不完整的保洁员导出为 `cleaning-cleaner-profile-issues-{timestamp}.csv`。
|
||||||
|
- 导出字段包含保洁员 ID、姓名、状态、待补项目、微信绑定、门店范围、脱敏手机号、最近登录和备注,便于真实微信转账前集中补齐人员资料。
|
||||||
|
- 待补项目按未绑定微信、未配置门店范围和缺姓名判定,复用前端已加载员工列表数据,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `profileIssues`、`exportCleanerProfileIssues`、导出文件名前缀和“导出待补”入口。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调风险清单导出增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增“风险”按钮,可将当前本地联调草稿中的阻断、待处理和缺证据检查项导出为 `cleaning-field-risk-register-{timestamp}.csv`。
|
||||||
|
- 导出字段包含联调批次、现场/门店、负责人、执行时间、最后更新时间、检查项、状态、风险/缺口、应留证据、证据记录和下一步,便于真实商户、微信转账、硬件厂商和现场负责人拆分收口。
|
||||||
|
- 风险清单复用浏览器本地联调草稿和既有 UTF-8 BOM CSV 下载工具,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `riskItems`、`exportRiskRegister`、导出文件名前缀和缺证据标记,避免后续联调面板改动丢失风险导出能力。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调归档包导出增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增“归档包”按钮,只有收口门禁满足时才允许导出 `cleaning-field-closeout-archive-{timestamp}.json`。
|
||||||
|
- 归档包包含 schema、导出时间、场次信息、收口门禁、统计摘要、分类进度、风险项、待补证据项、全量检查项和交接报告文本,便于真实商户、微信转账和硬件现场收口后一次性归档。
|
||||||
|
- 本增量复用本地联调草稿、风险清单、证据清单和交接报告构建逻辑,不新增后端路由、数据库字段或第三方依赖。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `exportCloseoutArchive`、`buildCloseoutArchive`、`serializeHandoffItem`、归档包 schema 和文件名前缀。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调负责人筛选增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增负责人筛选,支持查看全部负责人、未分派检查项或指定负责人名下检查项。
|
||||||
|
- 筛选项从当前本地联调草稿中的负责人记录自动聚合,并与分类、状态筛选组合生效,便于真实商户、微信转账和硬件现场执行时按责任人拆分处理。
|
||||||
|
- 重置联调草稿时负责人筛选同步回到“全部负责人”,避免重置后停留在空结果筛选状态。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `ownerFilter`、`ownerOptions`、负责人筛选控件和未分派选项。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调期限记录增量
|
||||||
|
|
||||||
|
- 后台现场联调面板为每个检查项新增“期限”字段,可记录负责人处理阻断、补证据或完成验收的目标日期。
|
||||||
|
- 批量标记弹窗支持批量写入期限;留空时不覆盖已有期限,便于现场负责人按筛选结果统一分派和排期。
|
||||||
|
- 阻断摘要、待补证据清单、交接报告、清单 CSV、风险清单、JSON 快照导入导出和归档包均同步带出期限字段。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `deadline`、期限列、批量标记期限和日期占位。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调逾期清单增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增逾期统计和“逾期检查项”清单,自动汇总已过期限且状态仍未通过/不适用的检查项。
|
||||||
|
- 新增“复制逾期清单”按钮,可带出批次、现场、负责人、最后更新、状态、负责人、期限和结果记录,便于现场负责人追踪超时缺口。
|
||||||
|
- 收口门禁会把逾期检查项纳入待补字段;交接报告、清单 CSV 和归档包同步带出逾期数量与逾期明细。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `overdueItems`、`isOverdueDraft`、`parseDeadline`、`copyOverdueSummary` 和逾期复制提示。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调负责人看板增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增“负责人看板”,按负责人自动聚合总项、通过、待处理、阻断、缺证据和逾期数量。
|
||||||
|
- 负责人卡片可直接切换负责人筛选,便于现场负责人从全局看板快速聚焦自己名下或未分派的检查项。
|
||||||
|
- 新增“复制负责人摘要”按钮;交接报告和归档包同步带出负责人维度汇总,便于真实商户、微信转账和硬件现场复盘。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `ownerProgress`、`copyOwnerSummary`、负责人看板文案和样式类。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 联调执行阶段看板增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增“执行阶段看板”,按商户、微信、转账和硬件阶段聚合通过数、证据数、阻断、缺证据、逾期和下一关注项。
|
||||||
|
- 阶段卡片可直接切换分类筛选,便于现场负责人从阶段视图快速进入商户资料、微信域名、真实转账或硬件联动缺口。
|
||||||
|
- 新增“复制阶段摘要”按钮;交接报告和归档包同步带出阶段维度汇总,便于真实商户、微信转账和硬件现场按阶段收口。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `stageProgress`、`copyStageSummary`、阶段看板文案和样式类。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 保洁员绩效排行增量
|
||||||
|
|
||||||
|
- 管理侧保洁统计接口的成员维度新增 `completedTaskCount` 和 `rejectedTaskCount`,真实返回每个保洁员的完成任务数和驳回任务数。
|
||||||
|
- 后台统计页新增“保洁员绩效排行”,按任务数、完成数、驳回数和结算金额排序展示前 8 名,并可点击保洁员卡片进入该保洁员统计筛选。
|
||||||
|
- 新增“导出排行”按钮,生成 `cleaning-cleaner-performance-{timestamp}.csv`;统计总导出同步带出成员完成、驳回和绩效排行区段。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查绩效排行 UI、导出文件名前缀、完成/驳回字段和后端统计 SQL 聚合。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`npm test -- --runInBand backend/tests/cleaning-route.test.mjs`(`backend/`,实际执行后端全量测试链)PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 保洁员端统计看板增量
|
||||||
|
|
||||||
|
- 保洁员端 `GET /app-api/cleaning/stats` 新增任务总数、完成数、驳回数、完成率和已结算金额,继续按负责人/协作者口径统计当前保洁员可见任务。
|
||||||
|
- 小程序保洁任务页新增统计看板,展示任务总数、完成率、驳回、待结算和已结算金额,便于保洁员本人核对任务处理和结算口径。
|
||||||
|
- `scripts/check-miniapp-m08-a.mjs` 扩展检查 `settledRewardText`、`completionRate`、`stats-board` 和统计看板文案,避免后续小程序保洁统计能力回退。
|
||||||
|
- 验证:`npm test -- --runInBand backend/tests/cleaning-route.test.mjs`(`backend/`,实际执行后端全量测试链)PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
|
## 2026-07-07 任务免清洁增量
|
||||||
|
|
||||||
|
- 后端新增 `POST /admin-api/cleaning/tasks/:taskId/exempt`,管理侧可将 WAITING、CLAIMED、STARTED、SUBMITTED、REJECTED 任务标记为 `EXEMPT`。
|
||||||
|
- `CleaningTaskRepository.exempt` 在事务内锁定任务、清零任务奖励、移除未结算协作者并写入 `EXEMPT` 事件;待结算候选仍限定 `COMPLETED` 且未结算任务,免清洁不进入结算。
|
||||||
|
- 后台任务面板新增“免清洁”单任务操作和 `EXEMPT` 状态筛选,操作后刷新任务列表和统计概览。
|
||||||
|
- `backend/tests/cleaning-route.test.mjs` 覆盖免清洁路由透传,`scripts/check-admin-m08-b.mjs` 增加免清洁 API、父组件、任务面板和仓储静态检查。
|
||||||
|
- 验证:`npm run build`(`backend/`)PASS;`npm test -- --runInBand backend/tests/cleaning-route.test.mjs`(`backend/`,实际执行后端全量测试链)PASS;`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-08 免清洁统计展示增量
|
||||||
|
|
||||||
|
- 管理侧 `GET /admin-api/cleaning/statistics` 新增 `exempted` 统计字段,summary、门店明细和每日趋势均可返回免清洁数量。
|
||||||
|
- 后台统计页新增免清洁概览卡、每日趋势免清洁数量和门店明细免清洁列;统计 CSV 导出同步带出免清洁数量,并保留每日发放和门店奖励口径。
|
||||||
|
- `backend/tests/cleaning-route.test.mjs` 补充 `summary.exempted`、`byStore[].exempted`、`trend[].exempted` 断言,`scripts/check-admin-m08-b.mjs` 增加免清洁统计展示和后端 SQL 聚合探针。
|
||||||
|
- 验证:`npm run build`(`backend/`)PASS;`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`npm test -- --runInBand backend/tests/cleaning-route.test.mjs`(`backend/`,实际执行后端全量测试链)PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-status-docs.ps1` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-08 批量免清洁操作增量
|
||||||
|
|
||||||
|
- 后台任务列表新增“批量免清洁”工具栏按钮,允许多选 WAITING、CLAIMED、STARTED、SUBMITTED、REJECTED 等可免清洁任务后统一标记。
|
||||||
|
- 任务面板新增 `selectedExemptableTasks` 和 `selectedExemptableCount`,选择列从仅待验收扩展为可批量处理任务,同时批量验收/批量驳回仍只作用于 `SUBMITTED` 待验收任务。
|
||||||
|
- 父级工作台新增 `handleExemptMany`,按任务 ID 顺序复用既有免清洁 API,完成后刷新任务列表和统计概览。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查批量免清洁按钮、可免清洁任务过滤和父子组件事件,避免后续管理端批量运营能力回退。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-status-docs.ps1` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-08 联调检查项搜索增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增关键字搜索框,可按检查项 ID、类别、标题、期望、应留证据、状态、负责人、期限、结果记录和证据记录检索。
|
||||||
|
- `filteredChecklist` 新增 `matchesKeyword` 条件,关键字检索与分类、状态、负责人筛选叠加生效;批量标记继续作用于当前筛选出的检查项,便于现场按流水号、DeviceID、负责人或证据编号快速定位后批量处理。
|
||||||
|
- `admin/src/styles.css` 新增 `.handoff-search` 响应式宽度,桌面保持工具栏稳定,移动端占满一行。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `keywordFilter`、`matchesKeyword`、搜索框文案和样式,避免后续联调面板回退到只能按状态/负责人筛选。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-status-docs.ps1` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-08 联调筛选导出增量
|
||||||
|
|
||||||
|
- 后台现场联调面板将“导出”改为“导出筛选”,CSV 明细只导出当前分类、状态、负责人和关键字筛选后的检查项。
|
||||||
|
- CSV 顶部新增“当前筛选条件”和“导出检查项数”,带出分类、状态、负责人、关键字和导出数量,便于现场按某个负责人、阻断原因、DeviceID 或证据编号导出交接。
|
||||||
|
- `exportChecklist` 新增 `exportItems = filteredChecklist.value` 和 `buildFilterSummary`,让导出结果与表格、批量标记保持同一筛选口径。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查“导出筛选”、`exportItems`、`buildFilterSummary` 和筛选元数据字段,避免后续 CSV 又回退为全量导出。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS;`node scripts/check-miniapp-m08-a.mjs` PASS;`check-status-docs.ps1` PASS;`check-secrets.ps1` PASS;`check-large-files.ps1` 仅保留既有 `参考\mazongjian-server.xjar` 超 100MB 警告;`git diff --check` PASS。
|
||||||
|
|
||||||
|
## 2026-07-15 联调筛选清除增量
|
||||||
|
|
||||||
|
- 后台现场联调面板新增“清除筛选”按钮;仅当分类、状态、负责人或关键字存在任一筛选条件时可用。
|
||||||
|
- 清除操作将四项视图条件恢复为全量口径,不会修改已填写的检查项状态、负责人、期限、结果记录或证据记录。
|
||||||
|
- `scripts/check-admin-m08-b.mjs` 扩展检查 `FilterX`、`hasActiveFilters`、`clearHandoffFilters` 和按钮文案,避免后续筛选导出能力缺少无损返回全量视图的入口。
|
||||||
|
- 验证:`npm run build`(`admin/`)PASS;`node scripts/check-admin-m08-b.mjs` PASS。
|
||||||
|
|
||||||
## 状态
|
## 状态
|
||||||
|
|
||||||
M08-B 保持 `PARTIAL`。当前已完成保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建保洁任务、统计、管理员任务查询、指派、验收、驳回、批量验收、批量驳回、超时回收、任务事件流水、多人协作分账、任务详情协作分账展示、待结算候选与后台预览/导出、正式结算单生成、确认、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、微信转账预检资料展示与导出、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、保洁员资料管理界面、手机号维护、微信绑定状态、每日统计趋势、任务/结算/统计/候选门店和保洁员筛选、任务/协作者/结算/统计保洁员选择器以及运营待处理快捷入口;真实商户现场联调和更完整的后台/小程序管理界面仍待继续。M08-A 的真机合法域名、真实微信支付和实物开门验证按外部条件阻塞保留,不阻断 M08-B 工程推进。
|
M08-B 保持 `PARTIAL`。当前已完成保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建保洁任务、统计、管理员任务查询、指派、验收、驳回、免清洁、批量验收、批量驳回、批量免清洁、超时回收、任务事件流水、任务流水导出、多人协作分账、任务成员导出、任务详情协作分账展示、任务详情导出、待结算候选与后台预览/导出、正式结算单生成、确认、结算详情导出、结算列表导出、任务列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、微信转账预检资料展示与导出、真实微信转账前自动预检拦截、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、统计导出、保洁员绩效排行、保洁员端统计看板、任务免清洁标记、免清洁统计展示、保洁员资料管理界面、保洁员列表导出、保洁员待补资料导出、手机号维护、微信绑定状态、每日统计趋势、任务/结算/统计/候选门店和保洁员筛选、任务/协作者/结算/统计保洁员选择器、运营待处理快捷入口、运营待处理导出以及真实商户/微信/转账/硬件现场联调清单、联调检查项搜索、联调筛选结果导出与筛选清除、联调状态筛选、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、联调批量标记、联调阻断摘要复制、联调场次信息记录、联调 JSON 快照导入导出、联调分类进度、联调验收结论复制、联调更新时间、联调证据记录、待补证据清单、联调交接报告、联调风险清单导出、联调归档包导出、联调收口签署字段和联调收口门禁;真实商户现场执行和更完整的后台/小程序管理界面仍待继续。M08-A 的真机合法域名、真实微信支付和实物开门验证按外部条件阻塞保留,不阻断 M08-B 工程推进。
|
||||||
|
|
||||||
## 提交
|
## 提交
|
||||||
|
|
||||||
- 工程提交:`M08-B微信预检导出增量`
|
- 最近工程提交:`96c5fa4` / `M08-B联调筛选清除增量`
|
||||||
- 远端校验:待本轮 push 后执行 `HEAD == origin/main`。
|
- 上次远端校验:`3bee3c47b6935f382009a6da5c325f03414a9b03`。
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,14 +17,15 @@
|
|||||||
| OPS-003 | 整仓发布清单 | M00-E/M10 | PARTIAL | `59d92c0` | `deploy-business.sh --dry-run` 可在 Windows/WSL 验证当前 HEAD 的 release manifest 结构;`check-release-manifest.ps1` 已接入 `test-all.ps1`;正式构建待项目生成。 | 后端/后台尚未生成,生产菜单未执行。 | M01/M09 后接入真实构建结果,并在生产菜单 2 生成真实 release manifest。 |
|
| OPS-003 | 整仓发布清单 | M00-E/M10 | PARTIAL | `59d92c0` | `deploy-business.sh --dry-run` 可在 Windows/WSL 验证当前 HEAD 的 release manifest 结构;`check-release-manifest.ps1` 已接入 `test-all.ps1`;正式构建待项目生成。 | 后端/后台尚未生成,生产菜单未执行。 | M01/M09 后接入真实构建结果,并在生产菜单 2 生成真实 release manifest。 |
|
||||||
| OPS-004 | 菜单式更新与环境监测 | M00-E/M10 | PARTIAL | `292ab7f` | `setup.sh` 已接入初始化、更新、MQTT、HTTPS、状态、备份、恢复、回滚和诊断菜单;`--backup-status` 已在 WSL 验证,可检查备份工具、目录和模板。 | 未在生产 Ubuntu 执行;真实备份配置未启用。 | 生产执行后补部署记录、真实备份和恢复演练记录。 |
|
| OPS-004 | 菜单式更新与环境监测 | M00-E/M10 | PARTIAL | `292ab7f` | `setup.sh` 已接入初始化、更新、MQTT、HTTPS、状态、备份、恢复、回滚和诊断菜单;`--backup-status` 已在 WSL 验证,可检查备份工具、目录和模板。 | 未在生产 Ubuntu 执行;真实备份配置未启用。 | 生产执行后补部署记录、真实备份和恢复演练记录。 |
|
||||||
| IOT-001 | MQTT Broker 生产部署 | M00/M06 | PARTIAL | `d01f771` | 菜单 3 已支持 Ubuntu 24.04 amd64 原生安装/更新与复检;正式 Topic ACL 已固定;后端实现 MQTT.js 3.1、QoS 1、持久会话、自动重连、订阅恢复、健康检查、消息上限和真实硬件烟测运行器;Windows 全量测试通过,WSL EMQX 5.8.9 服务级检查通过。 | 缺生产 EMQX 安装、正式账号、ACL/端口/备份验收;WSL 本地账号未配置,真实硬件烟测按预期 SKIP。 | 由管理员在生产菜单 3 执行并登记结果;提供生产账号、DeviceID 和实物后执行 `node dist/devices/hardware-smoke-runner.js`。 |
|
| IOT-001 | MQTT Broker 生产部署 | M00/M06 | PARTIAL | `d01f771` | 菜单 3 已支持 Ubuntu 24.04 amd64 原生安装/更新与复检;正式 Topic ACL 已固定;后端实现 MQTT.js 3.1、QoS 1、持久会话、自动重连、订阅恢复、健康检查、消息上限和真实硬件烟测运行器;Windows 全量测试通过,WSL EMQX 5.8.9 服务级检查通过。 | 缺生产 EMQX 安装、正式账号、ACL/端口/备份验收;WSL 本地账号未配置,真实硬件烟测按预期 SKIP。 | 由管理员在生产菜单 3 执行并登记结果;提供生产账号、DeviceID 和实物后执行 `node dist/devices/hardware-smoke-runner.js`。 |
|
||||||
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `M08-B微信预检导出增量` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起、余额支付、优惠券/套餐下单抵扣参数与可视化选择器、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细,以及保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做入口、统计和管理侧验收/驳回/批量验收/批量驳回/指派/结算/多人协作/发放 API;后端已接入微信商家转账适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、结算详情、管理统计、员工角色筛选、统计趋势、统计按保洁员筛选、待结算候选筛选、任务事件流水、保洁员微信绑定状态、结算转账状态筛选和非生产 Mock 门禁;后台已建立保洁运营工作台,可维护任务协作者、查看任务详情、照片预览、操作流水和协作分账、批量验收/批量驳回待验收任务、查看结算单详情、预览并导出待结算候选任务、导出结算列表、批量同步微信转账状态、按转账状态筛选结算单、在结算详情和导出中查看微信确认参数、在微信转账预检中查看并导出凭据/授权/通知 URL/平台证书/OpenID 资料和检查项、统计明细、每日趋势、管理保洁员手机号/资料完整度、通过保洁员选择器完成任务指派/协作者/结算生成人员选择,按门店和保洁员筛选任务/结算/统计/候选,通过首屏运营待处理入口跳转待验收、驳回补做、待确认结算和待发放队列,并查看微信转账真实商户前置条件;`admin npm run build` 和 `node scripts/check-admin-m08-b.mjs` 通过。 | M08-A 真机联调缺微信后台/商户/硬件条件;M08-B 真实商户现场联调和更完整管理界面待继续。 | 继续 M08-B,补更完整保洁运营管理界面和真实商户现场联调清单。 |
|
| SYS-001 | 微信原生小程序 | M00-C/M08 | PARTIAL | `96c5fa4` | 微信原生模板已接入顾客端登录态、选店跳转、门店详情、房间列表、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起、余额支付、优惠券/套餐下单抵扣参数与可视化选择器、受控 Wi-Fi、订单列表、订单详情、状态历史、取消入口、订单权限开门入口、续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细,以及保洁端任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做入口、统计和管理侧验收/驳回/免清洁/批量验收/批量驳回/批量免清洁/指派/结算/多人协作/发放 API;后端已接入微信商家转账适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、结算详情、管理统计、员工角色筛选、统计趋势、统计按保洁员筛选、待结算候选筛选、任务事件流水、保洁员微信绑定状态、结算转账状态筛选和非生产 Mock 门禁;后台已建立保洁运营工作台,可维护任务协作者、导出单任务成员分账、查看任务详情、照片预览、操作流水和协作分账、批量验收/批量驳回待验收任务、单条或批量标记任务免清洁、导出当前任务列表、单任务详情和单任务操作流水、查看并导出结算单详情、预览并导出待结算候选任务、导出结算列表、批量同步微信转账状态、按转账状态筛选结算单、在结算详情和导出中查看微信确认参数、在微信转账预检中查看并导出凭据/授权/通知 URL/平台证书/OpenID 资料和检查项、发起真实转账前自动预检并在阻断项未处理时禁用 API 发起、统计明细、每日趋势、保洁员绩效排行、保洁员端统计看板、导出当前统计结果、管理保洁员手机号/资料完整度、导出当前保洁员列表、导出当前待补资料保洁员清单、通过保洁员选择器完成任务指派/协作者/结算生成人员选择,按门店和保洁员筛选任务/结算/统计/候选,通过首屏运营待处理入口跳转待验收、驳回补做、待确认结算和待发放队列,并可导出待处理队列摘要,查看微信转账真实商户前置条件,提供真实商户/微信/转账/硬件现场联调清单并支持本地记录、场次信息、关键字搜索、筛选结果 CSV 导出、状态筛选、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、批量标记、阻断摘要复制、JSON 快照导入导出、分类进度展示、验收结论复制、最后更新时间、证据记录、待补证据清单、联调交接报告、联调风险清单导出、联调归档包导出、收口签署字段和收口归档门禁;`admin npm run build` 和 `node scripts/check-admin-m08-b.mjs` 通过。 | M08-A 真机联调缺微信后台/商户/硬件条件;M08-B 真实商户现场执行和更完整管理界面待继续。 | 继续 M08-B,补更完整保洁运营管理界面和真实商户现场执行记录。 |
|
||||||
| CFG-001 | 小程序品牌自定义 | M02-A/M03/M08 | PARTIAL | `8b8fb28` | 已建立 AppID/tenant 品牌配置表和 `/app-api/bootstrap`;同一 AppID 两租户隔离读取在 MySQL 8.4.9 实测通过。 | Logo/分享图片上传与小程序实际展示属于后续阶段。 | M03/M08 接入配置管理和小程序展示。 |
|
| CFG-001 | 小程序品牌自定义 | M02-A/M03/M08 | PARTIAL | `8b8fb28` | 已建立 AppID/tenant 品牌配置表和 `/app-api/bootstrap`;同一 AppID 两租户隔离读取在 MySQL 8.4.9 实测通过。 | Logo/分享图片上传与小程序实际展示属于后续阶段。 | M03/M08 接入配置管理和小程序展示。 |
|
||||||
| BKG-010 | 后台多小程序管理 | M02-A/M08/M10 | PARTIAL | `8b8fb28` | 已建立逻辑应用、租户绑定和租户配置模型;多租户 AppID 未指定租户会被拒绝。 | 尚无后台管理页面,多 AppID 真机配置未验证。 | M02-B/C 完成身份权限,M08 增加管理页面。 |
|
| BKG-010 | 后台多小程序管理 | M02-A/M08/M10 | PARTIAL | `8b8fb28` | 已建立逻辑应用、租户绑定和租户配置模型;多租户 AppID 未指定租户会被拒绝。 | 尚无后台管理页面,多 AppID 真机配置未验证。 | M02-B/C 完成身份权限,M08 增加管理页面。 |
|
||||||
| AUTH-001 | 多端统一小程序身份 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已实现微信 code 交换适配器、租户/AppID 隔离身份、JWT、服务端会话、当前用户和注销;禁用、角色/门店范围变化及管理员重置均使旧会话立即失效。 | 缺真实 AppSecret 真机联调和小程序动态角色界面。 | M08 完成小程序角色界面与真机登录。 |
|
| AUTH-001 | 多端统一小程序身份 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已实现微信 code 交换适配器、租户/AppID 隔离身份、JWT、服务端会话、当前用户和注销;禁用、角色/门店范围变化及管理员重置均使旧会话立即失效。 | 缺真实 AppSecret 真机联调和小程序动态角色界面。 | M08 完成小程序角色界面与真机登录。 |
|
||||||
| AUTH-002 | 多级权限 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已建立六类角色、权限目录、用户角色和门店范围;后台员工 API 同时执行 capability、租户和门店范围校验,越权分配被拒绝并记录审计。 | 后续业务资源接口和前端按钮/菜单仍需逐模块接入。 | M03 起所有管理接口复用 capability 与数据范围;M08 完成前端菜单按钮控制。 |
|
| AUTH-002 | 多级权限 | M02-B/M02-C/M08 | PARTIAL | `5a300a8` | 已建立六类角色、权限目录、用户角色和门店范围;后台员工 API 同时执行 capability、租户和门店范围校验,越权分配被拒绝并记录审计。 | 后续业务资源接口和前端按钮/菜单仍需逐模块接入。 | M03 起所有管理接口复用 capability 与数据范围;M08 完成前端菜单按钮控制。 |
|
||||||
| CLN-001 | 保洁人员管理 | M08-B/M09 | PARTIAL | `M08-B保洁员选择器增量` | `CLEANER` 角色已接入 `cleaning.task.read/write` 和 `cleaning.statistics.read`,保洁接口按登录态、capability 和门店范围裁剪任务大厅;后台已可按 `CLEANER` 角色筛选员工,创建保洁员,编辑姓名/手机号/门店范围/备注,启停账号并重置会话;员工列表返回头像 URL 和微信小程序 openid 绑定状态,后台展示“已绑微信/未绑微信”和资料完整度标签,并复用该列表作为任务指派、协作者管理和生成结算单的可搜索保洁员选择源。 | 真实商户现场联调和更完整管理界面仍待继续。 | 继续 M08-B/M09,补更完整保洁运营管理界面。 |
|
| CLN-001 | 保洁人员管理 | M08-B/M09 | PARTIAL | `M08-B保洁员待补资料导出增量` | `CLEANER` 角色已接入 `cleaning.task.read/write` 和 `cleaning.statistics.read`,保洁接口按登录态、capability 和门店范围裁剪任务大厅;后台已可按 `CLEANER` 角色筛选员工,创建保洁员,编辑姓名/手机号/门店范围/备注,启停账号并重置会话;员工列表返回头像 URL 和微信小程序 openid 绑定状态,后台展示“已绑微信/未绑微信”和资料完整度标签,并复用该列表作为任务指派、协作者管理和生成结算单的可搜索保洁员选择源;保洁员管理页可导出当前筛选页 CSV,带出资料完整度、微信绑定、门店范围、脱敏手机号、最近登录/IP 和备注,也可单独导出待补资料清单,列出未绑定微信、未配置门店范围和缺姓名等缺口。 | 真实商户现场联调和更完整管理界面仍待继续。 | 继续 M08-B/M09,补更完整保洁运营管理界面。 |
|
||||||
| CLN-002 | 保洁任务大厅 | M08-B/M09 | PARTIAL | `M08-B微信预检导出增量` | 新增 `qipai_cleaning_tasks`、`qipai_cleaning_task_events`、`GET /app-api/cleaning/tasks/hall`、`GET /app-api/cleaning/tasks/mine`、接单、开始、照片上传、提交验收、驳回补做接口;订单 `FINISHED` 时同事务幂等创建 `WAITING` 保洁任务;管理侧已支持任务查询、按状态/门店/负责人或协作者筛选、任务详情、照片预览、任务事件流水、任务详情协作分账、指派、验收、驳回、批量验收、批量驳回、超时回收、协作者查看/添加/移除、待结算候选筛选与后台预览/导出、正式结算单生成/确认、发放成功标记、发放失败记录、微信转账发放、转账预检、主动同步、批量同步、微信通知回调、结算单详情、结算转账状态筛选、微信确认参数展示与导出、管理统计、每日趋势、统计按保洁员筛选和保洁员资料管理;小程序 `pages/cleaner/tasks` 已调用真实 app-api 并支持相机/相册上传;后台 `admin/` 已提供任务筛选、待验收任务多选批量验收/驳回、保洁员选择器指派、验收、驳回、超时回收、任务成员协作管理、任务详情操作流水和协作分账、结算详情、待结算候选预览导出、结算列表导出、结算批量同步微信状态、转账状态筛选、微信确认参数展示与导出、统计明细、每日趋势、统计保洁员筛选、保洁员资料、手机号维护、微信绑定状态、结算微信转账预检资料展示导出界面和运营待处理快捷入口。 | 真实商户现场联调和更完整管理界面仍待继续。 | 继续 M08-B,补更完整保洁运营管理界面。 |
|
| CLN-002 | 保洁任务大厅 | M08-B/M09 | PARTIAL | `96c5fa4` | 新增 `qipai_cleaning_tasks`、`qipai_cleaning_task_events`、`GET /app-api/cleaning/tasks/hall`、`GET /app-api/cleaning/tasks/mine`、接单、开始、照片上传、提交验收、驳回补做接口;订单 `FINISHED` 时同事务幂等创建 `WAITING` 保洁任务;管理侧已支持任务查询、按状态/门店/负责人或协作者筛选、任务详情、照片预览、任务事件流水、任务详情协作分账、指派、验收、驳回、免清洁、批量验收、批量驳回、批量免清洁、超时回收、协作者查看/添加/移除、待结算候选筛选与后台预览/导出、正式结算单生成/确认、发放成功标记、发放失败记录、微信转账发放、转账预检、主动同步、批量同步、微信通知回调、结算单详情、结算详情导出、结算转账状态筛选、微信确认参数展示与导出、管理统计、每日趋势、统计按保洁员筛选和保洁员资料管理;小程序 `pages/cleaner/tasks` 已调用真实 app-api 并支持相机/相册上传;后台 `admin/` 已提供任务筛选、当前任务列表导出、单任务详情导出、单任务流水导出、单任务成员导出、待验收任务多选批量验收/驳回、可免清洁任务多选批量标记、保洁员选择器指派、验收、驳回、免清洁、超时回收、任务成员协作管理、任务详情操作流水和协作分账、结算详情、结算详情导出、待结算候选预览导出、结算列表导出、结算批量同步微信状态、转账状态筛选、微信确认参数展示与导出、统计明细、每日趋势、保洁员绩效排行、保洁员端统计看板、统计保洁员筛选、保洁员资料、待补资料导出、手机号维护、微信绑定状态、结算微信转账预检资料展示导出和转账前自动拦截界面、运营待处理快捷入口、运营待处理导出、真实商户/微信/转账/硬件现场联调清单、联调检查项搜索、联调筛选结果导出与筛选清除、联调状态筛选、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、联调批量标记、联调阻断摘要复制、联调场次信息记录、联调 JSON 快照导入导出、联调分类进度、联调验收结论复制、联调更新时间、联调证据记录、待补证据清单、联调交接报告、联调风险清单导出、联调归档包导出、收口签署字段和收口归档门禁。 | 真实商户现场执行和更完整管理界面仍待继续。 | 继续 M08-B,补更完整保洁运营管理界面。 |
|
||||||
| CLN-003 | 保洁统计 | M08-B/M09 | PARTIAL | `M08-B统计按保洁员筛选增量` | 新增 `GET /app-api/cleaning/stats`,返回当前保洁员负责人/协作者任务状态计数和按成员分账计算的待结算金额,小程序展示已抢、进行、待验、完成和待结算金额;管理侧新增 `GET /admin-api/cleaning/statistics`,按租户、门店范围、日期、门店和保洁员筛选返回状态分布、门店明细、结算口径、成员分账排行和每日趋势,保洁员筛选同时覆盖负责人/协作者任务口径、结算单口径和每日已发放金额;后台首屏汇总改为使用管理侧统计接口,统计页支持今日、近7天、本月快捷周期、每日趋势条形展示和可搜索保洁员筛选,任务/结算/统计列表支持门店和保洁员筛选以辅助定位统计异常。 | 真实商户现场联调和更完整管理界面待继续。 | M08-B/M09-C 补更完整管理界面。 |
|
| CLN-003 | 保洁统计 | M08-B/M09 | PARTIAL | `642659c` | 新增 `GET /app-api/cleaning/stats`,返回当前保洁员负责人/协作者任务状态计数、任务总数、完成数、驳回数、完成率、待结算金额和已结算金额,小程序展示已抢、进行、待验、完成、任务总数、完成率、驳回、待结算和已结算金额;管理侧新增 `GET /admin-api/cleaning/statistics`,按租户、门店范围、日期、门店和保洁员筛选返回状态分布、门店明细、免清洁统计、结算口径、成员分账排行和每日趋势,保洁员筛选同时覆盖负责人/协作者任务口径、结算单口径和每日已发放金额;后台首屏汇总改为使用管理侧统计接口,统计页支持今日、近7天、本月快捷周期、每日趋势条形展示、免清洁汇总/门店/趋势展示和可搜索保洁员筛选,任务/结算/统计列表支持门店和保洁员筛选以辅助定位统计异常,并可导出当前筛选条件下的汇总、任务状态、结算口径、每日趋势、门店明细、免清洁数量和成员分账 CSV。 | 真实商户现场联调和更完整管理界面待继续。 | M08-B/M09-C 补更完整管理界面。 |
|
||||||
|
| CLN-005 | 保洁驳回/免清洁 | M08-B/M09 | PARTIAL | `eb838f5` | 已支持管理侧驳回、批量驳回和保洁员驳回补做;已新增 `POST /admin-api/cleaning/tasks/:taskId/exempt`,后台任务列表提供免清洁按钮、批量免清洁和 `EXEMPT` 筛选,仓储将可处理任务置为 `EXEMPT`、奖励归零并移除未结算协作者;待结算候选继续只取 `COMPLETED` 且未结算任务,免清洁任务不进入结算;管理统计 summary、门店明细、每日趋势和统计导出均新增免清洁数量,便于核对不结算口径。 | 真实商户现场执行仍待继续。 | 继续 M08-B/M09,补现场验收记录和更完整运营管理界面。 |
|
||||||
| STAFF-001 | 员工账号 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现创建员工、分配角色/门店、禁用、备注、重置会话和审计;WSL MySQL 实测权限变化撤销活动会话。 | 后台与管理员小程序页面尚未实现。 | M08 接入管理界面。 |
|
| STAFF-001 | 员工账号 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现创建员工、分配角色/门店、禁用、备注、重置会话和审计;WSL MySQL 实测权限变化撤销活动会话。 | 后台与管理员小程序页面尚未实现。 | M08 接入管理界面。 |
|
||||||
| BKG-002 | 后台用户管理 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现分页筛选 API、注册/登录时间、状态、角色、门店范围以及手机号/IP 脱敏。 | Vue3 后台页面尚未实现。 | M08 实现响应式用户管理页面。 |
|
| BKG-002 | 后台用户管理 | M02-D/M08 | PARTIAL | `5a300a8` | 已实现分页筛选 API、注册/登录时间、状态、角色、门店范围以及手机号/IP 脱敏。 | Vue3 后台页面尚未实现。 | M08 实现响应式用户管理页面。 |
|
||||||
| TEN-001 | 多门店支持 | M02/M03 | PARTIAL | `15139b3` | 门店 CRUD 与门店管理员数据范围已实现;跨门店写操作在 Windows 和 WSL MySQL 实测被拒绝。 | 地图选店、前端切换与完整订单数据范围待后续阶段。 | M03-C 接入地图选店,M04 起业务资源继承门店范围。 |
|
| TEN-001 | 多门店支持 | M02/M03 | PARTIAL | `15139b3` | 门店 CRUD 与门店管理员数据范围已实现;跨门店写操作在 Windows 和 WSL MySQL 实测被拒绝。 | 地图选店、前端切换与完整订单数据范围待后续阶段。 | M03-C 接入地图选店,M04 起业务资源继承门店范围。 |
|
||||||
@@ -45,7 +46,7 @@
|
|||||||
| GRP-002 | 美团直订 | M05-C | PARTIAL | `cda640b` | 已实现 HMAC 回调、事件幂等、外部门店/房间映射、未映射人工队列、顾客认领和团购支付订单生成;映射成功订单可进入 PAID。 | 缺美团开放平台授权和真实回调协议确认。 | 取得授权后按厂商协议实现专用签名适配并联调。 |
|
| GRP-002 | 美团直订 | M05-C | PARTIAL | `cda640b` | 已实现 HMAC 回调、事件幂等、外部门店/房间映射、未映射人工队列、顾客认领和团购支付订单生成;映射成功订单可进入 PAID。 | 缺美团开放平台授权和真实回调协议确认。 | 取得授权后按厂商协议实现专用签名适配并联调。 |
|
||||||
| GRP-003 | 管理员验券 | M05-C/M08 | PARTIAL | `cda640b` | 已提供后台人工验券、配置、映射和记录查询 API,门店数据范围校验生效,券码列表只返回脱敏值。 | 管理员小程序扫码界面待 M08,真实平台核销待授权。 | M08 接入扫码界面;授权后切换 API 模式。 |
|
| GRP-003 | 管理员验券 | M05-C/M08 | PARTIAL | `cda640b` | 已提供后台人工验券、配置、映射和记录查询 API,门店数据范围校验生效,券码列表只返回脱敏值。 | 管理员小程序扫码界面待 M08,真实平台核销待授权。 | M08 接入扫码界面;授权后切换 API 模式。 |
|
||||||
| FRN-001 | 加盟商与自动分账 | M05-D/M10/M08 | PARTIAL | `1680d73` | 已实现租户/门店收款账户、商户号、环境凭据引用、分账授权状态、接收方哈希脱敏、比例总和校验、支付后幂等分账和明细查询;未授权不能开启,生产环境 Mock 强制关闭。 | 缺微信支付服务商和分账权限,尚未执行真实分账。 | M10/M08 补加盟流程与界面;取得权限后执行真实分账与对账。 |
|
| FRN-001 | 加盟商与自动分账 | M05-D/M10/M08 | PARTIAL | `1680d73` | 已实现租户/门店收款账户、商户号、环境凭据引用、分账授权状态、接收方哈希脱敏、比例总和校验、支付后幂等分账和明细查询;未授权不能开启,生产环境 Mock 强制关闭。 | 缺微信支付服务商和分账权限,尚未执行真实分账。 | M10/M08 补加盟流程与界面;取得权限后执行真实分账与对账。 |
|
||||||
| BKG-007 | 后台微信支付配置 | M05-D/M08 | PARTIAL | `M08-B微信预检导出增量` | 已提供收款账户、分账接收方、门店/全局比例策略和授权状态 API;私钥、APIv3 Key 和接收方真实标识只使用环境引用;M08-B 新增保洁结算微信转账预检,后台可查看并导出脱敏商户号、凭据引用、授权状态、账户范围、场景 ID、报备项数量、通知地址、平台证书数量、保洁员 openid 和检查项是否满足真实转账前置条件。 | 真实商户与服务商授权、微信后台场景报备和生产小额转账仍需现场联调。 | M08/M09 接入更完整支付配置页面;授权后完成生产验收。 |
|
| BKG-007 | 后台微信支付配置 | M05-D/M08 | PARTIAL | `M08-B微信转账预检拦截增量` | 已提供收款账户、分账接收方、门店/全局比例策略和授权状态 API;私钥、APIv3 Key 和接收方真实标识只使用环境引用;M08-B 新增保洁结算微信转账预检,后台可查看并导出脱敏商户号、凭据引用、授权状态、账户范围、场景 ID、报备项数量、通知地址、平台证书数量、保洁员 openid 和检查项是否满足真实转账前置条件;真实 API 转账弹窗会自动执行预检,存在 FAIL 阻断项时禁用发起。 | 真实商户与服务商授权、微信后台场景报备和生产小额转账仍需现场联调。 | M08/M09 接入更完整支付配置页面;授权后完成生产验收。 |
|
||||||
| DEV-003 | 设备管理 | M06-B/M08 | PARTIAL | `9144fa8` | 已实现 DeviceID/IMEI/ICCID/型号/固件/信号/能力资产,控制箱通道、智慧插座负载、Sub-1G 父子拓扑、状态快照、开放告警和维护记录查询;插座过载、过温、过流、过压/欠压、功率和温度阈值告警已接入;门店数据范围生效。 | 尚无后台/手机页面,真实硬件在线/计量仍需 M06-G 实物更新。 | M06-F 接入订单自动联动;M08 实现响应式界面。 |
|
| DEV-003 | 设备管理 | M06-B/M08 | PARTIAL | `9144fa8` | 已实现 DeviceID/IMEI/ICCID/型号/固件/信号/能力资产,控制箱通道、智慧插座负载、Sub-1G 父子拓扑、状态快照、开放告警和维护记录查询;插座过载、过温、过流、过压/欠压、功率和温度阈值告警已接入;门店数据范围生效。 | 尚无后台/手机页面,真实硬件在线/计量仍需 M06-G 实物更新。 | M06-F 接入订单自动联动;M08 实现响应式界面。 |
|
||||||
| BKG-004 | 后台设备管理 | M06-B/M08 | PARTIAL | `9144fa8` | 已提供设备入库、列表、拓扑、通道绑定、Sub-1G 绑定、状态、维护和插座控制 API;同一房间控制目标唯一,控制箱与智慧插座重复负载被数据库拒绝。 | Vue 后台页面和真实设备扫码入库待 M08/M06-G。 | M06-F 接入订单自动联动;M08 实现管理页面。 |
|
| BKG-004 | 后台设备管理 | M06-B/M08 | PARTIAL | `9144fa8` | 已提供设备入库、列表、拓扑、通道绑定、Sub-1G 绑定、状态、维护和插座控制 API;同一房间控制目标唯一,控制箱与智慧插座重复负载被数据库拒绝。 | Vue 后台页面和真实设备扫码入库待 M08/M06-G。 | M06-F 接入订单自动联动;M08 实现管理页面。 |
|
||||||
| IOT-006 | MQTT 消息幂等 | M01/M06-C | DONE | `e795cdb` | 上行按租户、设备、Topic 和 payload SHA-256 唯一;QoS 1 重复消息只增加 `receive_count`,不重复更新命令或设备副作用;WSL MySQL 8.4.9 实测两次 ACK 仅一条事件。 | - | M06-D/E 继续复用同一消费链路。 |
|
| IOT-006 | MQTT 消息幂等 | M01/M06-C | DONE | `e795cdb` | 上行按租户、设备、Topic 和 payload SHA-256 唯一;QoS 1 重复消息只增加 `receive_count`,不重复更新命令或设备副作用;WSL MySQL 8.4.9 实测两次 ACK 仅一条事件。 | - | M06-D/E 继续复用同一消费链路。 |
|
||||||
|
|||||||
@@ -7,11 +7,11 @@ execution_cursor:
|
|||||||
stage_status: PARTIAL
|
stage_status: PARTIAL
|
||||||
last_completed_stage: M07-D
|
last_completed_stage: M07-D
|
||||||
next_stage: M08-B
|
next_stage: M08-B
|
||||||
last_engineering_commit: `M08-B微信预检导出增量`
|
last_engineering_commit: `96c5fa4`
|
||||||
last_push_verified: true
|
last_push_verified: true
|
||||||
base_branch: main
|
base_branch: main
|
||||||
blocked_reason: "M08-A 真机合法域名、真实微信支付和实物开门验证缺微信后台/商户/硬件现场条件;M08-B 已完成照片上传、驳回补做、订单结束自动建保洁任务、管理员查询/指派/验收/驳回、批量验收、批量驳回、超时回收、任务事件流水、待结算候选与后台预览/导出、正式结算单生成/确认、多保洁员协作分账策略、任务详情协作分账展示、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、微信转账预检资料展示与导出、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、每日统计趋势、保洁员资料管理界面、手机号维护、微信绑定状态展示、任务/协作者/结算/统计保洁员选择器、任务/结算/统计/候选门店和保洁员筛选以及运营待处理快捷入口,仍需继续补真实商户现场联调和更完整的管理界面。M06-G 真实硬件联调仍缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线。"
|
blocked_reason: "M08-A 真机合法域名、真实微信支付和实物开门验证缺微信后台/商户/硬件现场条件;M08-B 已完成照片上传、驳回补做、订单结束自动建保洁任务、管理员查询/指派/验收/驳回/免清洁、批量验收、批量驳回、批量免清洁、超时回收、任务事件流水、任务流水导出、任务成员导出、待结算候选与后台预览/导出、正式结算单生成/确认、多保洁员协作分账策略、任务详情协作分账展示、任务列表导出、任务详情导出、结算详情导出、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、微信转账预检资料展示与导出、真实微信转账前自动预检拦截、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、统计导出、每日统计趋势、保洁员绩效排行、保洁员端统计看板、任务免清洁标记、免清洁统计展示、保洁员资料管理界面、保洁员列表导出、保洁员待补资料导出、手机号维护、微信绑定状态展示、任务/协作者/结算/统计保洁员选择器、任务/结算/统计/候选门店和保洁员筛选、运营待处理快捷入口、运营待处理导出以及真实商户/微信/转账/硬件现场联调清单、联调检查项搜索、联调筛选结果导出与筛选清除、联调状态筛选、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、联调批量标记、联调阻断摘要复制、联调场次信息记录、联调 JSON 快照导入导出、联调分类进度、联调验收结论复制、联调更新时间、联调证据记录、待补证据清单、联调交接报告、联调风险清单导出、联调归档包导出、联调收口签署字段和联调收口门禁,仍需继续补真实商户现场执行和更完整的管理界面。M06-G 真实硬件联调仍缺生产 MQTT 账号/ACL、DeviceID、控制箱、门锁、插座和现场配线。"
|
||||||
updated_at: 2026-07-02T00:00:00+08:00
|
updated_at: 2026-07-15T00:00:00+08:00
|
||||||
```
|
```
|
||||||
|
|
||||||
| 模块 | 状态 | 最近提交 | 最近开发日志 | 备注 |
|
| 模块 | 状态 | 最近提交 | 最近开发日志 | 备注 |
|
||||||
@@ -24,6 +24,7 @@ execution_cursor:
|
|||||||
| M05 会员、余额、套餐、优惠券 | PARTIAL | `1680d73` | docs/devlogs/2026-06-22-M05-D-分账与收款配置.md | M05-A/B/C/D 工程闭环已完成:统一支付、微信支付退款、团购直订、门店收款账户、分账接收方、比例策略、授权门禁、幂等分账和对账查询均通过 Windows 与 WSL MySQL 回归;真实微信/团购/分账权限未提供,模块保持 PARTIAL/BLOCKED_EXTERNAL。 |
|
| M05 会员、余额、套餐、优惠券 | PARTIAL | `1680d73` | docs/devlogs/2026-06-22-M05-D-分账与收款配置.md | M05-A/B/C/D 工程闭环已完成:统一支付、微信支付退款、团购直订、门店收款账户、分账接收方、比例策略、授权门禁、幂等分账和对账查询均通过 Windows 与 WSL MySQL 回归;真实微信/团购/分账权限未提供,模块保持 PARTIAL/BLOCKED_EXTERNAL。 |
|
||||||
| M06 设备、MQTT 与真实硬件联动 | PARTIAL | `d01f771` | docs/devlogs/2026-06-24-M06-G-真实硬件联调.md | M06-A 至 F 已完成 MQTT、拓扑、协议幂等、控制箱、Sub-1G 门锁、智慧插座和订单自动联动任务;M06-G 已补真实硬件烟测运行器,缺生产 MQTT 账号/ACL、DeviceID 和实物配线,保持 BLOCKED_EXTERNAL。 |
|
| M06 设备、MQTT 与真实硬件联动 | PARTIAL | `d01f771` | docs/devlogs/2026-06-24-M06-G-真实硬件联调.md | M06-A 至 F 已完成 MQTT、拓扑、协议幂等、控制箱、Sub-1G 门锁、智慧插座和订单自动联动任务;M06-G 已补真实硬件烟测运行器,缺生产 MQTT 账号/ACL、DeviceID 和实物配线,保持 BLOCKED_EXTERNAL。 |
|
||||||
| M07 会员、余额、充值、优惠券和套餐营销 | DONE | `ed0d455` | docs/devlogs/2026-06-24-M07-D-会员管理.md | M07-A 已完成现金/赠送双余额账本;M07-B 已完成充值优惠;M07-C 已完成优惠券/套餐权益底表和冻结、确认、退回的可靠补偿核销服务;M07-D 已完成会员画像、订单、消费、余额、充值、优惠券和套餐聚合查询。 |
|
| M07 会员、余额、充值、优惠券和套餐营销 | DONE | `ed0d455` | docs/devlogs/2026-06-24-M07-D-会员管理.md | M07-A 已完成现金/赠送双余额账本;M07-B 已完成充值优惠;M07-C 已完成优惠券/套餐权益底表和冻结、确认、退回的可靠补偿核销服务;M07-D 已完成会员画像、订单、消费、余额、充值、优惠券和套餐聚合查询。 |
|
||||||
| M08 微信原生小程序完整业务 | PARTIAL | `M08-B微信预检导出增量` | docs/devlogs/2026-06-25-M08-B-保洁端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起与通知入账、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细、优惠券/套餐/余额下单抵扣工程闭环和权益可视化选择器;真机合法域名、真实微信支付和实物开门验证按 BLOCKED_EXTERNAL 旁路。M08-B 已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员查询、指派、验收、驳回、批量验收、批量驳回、超时回收、任务事件流水、任务详情协作分账展示、待结算候选与后台预览/导出、正式结算单生成/确认、多保洁员协作分账策略、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检和预检资料展示导出、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、保洁员资料管理界面、手机号维护、微信绑定状态、每日统计趋势、任务/协作者/结算/统计保洁员选择器、任务/结算/统计/候选门店和保洁员筛选以及运营待处理快捷入口;真实商户现场联调和更完整的管理界面待继续。 |
|
| M08 微信原生小程序完整业务 | PARTIAL | `96c5fa4` | docs/devlogs/2026-06-25-M08-B-保洁端.md | M08-A 已完成顾客端选店、门店/房间浏览、报价、预占、测试支付、订单生产微信预支付调起、充值微信支付调起与通知入账、受控 Wi-Fi、订单列表、订单详情、状态历史、取消测算、取消订单、订单权限开门、顾客续费、同门店换房、分享口令生成、个人中心余额/权益/账单汇总、充值计划/充值单入口、优惠券/套餐明细、优惠券/套餐/余额下单抵扣工程闭环和权益可视化选择器;真机合法域名、真实微信支付和实物开门验证按 BLOCKED_EXTERNAL 旁路。M08-B 已完成保洁任务底表、权限、任务大厅、我的任务、接单、开始、照片上传、提交验收、驳回补做、订单结束自动建任务、统计、管理员查询、指派、验收、驳回、免清洁、批量验收、批量驳回、批量免清洁、超时回收、任务事件流水、任务流水导出、任务成员导出、任务详情协作分账展示、待结算候选与后台预览/导出、正式结算单生成/确认、多保洁员协作分账策略、任务列表导出、任务详情导出、结算详情导出、结算列表导出、结算批量同步微信状态、结算转账状态筛选、微信确认参数展示与导出、发放成功标记、发放失败记录、微信商家转账 API 适配、转账中间态落库、主动轮询同步、微信转账通知回调、微信转账预检、预检资料展示导出和真实转账前预检拦截、非生产 Mock 门禁、后台任务成员协作管理、任务详情照片预览、操作流水、结算单详情、统计明细、统计导出、保洁员绩效排行、保洁员端统计看板、任务免清洁标记、免清洁统计展示、保洁员资料管理界面、保洁员列表导出、保洁员待补资料导出、手机号维护、微信绑定状态、每日统计趋势、任务/协作者/结算/统计保洁员选择器、任务/结算/统计/候选门店和保洁员筛选、运营待处理快捷入口、运营待处理导出以及真实商户/微信/转账/硬件现场联调清单、联调检查项搜索、联调筛选结果导出与筛选清除、联调状态筛选、联调负责人筛选、联调负责人看板、联调执行阶段看板、联调期限记录、联调逾期清单、联调批量标记、联调阻断摘要复制、联调场次信息记录、联调 JSON 快照导入导出、联调分类进度、联调验收结论复制、联调更新时间、联调证据记录、待补证据清单、联调交接报告、联调风险清单导出、联调归档包导出、联调收口签署字段和联调收口门禁;真实商户现场执行和更完整的管理界面待继续。 |
|
||||||
| M09 后台管理端完整业务 | TODO | - | - | - |
|
| M09 后台管理端完整业务 | TODO | - | - | - |
|
||||||
| M10 部署、域名、验收和运维闭环 | TODO | - | - | - |
|
| M10 部署、域名、验收和运维闭环 | TODO | - | - | - |
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,15 @@ Page({
|
|||||||
activeTab: 'hall',
|
activeTab: 'hall',
|
||||||
hallTasks: [],
|
hallTasks: [],
|
||||||
myTasks: [],
|
myTasks: [],
|
||||||
stats: { byStatus: {}, pendingSettlementText: cents(0) },
|
stats: {
|
||||||
|
byStatus: {},
|
||||||
|
taskTotal: 0,
|
||||||
|
completed: 0,
|
||||||
|
rejected: 0,
|
||||||
|
completionRate: 0,
|
||||||
|
pendingSettlementText: cents(0),
|
||||||
|
settledRewardText: cents(0),
|
||||||
|
},
|
||||||
selectedPhotosByTask: {},
|
selectedPhotosByTask: {},
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -122,9 +130,17 @@ function formatTask(task) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function formatStats(stats) {
|
function formatStats(stats) {
|
||||||
|
const taskTotal = Number(stats.taskTotal || 0)
|
||||||
|
const completed = Number(stats.completed || 0)
|
||||||
|
const rejected = Number(stats.rejected || 0)
|
||||||
return {
|
return {
|
||||||
byStatus: stats.byStatus || {},
|
byStatus: stats.byStatus || {},
|
||||||
|
taskTotal,
|
||||||
|
completed,
|
||||||
|
rejected,
|
||||||
|
completionRate: Number(stats.completionRate || 0),
|
||||||
pendingSettlementText: cents(stats.pendingSettlementCents),
|
pendingSettlementText: cents(stats.pendingSettlementCents),
|
||||||
|
settledRewardText: cents(stats.settledRewardCents),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<view class="header">
|
<view class="header">
|
||||||
<view>
|
<view>
|
||||||
<view class="title">保洁任务</view>
|
<view class="title">保洁任务</view>
|
||||||
<view class="muted">待结算 {{stats.pendingSettlementText}}</view>
|
<view class="muted">待结算 {{stats.pendingSettlementText}} · 已结算 {{stats.settledRewardText}}</view>
|
||||||
</view>
|
</view>
|
||||||
<button size="mini" loading="{{loading}}" bindtap="refreshAll">刷新</button>
|
<button size="mini" loading="{{loading}}" bindtap="refreshAll">刷新</button>
|
||||||
</view>
|
</view>
|
||||||
@@ -20,6 +20,25 @@
|
|||||||
<text>完成 {{stats.byStatus.COMPLETED || 0}}</text>
|
<text>完成 {{stats.byStatus.COMPLETED || 0}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
<view class="stats-board">
|
||||||
|
<view class="stats-card">
|
||||||
|
<text>任务总数</text>
|
||||||
|
<strong>{{stats.taskTotal}}</strong>
|
||||||
|
</view>
|
||||||
|
<view class="stats-card">
|
||||||
|
<text>完成率</text>
|
||||||
|
<strong>{{stats.completionRate}}%</strong>
|
||||||
|
</view>
|
||||||
|
<view class="stats-card">
|
||||||
|
<text>驳回</text>
|
||||||
|
<strong>{{stats.rejected}}</strong>
|
||||||
|
</view>
|
||||||
|
<view class="stats-card">
|
||||||
|
<text>已结算</text>
|
||||||
|
<strong>{{stats.settledRewardText}}</strong>
|
||||||
|
</view>
|
||||||
|
</view>
|
||||||
|
|
||||||
<view wx:if="{{errorMessage}}" class="error">{{errorMessage}}</view>
|
<view wx:if="{{errorMessage}}" class="error">{{errorMessage}}</view>
|
||||||
|
|
||||||
<block wx:if="{{activeTab === 'hall'}}">
|
<block wx:if="{{activeTab === 'hall'}}">
|
||||||
|
|||||||
@@ -53,6 +53,32 @@
|
|||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.stats-board {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: repeat(2, minmax(0, 1fr));
|
||||||
|
gap: 16rpx;
|
||||||
|
margin-top: 16rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-card {
|
||||||
|
display: grid;
|
||||||
|
gap: 8rpx;
|
||||||
|
min-width: 0;
|
||||||
|
padding: 20rpx 24rpx;
|
||||||
|
border-radius: 16rpx;
|
||||||
|
background: #ffffff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-card text {
|
||||||
|
color: #667085;
|
||||||
|
font-size: 24rpx;
|
||||||
|
}
|
||||||
|
|
||||||
|
.stats-card strong {
|
||||||
|
color: #101828;
|
||||||
|
font-size: 34rpx;
|
||||||
|
}
|
||||||
|
|
||||||
.task-card {
|
.task-card {
|
||||||
margin-top: 20rpx;
|
margin-top: 20rpx;
|
||||||
padding: 28rpx;
|
padding: 28rpx;
|
||||||
|
|||||||
@@ -33,13 +33,21 @@ for (const pattern of [
|
|||||||
'handleSyncTransferMany',
|
'handleSyncTransferMany',
|
||||||
'handleCompleteMany',
|
'handleCompleteMany',
|
||||||
'handleRejectMany',
|
'handleRejectMany',
|
||||||
|
'handleExempt',
|
||||||
|
'handleExemptMany',
|
||||||
'运营待处理',
|
'运营待处理',
|
||||||
'jumpToTaskStatus',
|
'jumpToTaskStatus',
|
||||||
'jumpToSettlementStatus',
|
'jumpToSettlementStatus',
|
||||||
'draftSettlementTotal',
|
'draftSettlementTotal',
|
||||||
|
'operationalQueueTotal',
|
||||||
|
'exportOperationalQueue',
|
||||||
|
'cleaning-operational-queue',
|
||||||
|
'导出待处理',
|
||||||
'settlementFilters.payoutState',
|
'settlementFilters.payoutState',
|
||||||
'待确认结算',
|
'待确认结算',
|
||||||
'待发放金额'
|
'待发放金额',
|
||||||
|
'CleaningFieldHandoffPanel',
|
||||||
|
'联调'
|
||||||
]) {
|
]) {
|
||||||
assert.match(app, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(app, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
}
|
}
|
||||||
@@ -56,6 +64,7 @@ for (const route of [
|
|||||||
'/assign',
|
'/assign',
|
||||||
'/complete',
|
'/complete',
|
||||||
'/reject',
|
'/reject',
|
||||||
|
'/exempt',
|
||||||
'/members',
|
'/members',
|
||||||
'/cleaning/reclaim-timeouts',
|
'/cleaning/reclaim-timeouts',
|
||||||
'/cleaning/settlements?',
|
'/cleaning/settlements?',
|
||||||
@@ -86,8 +95,15 @@ for (const pattern of [
|
|||||||
'批量验收',
|
'批量验收',
|
||||||
'批量驳回',
|
'批量驳回',
|
||||||
'selectedSubmittedTasks',
|
'selectedSubmittedTasks',
|
||||||
|
'selectedExemptableTasks',
|
||||||
|
'selectedExemptableCount',
|
||||||
'complete-many',
|
'complete-many',
|
||||||
'reject-many',
|
'reject-many',
|
||||||
|
'exempt-many',
|
||||||
|
'exempt',
|
||||||
|
'canExempt',
|
||||||
|
'\\u6279\\u91cf\\u514d\\u6e05\\u6d01',
|
||||||
|
'EXEMPT',
|
||||||
'photo-grid',
|
'photo-grid',
|
||||||
'timeline-grid',
|
'timeline-grid',
|
||||||
'el-image',
|
'el-image',
|
||||||
@@ -97,7 +113,21 @@ for (const pattern of [
|
|||||||
'cleanerLabel',
|
'cleanerLabel',
|
||||||
'filterDraft',
|
'filterDraft',
|
||||||
'门店 ID',
|
'门店 ID',
|
||||||
'筛选'
|
'筛选',
|
||||||
|
'导出',
|
||||||
|
'exportTasks',
|
||||||
|
'exportTaskDetail',
|
||||||
|
'exportTaskEvents',
|
||||||
|
'exportTaskMembers',
|
||||||
|
'cleaning-tasks',
|
||||||
|
'cleaning-task-detail',
|
||||||
|
'cleaning-task-events',
|
||||||
|
'cleaning-task-members',
|
||||||
|
'导出详情',
|
||||||
|
'导出成员',
|
||||||
|
'downloadCsv',
|
||||||
|
'csvCell',
|
||||||
|
'photoUrls?.length'
|
||||||
]) {
|
]) {
|
||||||
assert.match(tasks, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(tasks, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
}
|
}
|
||||||
@@ -130,11 +160,16 @@ for (const pattern of [
|
|||||||
'导出预检',
|
'导出预检',
|
||||||
'exportPreflight',
|
'exportPreflight',
|
||||||
'cleaning-transfer-preflight',
|
'cleaning-transfer-preflight',
|
||||||
|
'transferPreflightTitle',
|
||||||
|
'transferCanSubmit',
|
||||||
|
'preflightLoading',
|
||||||
'listCleaningSettlementCandidates',
|
'listCleaningSettlementCandidates',
|
||||||
'candidateDialog',
|
'candidateDialog',
|
||||||
'useCandidateFilters',
|
'useCandidateFilters',
|
||||||
'exportSettlements',
|
'exportSettlements',
|
||||||
'exportCandidates',
|
'exportCandidates',
|
||||||
|
'exportSettlementDetail',
|
||||||
|
'cleaning-settlement-detail',
|
||||||
'downloadCsv',
|
'downloadCsv',
|
||||||
'MOCK',
|
'MOCK',
|
||||||
'el-select',
|
'el-select',
|
||||||
@@ -161,14 +196,43 @@ for (const pattern of [
|
|||||||
'paidSettlementCents',
|
'paidSettlementCents',
|
||||||
'门店明细',
|
'门店明细',
|
||||||
'成员分账',
|
'成员分账',
|
||||||
|
'保洁员绩效排行',
|
||||||
|
'cleanerPerformanceRows',
|
||||||
|
'completionRate',
|
||||||
|
'filterByCleaner',
|
||||||
|
'exportCleanerPerformance',
|
||||||
|
'cleaning-cleaner-performance',
|
||||||
|
'completedTaskCount',
|
||||||
|
'rejectedTaskCount',
|
||||||
|
'exempted',
|
||||||
|
'导出排行',
|
||||||
'pendingSettlementCents',
|
'pendingSettlementCents',
|
||||||
'filterDraft.cleanerUserId',
|
'filterDraft.cleanerUserId',
|
||||||
'cleanerLabel',
|
'cleanerLabel',
|
||||||
|
'exportStatistics',
|
||||||
|
'cleaning-statistics',
|
||||||
|
'downloadCsv',
|
||||||
|
'csvCell',
|
||||||
'el-select'
|
'el-select'
|
||||||
]) {
|
]) {
|
||||||
assert.match(statistics, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(statistics, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const cleaningRepository = read('backend/src/cleaning/cleaning-task-repository.ts');
|
||||||
|
for (const pattern of [
|
||||||
|
'completedTaskCount',
|
||||||
|
'rejectedTaskCount',
|
||||||
|
"t.status IN ('COMPLETED', 'SETTLED')",
|
||||||
|
"t.status = 'REJECTED'",
|
||||||
|
'async exempt',
|
||||||
|
"status = 'EXEMPT'",
|
||||||
|
'reward_cents = 0',
|
||||||
|
'AS exempted',
|
||||||
|
"countStatus(byStatus, 'EXEMPT')"
|
||||||
|
]) {
|
||||||
|
assert.match(cleaningRepository, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
|
}
|
||||||
|
|
||||||
const cleaners = read('admin/src/components/CleanersPanel.vue');
|
const cleaners = read('admin/src/components/CleanersPanel.vue');
|
||||||
for (const pattern of [
|
for (const pattern of [
|
||||||
'新增保洁员',
|
'新增保洁员',
|
||||||
@@ -176,6 +240,14 @@ for (const pattern of [
|
|||||||
'已绑微信',
|
'已绑微信',
|
||||||
'待补资料',
|
'待补资料',
|
||||||
'profileComplete',
|
'profileComplete',
|
||||||
|
'profileIssues',
|
||||||
|
'exportCleaners',
|
||||||
|
'exportCleanerProfileIssues',
|
||||||
|
'cleaning-cleaners',
|
||||||
|
'cleaning-cleaner-profile-issues',
|
||||||
|
'导出待补',
|
||||||
|
'downloadCsv',
|
||||||
|
'csvCell',
|
||||||
'会话',
|
'会话',
|
||||||
'status-toggle',
|
'status-toggle',
|
||||||
'reset-sessions'
|
'reset-sessions'
|
||||||
@@ -183,6 +255,133 @@ for (const pattern of [
|
|||||||
assert.match(cleaners, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(cleaners, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const handoff = read('admin/src/components/CleaningFieldHandoffPanel.vue');
|
||||||
|
for (const pattern of [
|
||||||
|
'现场联调进度',
|
||||||
|
'qipai.cleaning.field-handoff',
|
||||||
|
'qipai.cleaning.field-handoff.session',
|
||||||
|
'联调批次',
|
||||||
|
'现场/门店',
|
||||||
|
'验收人',
|
||||||
|
'收口结论',
|
||||||
|
'下一步',
|
||||||
|
'acceptor',
|
||||||
|
'closeoutVerdict',
|
||||||
|
'nextAction',
|
||||||
|
'createEmptySessionMeta',
|
||||||
|
'最后更新',
|
||||||
|
'证据记录',
|
||||||
|
'evidenceRecordedCount',
|
||||||
|
'待补证据',
|
||||||
|
'evidenceMissingItems',
|
||||||
|
'evidenceMissingCount',
|
||||||
|
'overdueItems',
|
||||||
|
'isOverdueDraft',
|
||||||
|
'parseDeadline',
|
||||||
|
'copyOverdueSummary',
|
||||||
|
'逾期检查项',
|
||||||
|
'逾期清单已复制',
|
||||||
|
'copyEvidenceSummary',
|
||||||
|
'待补证据清单已复制',
|
||||||
|
'现场交接报告已复制',
|
||||||
|
'copyHandoffReport',
|
||||||
|
'exportHandoffReport',
|
||||||
|
'exportCloseoutArchive',
|
||||||
|
'buildCloseoutArchive',
|
||||||
|
'serializeHandoffItem',
|
||||||
|
'buildHandoffReport',
|
||||||
|
'formatReportItem',
|
||||||
|
'statusText',
|
||||||
|
'cleaning-field-handoff-report',
|
||||||
|
'cleaning-field-closeout-archive',
|
||||||
|
'qipai.cleaning.field-handoff.closeout-archive.v1',
|
||||||
|
'归档包',
|
||||||
|
'evidenceRef',
|
||||||
|
'normalizeDraft',
|
||||||
|
'sessionMeta',
|
||||||
|
'updatedAt',
|
||||||
|
'persistSessionMeta',
|
||||||
|
'formatLocalMinute',
|
||||||
|
'快照',
|
||||||
|
'导入',
|
||||||
|
'exportSnapshot',
|
||||||
|
'importSnapshot',
|
||||||
|
'qipai.cleaning.field-handoff.snapshot.v1',
|
||||||
|
'cleaning-field-handoff-snapshot',
|
||||||
|
'categoryProgress',
|
||||||
|
'passPercent',
|
||||||
|
'handoff-category-progress',
|
||||||
|
'stageProgress',
|
||||||
|
'copyStageSummary',
|
||||||
|
'执行阶段看板',
|
||||||
|
'阶段摘要已复制',
|
||||||
|
'可进入现场验收收口',
|
||||||
|
'handoffReady',
|
||||||
|
'missingCloseoutFields',
|
||||||
|
'closeoutReady',
|
||||||
|
'copyVerdict',
|
||||||
|
'copyCloseoutGate',
|
||||||
|
'收口门禁已复制',
|
||||||
|
'归档门禁',
|
||||||
|
'现场记录可归档',
|
||||||
|
'收口资料待补齐',
|
||||||
|
'检查项状态',
|
||||||
|
'现场证据',
|
||||||
|
'联调结论已复制',
|
||||||
|
'商户凭据引用',
|
||||||
|
'小程序合法域名',
|
||||||
|
'小额真实转账',
|
||||||
|
'订单权限开门',
|
||||||
|
'控电和插座联动',
|
||||||
|
'BLOCKED',
|
||||||
|
'statusFilter',
|
||||||
|
'handoff-status-select',
|
||||||
|
'全部状态',
|
||||||
|
'ownerFilter',
|
||||||
|
'keywordFilter',
|
||||||
|
'matchesKeyword',
|
||||||
|
'FilterX',
|
||||||
|
'hasActiveFilters',
|
||||||
|
'clearHandoffFilters',
|
||||||
|
'\\u6e05\\u9664\\u7b5b\\u9009',
|
||||||
|
'ownerOptions',
|
||||||
|
'ownerProgress',
|
||||||
|
'copyOwnerSummary',
|
||||||
|
'负责人看板',
|
||||||
|
'负责人摘要已复制',
|
||||||
|
'handoff-owner-select',
|
||||||
|
'handoff-search',
|
||||||
|
'\\u641c\\u7d22\\u68c0\\u67e5\\u9879/\\u8d1f\\u8d23\\u4eba/\\u8bc1\\u636e',
|
||||||
|
'全部负责人',
|
||||||
|
'未分派',
|
||||||
|
'批量标记',
|
||||||
|
'bulkForm',
|
||||||
|
'deadline',
|
||||||
|
'期限',
|
||||||
|
'YYYY-MM-DD',
|
||||||
|
'applyBulkMark',
|
||||||
|
'应用到当前筛选',
|
||||||
|
'阻断摘要',
|
||||||
|
'blockedItems',
|
||||||
|
'riskItems',
|
||||||
|
'copyBlockedSummary',
|
||||||
|
'navigator.clipboard.writeText',
|
||||||
|
'exportChecklist',
|
||||||
|
'导出筛选',
|
||||||
|
'exportItems',
|
||||||
|
'buildFilterSummary',
|
||||||
|
'当前筛选条件',
|
||||||
|
'导出检查项数',
|
||||||
|
'exportRiskRegister',
|
||||||
|
'cleaning-field-handoff',
|
||||||
|
'cleaning-field-risk-register',
|
||||||
|
'缺证据',
|
||||||
|
'localStorage',
|
||||||
|
'downloadCsv'
|
||||||
|
]) {
|
||||||
|
assert.match(handoff, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
|
}
|
||||||
|
|
||||||
const styles = read('admin/src/styles.css');
|
const styles = read('admin/src/styles.css');
|
||||||
assert.match(styles, /\.cleaner-select/);
|
assert.match(styles, /\.cleaner-select/);
|
||||||
assert.match(styles, /\.option-row/);
|
assert.match(styles, /\.option-row/);
|
||||||
@@ -190,6 +389,27 @@ assert.match(styles, /\.filter-select/);
|
|||||||
assert.match(styles, /\.narrow-input/);
|
assert.match(styles, /\.narrow-input/);
|
||||||
assert.match(styles, /\.action-board/);
|
assert.match(styles, /\.action-board/);
|
||||||
assert.match(styles, /\.action-tile/);
|
assert.match(styles, /\.action-tile/);
|
||||||
|
assert.match(styles, /\.handoff-summary/);
|
||||||
|
assert.match(styles, /\.handoff-body/);
|
||||||
|
assert.match(styles, /\.handoff-session/);
|
||||||
|
assert.match(styles, /\.handoff-category-progress/);
|
||||||
|
assert.match(styles, /\.handoff-category-row/);
|
||||||
|
assert.match(styles, /\.handoff-stage-board/);
|
||||||
|
assert.match(styles, /\.handoff-stage-grid/);
|
||||||
|
assert.match(styles, /\.handoff-stage-card/);
|
||||||
|
assert.match(styles, /\.handoff-owner-board/);
|
||||||
|
assert.match(styles, /\.handoff-owner-grid/);
|
||||||
|
assert.match(styles, /\.handoff-owner-card/);
|
||||||
|
assert.match(styles, /\.handoff-search/);
|
||||||
|
assert.match(styles, /\.handoff-verdict/);
|
||||||
|
assert.match(styles, /\.handoff-status-select/);
|
||||||
|
assert.match(styles, /\.handoff-bulk-form/);
|
||||||
|
assert.match(styles, /\.handoff-blockers/);
|
||||||
|
assert.match(styles, /\.cleaner-performance-board/);
|
||||||
|
assert.match(styles, /\.cleaner-performance-grid/);
|
||||||
|
assert.match(styles, /\.cleaner-performance-card/);
|
||||||
|
assert.match(styles, /\.hidden-file-input/);
|
||||||
|
assert.match(styles, /\.transfer-preflight-alert/);
|
||||||
assert.match(styles, /@media \(max-width: 980px\)/);
|
assert.match(styles, /@media \(max-width: 980px\)/);
|
||||||
assert.match(styles, /@media \(max-width: 560px\)/);
|
assert.match(styles, /@media \(max-width: 560px\)/);
|
||||||
|
|
||||||
|
|||||||
@@ -130,6 +130,13 @@ for (const pattern of [
|
|||||||
'submitTask',
|
'submitTask',
|
||||||
'photoUrls',
|
'photoUrls',
|
||||||
'pendingSettlementText',
|
'pendingSettlementText',
|
||||||
|
'settledRewardText',
|
||||||
|
'completionRate',
|
||||||
|
'stats-board',
|
||||||
|
'任务总数',
|
||||||
|
'完成率',
|
||||||
|
'已结算',
|
||||||
|
'驳回',
|
||||||
'保洁任务'
|
'保洁任务'
|
||||||
]) {
|
]) {
|
||||||
assert.match(cleaner, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
assert.match(cleaner, new RegExp(pattern.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')));
|
||||||
|
|||||||
Reference in New Issue
Block a user