Commits · 5627765bb08e87b4f3f8a8425525dbe79577be7f · qinjianhui / factory_front · GitLab

21 Jul, 2026 8 commits
- Merge branch 'dev_logistic_sort_rule' of… · 5627765b
```
Merge branch 'dev_logistic_sort_rule' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_logistic_sort_rule
```
  wusiyi committed Jul 21, 2026
  5627765b Browse Files
- fix: bug · 52dddba4
  wusiyi committed Jul 21, 2026
  
  52dddba4 Browse Files
- fix: 修复placeholder不展示bug · 395c6008
  wusiyi committed Jul 21, 2026
  
  395c6008 Browse Files
- fix: 样式调整 · f185347d
  wusiyi committed Jul 21, 2026
  
  f185347d Browse Files
- feat: 物流分拣规则改造，支持平台+物流公司条件 #1010010 · 13127b47
  wusiyi committed Jul 21, 2026
  
  13127b47 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 18 commits
- 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
- Merge branch 'dev_logistic_sort_rule' of… · 0c32e1a1
```
Merge branch 'dev_logistic_sort_rule' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_logistic_sort_rule
```
  wusiyi committed Jul 20, 2026
  0c32e1a1 Browse Files
- fix: bug · bc2d5c47
  wusiyi committed Jul 20, 2026
  
  bc2d5c47 Browse Files
- fix: 修复placeholder不展示bug · fe793606
  wusiyi committed Jul 20, 2026
  
  fe793606 Browse Files
- fix: 样式调整 · e1d5b669
  wusiyi committed Jul 20, 2026
  
  e1d5b669 Browse Files
- feat: 物流分拣规则改造，支持平台+物流公司条件 #1010010 · b389981e
  wusiyi committed Jul 20, 2026
  
  b389981e 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
- fix: bug · eeb873e5
  wusiyi committed Jul 20, 2026
  
  eeb873e5 Browse Files
- fix: 修复placeholder不展示bug · ff9477d7
  wusiyi committed Jul 20, 2026
  
  ff9477d7 Browse Files
17 Jul, 2026 5 commits
- 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
- Merge branch 'dev_logistic_sort_rule' of… · 027ce30b
```
Merge branch 'dev_logistic_sort_rule' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_logistic_sort_rule
```
  wuqian committed Jul 17, 2026
  027ce30b Browse Files
- fix: 样式调整 · 6b81ed2e
  wusiyi committed Jul 17, 2026
  
  6b81ed2e Browse Files
- feat: 物流分拣规则改造，支持平台+物流公司条件 #1010010 · c4db0266
  wusiyi committed Jul 17, 2026
  
  c4db0266 Browse Files
16 Jul, 2026 2 commits
- 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 2 commits
- fix: 修复配货打单/配货分拣断线自动重连未发送消息订阅bug #1001825 · 0412a532
  wusiyi committed Jul 14, 2026
  
  0412a532 Browse Files
- fix: 修复配货打单/配货分拣断线自动重连未发送消息订阅bug #1001825 · 757ff15f
  wusiyi committed Jul 14, 2026
  
  757ff15f Browse Files
13 Jul, 2026 3 commits
- Merge branch 'fix_1001824' into 'dev' · e76438b8
```
fix: 修复配货打单接收到配货分拣ws消息bug #1001824

See merge request !261
```
  wusiyi committed Jul 13, 2026
  e76438b8 Browse Files
- fix: 修复配货打单接收到配货分拣ws消息bug #1001824 · f89a7b05
  wusiyi committed Jul 13, 2026
  
  f89a7b05 Browse Files
- feat: 操作单号查询需支持二维码扫描识别出来的单号 #1010763 · 72aef730
  wusiyi committed Jul 13, 2026
  
  72aef730 Browse Files
10 Jul, 2026 2 commits
- Merge branch 'dev_order_new_optimize' of… · 291580cc
```
Merge branch 'dev_order_new_optimize' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_order_new_optimize
```
  wusiyi committed Jul 10, 2026
  291580cc Browse Files
- feat: 工厂订单new界面优化 #1010397 · 47987081
  wusiyi committed Jul 10, 2026
  
  47987081 Browse Files