Commits · 1e7d8f9b7d825a29716cdf3ea7c64a027fb6366e · ximai / mes-pad

18 Mar, 2024 1 commit
- 修复默认绑定bug · 1e7d8f9b
  chenzj authored Mar 18, 2024
  
  1e7d8f9b
16 Mar, 2024 6 commits
- Merge remote-tracking branch 'origin/dev' into dev · 5e263241
  李驰骋 authored Mar 16, 2024
  
  5e263241
- 1 · f860747d
  李驰骋 authored Mar 16, 2024
  
  f860747d
- 报工添加SIZE与指令 · d7e3174a
  李驰骋 authored Mar 16, 2024
  
  d7e3174a
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 3e27d024
  chenzj authored Mar 16, 2024
  
  3e27d024
- 修复 · dd1ea6f0
  chenzj authored Mar 16, 2024
  
  dd1ea6f0
- delete:删除uni-ui组件 · f2ceaa07
  张海景 authored Mar 16, 2024
  
  f2ceaa07
15 Mar, 2024 3 commits
- update:修改生产工单一屏显示 · 9db3f6af
  张海景 authored Mar 15, 2024
  
  9db3f6af
- update:修改排版和修复表格触发两次问题 · 67d6f8bd
  张海景 authored Mar 15, 2024
  
  67d6f8bd
- 修复 · 8d5443d2
  chenzj authored Mar 15, 2024
  
  8d5443d2
14 Mar, 2024 12 commits
- update:加依赖 · b7e6eab8
  张海景 authored Mar 14, 2024
  
  b7e6eab8
- update:实现打印pdf功能 · 585063b0
  张海景 authored Mar 14, 2024
  
  585063b0
- update:修改任务工单加搜索功能 · 97f5de25
  张海景 authored Mar 14, 2024
  
  97f5de25
- Merge remote-tracking branch 'origin/dev' into dev · b0481d49
  李驰骋 authored Mar 14, 2024
  
  b0481d49
- 时间字段名称调整 · fb4629fe
  李驰骋 authored Mar 14, 2024
  
  fb4629fe
- Merge branch 'dev' of http://git.local.topsunit.com/mes/mes-pad into dev · 5ba3503c
  chenzj authored Mar 14, 2024
  
  5ba3503c
- 生产报工人员选择框加筛选 · 716433e4
  chenzj authored Mar 14, 2024
  
  716433e4
- 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 3 commits
- update:修改开始按钮加接口判断 · 525190e4
  张海景 authored Mar 11, 2024
  
  525190e4
- update:修改过滤可加工数量和背景色 · 934324cc
  张海景 authored Mar 11, 2024
  
  934324cc
- 修复暂停作业bug · e1f9027f
  chenzj authored Mar 11, 2024
  
  e1f9027f