Commits · 87694731db5bb4f5b0d87d4f851df196905ae587 · qinjianhui / factory_front · GitLab

22 Jul, 2026 17 commits
- Merge branch 'dev' into 'master' · 87694731
```
Dev

See merge request !279
```
  qinjianhui committed Jul 22, 2026
  87694731 Browse Files
- Merge branch 'dev_share_inventory' into 'dev' · 6d298c26
```
Dev share inventory

See merge request !278
```
  qinjianhui committed Jul 22, 2026
  6d298c26 Browse Files
- fix: 问题修改 · 7f6046a3
  qinjianhui committed Jul 22, 2026
  
  7f6046a3 Browse Files
- fix: 修改路由名称 · b101687c
  qinjianhui committed Jul 22, 2026
  
  b101687c Browse Files
- Merge branch 'dev' into 'master' · 9aa459de
```
Dev

See merge request !277
```
  qinjianhui committed Jul 22, 2026
  9aa459de Browse Files
- fix: 问题修改 · c93e5c54
  qinjianhui committed Jul 22, 2026
  
  c93e5c54 Browse Files
- fix: 修改路由名称 · 278ecd7f
  qinjianhui committed Jul 22, 2026
  
  278ecd7f Browse Files
- feat：库存SKU展示共享库存SKU · d0b0184a
  qinjianhui committed Jul 22, 2026
  
  d0b0184a Browse Files
- fix: 页面加载添加loading · 850bd021
  qinjianhui committed Jul 22, 2026
  
  850bd021 Browse Files
- fix: 样式修改 · 4a1f4ebb
  qinjianhui committed Jul 22, 2026
  
  4a1f4ebb Browse Files
- feat: 删除功能调整 · b4e94928
  qinjianhui committed Jul 22, 2026
  
  b4e94928 Browse Files
- fix: enable drag-and-drop on entire SPU table rows · 138d026d
  qinjianhui committed Jul 22, 2026
  
  138d026d Browse Files
- fix: 查询SPU时，添加仓库筛选 · 8f33bdca
  qinjianhui committed Jul 22, 2026
  
  8f33bdca Browse Files
- feat: 共享库存接口联调 · ab69ed95
  qinjianhui committed Jul 22, 2026
  
  ab69ed95 Browse Files
- feat: 共享库存表格、新增页面 · 90edc8d4
  qinjianhui committed Jul 22, 2026
  
  90edc8d4 Browse Files
- fix: 共享库存页面 · 235f0069
  qinjianhui committed Jul 22, 2026
  
  235f0069 Browse Files
- fix: 添加菜单 · 5c27488d
  qinjianhui committed Jul 22, 2026
  
  5c27488d Browse Files
21 Jul, 2026 4 commits
- Merge branch 'dev' into 'master' · ca66d631
```
Dev

See merge request !274
```
  qinjianhui committed Jul 21, 2026
  ca66d631 Browse Files
- Merge branch 'dev_order_new_filter' into 'dev' · fb0cf8ba
```
Dev order new filter

See merge request !273
```
  wusiyi committed Jul 21, 2026
  fb0cf8ba Browse Files
- feat: 工厂订单筛选栏对齐、待接单展示延期时间 #1011590 · 34c25728
  wusiyi committed Jul 21, 2026
  
  34c25728 Browse Files
- feat: 工厂订单筛选栏对齐、待接单展示延期时间 #1011590 · 540d8b2e
  wusiyi committed Jul 21, 2026
  
  540d8b2e Browse Files
20 Jul, 2026 12 commits
- Merge branch 'dev' into 'master' · 2b8b9c96
```
Dev

See merge request !272
```
  wuqian committed Jul 20, 2026
  2b8b9c96 Browse Files
- Merge branch 'dev_factory_new' into 'dev' · be024416
```
Dev factory new

See merge request !271
```
  wuqian committed Jul 20, 2026
  be024416 Browse Files
- Merge branch 'dev_factory_new' of… · 78e680e2
```
Merge branch 'dev_factory_new' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_factory_new
```
  wuqian committed Jul 20, 2026
  78e680e2 Browse Files
- 全部状态待接单和已取消的所有状态正常展示延期时间的值 · 1de73eae
  wuqian committed Jul 20, 2026
  
  1de73eae Browse Files
- feat:工厂订单筛选操作单状态、订单列表展示延期时间#ID1011328 · 4118f798
  wuqian committed Jul 20, 2026
  
  4118f798 Browse Files
- Merge branch 'dev_new_status' into 'dev' · 839c1833
```
feat: 工厂订单左侧状态栏数据统计增加单位描述 #1010844

See merge request !270
```
  wusiyi committed Jul 20, 2026
  839c1833 Browse Files
- feat:工厂订单筛选操作单状态、订单列表展示延期时间#ID1011328 · bd00c32a
  wuqian committed Jul 20, 2026
  
  bd00c32a Browse Files
- Merge branch 'fix_1001825' into 'dev' · d4726efb
```
Fix 1001825

See merge request !269
```
  wusiyi committed Jul 20, 2026
  d4726efb Browse Files
- feat: 工厂订单左侧状态栏数据统计增加单位描述 #1010844 · d4f2c0e3
  wusiyi committed Jul 20, 2026
  
  d4f2c0e3 Browse Files
- Merge branch 'fix_1001825' of http://47.122.114.111:9999/qinjianhui/factory_front into fix_1001825 · 506e2e41
  wusiyi committed Jul 20, 2026
  
  506e2e41 Browse Files
- fix: 修复配货打单/配货分拣断线自动重连未发送消息订阅bug #1001825 · d0c435b7
  wusiyi committed Jul 20, 2026
  
  d0c435b7 Browse Files
- fix: 修复配货打单/配货分拣断线自动重连未发送消息订阅bug #1001825 · f48383a0
  wusiyi committed Jul 20, 2026
  
  f48383a0 Browse Files
17 Jul, 2026 3 commits
- Merge branch 'dev' · 6846d780
  wuqian committed Jul 17, 2026
  
  6846d780 Browse Files
- Merge branch 'dev_factory_new' into 'dev' · 54195e1d
```
工厂订单New-前端样式

See merge request !268
```
  Administrator committed Jul 17, 2026
  54195e1d Browse Files
- 工厂订单New-前端样式 · fa1d6fdb
  wuqian committed Jul 17, 2026
  
  fa1d6fdb Browse Files
16 Jul, 2026 3 commits
- Merge branch 'dev' into 'master' · ce169029
```
Dev

See merge request !267
```
  wusiyi committed Jul 16, 2026
  ce169029 Browse Files
- Merge branch 'dev_delivery_remark' into 'dev' · f44f8816
```
Dev delivery remark

See merge request !266
```
  wusiyi committed Jul 16, 2026
  f44f8816 Browse Files
- Merge branch 'dev_order_new_optimize' into 'dev' · cbb55ef3
```
Dev order new optimize

See merge request !265
```
  wusiyi committed Jul 16, 2026
  cbb55ef3 Browse Files
14 Jul, 2026 1 commit
- fix: 修复配货打单/配货分拣断线自动重连未发送消息订阅bug #1001825 · 0412a532
  wusiyi committed Jul 14, 2026
  
  0412a532 Browse Files