Commit Graph
67 Commits
Author SHA1 Message Date
liuyihe 90e1e646ec 优化提交 2026-10-10 13:47:47 +08:00
ouyangxq 5751973c83 Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test 2026-10-10 02:20:16 +08:00
ouyangxq d7f8365ecc feat(procurement): show customer sample fulfillment and charges 2026-10-10 02:19:39 +08:00
liuyihe 509dc677cb 优化 2026-10-09 20:39:38 +08:00
liuyihe d2bbd5024b 优化 2026-10-09 15:25:27 +08:00
liuyihe 07ba9fcb7c 优化 2026-10-09 11:48:52 +08:00
ouyangxq 2aa20b7172 test(client): verify return labels preserve server print templates 2026-10-08 20:18:39 +08:00
liuyihe 0be4088fa9 优化 2026-10-08 15:34:37 +08:00
liuyihe ff0754810a 优化 2026-09-30 14:53:39 +08:00
liuyihe 151106250f Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test 2026-09-29 20:52:36 +08:00
liuyihe d45cd19361 优化 2026-09-29 20:52:34 +08:00
ouyangxq a427aca5c3 优化 2026-09-29 17:56:03 +08:00
ouyangxq ffbe3480a8 fix(client): align customs completion notice and warehouse labels 2026-09-28 17:01:36 +01:00
liuyihe 225e3b0e71 merge client changes into release/test 2026-09-28 17:32:06 +08:00
liuyihe f24674dddc 优化提交 2026-09-28 17:26:37 +08:00
ouyangxq e681eadfcd fix(client): complete warehouse transfer contracts 2026-09-28 15:04:54 +08:00
liuyihe aa189146a0 提交 2026-09-24 10:11:16 +08:00
liuyihe 671351fa7c 解决客户工作台合并冲突 2026-09-24 09:02:34 +08:00
liuyihe 6926e99bd2 提交 2026-09-24 08:55:27 +08:00
liuyihe bc5c56d0e4 贴标优化0923 2026-09-23 11:25:35 +08:00
ouyangxq 06e0598e39 Merge remote-tracking branch 'origin/release/test' into release/test
# Conflicts:
#	src/modules/overseas-warehouse/views/WarehouseServiceView.vue
2026-09-23 10:27:47 +08:00
liuyihe 25db3c1777 提交 2026-09-23 09:06:20 +08:00
liuyihe 5de5f30b20 合并 release/test 前端冲突 2026-09-22 08:51:26 +08:00
liuyihe eb884c2790 修改提交 2026-09-22 08:47:31 +08:00
wujinliang 0fa80874bc 1Merge branch 'release/test' of http://8.163.30.128:10082/html/client-web into release/test
# Conflicts:
#	src/modules/overseas-warehouse/views/WarehouseServiceView.vue
2026-09-21 19:37:33 +08:00
wujinliang b4403ab188 1 2026-09-21 19:36:37 +08:00
ouyangxq befd22af96 优化 2026-09-21 11:17:13 +08:00
liuyihe 4b7becf9c2 优化 2026-09-20 20:48:01 +08:00
liuyihe 63d1bcef26 优化样式 2026-09-20 17:53:41 +08:00
liuyihe 308f7573c1 优化 2026-09-20 16:55:27 +08:00
ouyangxq 486d5163b2 优化 2026-09-20 16:02:10 +08:00
liuyihe 375e5e53ce merge release test changes and preserve local frontend updates 2026-09-20 15:23:50 +08:00
ouyangxq 514abf6eda 优化 2026-09-19 17:02:11 +08:00
ouyangxq 1d407620d2 优化 2026-09-18 16:48:35 +08:00
ouyangxq 5542ee80e6 优化 2026-09-17 18:32:43 +08:00
ouyangxq f5f5525a1b 优化 2026-09-17 18:25:08 +08:00
liuyihe 958da32b00 优化 2026-09-17 16:34:51 +08:00
liuyihe 8024fd4717 优化 2026-09-17 13:36:20 +08:00
liuyihe 9d6fde286b 优化 2026-09-15 15:20:35 +08:00
liuyihe ecd0317b58 优化 2026-09-14 16:51:43 +08:00
liuyihe 7e4c452608 Merge test into dev 2026-09-14 12:06:46 +08:00
liuyihe ad02451065 优化 2026-09-14 12:01:13 +08:00
ouyangxq cd057845bf Merge origin/dev into release/test preserving current workflows 2026-09-14 11:05:47 +08:00
ouyangxq 7286d08975 fix: 补齐海外仓服务输入提示 2026-09-14 10:22:20 +08:00
liuyihe ad4710fac2 优化 2026-09-13 21:10:14 +08:00
ouyangxq 12edb30cf1 fix(client): align return inventory desktop filters and display labels 2026-09-12 16:28:02 +08:00
ouyangxq 61a562b828 fix(client): correct return inventory carton paging and label printing 2026-09-12 16:16:40 +08:00
ouyangxq 53c48501dc fix: keep return forecast labels on one line 2026-09-11 15:33:55 +08:00
ouyangxq e1eabf2946 fix: avoid duplicate return order loading 2026-09-11 15:30:46 +08:00
ouyangxq 55914382de fix: improve return receipt client display 2026-09-11 15:28:19 +08:00