Commits · ca66d631804d4b27c12065084b8ba6358ca3d71b · qinjianhui / factory_front · GitLab

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 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 4 commits
- Merge branch 'dev' into 'master' · 31d03a6d
```
Dev

See merge request !262
```
  wusiyi committed Jul 13, 2026
  31d03a6d Browse Files
- 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 12 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
- feat: 工厂订单new界面优化 #1010397 · b9249a46
  wusiyi committed Jul 10, 2026
  
  b9249a46 Browse Files
- Merge branch 'dev_delivery_remark' of… · 5441a53f
```
Merge branch 'dev_delivery_remark' of http://47.122.114.111:9999/qinjianhui/factory_front into dev_delivery_remark
```
  wusiyi committed Jul 10, 2026
  5441a53f Browse Files
- fix: 切换仓库配货区时清空平台筛选 · a8c7ed38
  wusiyi committed Jul 10, 2026
  
  a8c7ed38 Browse Files
- feat: 客户发货备注样式修改 · 03240dda
  wusiyi committed Jul 10, 2026
  
  03240dda Browse Files
- feat: 配货分拣/配货打单支持筛选平台 #1009989 · 2cec3b0a
  wusiyi committed Jul 10, 2026
  
  2cec3b0a Browse Files
- feat: 工厂订单展示ERP的客户发货备注 #1009821 · 4b2ac7a9
  wusiyi committed Jul 10, 2026
  
  4b2ac7a9 Browse Files
- Merge branch 'dev' into 'master' · e9d8988b
```
Dev

See merge request !260
```
  qinjianhui committed Jul 10, 2026
  e9d8988b Browse Files
- Merge branch 'dev_user_permission' into 'dev' · 4b29cd82
```
下载生产客户端不跳转页面，直接下载

See merge request !259
```
  qinjianhui committed Jul 10, 2026
  4b29cd82 Browse Files
- 下载生产客户端不跳转页面，直接下载 · cba625e4
  wuqian committed Jul 10, 2026
  
  cba625e4 Browse Files
- Merge branch 'dev_order_new_optimize' of… · 952dc914
```
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
  952dc914 Browse Files