cykj/zkxw
1
0 Fork 0
Code Issues 3 Pull Requests Packages Projects Releases Wiki Activity
1,067 Commits 55 Branches 10 Tags
codex/issue-26-cs-export-samplecode
Commit Graph
1067 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zlwuandCursor 6df6306ef0 fix(web-admin): 客服导出协议编号列改用样本编码 
验收反馈要求客户服务管理导出表头「协议编号」填样本编码，避免与协议号混淆。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-06 11:52:45 +08:00
cykj 57049f17b0 Merge pull request 'feat(web-admin): 按采集大表导出预签约、自存、科研和客服表' (#66) from codex/issue-26-collection-ledger-b0b170257c35 into V2.0 
按采集大表导出预签约、自存、科研和客服表。
 2026-11-06 02:25:49 +00:00
zlwuandCursor a214a35f4f feat(web-admin): 按采集大表导出预签约、自存、科研和客服表 
市场人员需要把四张列表按采集大表对应工作表导出为 Excel 文本。补预签约列表的地区、医院、样本类型和转账时间，并沿用现有工具栏导出。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-06 10:05:11 +08:00
cykj faef6adf94 Merge pull request 'fix(web-admin): 样本接收弹窗不展示协议附件项' (#65) from codex/issue-43-reception-atts-fix-859e92e16ac2 into V2.0 
fix(web-admin): 样本接收弹窗不展示协议附件项 (#65)

Refs #43
 2026-11-05 15:05:59 +00:00
zlwuandCursor 9f37181478 fix(web-admin): 样本接收弹窗不展示协议附件项 
验收要求仅展示知情同意书与孕妇健康调查表，移除第三项「协议附件」分组。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 23:00:37 +08:00
cykj 00635740f1 Merge pull request 'fix(web-admin): 修复样本接收弹窗协议附件不展示' (#64) from codex/issue-43-reception-atts-fix-859e92e16ac2 into V2.0 
fix(web-admin): 修复样本接收弹窗协议附件不展示

Merge PR #64 for issue #43
 2026-11-05 14:43:28 +00:00
zlwuandCursor 76316fad7a fix(web-admin): 修复样本接收弹窗协议附件不展示 
弹窗改用与列表一致的 MiniReadonly 缩略图，并统一 attachmentFullUrl 解析 /minio 路径；编辑时合并详情附件字段，分组顺序优先知情同意书与调查表。

关联 #43

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 22:42:47 +08:00
cykj d4617b4988 Merge pull request 'fix(web-admin): 样本接收展示协议知情同意书等附件' (#63) from codex/issue-43-sample-reception-atts-f8ee4652859e into V2.0 
fix(web-admin): 样本接收展示协议知情同意书等附件

Merge PR #63 for issue #43
 2026-11-05 13:56:45 +00:00
zlwuandCursor c40feab76a fix(web-admin): 样本接收展示协议知情同意书等附件 
质检样本接收列表与弹窗需查看采集协议侧附件。后端待接收/已接收列表补齐协议附件字段；前端列表增加知情同意书缩略图，接收弹窗右侧改为上运输、下协议附件分组展示。

关联 #43

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 21:53:56 +08:00
cykj 9cf1110495 fix(mobile): 协议单表单项目归属移入协议信息 (#61) 
fix(mobile): 协议单表单项目归属移入协议信息 (#61)

Merged from PR #62
 2026-11-05 09:59:44 +00:00
zlwuandCursor fefef41524 fix(mobile): 协议单表单将项目归属移入协议信息分区 
按专员/经理协议单诉求，把项目归属嵌入协议信息卡片并置于协议状态上方，避免独立成卡打断填写顺序。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 17:57:57 +08:00
cykj e97f47b06a fix(mobile): 协议单列表项目筛选下移并补齐科研捐赠筛选 (#59) 
fix(mobile): 协议单列表项目筛选下移并补齐科研捐赠筛选 (#59)
 2026-11-05 09:14:29 +00:00
zlwuandCursor a4defb2c94 fix(mobile): 协议单列表项目筛选下移并补齐科研捐赠筛选 
将项目筛选并入搜索框下方的 van-dropdown 行，与协议状态样式一致；科研捐赠 Tab 同步展示两项筛选，并修复捐赠列表按 protocolStatus 过滤 donation_status。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 17:13:15 +08:00
cykj 8717702b58 fix(personal-dev): 结束 Gitea 短页评论翻页 (#57) 
Merge pull request #58 from cursor/issue-57-gitea-pagination

#57
 2026-11-05 09:00:54 +00:00
zlwuandCursor d30dbad788 fix(personal-dev): 结束 Gitea 短页评论翻页 (#57) 
避免评论列表短于 PAGE_SIZE 时因忽略 page 参数反复同页而触发分页上限。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 17:00:16 +08:00
cykj e92112e9fd fix(web-admin): 简化项目归属维护调整弹窗 (#52) 
Merge pull request #56 from cursor/issue-52-assignment-dialog

关联 #52
 2026-11-05 08:56:30 +00:00
zlwuandCursor d6dc768efb fix(web-admin): 加宽归属审计记录弹窗 (#52) 
历史归属维护页审计表格列较多，800px 偏挤，调整为 1100px。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 16:54:22 +08:00
zlwuandCursor 96518c08fb fix(web-admin): 简化项目归属维护调整弹窗 (#52) 
展示原项目组/项目，录入新项目组/项目与原因；确认时静默预览并仍级联关联单据。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 16:54:22 +08:00
cykj 54a34b24ba fix(web-admin): 协议单扁平行列表展示所属项目与项目组 (#55) 
fix(web-admin): 协议单扁平行列表展示所属项目与项目组 (#55)

Refs: #54
 2026-11-05 08:47:38 +00:00
zlwuandCursor 5dc695a138 fix(web-admin): 协议单扁平行列表展示所属项目与项目组 
采集协议单管理（细胞存储/科研捐赠）展平样本行时未拷贝项目归属字段，导致表格列空白；补齐展平字段并增加回归单测。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 16:45:33 +08:00
cykj 406ed0ee6d feat(project): 项目组变更写入版本历史快照 (#50) 
feat(project): 项目组变更写入版本历史快照 (#50)

Merged from PR #51 / issue #50.
 2026-11-05 07:09:37 +00:00
zlwuandCursor 6cba55f5c8 feat(project): 项目组变更写入版本历史快照 
每次创建/编辑/软删除项目组时追加 biz_project_team_history，
用完整 serialize 快照保留负责人、成员、地区与医院等信息，便于追溯。

Refs: #50
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 15:05:44 +08:00
cykj 352a4b7402 Merge pull request 'feat(project): 项目编号支持新增编辑自由填写' (#49) from codex/issue-45-project-leader-autofill-a9912a48015b into V2.0 2026-11-05 06:47:23 +00:00
zlwuandCursor e895daf8fc feat(project): 项目编号支持新增编辑自由填写 
项目管理弹窗增加项目编号输入；后端保存改为接收客户端编号并校验租户内唯一，不再自动生成。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 14:41:41 +08:00
cykj 3bdbefb56e Merge pull request 'feat(project): 选定所属项目组后自动带出负责人' (#46) from codex/issue-45-project-leader-autofill-a9912a48015b into V2.0 2026-11-05 06:39:14 +00:00
cykj ecfdf65d4f feat(web-admin): 项目组列表展示成员与负责医院 (#47) 
feat(web-admin): 项目组列表展示成员与负责医院

合入 #44 / PR #47
 2026-11-05 06:39:08 +00:00
zlwuandCursor 1fd1100b8f feat(web-admin): 项目组列表展示成员与负责医院 
在负责人列后追加成员、负责医院，复用列表接口已有子行名称并用顿号拼接。
关联 #44

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 14:33:02 +08:00
zlwuandCursor 2b2ddc8dd5 feat(project): 选定所属项目组后自动带出负责人 
项目管理新增/编辑弹窗选择或更换项目组时，用该组负责人填充表单负责人字段，仍可手工修改。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 14:32:13 +08:00
cykj 9af53e81f4 Merge pull request 'fix(qc): 调整检测清空重配不再误标工单已完成' (#42) from codex/issue-32-qc-adjust-status-84b58d9e903e into V2.0 
fix(qc): 调整检测清空重配不再误标工单已完成 (#42)

关联 #32
 2026-11-05 04:28:16 +00:00
zlwuandCursor 9e3a67a8e4 fix(qc): 调整检测清空重配不再误标工单已完成 
try_complete 在无活跃任务时也会把已配置打成已完成；清空全部后再添加会踩中。
现要求至少有一条活跃任务且全部完成后才自动完成，并强制全量重建时清理旧批次，前后端均校验批次须含检测项目。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 12:18:30 +08:00
cykj ebaab7d210 feat(protocol): 协议单操作日志埋点与查看入口 (#41) 
feat(protocol): 协议单操作日志埋点与查看入口

Closes related work for issue #24 (manual close after sync).
 2026-11-05 04:16:36 +00:00
zlwuandCursor ac9db561a4 fix(web-admin): 补齐捐赠查看操作日志接线并保留审核动作语义 
修复 DonationViewDialog 缺失的操作日志状态与加载调用，清理误插入的重置语句，并避免显式 audit 动作被状态映射覆盖。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 12:15:10 +08:00
zlwuandCursor 4a12d92631 feat(protocol): 记录协议单操作前后快照便于责任追溯 
为细胞存储与科研捐赠协议增加 append-only 操作日志，覆盖 Web/小程序 create/update/delete/状态类动作，并在查看弹窗与移动详情提供操作日志入口（Issue #24）。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 12:11:34 +08:00
cykj 1fb25f4fc2 Merge pull request 'fix(backend): 协议作废与样本接收废弃双向联动' (#40) from codex/issue-31-discard-sync-d7063ae6ff97 into V2.0 
fix(backend): 协议作废与样本接收废弃双向联动

Merge PR #40 for issue #31.
 2026-11-05 03:44:15 +00:00
zlwuandCursor e2e9059c17 fix(backend): sync protocol void with sample reception discard 
When a cell-storage or research-donation protocol is voided, mark all
related sample receptions as discarded; when every sample is discarded,
auto-void the protocol as 实验室废弃 (sysfq). Covers issue #31.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 11:37:58 +08:00
cykj 65aaaae885 Merge pull request 'fix(web-admin): 样本接收是否接收选项拒收改为废弃' (#39) from codex/issue-27-reject-to-discard-f4470ba481b0 into V2.0 
Merge pull request 'fix(web-admin): 样本接收是否接收选项拒收改为废弃' (#39) from codex/issue-27-reject-to-discard-f4470ba481b0 into V2.0
 2026-11-05 03:14:35 +00:00
zlwuandCursor 71051461a2 fix(web-admin): 样本接收「是否接收」选项拒收改为废弃 
质检样本接收登记弹窗与结论标签文案对齐工单 #27，取值 bj 不变。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 11:08:18 +08:00
zlwuandCursor 25c12ad4ff chore(agents): point Figma config to web and mobile design systems 
Replace the demo Figma reference with the confirmed web/mobile authority files and status notes so agent UI work follows the current design systems.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 11:00:53 +08:00
zlwu 5b440df17e Merge origin/V2.0: include list column order fix from #37 2026-11-05 10:55:34 +08:00
cykj 67846493fa Merge pull request 'fix(web-admin): 列表所属项目/项目组列移到序号之后' (#37) from codex/issue-34-list-col-order-20662a540e4e into V2.0 
fix(web-admin): 列表所属项目/项目组列移到序号之后 (#37)

Refs: #34
 2026-11-05 02:55:07 +00:00
zlwu 81154f4c94 Merge remote-tracking branch 'origin/V2.0' into V2.0 2026-11-05 10:50:41 +08:00
cykj 125398a3f5 Merge pull request 'fix(web): 加宽项目组新增编辑弹窗并调整字段布局' (#36) from codex/issue-33-team-dialog into V2.0 2026-11-05 02:49:53 +00:00
zlwu af730ad050 Merge remote-tracking branch 'origin/V2.0' into codex/issue-33-team-dialog 2026-11-05 10:48:32 +08:00
zlwu 2e21884d65 Merge remote-tracking branch 'origin/V2.0' into V2.0 2026-11-05 10:40:34 +08:00
cykj 6292badf8e Merge pull request 'fix(oa): 审批单 PDF 补齐评论、提及及附件链接' (#35) from codex/issue-30-oa-print-comments into V2.0 
User explicitly requested merging issue #30 before user testing. Acceptance remains pending; keep issue open.
 2026-11-05 02:40:21 +00:00
zlwu 5a55e9f574 fix(web): widen project team edit dialogs and give multi-select fields full rows 2026-11-05 10:35:08 +08:00
zlwu a511004812 fix(oa): include discussion comments and attachment links in approval PDFs 
Merge discussion comments into the existing printed approval flow on Web and mobile OA, preserving detail timeline order and hiding revoked content. Include mentions and absolute attachment URLs, and add PDF link annotations so rasterized exports retain usable links. Add regression tests for ordering, attachments, mentions and revoked comments. Related to Gitea issue #30.
 2026-11-05 10:27:39 +08:00
zlwu f1b4a5ce26 fix(web-admin): place project columns after index in lists 
Move 所属项目/项目组 after selection and serial-number columns so multi-select and index stay leftmost across affected business lists.
 2026-11-05 10:26:59 +08:00
zlwuandCursor 01fef051da chore(cursor): enable the Figma plugin 
The screen baseline is drawn in the shared Figma file, so the workspace plugin needs to stay enabled.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-11-05 06:45:27 +08:00
cykj 7ac2ff282c Merge pull request 'feat(project): add a standalone presign statistics column' (#22) from codex/issue-13-project-statistics into V2.0 2026-11-04 06:55:22 +00:00