Commits · 0b5f731541f3673beabce4fba524a2b3ddf340d7 · qinjianhui / factory_front · GitLab

07 Aug, 2026 1 commit
- feat: 订单添加质检流程 #1009863 · 0b5f7315
  wusiyi committed Aug 07, 2026
  
  0b5f7315 Browse Files
06 Aug, 2026 4 commits
- feat: 订单添加质检流程 #1009863 · b47669b4
  wusiyi committed Aug 06, 2026
  
  b47669b4 Browse Files
- Merge branch 'dev_pending_quality' of… · 16579bd0
```
Merge branch 'dev_pending_quality' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_pending_quality
```
  wusiyi committed Aug 06, 2026
  16579bd0 Browse Files
- feat：订单流程配置 #1011236 · e04bab3e
  wusiyi committed Aug 06, 2026
  
  e04bab3e Browse Files
- feat: 添加质检流程 #1009863 · e9da2e7e
  wusiyi committed Aug 06, 2026
  
  e9da2e7e Browse Files
05 Aug, 2026 3 commits
- Merge branch 'fix_1001961' into 'dev' · 18f72f82
```
Fix 1001961

See merge request !297
```
  wusiyi committed Aug 05, 2026
  18f72f82 Browse Files
- fix：修复接收到其他配货区信息导致箱子列表展示错乱bug #1001961 · 74787dd3
  wusiyi committed Aug 05, 2026
  
  74787dd3 Browse Files
- fix：修复接收到其他配货区信息导致箱子列表展示错乱bug #1001961 · 8967b965
  wusiyi committed Aug 05, 2026
  
  8967b965 Browse Files
04 Aug, 2026 5 commits
- Merge branch 'dev_finish_last' into 'dev' · 97b2d714
```
Dev finish last

See merge request !294
```
  wusiyi committed Aug 04, 2026
  97b2d714 Browse Files
- feat：订单质检流程#1011236 · c7c265e7
  wusiyi committed Aug 04, 2026
  
  c7c265e7 Browse Files
- feat：订单流程配置 #1011236 · 62486908
  wusiyi committed Aug 04, 2026
  
  62486908 Browse Files
- Merge branch 'dev_pending_quality' of… · 1b7616b7
```
Merge branch 'dev_pending_quality' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_pending_quality
```
  wusiyi committed Aug 04, 2026
  1b7616b7 Browse Files
- feat: 添加质检流程 #1009863 · 725f41ab
  wusiyi committed Aug 04, 2026
  
  725f41ab Browse Files
03 Aug, 2026 3 commits
- Merge branch 'dev_bug_update' into 'dev' · 08060a26
```
fix:bug修复

See merge request !292
```
  zhuzhequan committed Aug 03, 2026
  08060a26 Browse Files
- fix:bug修复 · 9deb8c3c
  zhuzhequan committed Aug 03, 2026
  
  9deb8c3c Browse Files
- feat: 快捷生产自动完成上一单 #1012121 · 493783b8
  wusiyi committed Aug 03, 2026
  
  493783b8 Browse Files
31 Jul, 2026 2 commits
- Merge branch 'dev_pending_quality' of… · ea291c61
```
Merge branch 'dev_pending_quality' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_pending_quality
```
  wusiyi committed Jul 31, 2026
  ea291c61 Browse Files
- feat: 添加质检流程 #1009863 · f5c8b937
  wusiyi committed Jul 31, 2026
  
  f5c8b937 Browse Files
30 Jul, 2026 21 commits
- Merge remote-tracking branch 'origin/dev' into dev · 6c4e5824
```
# Conflicts:
#	components.d.ts
#	src/api/order.ts
```
  zhuzhequan committed Jul 30, 2026
  6c4e5824 Browse Files
- fix:bug修复 · 2a89cc86
  zhuzhequan committed Jul 30, 2026
  
  2a89cc86 Browse Files
- Merge branch 'dev_logistic_sort_rule' into 'dev' · a690a9b4
```
Dev logistic sort rule

See merge request !288
```
  wusiyi committed Jul 30, 2026
  a690a9b4 Browse Files
- Merge branch 'fix_1001679' into 'dev' · bd79ca49
```
Fix 1001679

See merge request !287
```
  wusiyi committed Jul 30, 2026
  bd79ca49 Browse Files
- Merge branch 'dev_sorting_rule' into 'dev' · 46551e46
```
Dev sorting rule

See merge request !286
```
  wusiyi committed Jul 30, 2026
  46551e46 Browse Files
- Merge branch 'dev_sorting_rule' of… · 0a8d4cec
```
Merge branch 'dev_sorting_rule' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_sorting_rule
```
  wusiyi committed Jul 30, 2026
  0a8d4cec Browse Files
- fix: elementPlus样式适配 · 7f1261a3
  wusiyi committed Jul 30, 2026
  
  7f1261a3 Browse Files
- fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896 · dcee8831
  wusiyi committed Jul 30, 2026
  
  dcee8831 Browse Files
- fix: 待接单查询分页数据接口返回结果为空bug修复 #1001896 · 4a0f9012
  wusiyi committed Jul 30, 2026
  
  4a0f9012 Browse Files
- fix: 样式调整 · ab2f1dda
  wusiyi committed Jul 30, 2026
  
  ab2f1dda Browse Files
- feat: 配货分拣样式调整 · 24979309
  wusiyi committed Jul 30, 2026
  
  24979309 Browse Files
- feat: 展示商品类目 #1010170 · 1325871a
  wusiyi committed Jul 30, 2026
  
  1325871a Browse Files
- feat: 展示商品类目 #1010170 · 8fc34b81
  wusiyi committed Jul 30, 2026
  
  8fc34b81 Browse Files
- chore: 升级 element-plus 至2.14版本 · 73313386
  wusiyi committed Jul 30, 2026
  
  73313386 Browse Files
- fix: bug · 54ce2ac9
  wusiyi committed Jul 30, 2026
  
  54ce2ac9 Browse Files
- feat: 展示商品类目 #1010170 · f48efd31
  wusiyi committed Jul 30, 2026
  
  f48efd31 Browse Files
- feat: 展示商品类目 #1010170 · 7436780b
  wusiyi committed Jul 30, 2026
  
  7436780b Browse Files
- chore: 升级 element-plus 至2.14版本 · 8ad7dc9f
  wusiyi committed Jul 30, 2026
  
  8ad7dc9f Browse Files
- feat: 配货分拣规则支持商品类目条件 #1010170 · f2eff035
  wusiyi committed Jul 30, 2026
  
  f2eff035 Browse Files
- Merge branch 'refs/heads/release_v2.31.0' into dev_bug_update · 1196ab7d
```
# Conflicts:
#	components.d.ts
#	src/api/order.ts
```
  zhuzhequan committed Jul 30, 2026
  1196ab7d Browse Files
- fix:bug修复 · 2b26f4ab
  zhuzhequan committed Jul 30, 2026
  
  2b26f4ab Browse Files
29 Jul, 2026 1 commit
- fix: elementPlus样式适配 · 789cfb55
  wusiyi committed Jul 29, 2026
  
  789cfb55 Browse Files