Commits · fb4629fec588613f993b3fbdad0a149806496dac · ximai / mes-pad

14 Mar, 2024 6 commits
- 时间字段名称调整 · fb4629fe
  李驰骋 authored Mar 14, 2024
  
  fb4629fe
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 59eba741
  张海景 authored Mar 14, 2024
  
  59eba741
- add:导入uni-ui的组件 · 10cd40a7
  张海景 authored Mar 14, 2024
  
  10cd40a7
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 31f466a4
  chenzj authored Mar 14, 2024
  
  31f466a4
- 生产报工人员选择框加筛选 · 0fabb89f
  chenzj authored Mar 14, 2024
  
  0fabb89f
- 优化首检确认 · c440d2e1
  528360026@qq.com authored Mar 14, 2024
  
  c440d2e1
13 Mar, 2024 4 commits
- update:修改异常报告排版 · ef2e8f0f
  张海景 authored Mar 13, 2024
  
  ef2e8f0f
- Merge remote-tracking branch 'origin/dev' into dev · 69cfdc3a
  李驰骋 authored Mar 13, 2024
  
  69cfdc3a
- 报工限制改为报工数不超过排产数 · 0fd59619
  李驰骋 authored Mar 13, 2024
  
  0fd59619
- update:修改接口 · 586c5730
  张海景 authored Mar 13, 2024
  
  586c5730
12 Mar, 2024 11 commits
- update:注释刀具的提示 · e472ed5b
  张海景 authored Mar 12, 2024
  
  e472ed5b
- update:修改上下机状态 · 5cc33ef7
  张海景 authored Mar 12, 2024
  
  5cc33ef7
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 34616f8d
  chenzj authored Mar 12, 2024
  
  34616f8d
- 修改异常报告的bug · 1bbbf3e1
  chenzj authored Mar 12, 2024
  
  1bbbf3e1
- Merge remote-tracking branch 'origin/dev' into dev · e828d416
  李驰骋 authored Mar 12, 2024
  
  e828d416
- 质检显示首检按钮 · 9b1eb39c
  李驰骋 authored Mar 12, 2024
  
  9b1eb39c
- update:修改上下机接口传参 · 3112ee7a
  张海景 authored Mar 12, 2024
  
  3112ee7a
- 修改界面颜色 · c89145db
  chenzj authored Mar 12, 2024
  
  c89145db
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 992ee9e5
  chenzj authored Mar 12, 2024
```
# Conflicts:
#	pages/mes/prodReport/index.vue
```
  992ee9e5
- 修改开始作业和暂停作业传回的参数 · e4df7608
  chenzj authored Mar 12, 2024
  
  e4df7608
- update:提交预览pdf测试文件 · a93b3703
  张海景 authored Mar 12, 2024
  
  a93b3703
11 Mar, 2024 6 commits
- update:修改开始按钮加接口判断 · 525190e4
  张海景 authored Mar 11, 2024
  
  525190e4
- update:修改过滤可加工数量和背景色 · 934324cc
  张海景 authored Mar 11, 2024
  
  934324cc
- 修复暂停作业bug · e1f9027f
  chenzj authored Mar 11, 2024
  
  e1f9027f
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 56227fcf
  chenzj authored Mar 11, 2024
  
  56227fcf
- 生产报工报工人自动带入 · b71fd28a
  chenzj authored Mar 11, 2024
  
  b71fd28a
- 生产报工人自动带入和自己选择 · fda1fb0d
  chenzj authored Mar 11, 2024
  
  fda1fb0d
10 Mar, 2024 1 commit
- update:修改上机扫描和下机扫描 · 55147a8f
  张海景 authored Mar 10, 2024
  
  55147a8f
09 Mar, 2024 9 commits
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 8a5b5bd6
  chenzj authored Mar 09, 2024
  
  8a5b5bd6
- update:修改侧边栏和logo宽度 · ac7aec34
  张海景 authored Mar 09, 2024
  
  ac7aec34
- update:修改zb-table组件加上选中方法 · 59d0b6fe
  张海景 authored Mar 09, 2024
  
  59d0b6fe
- 投料校验再次添加taskId参数 · f62a9a80
  李驰骋 authored Mar 09, 2024
  
  f62a9a80
- Merge remote-tracking branch 'origin/dev' into dev · aac174dd
  李驰骋 authored Mar 09, 2024
  
  aac174dd
- 合格/不合格数量字段名调整 · 6e1852a9
  李驰骋 authored Mar 09, 2024
  
  6e1852a9
- update:修改刀模板上下机传参和接口 · 9e0f6f89
  张海景 authored Mar 09, 2024
  
  9e0f6f89
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 01068f2c
  chenzj authored Mar 09, 2024
  
  01068f2c
- 生产报工报工人自动带入 · 1479db3e
  chenzj authored Mar 09, 2024
  
  1479db3e
08 Mar, 2024 1 commit
- 状态改变添加taskWorkunitId字段 · 8d489203
  李驰骋 authored Mar 08, 2024
  
  8d489203
07 Mar, 2024 2 commits
- update:修改刀模板上下机传参 · cb026df5
  张海景 authored Mar 07, 2024
  
  cb026df5
- fix:修复领料和反冲料一进来就提示保存成功的提示 · 27e35b8e
  张海景 authored Mar 07, 2024
  
  27e35b8e