Compare commits

...
Author SHA1 Message Date
zlwuandCursor 476f744ee9 fix(backend): 协议列表从 V2 样本缴费补齐已收金额
自存表导出依赖 paymentSummary.receivedAmount,原先仅汇总 V1
biz_protocol_payment;现对 include_sample_payment_modes 路径补齐
合同额、已收、分期明细与退费,避免已缴/退款列为空。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 14:15:02 +08:00
zlwuandCursor cec96ce480 fix(web-admin): 批量调整归属按钮文案更明确
将历史归属维护列表工具栏按钮由「调整归属」改为「批量调整归属」,与行内单条操作区分。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 12:07:04 +08:00
zlwuandCursor 77473a1738 fix(web-admin): 恢复预签约导出并校准刷卡时间与表头样式
预签约列表重新显示导出按钮;刷卡时间仅统计已确认到账;Excel 标题行黄底居中并加边框。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 12:02:30 +08:00
zlwuandCursor db74cd64fe docs(agents): 完善 Cursor 确认问题与提示音可见性约定
明确工具先于正文时 notify-question 须为本轮最后一次调用,最终回复以「待你确认」打头,并区分 Queued 与确认入口,减少听音找不到题的情况。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 10:38:20 +08:00
cykj e1f0030403 fix(backend): 计划开始时间筛选不再内置工单状态限制 (#85)
fix(backend): 计划开始时间筛选不再内置工单状态限制

Refs #82
2026-11-11 02:23:12 +00:00
zlwuandCursor 5109d8b3e5 fix(backend): 计划开始时间筛选不再内置工单状态限制
去掉 EXISTS 中对工单/任务/步骤活跃态的硬编码,日期条件与前端勾选的状态等检索项组合生效,修复区间内有步骤日期却查空的问题。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 10:20:59 +08:00
zlwuandCursor 2a0a2ef72a feat(web-admin): 历史归属维护支持批量调整归属
在历史归属维护列表增加多选与工具栏批量「调整归属」,复用现有单条预览/保存接口逐条提交,便于一次将多条业务记录归属到同一项目。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-11 10:02:24 +08:00
zlwu 3a396d79a2 chore(mobile-h5): 切换本地联调环境与测试 AppID
continuous-integration/drone/tag Build is passing
按用户本地验收要求,将 APP_ENV 切换为 local,使用本机 API 和移动 H5 地址,并将微信 AppID 切换为测试号。
2026-11-10 09:37:04 +08:00
zlwu 9c4944702b fix(db): 补充协议操作日志旧表纠偏脚本
为同名旧表与现行日志模型不兼容的情况提供迁移脚本,并在原建表脚本注明纠偏入口。保留有数据的旧表为备份;本次仅提交现有脚本,未执行数据库迁移。
2026-11-10 09:37:04 +08:00
cykj e06f89dcf6 Merge pull request 'fix(mobile): 修复协议单保存前项目校验异常' (#79) from codex/issue-78-protocol-save into V2.0 2026-11-10 01:24:10 +00:00
zlwu f343f12645 fix(mobile): 修复协议单项目校验引用导致保存中断
循环模板内字符串 ref 被 Vue 收集为数组,调用 validate 时在请求前抛错。改用函数 ref 保持单组件实例,并覆盖两角色新增、编辑及项目校验提示。关联工单 #78。
2026-11-10 09:21:29 +08:00
zlwuandCursor 1032631318 chore(mobile-h5): 微信小程序 AppID 切换为生产
将 mp-weixin.appid 改为 wx2b139581f4c855e4,与 APP_ENV=prod 对齐。

Refs: #77
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-09 16:32:24 +08:00
zlwuandCursor f9f79479e8 chore(mobile-h5): 小程序切换为生产环境配置
将 APP_ENV 设为 prod,API/OA H5/MinIO 指向 xwyd.zkxw.cn,便于发生产版。

Refs: #76
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-09 16:27:28 +08:00
zlwuandCursor e488b86c35 fix(mobile): 小程序 WebView 附件下载改走宿主原生预览页
continuous-integration/drone/tag Build is passing
鸿蒙微信 ArkWeb 下 H5 window.open 常静默失败,仅出现「开始下载…」。
OA/市场附件在小程序 WebView 内改为跳转 pages/oa/file-preview,
用 uni.downloadFile + openDocument 打开,浏览器环境仍用预签名直链。

Refs: #74
Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-09 15:04:14 +08:00
zlwuandCursor 6a78c28121 chore(mobile-h5): 切换小程序到测试环境配置
将微信 AppID 与 APP_ENV 改为测试环境,便于对接测试后端与业务域名。

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-11-09 14:38:13 +08:00
cykj c7905b5da0 Merge pull request 'fix(web-admin): 样本接收弹窗恢复展示协议附件' (#73) into V2.0
fix(web-admin): 样本接收弹窗恢复展示协议附件 (#73)

Refs #43
2026-11-09 06:00:19 +00:00
28 changed files with 1471 additions and 65 deletions

No files matched your search

+1 -1
View File
@@ -19,7 +19,7 @@ description: Use when starting a project, designing or prototyping project UI, i
| 任务 | 读取 |
| --- | --- |
| 工单领取、并行会话、流程标签、转交、共享环境或合并排队 | [工单占用与隔离](references/issue-claims.md) |
| 发送确认问题、请求用户操作、补发缺推荐或缺超时说明的旧题 | 先按[问题展示](references/planning.md#问题展示)在当前回复写出「待你确认」,完成[发问前检查](references/planning.md#发问前检查)后,再按[本地确认语音](references/question-notification.md)提醒 |
| 发送确认问题、请求用户操作、补发缺推荐或缺超时说明的旧题 | 先按[问题展示](references/planning.md#问题展示)与 Cursor 宿主节在当前回复写出「待你确认」,完成[发问前检查](references/planning.md#发问前检查)后,再按[本地确认语音](references/question-notification.md)提醒;Cursor 下 `notify-question` 须为本轮最后一次工具且发问后停手 |
| 关闭/恢复声音提醒 | [本地确认语音](references/question-notification.md) |
| 空白工程、大需求、技术栈或架构变化 | [建设与规格](references/planning.md) |
| 拉取工单、理解评论和截图、续接工单或交付前核对补充 | [工单全文、评论与图片](references/issue-context.md) |
@@ -43,6 +43,14 @@
必须等待的题,最后一行写「未回复时:本题保持等待。」宿主问题卡片可以同时使用,卡片内容与这份清单一致。回复正文里没有「待你确认」时,不播放提示音,也不开始 60 秒计时。
### Cursor / 工具先于正文的宿主
Cursor Agent 等同轮「先跑工具、再出最终回复」的宿主上:
1. 需要播音时,`notify-question` 只能作为本轮**最后一次**工具调用;最终可见回复必须以「待你确认」开头写全清单,本轮随后不得再编辑代码、开浏览器或继续依赖答复的实现。
2. 承认提示音可能早于正文渲染数秒;用清单内一句「请在本会话回复;Queued 不是确认入口」消除错位。提示音整机可听,不保证当前聚焦会话就是发问会话。
3. 工程若提供宿主适配说明(如 `docs/agents/cursor-question-visibility.md`),发问前按该说明执行;与本节冲突时以「用户必须看见清单」为准。
## 发问前检查
每次发送确认问题(含调用宿主提问工具)前,逐题完成以下检查;缺项先改题,再按[问题展示](#问题展示)写入当前回复。这里是 Agent 的执行步骤,尚无自动拦截宿主问题卡片的校验器。
@@ -6,7 +6,8 @@
1. 先核对用户/工程的静音选择。当前回复已经写上「待你确认」清单后,记录该批问题的发送时间、推荐及范围,再播放。回复里还没有这份清单时不播放,也不把这一轮当作已经发问。
2. 每批问题只播放一次,多题合并发送共用一次提醒。将“已尝试提醒/结果”记在现有任务记录;同一批等待、轮询、重试和会话恢复不重复播放。真正重新提出的新问题或用户要求再提醒时才播放下一次。
3. 执行以下已安装入口。它只读取随包预生成的本地 WAV,并调用播放器;不联网、不调用语音生成服务、不在提问时临时生成语音。命令最多等待播放器 12 秒,不另开后台常驻进程。
3. **Cursor 等「工具先于最终正文」的宿主**:不得在仍要继续工具批处理时播放。需要播放时,将 `notify-question` 放在本轮最后一次工具调用,并保证同轮最终正文以「待你确认」清单为主体且本轮停手。提示音在整机播放、不绑定聊天标签;Queued/Multitasking 队列不是确认入口。工程适配见 `docs/agents/cursor-question-visibility.md`(若存在)。
4. 执行以下已安装入口。它只读取随包预生成的本地 WAV,并调用播放器;不联网、不调用语音生成服务、不在提问时临时生成语音。命令最多等待播放器 12 秒,不另开后台常驻进程。
```sh
python3 .agents/skills/personal-dev/scripts/pda.py notify-question --project .
+9 -3
View File
@@ -1,8 +1,14 @@
---
description: 个人开发体系的工程任务入口
description: 个人开发体系的工程任务入口(含 Cursor 确认可见性)
alwaysApply: true
---
工程建设、界面设计或原型、需求开发、Bug 修复、验收反馈或提交/push/合并续聊时,先读根 AGENTS.md,再读取工程根目录的 .agents/skills/personal-dev/SKILL.md 进行任务分级。仅咨询概念时直接回答。业务约束仍按目标目录的 AGENTS.md 查阅。
工程建设、界面设计或原型、需求开发、Bug 修复、验收反馈或提交/push/合并续聊时,先读根 `AGENTS.md`,再读取工程根目录的 `.agents/skills/personal-dev/SKILL.md` 进行任务分级。仅咨询概念时直接回答。业务约束仍按目标目录的 `AGENTS.md` 查阅。
需要用户确认时,先在当前回复写出「待你确认」清单,再播放提示音。清单的写法以该 Skill 的问题展示规则为准。回复里没有这份清单时,不播放提示音。
需要用户确认时:
1. 先读 [Cursor 确认可见性](../../docs/agents/cursor-question-visibility.md),再按 Skill 的问题展示规则发问。
2. 本轮最终用户可见回复必须以「待你确认」清单为主体(含推荐与未回复处理);写完清单前不播放提示音。
3. 若播放提示音:`notify-question` 必须是本轮最后一次工具调用,且本轮随后不再继续编辑/浏览器/实现类工具。
4. 清单中写明请在本会话回复;底部 Queued / Multitasking 不是确认入口。
5. 回复正文没有「待你确认」时,不播放提示音。
+2
View File
@@ -576,12 +576,14 @@ def attach_presign_ledger_fields(
}
times_by_order: Dict[str, List[str]] = {}
if order_ids:
# 与 confirmedDepositAmount 一致:仅已确认到账(yjf)计入刷卡时间
transfers = (
db.query(BizPresignTransfer)
.filter(
BizPresignTransfer.presign_order_id.in_(order_ids),
BizPresignTransfer.tenant_no == tenant_no,
BizPresignTransfer.del_flag == 0,
BizPresignTransfer.pay_status == "yjf",
)
.order_by(
BizPresignTransfer.transfer_time.asc(),
+1 -7
View File
@@ -94,7 +94,7 @@ def apply_planned_start_time_step_filter(
planned_start_time_end: Optional[str] = None,
mine_user_id: Optional[str] = None,
):
"""按活跃工单/任务下未完成工艺步骤的计划开始时间过滤。"""
"""按工艺步骤计划开始时间过滤;工单/任务/步骤状态由外层检索条件组合控制。"""
start = (planned_start_time_start or "").strip()
end = (planned_start_time_end or "").strip()
if not start and not end:
@@ -104,15 +104,9 @@ def apply_planned_start_time_step_filter(
BizProductionTaskStep.del_flag == 0,
BizProductionTaskStep.tenant_no == tenant_no,
BizProductionTaskStep.planned_start_time.isnot(None),
BizProductionTaskStep.step_status != "ywc",
BizProductionTask.id == BizProductionTaskStep.task_id,
BizProductionTask.del_flag == 0,
BizProductionTask.tenant_no == tenant_no,
BizProductionTask.task_status.in_(("dpz", "jxz")),
BizProductionWorkOrder.id == BizProductionTask.work_order_id,
BizProductionWorkOrder.del_flag == 0,
BizProductionWorkOrder.tenant_no == tenant_no,
BizProductionWorkOrder.work_order_status.in_(("dpz", "jxz")),
work_order_id_column == BizProductionTask.work_order_id,
]
if start:
@@ -14,6 +14,7 @@ from app.models.models import (
BizProtocolPaymentDetail,
BizProtocolPaymentSchedule,
BizProtocolPaymentTransfer,
BizProtocolRefundRecord,
BizProtocolSamplePayment,
)
@@ -229,6 +230,197 @@ def _first_period_first_transfer_times(
return {pid: _fmt_dt(t) for pid, t in earliest.items() if _fmt_dt(t)}
def _received_amount_from_transfers(transfers: List[BizProtocolPaymentTransfer]) -> float:
total = Decimal("0")
for t in transfers:
st = (t.pay_status or "").strip()
if st in ("yjf", "jfqrz"):
total += t.transfer_amount or Decimal("0")
return float(total)
def _v2_schedule_detail_rows(
schedules: List[BizProtocolPaymentSchedule],
transfers: List[BizProtocolPaymentTransfer],
pay_mode: str,
) -> List[Dict[str, Any]]:
by_schedule: Dict[str, List[BizProtocolPaymentTransfer]] = {}
for t in transfers:
sid = (t.schedule_id or "").strip()
if sid:
by_schedule.setdefault(sid, []).append(t)
active = [
s
for s in schedules
if (s.schedule_status or "").strip() != "void"
]
active.sort(
key=lambda s: (
s.schedule_no if s.schedule_no is not None else 10_000,
s.order_num if s.order_num is not None else 0,
s.create_time or datetime.min,
)
)
rows: List[Dict[str, Any]] = []
for idx, sch in enumerate(active):
sch_transfers = by_schedule.get(sch.id, [])
paid = [
t
for t in sch_transfers
if (t.pay_status or "").strip() in ("yjf", "jfqrz")
]
paid_amount = _received_amount_from_transfers(paid) if paid else None
statuses = [(t.pay_status or "").strip() for t in sch_transfers if (t.pay_status or "").strip()]
if "jfqrz" in statuses:
st = "jfqrz"
elif "yjf" in statuses and paid:
st = "yjf"
elif statuses:
st = statuses[0]
else:
st = "dfj"
times = [t.transfer_time for t in paid if t.transfer_time is not None]
transfer_time = _fmt_dt(min(times)) if times else ""
inst_no = sch.schedule_no
if pay_mode in ("fq", "djfq") and inst_no is not None:
label = f"第{inst_no}期"
else:
label = f"缴费{idx + 1}"
rows.append(
{
"installmentNo": inst_no,
"installmentLabel": label,
"installmentDueDate": _fmt_ymd(sch.due_date),
"dueAmount": _dec(sch.due_amount),
"transferAmount": paid_amount,
"refundAmount": None,
"payStatus": st,
"payStatusLabel": _PAY_STATUS_LABELS.get(st, st or "—"),
"transferTime": transfer_time,
}
)
return rows
def _load_v2_protocol_payment_amounts(
db: Session,
protocol_ids: List[str],
tenant_no: str,
) -> Dict[str, Dict[str, Any]]:
"""按协议汇总 V2 样本缴费合同额、已收、明细与退费(仅 list/export 摘要用)。"""
ids = [x.strip() for x in protocol_ids if (x or "").strip()]
if not ids:
return {}
samples = (
db.query(BizProtocolSamplePayment)
.filter(
BizProtocolSamplePayment.collection_protocol_id.in_(ids),
BizProtocolSamplePayment.tenant_no == tenant_no,
BizProtocolSamplePayment.del_flag == 0,
)
.all()
)
if not samples:
return {}
schedules = (
db.query(BizProtocolPaymentSchedule)
.filter(
BizProtocolPaymentSchedule.collection_protocol_id.in_(ids),
BizProtocolPaymentSchedule.tenant_no == tenant_no,
BizProtocolPaymentSchedule.del_flag == 0,
)
.all()
)
transfers = (
db.query(BizProtocolPaymentTransfer)
.filter(
BizProtocolPaymentTransfer.collection_protocol_id.in_(ids),
BizProtocolPaymentTransfer.tenant_no == tenant_no,
BizProtocolPaymentTransfer.del_flag == 0,
)
.all()
)
refunds = (
db.query(BizProtocolRefundRecord)
.filter(
BizProtocolRefundRecord.collection_protocol_id.in_(ids),
BizProtocolRefundRecord.tenant_no == tenant_no,
BizProtocolRefundRecord.del_flag == 0,
)
.all()
)
samples_by: Dict[str, List[BizProtocolSamplePayment]] = {}
for sp in samples:
samples_by.setdefault(sp.collection_protocol_id, []).append(sp)
schedules_by: Dict[str, List[BizProtocolPaymentSchedule]] = {}
for s in schedules:
schedules_by.setdefault(s.collection_protocol_id, []).append(s)
transfers_by: Dict[str, List[BizProtocolPaymentTransfer]] = {}
for t in transfers:
transfers_by.setdefault(t.collection_protocol_id, []).append(t)
refund_by: Dict[str, float] = {}
refund_seen: Dict[str, bool] = {}
for r in refunds:
amt = _dec(r.refund_amount)
if amt is None:
continue
refund_seen[r.collection_protocol_id] = True
refund_by[r.collection_protocol_id] = refund_by.get(r.collection_protocol_id, 0.0) + float(amt)
out: Dict[str, Dict[str, Any]] = {}
for pid, sp_list in samples_by.items():
modes = {(sp.pay_mode or "").strip() for sp in sp_list if (sp.pay_mode or "").strip()}
ordered_modes = sorted(
modes,
key=lambda mode: ({"dj": 0, "fq": 1, "djfq": 2, "fgd": 3}.get(mode, 99), mode),
)
if modes == {"dj", "fq"}:
pay_mode = "djfq"
else:
pay_mode = "+".join(ordered_modes) if ordered_modes else ""
contract_total = Decimal("0")
has_contract = False
for sp in sp_list:
if sp.contract_amount is not None:
has_contract = True
contract_total += sp.contract_amount or Decimal("0")
contract = float(contract_total) if has_contract else None
proto_transfers = transfers_by.get(pid, [])
received = _received_amount_from_transfers(proto_transfers)
pending = max(contract - received, 0) if contract is not None else None
detail_rows = _v2_schedule_detail_rows(
schedules_by.get(pid, []),
proto_transfers,
pay_mode,
)
statuses = [(t.pay_status or "").strip() for t in proto_transfers]
overall = _protocol_overall_status(statuses, contract, pending)
hint = _protocol_status_hint(pay_mode, statuses) or overall["overallPayStatusLabel"]
installment_count = None
if pay_mode in ("fq", "djfq"):
installment_count = len(
{
d.get("installmentNo")
for d in detail_rows
if d.get("installmentNo") is not None
}
) or len(detail_rows)
payload: Dict[str, Any] = {
"payMode": pay_mode,
"contractAmount": contract,
"receivedAmount": received,
"pendingAmount": pending,
"statusHint": hint,
"installmentCount": installment_count,
"paymentDetails": detail_rows,
**overall,
}
if refund_seen.get(pid):
payload["refundAmount"] = refund_by.get(pid, 0.0)
out[pid] = payload
return out
def build_protocol_payment_summaries(
db: Session,
protocol_ids: List[str],
@@ -263,6 +455,7 @@ def build_protocol_payment_summaries(
):
details_by_payment.setdefault(d.payment_id, []).append(d)
sample_modes: Dict[str, set] = {}
v2_amounts: Dict[str, Dict[str, Any]] = {}
if include_sample_payment_modes:
for pid, mode in db.query(
BizProtocolSamplePayment.collection_protocol_id,
@@ -274,6 +467,7 @@ def build_protocol_payment_summaries(
).all():
if mode:
sample_modes.setdefault(pid, set()).add(mode)
v2_amounts = _load_v2_protocol_payment_amounts(db, ids, tenant_no)
first_pay_map = _first_period_first_transfer_times(db, ids, tenant_no)
out: Dict[str, Dict[str, Any]] = {}
for pid in ids:
@@ -285,7 +479,8 @@ def build_protocol_payment_summaries(
)
first_pay = first_pay_map.get(pid) or ""
modes = sample_modes.get(pid, set())
if not summary and not first_pay and not modes:
v2 = v2_amounts.get(pid)
if not summary and not first_pay and not modes and not v2:
continue
if not summary:
summary = {
@@ -294,6 +489,7 @@ def build_protocol_payment_summaries(
"contractAmount": None,
"receivedAmount": None,
"pendingAmount": None,
"refundAmount": None,
"statusHint": "",
"installmentCount": None,
"paymentDetails": [],
@@ -309,6 +505,27 @@ def build_protocol_payment_summaries(
labels = {**_PAY_MODE_LABELS, "fgd": "分改趸"}
summary["payMode"] = "djfq" if modes == {"dj", "fq"} else "+".join(ordered_modes)
summary["payModeLabel"] = "+".join(labels.get(mode, mode) for mode in ordered_modes)
# V1 摘要缺已收金额时,用 V2 样本缴费补齐(自存表导出 / 协议列表依赖)。
if v2 and summary.get("receivedAmount") is None:
if summary.get("contractAmount") is None:
summary["contractAmount"] = v2.get("contractAmount")
summary["receivedAmount"] = v2.get("receivedAmount")
if summary.get("pendingAmount") is None:
summary["pendingAmount"] = v2.get("pendingAmount")
if not summary.get("paymentDetails"):
summary["paymentDetails"] = v2.get("paymentDetails") or []
if summary.get("installmentCount") is None:
summary["installmentCount"] = v2.get("installmentCount")
if summary.get("refundAmount") is None and "refundAmount" in v2:
summary["refundAmount"] = v2.get("refundAmount")
for key in (
"statusHint",
"overallPayStatus",
"overallPayStatusLabel",
"overallPayStatusTagType",
):
if not summary.get(key) and v2.get(key):
summary[key] = v2.get(key)
if first_pay:
summary["firstPayTransferTime"] = first_pay
out[pid] = summary
+3
View File
@@ -2564,10 +2564,13 @@ def test_web_presign_list_includes_ledger_fields():
order.mother_name = '陈影'
transfer = _transfer('ledger-transfer', order_id='ledger-1', pay_status='yjf')
transfer.transfer_time = datetime(2026, 4, 2, 16, 49, 42)
pending = _transfer('ledger-pending', order_id='ledger-1', pay_status='dfj')
pending.transfer_time = datetime(2026, 4, 1, 10, 0, 0)
db.add_all(
[
order,
transfer,
pending,
BizPresignOrderSampleType(
id='ledger-type',
presign_order_id='ledger-1',
@@ -0,0 +1,42 @@
"""计划开始时间筛选:不内置工单/任务/步骤状态限制,交给外层组合条件。"""
from sqlalchemy import create_engine
from sqlalchemy.dialects import mysql
from sqlalchemy.orm import sessionmaker
from app.crud.production_work_order import apply_planned_start_time_step_filter
from app.models.models import BizProductionWorkOrder
def _compile_planned_start_sql() -> str:
eng = create_engine("sqlite://")
SessionLocal = sessionmaker(bind=eng)
db = SessionLocal()
try:
q = db.query(BizProductionWorkOrder).filter(BizProductionWorkOrder.del_flag == 0)
filtered = apply_planned_start_time_step_filter(
q,
tenant_no="zkxw",
work_order_id_column=BizProductionWorkOrder.id,
planned_start_time_start="2026-10-01",
planned_start_time_end="2026-12-31",
)
return str(
filtered.statement.compile(
dialect=mysql.dialect(), compile_kwargs={"literal_binds": True}
)
)
finally:
db.close()
def test_planned_start_filter_keeps_date_bounds_without_status_hardcodes():
sql = _compile_planned_start_sql().lower()
assert "planned_start_time" in sql
assert "2026-10-01 00:00:00" in sql
assert "2026-12-31 23:59:59" in sql
# 不再在 EXISTS 内强制待配置/进行中或未完成步骤
assert "work_order_status in (" not in sql
assert "task_status in (" not in sql
assert "step_status !=" not in sql
assert "step_status <>" not in sql
@@ -1,10 +1,18 @@
"""协议列表可显式读取 V2 样本方案,其他费用摘要消费者保持原行为。"""
from datetime import datetime
from decimal import Decimal
import pytest
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
from app.models.base import Base
from app.models.models import BizProtocolSamplePayment
from app.models.models import (
BizProtocolPaymentSchedule,
BizProtocolPaymentTransfer,
BizProtocolRefundRecord,
BizProtocolSamplePayment,
)
from app.services.qc_work_order_fee_summary import build_protocol_payment_summaries
@@ -31,3 +39,180 @@ def test_protocol_list_uses_active_tenant_v2_payment_modes(modes, expected, labe
assert result['p1']['payModeLabel'] == label
assert build_protocol_payment_summaries(db, ['p1'], 'tenant-a') == {}
engine.dispose()
def test_protocol_list_fills_received_from_v2_sample_transfers():
engine = create_engine('sqlite:///:memory:')
Base.metadata.create_all(engine)
with sessionmaker(bind=engine)() as db:
db.add_all(
[
BizProtocolSamplePayment(
id='sp-dj',
collection_protocol_id='p-v2',
sample_code='S1',
pay_mode='dj',
contract_amount=Decimal('12800'),
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolSamplePayment(
id='sp-fq',
collection_protocol_id='p-v2',
sample_code='S2',
pay_mode='fq',
contract_amount=Decimal('22880'),
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentSchedule(
id='sch-dj-1',
sample_payment_id='sp-dj',
collection_protocol_id='p-v2',
sample_code='S1',
schedule_no=1,
due_amount=Decimal('12800'),
due_date='20260915',
schedule_status='cleared',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentSchedule(
id='sch-fq-1',
sample_payment_id='sp-fq',
collection_protocol_id='p-v2',
sample_code='S2',
schedule_no=1,
due_amount=Decimal('6480'),
due_date='20260915',
schedule_status='cleared',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentSchedule(
id='sch-fq-2',
sample_payment_id='sp-fq',
collection_protocol_id='p-v2',
sample_code='S2',
schedule_no=2,
due_amount=Decimal('16400'),
due_date='20261015',
schedule_status='open',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentTransfer(
id='tr-dj',
schedule_id='sch-dj-1',
sample_payment_id='sp-dj',
collection_protocol_id='p-v2',
sample_code='S1',
transfer_amount=Decimal('12800'),
transfer_time=datetime(2026, 9, 15, 12, 0, 0),
pay_status='yjf',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentTransfer(
id='tr-fq',
schedule_id='sch-fq-1',
sample_payment_id='sp-fq',
collection_protocol_id='p-v2',
sample_code='S2',
transfer_amount=Decimal('6480'),
transfer_time=datetime(2026, 9, 15, 11, 13, 1),
pay_status='yjf',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentTransfer(
id='tr-pending',
schedule_id='sch-fq-2',
sample_payment_id='sp-fq',
collection_protocol_id='p-v2',
sample_code='S2',
transfer_amount=None,
transfer_time=None,
pay_status='dfj',
tenant_no='tenant-a',
del_flag=0,
),
]
)
db.commit()
result = build_protocol_payment_summaries(
db, ['p-v2'], 'tenant-a', include_sample_payment_modes=True
)
summary = result['p-v2']
assert summary['payMode'] == 'djfq'
assert summary['contractAmount'] == 35680.0
assert summary['receivedAmount'] == 19280.0
assert summary['pendingAmount'] == 16400.0
details = summary['paymentDetails']
assert len(details) == 3
first = [d for d in details if d['installmentNo'] == 1]
assert sum(float(d['dueAmount'] or 0) for d in first) == 19280.0
assert sum(float(d['transferAmount'] or 0) for d in first) == 19280.0
# 未开启 include 时不补齐 V2 已收(质检费用摘要保持原语义)
plain = build_protocol_payment_summaries(db, ['p-v2'], 'tenant-a')
assert plain['p-v2'].get('receivedAmount') is None
assert plain['p-v2'].get('paymentDetails') == []
engine.dispose()
def test_protocol_list_fills_refund_amount_from_v2_refund_records():
engine = create_engine('sqlite:///:memory:')
Base.metadata.create_all(engine)
with sessionmaker(bind=engine)() as db:
db.add_all(
[
BizProtocolSamplePayment(
id='sp-void',
collection_protocol_id='p-void',
sample_code='S9',
pay_mode='dj',
contract_amount=Decimal('5000'),
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentSchedule(
id='sch-void',
sample_payment_id='sp-void',
collection_protocol_id='p-void',
sample_code='S9',
schedule_no=1,
due_amount=Decimal('5000'),
due_date='20260918',
schedule_status='cleared',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolPaymentTransfer(
id='tr-void',
schedule_id='sch-void',
sample_payment_id='sp-void',
collection_protocol_id='p-void',
sample_code='S9',
transfer_amount=Decimal('5000'),
transfer_time=datetime(2026, 9, 18, 14, 55, 4),
pay_status='yjf',
tenant_no='tenant-a',
del_flag=0,
),
BizProtocolRefundRecord(
id='rf-void',
collection_protocol_id='p-void',
refund_amount=Decimal('5000'),
refund_time=datetime(2026, 9, 19, 10, 0, 0),
tenant_no='tenant-a',
del_flag=0,
),
]
)
db.commit()
summary = build_protocol_payment_summaries(
db, ['p-void'], 'tenant-a', include_sample_payment_modes=True
)['p-void']
assert summary['receivedAmount'] == 5000.0
assert summary['refundAmount'] == 5000.0
engine.dispose()
+7
View File
@@ -60,6 +60,13 @@ Agent 需要你做决定时,会在当前回复里直接写出「待你确认
完整安装提供 `notify-question` 命令,由 Agent 在提问后调用,不是宿主自动弹窗钩子。当前支持用户 macOS 本机;其他系统或远程执行缺少本地播放条件时回退文字提醒,不代表你已听到。安装、更新、普通进度和结束答复不播放。细则见安装目录 `references/question-notification.md`。
### 在 Cursor 里听到提示音却看不到题时
- 提示音在整机播放,**不会自动跳到对应聊天**;请到正在跑 Agent 的会话里搜索「待你确认」。
- 输入框上方的 **Queued / Start Multitasking** 是你排队的后续消息,**不是**确认清单。
- Cursor 会先跑工具再刷出最终正文,声音可能比清单早响一两秒;清单应出现在该轮助手正文开头。多会话并行时,切换其他进行中会话再搜一次。
- 工程内 Agent 适配约定见 [Cursor 确认可见性](cursor-question-visibility.md)。
## 日常开发怎么提需求
| 场景 | 可以直接发送的示例 |
+33
View File
@@ -0,0 +1,33 @@
# Cursor 宿主:确认问题可见性
个人开发体系要求:先在用户可见回复写出「待你确认」,再播放本机提示音。Cursor Agent 的执行顺序与此不完全同构,本文件是工程内的 Cursor 适配约定;与安装目录 `references/planning.md`、`references/question-notification.md` 并用,冲突时以「用户必须先看见清单」为准。
## Cursor 执行顺序
1. 同轮内的**工具调用先执行**,最终助手正文后出现。
2. `notify-question`(`afplay`)若作为工具调用,提示音可能比「待你确认」正文早数秒响起。
3. 提示音在**整机**播放,不绑定当前聚焦的聊天标签;多会话并行时,声音来源会话可能不是眼前这个。
4. 输入框上方的 **Queued / Start Multitasking** 是用户排队的后续消息,**不是** Agent 确认清单。
## Agent 必须遵守
发问当轮:
1. **先写清单**:该轮最终用户可见回复必须以「待你确认」开头(或紧接一句定位后立刻出现该标题),按问题展示规则写全题、推荐、理由与未回复处理。
2. **同轮停手**:写出清单并(如需)播放提示音后,本轮不得再调用编辑、浏览器、继续实现等工具;依赖答复的工作等下一轮。允许的独立只读工作若与本题无关,应在发问**之前**做完,或放到用户答复之后。
3. **提示音时机**:需要播放时,`notify-question` 必须是本轮**最后一次**工具调用,且本轮最终正文就是确认清单。禁止在仍计划继续工具批处理时提前播放。
4. **正文定位**:清单首段或标题下用一句说明「请在本会话回复;提示音不念题目,底部 Queued 不是确认入口。」
5. **无清单不播放**:最终正文没有「待你确认」时,不得调用 `notify-question`。
6. **原生卡片**:若当前 Cursor 会话提供宿主提问/确认卡片,可与清单并用,卡片内容须与「待你确认」一致;不得只用卡片、省略正文清单。
## 用户侧核对
听到「有问题待确认」时:
1. 看**正在或刚结束工具步骤的那个聊天**(不必先看 Queued)。
2. 在该会话搜索或上翻 **「待你确认」**;清单在工具时间线收折块之外的助手正文里。
3. 若多聊天并行,切换到其他进行中会话再搜同一标题。
## 静音与一分钟策略
声音开关、一分钟默认选择仍按安装目录规则;本文件不改变其语义,只约束 Cursor 下的展示与播音顺序。
@@ -1,6 +1,10 @@
-- Issue #24:协议单操作过程日志(before / action / after)
-- MySQL 5.7;可重复执行(CREATE IF NOT EXISTS)。上线前须备份并在目标副本验证。
-- DDL 隐式提交;该脚本不作为自动应用启动步骤。
--
-- 注意:若目标库已存在同名「采集协议单操作日志」旧表(含 collection_protocol_id /
-- operation_code 等列),本脚本会因 IF NOT EXISTS 直接跳过,不会纠偏。
-- 生产纠偏请改用:2026-11-09-protocol-operation-log-rebuild.sql
CREATE TABLE IF NOT EXISTS biz_protocol_operation_log (
id VARCHAR(64) NOT NULL,
@@ -0,0 +1,119 @@
-- =============================================================================
-- 协议操作日志:兼容生产旧表同名冲突,重建为 Issue #24 模型
-- MySQL 5.7;可重复执行。上线前须备份,并在目标副本验证。
--
-- 背景:
-- 生产曾有「采集协议单操作日志」同名表(collection_protocol_id / operation_*),
-- 与当前代码(biz_type / before_json / after_json)不兼容。
-- 旧脚本 2026-11-05-protocol-operation-log.sql 使用 CREATE IF NOT EXISTS,
-- 遇到旧表会直接跳过,无法纠偏。本脚本用于生产纠偏与新环境兜底。
--
-- 行为:
-- 1) 已是新模型(有 biz_type)→ 跳过结构变更
-- 2) 旧模型且 0 行 → DROP 后按新模型 CREATE
-- 3) 旧模型且有数据 → RENAME 为 biz_protocol_operation_log_legacy_20261109 再 CREATE
-- 4) 表不存在 → 直接 CREATE
-- =============================================================================
SET @db := DATABASE();
SET @table_exists := (
SELECT COUNT(*) FROM information_schema.tables
WHERE table_schema = @db AND table_name = 'biz_protocol_operation_log'
);
SET @has_legacy_col := (
SELECT COUNT(*) FROM information_schema.columns
WHERE table_schema = @db
AND table_name = 'biz_protocol_operation_log'
AND column_name = 'collection_protocol_id'
);
SET @has_new_col := (
SELECT COUNT(*) FROM information_schema.columns
WHERE table_schema = @db
AND table_name = 'biz_protocol_operation_log'
AND column_name = 'biz_type'
);
SET @is_legacy := IF(@table_exists > 0 AND @has_legacy_col > 0 AND @has_new_col = 0, 1, 0);
SET @legacy_rows := 0;
SET @cnt_sql := IF(
@is_legacy = 1,
'SET @legacy_rows = (SELECT COUNT(*) FROM `biz_protocol_operation_log`)',
'SET @legacy_rows = 0'
);
PREPARE pol_stmt FROM @cnt_sql;
EXECUTE pol_stmt;
DEALLOCATE PREPARE pol_stmt;
-- 空旧表:直接删除
SET @drop_sql := IF(
@is_legacy = 1 AND @legacy_rows = 0,
'DROP TABLE `biz_protocol_operation_log`',
'SELECT ''skip drop empty legacy biz_protocol_operation_log'' AS migration_status'
);
PREPARE pol_stmt FROM @drop_sql;
EXECUTE pol_stmt;
DEALLOCATE PREPARE pol_stmt;
-- 有数据的旧表:改名保留,避免丢历史(当前生产为 0 行,通常不会走到这里)
SET @legacy_backup_exists := (
SELECT COUNT(*) FROM information_schema.tables
WHERE table_schema = @db AND table_name = 'biz_protocol_operation_log_legacy_20261109'
);
SET @rename_sql := IF(
@is_legacy = 1 AND @legacy_rows > 0 AND @legacy_backup_exists = 0,
'RENAME TABLE `biz_protocol_operation_log` TO `biz_protocol_operation_log_legacy_20261109`',
IF(
@is_legacy = 1 AND @legacy_rows > 0 AND @legacy_backup_exists > 0,
'SELECT ''ERROR: legacy backup biz_protocol_operation_log_legacy_20261109 already exists; resolve manually'' AS migration_status',
'SELECT ''skip rename legacy biz_protocol_operation_log'' AS migration_status'
)
);
PREPARE pol_stmt FROM @rename_sql;
EXECUTE pol_stmt;
DEALLOCATE PREPARE pol_stmt;
-- 新模型建表(纠偏后或全新环境)
CREATE TABLE IF NOT EXISTS `biz_protocol_operation_log` (
`id` VARCHAR(64) NOT NULL COMMENT '主键ID',
`biz_type` VARCHAR(32) NOT NULL COMMENT '业务类型 cell_storage/research_donation',
`biz_id` VARCHAR(64) NOT NULL COMMENT '协议单或捐赠单ID',
`protocol_no` VARCHAR(64) NULL COMMENT '协议/捐赠编号快照',
`action` VARCHAR(32) NOT NULL COMMENT '动作 create/update/delete/void/activate/expire/to_research/to_storage/audit',
`client_channel` VARCHAR(16) NOT NULL DEFAULT 'web' COMMENT '来源端 web/mini',
`before_json` MEDIUMTEXT NULL COMMENT '操作前协议信息JSON',
`after_json` MEDIUMTEXT NULL COMMENT '操作后协议信息JSON',
`operator_user_id` VARCHAR(64) NULL COMMENT '操作人用户ID',
`operator_user_name` VARCHAR(64) NULL COMMENT '操作人姓名快照',
`operate_time` DATETIME NOT NULL COMMENT '业务操作时间',
`tenant_no` VARCHAR(64) NOT NULL COMMENT '租户编号',
`order_num` INT NULL COMMENT '排序号',
`remark` VARCHAR(512) NULL COMMENT '备注',
`create_by` VARCHAR(64) NULL COMMENT '创建人id',
`create_dept_id` VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
`create_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`update_by` VARCHAR(64) NULL COMMENT '更新人id',
`update_time` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`del_flag` SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (`id`),
KEY `ix_pol_biz` (`tenant_no`, `biz_type`, `biz_id`, `del_flag`),
KEY `ix_pol_time` (`tenant_no`, `operate_time`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='协议单操作过程日志';
-- 验收:新模型关键列应存在
SELECT
COLUMN_NAME,
COLUMN_TYPE,
IS_NULLABLE,
COLUMN_COMMENT
FROM information_schema.columns
WHERE table_schema = DATABASE()
AND table_name = 'biz_protocol_operation_log'
AND COLUMN_NAME IN (
'biz_type', 'biz_id', 'action', 'before_json', 'after_json',
'client_channel', 'operate_time', 'collection_protocol_id', 'operation_code'
)
ORDER BY ORDINAL_POSITION;
+2 -2
View File
@@ -49,11 +49,11 @@
/* 快应用特有相关 */
"quickapp" : {},
/* 小程序特有相关 */
/* 当前:生产 AppID;切测试时把 appid 改为下方测试值 */
/* 当前:测试 AppID;切生产时把 appid 改为下方生产值 */
/* 生产 AppID:wx2b139581f4c855e4 */
/* 测试 AppID:wxa261ad85f2c99b26 */
"mp-weixin" : {
"appid" : "wx2b139581f4c855e4",
"appid" : "wxa261ad85f2c99b26",
"setting" : {
"urlCheck" : false,
"es6" : true
+8
View File
@@ -95,6 +95,14 @@
"navigationBarTextStyle": "black"
}
},
{
"path": "pages/oa/file-preview/index",
"style": {
"navigationBarTitleText": "附件预览",
"navigationBarBackgroundColor": "#ecfdf5",
"navigationBarTextStyle": "black"
}
},
{
"path": "pages/market/webview/index",
"style": {
+196
View File
@@ -0,0 +1,196 @@
<template>
<view class="file-preview">
<view class="file-preview__tip">{{ tip }}</view>
</view>
</template>
<script>
import { API_BASE_URL, MINIO_BASE_URL } from '../../../utils/config.js'
import { getToken } from '../../../utils/auth.js'
import {
buildDirectMinioUrl,
pdfPreviewLog,
toAbsoluteDownloadUrl
} from '../../../utils/oa-pdf-preview-query.js'
import { parseFilePreviewQuery } from '../../../utils/oa-file-preview.js'
function absolutize(url) {
const abs = toAbsoluteDownloadUrl(url, {
apiBaseUrl: API_BASE_URL,
minioBaseUrl: MINIO_BASE_URL
})
if (String(url || '').trim() && abs && abs !== url) {
pdfPreviewLog('file-preview absolutize', {
from: String(url).slice(0, 120),
to: abs.slice(0, 160)
})
}
return abs
}
function directMinio(fileUrl) {
return buildDirectMinioUrl(fileUrl, {
apiBaseUrl: API_BASE_URL,
minioBaseUrl: MINIO_BASE_URL
})
}
export default {
data() {
return {
tip: '正在打开附件…',
_opened: false
}
},
onLoad(query) {
pdfPreviewLog('file-preview onLoad raw query', query)
this.openFromQuery(query || {})
},
methods: {
async openFromQuery(query) {
const parsed = parseFilePreviewQuery(query)
const { fileUrl, legacyUrl, name, fileType, rawKeys } = parsed
pdfPreviewLog('file-preview parsed query', {
rawKeys,
name,
fileType,
fileUrlLen: fileUrl.length,
fileUrlPreview: fileUrl.slice(0, 160),
legacyUrlLen: legacyUrl.length,
legacyUrlPreview: legacyUrl.slice(0, 120),
hasToken: !!getToken(),
minioBase: String(MINIO_BASE_URL || '').slice(0, 80)
})
// 与 PDF 预览一致:优先 MinIO 公网直链;预签名经 /minio 改写后真机常 403。
let url = ''
let fallbackUrl = ''
let source = ''
if (legacyUrl) {
const absLegacy = absolutize(legacyUrl)
const direct = directMinio(fileUrl || legacyUrl)
if (direct && /^https?:\/\//i.test(direct)) {
url = direct
fallbackUrl = absLegacy && absLegacy !== direct ? absLegacy : ''
source = 'minio-direct(+legacy-fallback)'
} else {
url = absLegacy
source = 'query.url'
}
} else if (fileUrl) {
url = directMinio(fileUrl)
source = 'minio-direct'
pdfPreviewLog('file-preview minio-direct', {
urlPreview: String(url || '').slice(0, 160)
})
}
url = absolutize(url) || url
fallbackUrl = absolutize(fallbackUrl) || fallbackUrl
if (!url || !/^https?:\/\//i.test(url)) {
const reason = !fileUrl && !legacyUrl
? '缺少 fileUrl/url 参数(请确认小程序与 oa-h5 已同步部署)'
: '无法解析为 http(s) 下载地址'
pdfPreviewLog('file-preview invalid url', { reason, fileUrl, legacyUrl, url })
this.tip = '文件地址无效'
uni.showToast({ title: '文件地址无效', icon: 'none' })
return
}
pdfPreviewLog('file-preview open', {
source,
name,
fileType,
urlPreview: url.slice(0, 160),
hasFallback: !!fallbackUrl
})
this.openFile(url, name, fileType, fallbackUrl)
},
openFile(url, name, fileType, fallbackUrl) {
if (this._opened) return
this._opened = true
this._tryDownload(url, name, fileType, fallbackUrl, false)
},
_tryDownload(url, name, fileType, fallbackUrl, isRetry) {
pdfPreviewLog('file-preview downloadFile start', {
name,
fileType,
isRetry: !!isRetry,
urlPreview: String(url || '').slice(0, 160)
})
uni.downloadFile({
url,
success: (res) => {
const code = res && res.statusCode
pdfPreviewLog('file-preview downloadFile success', {
statusCode: code,
hasTemp: !!(res && res.tempFilePath),
isRetry: !!isRetry
})
if (code === 403 && fallbackUrl && !isRetry) {
pdfPreviewLog('file-preview 403 → retry fallback', {
fallbackPreview: String(fallbackUrl).slice(0, 160)
})
this._tryDownload(fallbackUrl, name, fileType, '', true)
return
}
if (!res || code !== 200 || !res.tempFilePath) {
this.tip = '下载失败' + (code ? '(' + code + ')' : '')
uni.showToast({
title: '下载失败' + (code ? ' ' + code : ''),
icon: 'none'
})
this._opened = false
return
}
const openOpts = {
filePath: res.tempFilePath,
showMenu: true,
success: () => {
pdfPreviewLog('file-preview openDocument success')
this.tip = '已打开预览'
setTimeout(() => {
uni.navigateBack({ fail: () => {} })
}, 300)
},
fail: (err) => {
pdfPreviewLog('file-preview openDocument fail', err)
this.tip = '无法打开附件,请通过右上角菜单转发或用其他应用打开'
uni.showToast({ title: '无法打开附件', icon: 'none' })
this._opened = false
}
}
if (fileType) openOpts.fileType = fileType
uni.openDocument(openOpts)
},
fail: (err) => {
pdfPreviewLog('file-preview downloadFile fail', err)
if (fallbackUrl && !isRetry) {
pdfPreviewLog('file-preview fail → retry fallback')
this._tryDownload(fallbackUrl, name, fileType, '', true)
return
}
this.tip = '下载失败'
uni.showToast({ title: '下载失败', icon: 'none' })
this._opened = false
}
})
}
}
}
</script>
<style scoped>
.file-preview {
min-height: 100vh;
padding: 48rpx 32rpx;
background: #f5f7fa;
}
.file-preview__tip {
text-align: center;
color: #64748b;
font-size: 28rpx;
}
</style>
+51
View File
@@ -0,0 +1,51 @@
/**
* OA / 市场附件:小程序宿主预览页的 query 与 openDocument 类型
*/
import {
pickQueryValue,
safeDecodeURIComponent
} from './oa-pdf-preview-query.js'
const OPEN_DOCUMENT_EXTS = {
pdf: 'pdf',
doc: 'doc',
docx: 'docx',
xls: 'xls',
xlsx: 'xlsx',
ppt: 'ppt',
pptx: 'pptx'
}
export function fileExtension(fileName) {
const match = String(fileName || '')
.trim()
.toLowerCase()
.match(/\.([a-z0-9]+)$/)
return match ? match[1] : ''
}
export function openDocumentFileType(fileName) {
const ext = fileExtension(fileName)
return OPEN_DOCUMENT_EXTS[ext] || ''
}
/**
* @returns {{ fileUrl: string, legacyUrl: string, name: string, fileType: string, rawKeys: string[] }}
*/
export function parseFilePreviewQuery(query) {
const rawKeys = Object.keys(query && typeof query === 'object' ? query : {})
const fileUrl = safeDecodeURIComponent(
pickQueryValue(query, ['fileUrl', 'fileurl', 'file_url', 'f'])
)
const legacyUrl = safeDecodeURIComponent(
pickQueryValue(query, ['url', 'downloadUrl', 'download_url'])
)
const name =
safeDecodeURIComponent(pickQueryValue(query, ['name', 'fileName', 'file_name', 'n'])) ||
'file.bin'
const fileType =
safeDecodeURIComponent(pickQueryValue(query, ['fileType', 'file_type', 't'])) ||
openDocumentFileType(name)
return { fileUrl, legacyUrl, name, fileType, rawKeys }
}
+25
View File
@@ -0,0 +1,25 @@
import assert from 'node:assert/strict'
import {
openDocumentFileType,
parseFilePreviewQuery
} from './oa-file-preview.js'
assert.equal(openDocumentFileType('a.xlsx'), 'xlsx')
assert.equal(openDocumentFileType('a.zip'), '')
const parsed = parseFilePreviewQuery({
fileUrl: encodeURIComponent('oa-approval/202610/abc.xlsx'),
n: 'file.xlsx'
})
assert.equal(parsed.fileUrl, 'oa-approval/202610/abc.xlsx')
assert.equal(parsed.name, 'file.xlsx')
assert.equal(parsed.fileType, 'xlsx')
const fallback = parseFilePreviewQuery({
f: 'oa-approval/x.pdf'
})
assert.equal(fallback.fileUrl, 'oa-approval/x.pdf')
assert.equal(fallback.name, 'file.bin')
assert.equal(fallback.fileType, '')
console.log('oa-file-preview: ok')
@@ -0,0 +1,110 @@
import test from 'node:test'
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import vm from 'node:vm'
import * as Vue from 'vue'
import { compile } from '@vue/compiler-dom'
import { projectValidation } from './project-assignment.js'
const source = readFileSync(new URL('../views/market/MarketModuleForm.vue', import.meta.url), 'utf8')
// Render the real loop/slot/ref structure; native host nodes need no browser or service.
const template = source.slice(source.indexOf('<template v-for="section in leadingSections"'), source.indexOf('\n\n <section'))
const render = new Function('Vue', compile(template, { prefixIdentifiers: true }).code)(Vue)
const submitSource = source.slice(source.indexOf('async function submit()'), source.indexOf('\nasync function confirmLeave()'))
const renderer = Vue.createRenderer({
createElement: () => ({}), createText: () => ({}), createComment: () => ({}),
insert(node, parent, anchor = null) {
parent.children ||= []
node.parent = parent
const index = parent.children.indexOf(anchor)
parent.children.splice(index < 0 ? parent.children.length : index, 0, node)
},
remove(node) {
const siblings = node.parent?.children || []
const index = siblings.indexOf(node)
if (index >= 0) siblings.splice(index, 1)
},
setText() {}, setElementText() {}, patchProp() {},
parentNode: (node) => node.parent,
nextSibling: (node) => {
const siblings = node.parent?.children || []
return siblings[siblings.indexOf(node) + 1] || null
}
})
async function mountForm({ role, mode = 'create', projectId = 'project-1', loading = false, error = '' }) {
const projectAssignment = Vue.ref(null)
const formData = Vue.ref({ source: 'research_donation', projectId })
const messages = [], requests = []
let validations = 0
const ProjectAssignmentField = {
setup(_, { expose }) {
expose({ validate() {
validations++
return projectValidation({ editing: mode === 'edit', required: true, projectId, loading, error })
} })
return () => Vue.h('div')
}
}
const Section = { setup: (_, { slots }) => () => slots.insert?.() }
const context = Vue.ref({ module: 'protocol', marketRole: role })
const app = renderer.createApp({
components: { MarketFormSection: Section, ProjectAssignmentField },
setup: () => ({
projectAssignment, context, formData, mode,
leadingSections: [{ key: 'customer' }, { key: 'protocol' }],
formOptions: {}, fieldsLocked: false, dirty: false,
sectionValue: () => ({}), searchProtocolCustomers() {}, setSectionValue() {},
uploadField() {}, handleFieldChange() {}, handleCustomerSelect() {}
}), render
})
app.mount({})
await Vue.nextTick()
const scope = {
projectAssignment, context, formData, mode: Vue.ref(mode),
submitting: Vue.ref(false), uploadPending: Vue.ref(0), isProtocolV2: Vue.ref(false),
isProtocolV1: Vue.ref(false), id: Vue.ref(mode === 'edit' ? 'record-1' : ''),
action: Vue.ref(mode), visibleSections: Vue.ref([]), dirty: Vue.ref(true),
showToast: (text) => messages.push(text), showSuccessToast: (text) => messages.push(text),
validateRequiredFields: () => '', buildMarketActionPayload: (_module, _action, data) => data,
sanitizeMarketPayload: (data) => data, buildPayload: () => formData.value,
AbortController, submitController: null, allowLeave: false,
saveMarketRecord: async (...args) => { requests.push(args); return { id: 'saved' } },
mountGuard: { isCurrent: () => true }, mountToken: 1,
resolveMarketSavedDetailId: () => 'saved', router: { replace: async () => {} },
route: { query: {} }, marketRecordNavigationQuery: () => ({}),
marketErrorMessage: (cause) => cause.message
}
const submit = vm.runInNewContext(`${submitSource}\nsubmit`, scope)
return { submit, messages, requests, app, validations: () => validations }
}
for (const role of ['specialist', 'manager']) {
for (const mode of ['create', 'edit']) {
test(`${role} ${mode}: a valid project reaches the save request`, async () => {
const form = await mountForm({ role, mode })
try {
await form.submit()
assert.equal(form.validations(), 1)
assert.equal(form.requests.length, 1)
assert.equal(form.requests[0][0].marketRole, role)
assert.deepEqual(form.messages, ['保存成功'])
} finally { form.app.unmount() }
})
}
for (const [state, message] of [
[{ projectId: '' }, '请选择所属项目'],
[{ loading: true }, '项目选项加载中,请稍后保存'],
[{ error: 'network' }, '项目选项加载失败,请重试后保存']
]) {
test(`${role}: ${message}`, async () => {
const form = await mountForm({ role, ...state })
try {
await form.submit()
assert.equal(form.validations(), 1)
assert.equal(form.requests.length, 0)
assert.deepEqual(form.messages, [message])
} finally { form.app.unmount() }
})
}
}
+19 -5
View File
@@ -1,7 +1,11 @@
/** 附件下载:优先后端预签名 URL,保证跨域场景保留原始文件名 */
/** 附件下载:小程序 WebView 走宿主原生页;其它环境用预签名 URL 打开 */
import { fetchAttachmentDownloadUrl } from '../api/oa.js'
import { attachmentFullUrl } from './attachment.js'
import {
isWeChatMiniWebView,
navigateToHostFilePreview
} from './host-file-preview-nav.js'
function openDownloadUrl(href, fileName) {
// 微信 web-view 对 a[download] 支持差;优先新开页打开带 Content-Disposition 的地址
@@ -17,13 +21,19 @@ function openDownloadUrl(href, fileName) {
document.body.removeChild(a)
}
async function openViaHostPreview(fileUrl, fileName, deps = {}) {
const navigate = deps.navigateToHostFilePreview || navigateToHostFilePreview
const detectMini = deps.isWeChatMiniWebView || isWeChatMiniWebView
if (!detectMini(deps.window)) return false
const nav = await navigate({ fileUrl, fileName }, { window: deps.window })
if (nav && nav.ok) return true
throw new Error((nav && nav.message) || '无法打开附件预览页')
}
/**
* @param {{ fileUrl?: string, url?: string, fileName?: string, name?: string }} file
*/
export async function downloadAttachmentFile(
file,
options = {}
) {
export async function downloadAttachmentFile(file, options = {}) {
const hasAuthorizedResolver = typeof options.fetchDownloadUrl === 'function'
const fetchDownloadUrl = options.fetchDownloadUrl || fetchAttachmentDownloadUrl
const fileUrl = String(file?.fileUrl || file?.url || '').trim()
@@ -31,6 +41,10 @@ export async function downloadAttachmentFile(
const explicitFileName = String(file?.fileName || file?.name || '').trim()
const fallbackFileName = explicitFileName || fileUrl.split('/').pop() || 'download'
// 小程序 WebView(含鸿蒙):跳转宿主 downloadFile + openDocument,避免 window.open 静默失败
const openedOnHost = await openViaHostPreview(fileUrl, fallbackFileName, options)
if (openedOnHost) return
try {
const res = await fetchDownloadUrl({
fileUrl,
@@ -18,6 +18,7 @@ test('uses an injected authorized resolver before opening the signed download ur
await downloadAttachmentFile(
{ fileUrl: 'market/specialist/protocol/a.png', fileName: '协议扫描件.png' },
{
isWeChatMiniWebView: () => false,
fetchDownloadUrl: async (payload) => {
requested = payload
return { downloadUrl: 'https://files.test/signed-download' }
@@ -52,6 +53,7 @@ test('never falls back to the raw object url when an authorized resolver rejects
downloadAttachmentFile(
{ fileUrl: 'https://files.test/private.pdf', fileName: '私密附件.pdf' },
{
isWeChatMiniWebView: () => false,
fetchDownloadUrl: async () => {
throw new Error('附件不存在或无权下载')
}
@@ -65,3 +67,54 @@ test('never falls back to the raw object url when an authorized resolver rejects
assert.deepEqual(opened, [])
})
test('mini program webview navigates to host file preview instead of window.open', async () => {
const originalWindow = globalThis.window
const opened = []
const navCalls = []
globalThis.window = {
open(href) {
opened.push(href)
return {}
}
}
try {
await downloadAttachmentFile(
{ fileUrl: 'oa-approval/202610/task.xlsx', fileName: '生产任务.xlsx' },
{
isWeChatMiniWebView: () => true,
navigateToHostFilePreview: async (payload) => {
navCalls.push(payload)
return { ok: true, via: 'test' }
},
fetchDownloadUrl: async () => {
throw new Error('should not fetch download-url in mini path')
}
}
)
} finally {
globalThis.window = originalWindow
}
assert.deepEqual(navCalls, [
{ fileUrl: 'oa-approval/202610/task.xlsx', fileName: '生产任务.xlsx' }
])
assert.deepEqual(opened, [])
})
test('mini program navigate failure surfaces as download error', async () => {
await assert.rejects(
downloadAttachmentFile(
{ fileUrl: 'oa-approval/x.xlsx', fileName: 'x.xlsx' },
{
isWeChatMiniWebView: () => true,
navigateToHostFilePreview: async () => ({
ok: false,
message: '无法跳转附件预览页'
})
}
),
/无法跳转附件预览页/
)
})
@@ -0,0 +1,178 @@
/**
* 微信 web-view → 小程序附件预览/下载页
* 对齐 OA 打印 PDF 的宿主跳转;避免 H5 window.open 在鸿蒙 ArkWeb 静默失败。
*/
import {
getOaPrintHostApis,
isWeChatMiniWebView,
printNavLog
} from '../oa/print/oa-pdf-preview-nav.js'
const OPEN_DOCUMENT_EXTS = new Set([
'pdf',
'doc',
'docx',
'xls',
'xlsx',
'ppt',
'pptx'
])
export function fileExtension(fileName) {
const match = String(fileName || '')
.trim()
.toLowerCase()
.match(/\.([a-z0-9]+)$/)
return match ? match[1] : ''
}
/** openDocument 支持的类型;其它扩展返回空串 */
export function openDocumentFileType(fileName) {
const ext = fileExtension(fileName)
return OPEN_DOCUMENT_EXTS.has(ext) ? ext : ''
}
/** query 只用 ASCII 名,避免 navigateTo 被中文撑爆;扩展名保留供宿主识别类型 */
export function asciiHostFileName(fileName) {
const ext = fileExtension(fileName) || 'bin'
return `file.${ext}`
}
/**
* @returns {{ path: string, queryLen: number, fileUrlLen: number, name: string, fileType: string }}
*/
export function buildHostFilePreviewPath({ fileUrl, fileName } = {}) {
const key = String(fileUrl || '').trim()
const name = asciiHostFileName(fileName)
const fileType = openDocumentFileType(name)
const q =
'fileUrl=' +
encodeURIComponent(key) +
'&f=' +
encodeURIComponent(key) +
'&n=' +
encodeURIComponent(name)
const path = '/pages/oa/file-preview/index?' + q
return {
path,
queryLen: q.length,
fileUrlLen: key.length,
name,
fileType
}
}
/**
* @returns {Promise<{ ok: boolean, via?: string, path?: string, message?: string, assumed?: boolean }>}
*/
export function navigateToHostFilePreview({ fileUrl, fileName } = {}, deps = {}) {
const { path, queryLen, fileUrlLen, name, fileType } = buildHostFilePreviewPath({
fileUrl,
fileName
})
const win =
deps.window !== undefined
? deps.window
: typeof window !== 'undefined'
? window
: undefined
const log = deps.log || printNavLog
const { wxApi, uniApi } = getOaPrintHostApis(win)
log('file-preview navigate start', {
fileUrlLen,
queryLen,
pathLen: path.length,
name,
fileType,
fileUrlPreview: String(fileUrl || '').slice(0, 120),
hasWindowWx: !!(win && win.wx),
hasWxMiniNavigate: !!(wxApi && wxApi.miniProgram && wxApi.miniProgram.navigateTo),
hasUniWebViewNavigate: !!(uniApi && uniApi.webView && uniApi.webView.navigateTo),
__wxjs_environment: win && win.__wxjs_environment
})
if (!String(fileUrl || '').trim()) {
log('file-preview navigate abort: empty fileUrl')
return Promise.resolve({ ok: false, message: '缺少 fileUrl' })
}
if (path.length > 900) {
log('file-preview warn path long', { pathLen: path.length })
}
const invokeNavigate = (label, navigateFn) =>
new Promise((resolve) => {
if (typeof navigateFn !== 'function') {
resolve(null)
return
}
let settled = false
const done = (result) => {
if (settled) return
settled = true
resolve(result)
}
try {
navigateFn({
url: path,
success: (res) => {
log(label + ' success', res)
done({ ok: true, via: label, path })
},
fail: (err) => {
log(label + ' fail', err)
done({
ok: false,
via: label,
path,
message: (err && (err.errMsg || err.message)) || 'navigateTo fail'
})
}
})
setTimeout(() => {
if (!settled) {
log(label + ' no-callback → assume ok', { pathLen: path.length })
done({ ok: true, via: label, path, assumed: true })
}
}, 80)
} catch (e) {
log(label + ' throw', String(e && e.message ? e.message : e))
done({
ok: false,
via: label,
path,
message: String(e && e.message ? e.message : e)
})
}
})
return invokeNavigate(
'wx.miniProgram.navigateTo',
wxApi && wxApi.miniProgram && wxApi.miniProgram.navigateTo
? wxApi.miniProgram.navigateTo.bind(wxApi.miniProgram)
: null
).then((wxRes) => {
if (wxRes && wxRes.ok) return wxRes
if (wxRes && wxRes.ok === false) {
log('file-preview wx failed, try uni', wxRes.message)
}
return invokeNavigate(
'uni.webView.navigateTo',
uniApi && uniApi.webView && uniApi.webView.navigateTo
? uniApi.webView.navigateTo.bind(uniApi.webView)
: null
).then((uniRes) => {
if (uniRes) return uniRes
if (wxRes) return wxRes
log('file-preview navigate unavailable')
return {
ok: false,
message: '无法跳转附件预览页:未找到 wx/uni navigateTo'
}
})
})
}
export { isWeChatMiniWebView }
@@ -0,0 +1,36 @@
import assert from 'node:assert/strict'
import test from 'node:test'
import {
asciiHostFileName,
buildHostFilePreviewPath,
openDocumentFileType
} from './host-file-preview-nav.js'
test('ascii host file name keeps extension only', () => {
assert.equal(asciiHostFileName('26-10生产任务.xlsx'), 'file.xlsx')
assert.equal(asciiHostFileName('report.PDF'), 'file.pdf')
assert.equal(asciiHostFileName('plain'), 'file.bin')
})
test('openDocument file types cover office docs', () => {
assert.equal(openDocumentFileType('a.xlsx'), 'xlsx')
assert.equal(openDocumentFileType('a.XLS'), 'xls')
assert.equal(openDocumentFileType('a.docx'), 'docx')
assert.equal(openDocumentFileType('a.zip'), '')
})
test('host file preview path is short and points at file-preview page', () => {
const built = buildHostFilePreviewPath({
fileUrl: 'oa-approval/202610/abc.xlsx',
fileName: '26-10生产任务.xlsx'
})
assert.ok(built.path.startsWith('/pages/oa/file-preview/index?'))
assert.ok(built.path.includes('fileUrl='))
assert.ok(built.path.includes('&f='))
assert.ok(built.path.includes('&n=file.xlsx'))
assert.equal(built.fileType, 'xlsx')
assert.ok(!built.path.includes('%E7%94%9F'))
assert.ok(built.queryLen < 400)
assert.ok(built.path.length < 500)
})
@@ -46,7 +46,7 @@
>
<template #insert>
<ProjectAssignmentField
ref="projectAssignment"
:ref="(instance) => (projectAssignment = instance)"
embedded
v-model="formData.projectId"
:biz-type="formData.source"
@@ -704,6 +704,19 @@ function fileStamp(): string {
return `${stamp.getFullYear()}${pad(stamp.getMonth() + 1)}${pad(stamp.getDate())}${pad(stamp.getHours())}${pad(stamp.getMinutes())}${pad(stamp.getSeconds())}`
}
const LEDGER_CELL_BORDER = {
top: { style: 'thin' as const },
left: { style: 'thin' as const },
bottom: { style: 'thin' as const },
right: { style: 'thin' as const }
}
const LEDGER_HEADER_FILL = {
type: 'pattern' as const,
pattern: 'solid' as const,
fgColor: { argb: 'FFFFFF00' }
}
export async function saveCollectionLedgerWorkbook(
sheetName: string,
headers: string[],
@@ -715,25 +728,31 @@ export async function saveCollectionLedgerWorkbook(
const FileSaver = (await import('file-saver')).default
const workbook = new ExcelJS.Workbook()
const sheet = workbook.addWorksheet(sheetName)
const colCount = headers.length
const headerRow = sheet.addRow(headers)
headerRow.eachCell((cell) => {
for (let col = 1; col <= colCount; col += 1) {
const cell = headerRow.getCell(col)
cell.numFmt = '@'
cell.alignment = { wrapText: true, vertical: 'middle' }
})
cell.alignment = { wrapText: true, vertical: 'middle', horizontal: 'center' }
cell.fill = LEDGER_HEADER_FILL
cell.border = LEDGER_CELL_BORDER
}
rows.forEach((line) => {
const added = sheet.addRow(line)
line.forEach((value, index) => {
const cell = added.getCell(index + 1)
cell.value = value
for (let col = 1; col <= colCount; col += 1) {
const cell = added.getCell(col)
cell.value = line[col - 1] ?? ''
cell.numFmt = '@'
cell.alignment = { vertical: 'middle', horizontal: 'center', wrapText: true }
})
cell.border = LEDGER_CELL_BORDER
}
})
merges.forEach((merge) => {
if (merge.endRow <= merge.startRow) return
sheet.mergeCells(merge.startRow, merge.startCol, merge.endRow, merge.endCol)
const cell = sheet.getCell(merge.startRow, merge.startCol)
cell.alignment = { vertical: 'middle', horizontal: 'center', wrapText: true }
cell.border = LEDGER_CELL_BORDER
})
headers.forEach((header, index) => {
sheet.getColumn(index + 1).width = Math.min(28, Math.max(12, header.replace(/\n/g, '').length + 2))
@@ -56,12 +56,7 @@
<el-icon><Plus /></el-icon>
新增预签约
</el-button>
<el-button
v-if="COLLECTION_LEDGER_EXPORT_ENABLED"
class="btn-ghost"
:loading="exporting"
@click="handleExport"
>
<el-button class="btn-ghost" :loading="exporting" @click="handleExport">
<el-icon><Download /></el-icon>
导出 Excel
</el-button>
@@ -208,7 +203,6 @@
import { Plus, Search, RefreshLeft, Edit, Delete, Check, Download } from '@element-plus/icons-vue'
import { ElMessage } from 'element-plus'
import {
COLLECTION_LEDGER_EXPORT_ENABLED,
buildPresignLedgerRows,
fetchAllPages,
PRESIGN_HEADERS,
@@ -78,15 +78,41 @@
<el-icon><RefreshRight /></el-icon>重试
</el-button>
</el-alert>
<div v-if="assignment" class="list-toolbar">
<div class="list-toolbar-row">
<div class="list-toolbar-selected">
已选 <span class="sel-num">{{ selectedRows.length }}</span> 项
</div>
<el-button
type="primary"
class="btn-main"
:disabled="!selectedRows.length || busy"
@click="openBatch"
>
<el-icon><Edit /></el-icon>批量调整归属
</el-button>
</div>
</div>
<div class="list-body list-wrap"
><el-table
ref="tableRef"
:key="query.bizType"
:data="rows"
v-loading="loading"
class="list-table"
stripe
row-key="id"
:empty-text="loading ? '正在加载…' : loadError ? '数据加载失败' : '暂无符合条件的单据'"
@selection-change="handleSelectionChange"
>
<el-table-column
v-if="assignment"
type="selection"
min-width="48"
align="center"
header-align="center"
fixed
/>
<el-table-column
type="index"
label="序号"
@@ -151,26 +177,26 @@
>
<el-form class="form-grid-2" label-position="top">
<el-form-item label="原所属项目组">
<el-input :model-value="selected.teamName || '未归属'" disabled />
<el-input :model-value="originalTeamLabel" disabled />
</el-form-item>
<el-form-item label="原所属项目">
<el-input :model-value="selected.projectName || '未归属'" disabled />
<el-input :model-value="originalProjectLabel" disabled />
</el-form-item>
<el-form-item label="新项目组" required>
<ProjectSelect
:key="`team-${selected.id}`"
:key="`team-${dialogSelectKey}`"
team
v-model="targetTeamId"
:biz-type="selected.bizType"
:biz-type="dialogBizType"
@update:model-value="onTargetTeamChange"
/>
</el-form-item>
<el-form-item label="新项目" required>
<ProjectSelect
:key="`project-${selected.id}-${targetTeamId}`"
:key="`project-${dialogSelectKey}-${targetTeamId}`"
v-model="target"
:team-id="targetTeamId"
:biz-type="selected.bizType"
:biz-type="dialogBizType"
:disabled="!targetTeamId"
/>
</el-form-item>
@@ -262,6 +288,7 @@
page: 1,
pageSize: 20
})
const tableRef = ref<{ clearSelection?: () => void } | null>(null)
const rows = ref<ProjectRecord[]>([]),
total = ref(0),
statusCounts = ref<Record<string, number>>({}),
@@ -273,6 +300,8 @@
target = ref(''),
reason = ref(''),
selected = ref<ProjectRecord>({}),
selectedRows = ref<ProjectRecord[]>([]),
editTargets = ref<ProjectRecord[]>([]),
historyVisible = ref(false),
historyRows = ref<ProjectRecord[]>([])
const visibleColumns = computed(() =>
@@ -283,6 +312,39 @@
const keywordHint = computed(() =>
query.bizType === 'presign' ? '请输入单据编号' : assignmentKeywordHints[query.bizType]
)
const dialogBizType = computed(
() =>
(editTargets.value[0]?.bizType ||
selected.value.bizType ||
query.bizType) as AssignmentBizType
)
const dialogSelectKey = computed(() => {
if (editTargets.value.length <= 1) {
return String(editTargets.value[0]?.id || selected.value.id || 'empty')
}
const firstId = editTargets.value[0]?.id || ''
const lastId = editTargets.value[editTargets.value.length - 1]?.id || ''
return `batch-${editTargets.value.length}-${firstId}-${lastId}`
})
const originalTeamLabel = computed(() => {
if (editTargets.value.length <= 1) {
return editTargets.value[0]?.teamName || selected.value.teamName || '未归属'
}
return `共 ${editTargets.value.length} 条`
})
const originalProjectLabel = computed(() => {
if (editTargets.value.length <= 1) {
return editTargets.value[0]?.projectName || selected.value.projectName || '未归属'
}
return `共 ${editTargets.value.length} 条`
})
function clearSelection() {
selectedRows.value = []
tableRef.value?.clearSelection?.()
}
function handleSelectionChange(selection: ProjectRecord[]) {
selectedRows.value = selection
}
let loadVersion = 0
function statusLabel(status: string) {
return query.bizType === 'presign'
@@ -307,6 +369,7 @@
loading.value = true
loadError.value = false
rows.value = []
clearSelection()
try {
const fetchRecords = props.assignment
? fetchAssignmentRecords
@@ -344,6 +407,7 @@
statusCounts.value = {}
visible.value = false
historyVisible.value = false
clearSelection()
search()
}
function switchBusiness(kind: AssignmentBizType) {
@@ -360,16 +424,41 @@
query.page = page
load()
}
function open(row: ProjectRecord) {
selected.value = row
function resetDialogForm(targets: ProjectRecord[]) {
editTargets.value = targets
selected.value = targets[0] || {}
targetTeamId.value = ''
target.value = ''
reason.value = ''
visible.value = true
}
function open(row: ProjectRecord) {
resetDialogForm([row])
}
function openBatch() {
if (!selectedRows.value.length) {
ElMessage.warning('请先选择要调整的记录')
return
}
resetDialogForm([...selectedRows.value])
}
function onTargetTeamChange() {
target.value = ''
}
async function assignOne(row: ProjectRecord, projectId: string, assignReason: string) {
const preview = await previewAssignment({
bizType: row.bizType,
id: row.id,
projectId
})
await saveAssignment({
bizType: row.bizType,
id: row.id,
projectId,
reason: assignReason,
expectedAssignments: assignmentSnapshot(preview.records)
})
}
async function commit() {
if (!targetTeamId.value) {
ElMessage.warning('请选择新项目组')
@@ -383,33 +472,45 @@
ElMessage.warning('请填写调整原因')
return
}
const targets = editTargets.value.length ? [...editTargets.value] : [selected.value]
if (!targets.length || !targets[0]?.id) {
ElMessage.warning('请选择要调整的记录')
return
}
busy.value = true
const commitTarget = target.value
const commitRecord = selected.value
const commitReason = reason.value.trim()
const commitTargets = targets
let successCount = 0
let failCount = 0
try {
const preview = await previewAssignment({
bizType: selected.value.bizType,
id: selected.value.id,
projectId: target.value
})
if (selected.value !== commitRecord || target.value !== commitTarget || !visible.value) {
for (const row of commitTargets) {
if (target.value !== commitTarget || !visible.value) {
return
}
try {
await assignOne(row, commitTarget, commitReason)
successCount += 1
} catch {
failCount += 1
// API layer already surfaces the conflict / validation message.
}
}
if (target.value !== commitTarget || !visible.value) {
return
}
await saveAssignment({
bizType: selected.value.bizType,
id: selected.value.id,
projectId: target.value,
reason: reason.value.trim(),
expectedAssignments: assignmentSnapshot(preview.records)
})
if (selected.value !== commitRecord || target.value !== commitTarget || !visible.value) {
return
if (successCount > 0) {
visible.value = false
clearSelection()
if (failCount === 0) {
ElMessage.success(
commitTargets.length > 1 ? `已调整 ${successCount} 条归属` : '归属已调整'
)
} else {
ElMessage.warning(`成功 ${successCount} 条,失败 ${failCount} 条`)
}
await load()
}
visible.value = false
ElMessage.success('归属已调整')
await load()
} catch {
// API layer already surfaces the conflict / validation message.
} finally {
busy.value = false
}