cykj/zkxw
1
0 Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity
964 Commits 6 Branches 9 Tags
076e892df9899b89cb5f522f6e04f1d59027418a
Commit Graph
964 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zlwuandCursor 076e892df9 fix: Drone 打包命令对自定义环境变量使用 $${}，避免版本被预处理成空 
Co-authored-by: Cursor <cursoragent@cursor.com>
ci-test-v110-202610241109-verfix 		2026-10-24 11:09:24 +08:00
zlwuandCursor 07508e677b fix: Drone 流水线去掉与 runner 重复的 host volume 挂载 
Co-authored-by: Cursor <cursoragent@cursor.com>
ci-test-v110-202610241057-volfix 		2026-10-24 10:57:01 +08:00
zlwuandCursor bab304abd3 fix: Drone 打包步骤去掉 privileged，避免未 trusted 仓库被拒绝 
Co-authored-by: Cursor <cursoragent@cursor.com>
ci-test-v110-202610241053-nopriv 		2026-10-24 10:53:05 +08:00
zlwuandCursor 6a9a8bddd6 fix: Drone 生产包镜像与文件名固定为 v1.1.0，便于现网部署 
Co-authored-by: Cursor <cursoragent@cursor.com>
ci-test-v110-202610241052 		2026-10-24 10:51:20 +08:00
zlwuandCursor c2c5078ee6 feat: Drone 仅在 tag 时打生产 Docker 交付包到 /root/zkxw-releases 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-24 10:44:42 +08:00
zlwuandCursor ef7ea3c190 docs: 补充 Drone 构建 swap 与 clone depth 说明 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 16:15:29 +08:00
zlwuandCursor 61fdb6ebcd fix: Drone web-admin 构建提高 Node 堆到 3GB 以降低 OOM 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 16:07:51 +08:00
zlwuandCursor 5651bcd85e fix: Drone 恢复默认 clone（depth=1），去掉慢速 apt 安装 git 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 16:02:01 +08:00
zlwuandCursor 17f3948dc7 docs: Drone 对外端口改为 18088 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 15:58:57 +08:00
zlwuandCursor 85f99ed757 fix: Drone 分步构建并限制 Node 堆，避免测试机 OOM 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 15:55:59 +08:00
zlwuandCursor b8b1631d46 fix: Drone 流水线去掉 pipefail，兼容 /bin/sh 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 15:35:55 +08:00
zlwuandCursor 97d73d835b fix: Drone 流水线改为自 clone，避免拉取 drone/git 失败 
关闭默认 clone，使用预拉的 node:20-bookworm；文档补充 daoCloud 预拉步骤。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 15:27:49 +08:00
zlwuandCursor a51d4e10aa feat: 测试机 Gogs 对接 Drone CI，仅编译打包不部署 
同机部署模板与 .drone.yml（web-admin/OA H5/backend 产物），入口端口 18080。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-23 15:14:09 +08:00
zlwuandCursor 33c24129b4 chore: 同步提交钩子更新后的知识图谱报告 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 09:23:35 +08:00
zlwuandCursor 063727a7d8 feat: 完善协议缴费分期、样本编码搜索与鸿蒙附件选择 
支持移动端样本编码远程关键字检索、分期起始日刷新与鸿蒙微信附件选取，并同步收款账户选择、角色页与相关设计文档。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-22 09:23:17 +08:00
zlwuandCursor 6e2656f999 fix: 顺丰月结导出失败时只提示一次，且不把其它错误说成没有数据 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 22:16:12 +08:00
zlwuandCursor a81f177cb6 feat: 增加顺丰月结列表，支持导出、结算和补填运费 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 20:17:45 +08:00
zlwuandCursor 77e8c78cb6 fix: 移动端关联已有顺丰批次显示月结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 20:08:13 +08:00
zlwuandCursor 9b34f9e1ba feat: 移动端和小程序的协议单、运费信息在选择顺丰时改为月结并填写单号 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:49:57 +08:00
zlwuandCursor 0fb3ee50e3 fix: 运费列表保留金额格式，空顺丰运费显示月结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:31:11 +08:00
zlwuandCursor d259004f9d fix: 关联已有和协议查看里的空顺丰运费显示月结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:23:33 +08:00
zlwuandCursor 9561f94074 feat: 网页配置顺丰运费时改为月结并填写顺丰单号 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:20:43 +08:00
zlwuandCursor afcb4e9ebe fix: 收款账户下拉在搜索无结果时不再说成没有账户 
有账户但关键字未命中时显示无匹配数据，只有列表本身为空才提示暂无本人的收款账户。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:17:54 +08:00
zlwuandCursor 0506fe7e8a fix: 发起审批时说明当前用户还没有收款账户 
两端选择器都只展示 options 接口返回的本人账户，空列表不再像是系统没有账户。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:13:30 +08:00
zlwuandCursor 545a4c5fc1 feat: 把顺丰月结菜单放在运费信息和缴费财务确认之间 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:08:43 +08:00
zlwuandCursor d37bb41948 feat: 收款账户管理页展示不可修改的所属人 
列表和查看能看出登记人，编辑时只读，避免把账户转给别人。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:08:32 +08:00
zlwuandCursor f76ef8a6e5 feat: 发起审批时拒绝不属于发起人的收款账户 
直接发起和草稿提交都走 start_instance，因此只在这一处核对账户归属。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 19:03:38 +08:00
zlwuandCursor 41e8d6f7c4 feat: 增加顺丰月结列表、结算和补填接口，市场端不能调用 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:54:16 +08:00
zlwuandCursor 7aa685840f feat: 收款账户选项只返回当前登记人并带上所属人姓名 
发起校验能识别已删除、他租户和他人账户，编辑账户不会改掉 create_by。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:45:43 +08:00
zlwuandCursor bd669ea77e fix: 已结算运费在协议保存时拒绝取消关联 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:41:31 +08:00
zlwuandCursor 96468f3c48 test: 锁定收款账户按登记人过滤和发起归属校验 
这些用例先失败，用来约束后续的选项接口和管理页展示。

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:37:52 +08:00
zlwuandCursor 11a46bf1eb feat: 顺丰运费保存单号并清空金额，已结算批次禁止改关联 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:25:54 +08:00
zlwuandCursor d67965aae2 fix: 样本上的空运费按空返回，避免顺丰月结显示成 0 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:10:46 +08:00
zlwuandCursor dd00dba39c fix: 运费金额为空时返回空值，便于顺丰批次展示月结 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 18:08:11 +08:00
zlwuandCursor 92c59d67b4 feat: 为运费批次增加顺丰单号和结算字段，并补上顺丰月结菜单 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 17:58:43 +08:00
zlwuandCursor 9325f8cf61 feat: 抽出顺丰月结的单号、金额和结算规则，供网页与市场端共用 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-21 17:45:38 +08:00
zlwuandCursor ac8e471aca fix: align sample registration, freight scope, and OA datetime display 
Let customer-service quick register write storage, certificate, and insurance separately without extra menu or data-scope checks. List freight by document data scope like the web admin, allow protocol staff outside the collection region, and pad OA datetimes to seconds so PC date pickers can show historical minute values.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-20 17:30:30 +08:00
zlwu 03fcc01d6d 提交 2026-10-17 17:36:14 +08:00
zlwuandCursor 3ceee48c00 style(web-admin): skin Fresh Mint info tags as barley soft. 
Align page/dialog el-tag--info with mobile market neutral tags
(#fff7e8 / #9a7020) so storage-service pending states match H5.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:08:03 +08:00
zlwuandCursor 19dffbaa49 fix(mobile-oa-h5): skin market neutral tags as barley soft. 
Map Element Plus info tones through Vant default and style them as
浅底大麦黄 so unpaid/pending tags stay visible and distinct from solid semantic tags.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 17:05:46 +08:00
zlwu be2226e4ca 提交 2026-10-17 11:46:53 +08:00
zlwuandCursor 48dcf991dc fix(mobile-oa-h5): finish storage-service tag tone parity for market details 
Wire detail header statusTone for protocol/payment/freight/chase from the
registry mirror, stop hardcoding primary on nested tags, and map 已过期 to
warning so title and field colors stay consistent.

Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 11:27:29 +08:00
zlwuandCursor d355cd0640 feat(mobile-oa-h5): inline payment detail transfers aligned with web dialog 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 11:12:23 +08:00
zlwuandCursor c825c170e7 refactor(mobile-oa-h5): extract ScheduleTransferEditor for shared transfer UI 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 11:04:14 +08:00
zlwuandCursor 9de7f5456e refactor(mobile-oa-h5): allow transfer helpers to use payment contextId 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 10:56:43 +08:00
zlwuandCursor e2fee1d9c5 feat(mobile-oa-h5): open protocol from payment as readonly detail 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 10:55:59 +08:00
zlwuandCursor 80d238d31d feat(mobile-oa-h5): add payment-entry helpers for readonly protocol view 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-17 10:53:11 +08:00
zlwuandCursor 526c9029c8 fix(web-admin): rename presign collector label to 市场专员 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 17:45:30 +08:00
zlwuandCursor b545e5987c fix(web-admin): remove collector staff from payment confirm timeline 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 17:45:30 +08:00
zlwuandCursor d85c70a860 fix(web-admin): hide collector staff on research donation UI 
Co-authored-by: Cursor <cursoragent@cursor.com>
 2026-10-16 17:45:30 +08:00