Commits · fe1806af62798731c4f9af0f9a59f1aa6efa9a5a · platform / hg-smart · GitLab

23 Oct, 2024 22 commits
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · fe1806af
  宋祥 authored Oct 23, 2024
  
  fe1806af Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · f3e9a974
  宋祥 authored Oct 23, 2024
  
  f3e9a974 Browse Files
- 1.仅同步审批通过的合同 · 64b09b2e
  宋祥 authored Oct 23, 2024
  
  64b09b2e Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc · 720a7513
```
# Conflicts:
#	src/main/webapp/common/js/common.js
```
  宋祥 authored Oct 23, 2024
  720a7513 Browse Files
- 1.优化文件预览，采用前端加载文件地址的方式 · 00eb6d24
  宋祥 authored Oct 23, 2024
  
  00eb6d24 Browse Files
- 2024-10-23 委外制造加工表 · 8d13ba90
  liuyang authored Oct 23, 2024
  
  8d13ba90 Browse Files
- 2024-10-23 委外制造加工表 · c798cd9b
  liuyang authored Oct 23, 2024
  
  c798cd9b Browse Files
- 2024-10-23 修复委外入库选择委外加工材料编码丢失bug · ab598c48
  liuyang authored Oct 23, 2024
  
  ab598c48 Browse Files
- 2024-10-23 修复委外入库选择委外加工材料编码丢失bug · 66591e0f
  liuyang authored Oct 23, 2024
  
  66591e0f Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 5f2b5322
  liuyang authored Oct 23, 2024
  
  5f2b5322 Browse Files
- 2024-10-23 · 3d867afc
```
1.生产订单批量派工和批量改派在班组人员增加录入功能，录入人员姓名，保存后在列表人员明细
```
  liuyang authored Oct 23, 2024
  3d867afc Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · 4548d92b
  宋祥 authored Oct 23, 2024
  
  4548d92b Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · abfd56a0
  宋祥 authored Oct 23, 2024
  
  abfd56a0 Browse Files
- 1.文档库页面授权增加是否授权 · 8df11b52
  宋祥 authored Oct 23, 2024
  
  8df11b52 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · b10fabe5
  宋祥 authored Oct 23, 2024
  
  b10fabe5 Browse Files
- 1.采购收货增加附件 · e7da7e30
  宋祥 authored Oct 23, 2024
  
  e7da7e30 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · a2bce679
  宋祥 authored Oct 23, 2024
  
  a2bce679 Browse Files
- Merge remote-tracking branch 'origin/dev' into dev · 3015073c
  宋祥 authored Oct 23, 2024
  
  3015073c Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 0bb26149
  宋祥 authored Oct 23, 2024
  
  0bb26149 Browse Files
- 1.顶级目录不能使用右键功能 · 6052c324
  宋祥 authored Oct 23, 2024
  
  6052c324 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · decd31d5
  liuyang authored Oct 23, 2024
  
  decd31d5 Browse Files
- 2024-10-22 · 6ed52b9c
```
1.委外制造加工表
```
  liuyang authored Oct 23, 2024
  6ed52b9c Browse Files
22 Oct, 2024 18 commits
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 72f531ff
  宋祥 authored Oct 22, 2024
  
  72f531ff Browse Files
- 1.调整列宽 · 15971322
  宋祥 authored Oct 22, 2024
  
  15971322 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · a4d65638
  宋祥 authored Oct 22, 2024
  
  a4d65638 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · ec832e2e
  宋祥 authored Oct 22, 2024
  
  ec832e2e Browse Files
- 1.下载报错问题修复 · 51a51b60
  宋祥 authored Oct 22, 2024
  
  51a51b60 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · 8cb86304
  宋祥 authored Oct 22, 2024
  
  8cb86304 Browse Files
- 1.采购收票的附件清单业务类型与合同管理的附件清单业务类型冲突 · 8e3d62c5
  宋祥 authored Oct 22, 2024
  
  8e3d62c5 Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into master-dc · 9009b50d
  宋祥 authored Oct 22, 2024
  
  9009b50d Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · cb1f88a0
  宋祥 authored Oct 22, 2024
  
  cb1f88a0 Browse Files
- 1.文档浏览，管理员可以直接下载 · 4eb3ebd0
  宋祥 authored Oct 22, 2024
  
  4eb3ebd0 Browse Files
- Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc · 93debeaf
  宋祥 authored Oct 22, 2024
  
  93debeaf Browse Files
- Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hg-smart into dev · c02e2c60
  宋祥 authored Oct 22, 2024
  
  c02e2c60 Browse Files
- 1.整改通知单增加处理按钮 · c011c9f6
```
2.日常巡检单可以修改处理人
3.采购收货详情可选择合同
```
  宋祥 authored Oct 22, 2024
  c011c9f6 Browse Files
- 2024-10-22 · f68ef529
```
1.文档管理添加附件变更记录
```
  liuyang authored Oct 22, 2024
  f68ef529 Browse Files
- Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly · 213204b6
  liuyang authored Oct 22, 2024
  
  213204b6 Browse Files
- 2024-10-22 · 2731dd53
```
1.文档管理添加附件变更记录
```
  liuyang authored Oct 22, 2024
  2731dd53 Browse Files
- 2024-10-22 · 5941e5a3
```
1.文档管理添加附件变更记录
```
  liuyang authored Oct 22, 2024
  5941e5a3 Browse Files
- 2024-10-22 · 42c8c599
```
1.修复生产管理驾驶舱项目进度bug
```
  liuyang authored Oct 22, 2024
  42c8c599 Browse Files