Maple
|
19cdc0998f
|
fix:收入合同
|
2025-08-07 16:15:23 +08:00 |
chabai
|
7efb1fa115
|
商务模块更改位置
|
2025-08-07 16:05:06 +08:00 |
|
chabai
|
66f6cce01b
|
Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment
|
2025-08-07 15:26:43 +08:00 |
|
chabai
|
53a81f0b01
|
完善商务模块重命名功能，修复文件上传bug
|
2025-08-07 15:26:29 +08:00 |
|
Maple
|
946c965935
|
Merge remote-tracking branch 'origin/devlopment' into devlopment
|
2025-08-07 14:14:50 +08:00 |
Mr.j
|
36db98a343
|
实现设备采购新增功能，并规范设备状态，添加未入库状态
|
2025-08-07 12:01:46 +08:00 |
|
Maple
|
4d4e6fdc2c
|
Merge remote-tracking branch 'origin/devlopment' into devlopment
# Conflicts:
# src/router/route.ts
|
2025-08-07 11:51:25 +08:00 |
|
chabai
|
e9d68d7ae3
|
制度管理模块功能修复
|
2025-08-07 09:15:20 +08:00 |
|
chabai
|
9a4d9232fc
|
优化商务数据库信息模块
|
2025-08-06 17:31:05 +08:00 |
|
Maple
|
895bfcbeaf
|
fix:将岗位与服务器的内容匹配（目前是岗位中的部门/所属部门）
|
2025-08-06 16:02:00 +08:00 |
|
Mr.j
|
9be59bee8a
|
优化完成设备管理和培训模块的加入到devlopment
|
2025-08-06 15:35:51 +08:00 |
|
Maple
|
7f654625aa
|
fix:修改了一部分菜单栏的问题，但是更多的还没有修复
|
2025-08-06 15:20:23 +08:00 |
|
Mr.j
|
b44bcebf0f
|
解决冲突并合并
|
2025-08-06 14:59:01 +08:00 |
|
Mr.j
|
45d54c50d5
|
把设备管理和培训模块加入到devlopment分支
|
2025-08-06 14:53:27 +08:00 |
 admin123
|
2fa43bf7cf
|
更新 .gitignore
|
2025-08-06 11:45:43 +08:00 |
|
admin123
|
79527eb506
|
更新 .gitignore
|
2025-08-06 11:43:42 +08:00 |
|
chabai
|
817a709639
|
商务信息库修复
|
2025-08-06 10:55:54 +08:00 |
|
Maple
|
864f926f2e
|
fix:菜单栏问题
|
2025-08-06 10:05:40 +08:00 |
|
admin123
|
6317d898a3
|
Merge pull request 'main' (#1) from main into devlopment
Reviewed-on: http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web/pulls/1
|
2025-08-06 08:48:40 +08:00 |
wuxueyu
|
69b4bf86bd
|
修复各种打包错误
|
2025-08-06 01:01:43 +08:00 |
|
wuxueyu
|
48f4020fc8
|
Merge branch 'main' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web
# Conflicts:
# .env.development
# src/views/project-management/bidding/information-retrieval/index.vue
|
2025-08-06 00:05:20 +08:00 |
|
wuxueyu
|
0eb12b4df9
|
信息检索模块新增爬虫设置、检索信息列表展示、信息详情查看
|
2025-08-06 00:03:43 +08:00 |
|
chabai
|
77238c3d03
|
route 商务添加
|
2025-08-05 22:50:37 +08:00 |
|
chabai
|
7e006acaa6
|
business
|
2025-08-05 22:44:39 +08:00 |
|
chabai
|
2065389094
|
Merge remote-tracking branch 'origin/main'
|
2025-08-05 21:37:05 +08:00 |
|
chabai
|
4972dcaf4d
|
fix
|
2025-08-05 21:36:46 +08:00 |
|
Mr.j
|
c7043dbdb1
|
备注
|
2025-08-05 21:21:06 +08:00 |
|
Maple
|
02c705ae3d
|
fix:优化了岗位详情信息
|
2025-08-05 17:16:45 +08:00 |
|
Maple
|
69ff1bba7d
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-05 15:40:37 +08:00 |
wangna0328
|
c47c8e48aa
|
制度代码修改版
|
2025-08-04 22:15:48 +08:00 |
|
Maple
|
c64166a7c0
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-04 17:27:42 +08:00 |
|
wxy
|
1307eaf651
|
Revert "Merge remote-tracking branch 'origin/jgqweb'"
This reverts commit 1648f3df96, reversing
changes made to c76d6beeb0.
|
2025-08-04 17:10:11 +08:00 |
|
wxy
|
d25a34e579
|
Revert "add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能"
This reverts commit a72aaafdfb.
|
2025-08-04 17:07:06 +08:00 |
|
wxy
|
fcd9604272
|
Revert "Merge branch 'ljy/master'"
This reverts commit 2492a57b88, reversing
changes made to 1648f3df96.
|
2025-08-04 16:59:54 +08:00 |
|
wxy
|
4ca2696896
|
Revert "信息检索、爬虫设置相关组件提交"
This reverts commit 11c9d33f94.
|
2025-08-04 16:57:59 +08:00 |
|
wxy
|
11c9d33f94
|
信息检索、爬虫设置相关组件提交
|
2025-08-04 16:25:43 +08:00 |
|
Maple
|
2492a57b88
|
Merge branch 'ljy/master'
# Conflicts:
# src/apis/system/post.ts
|
2025-08-04 14:55:23 +08:00 |
|
Maple
|
a72aaafdfb
|
add：添加了岗位信息，实现了通过岗位查询到该岗位的角色的功能
|
2025-08-04 14:50:06 +08:00 |
|
Mr.j
|
1648f3df96
|
Merge remote-tracking branch 'origin/jgqweb'
|
2025-08-04 11:54:12 +08:00 |
|
Maple
|
c76d6beeb0
|
Merge remote-tracking branch 'origin/main'
|
2025-08-04 10:51:45 +08:00 |
|
Maple
|
2bf9c6a5eb
|
none
|
2025-08-04 10:51:14 +08:00 |
|
chabai
|
ca1c3947c1
|
Merge remote-tracking branch 'refs/remotes/origin/main' into ccd
|
2025-08-04 09:42:01 +08:00 |
|
Mr.j
|
7246e8dc99
|
页面美化，隐藏搜索字段成弹窗形式
|
2025-08-01 17:59:51 +08:00 |
|
chabai
|
011e1c5337
|
完成制度管理模块开发，完善搜索功能
|
2025-08-01 17:22:47 +08:00 |
|
Mr.j
|
eaec8547aa
|
优化分页查询无法绑定数据模型问题
|
2025-08-01 16:24:33 +08:00 |
|
chabai
|
7f8ccb76cb
|
完成制度管理模块开发
|
2025-08-01 15:37:53 +08:00 |
|
Mr.j
|
543ab3d027
|
实现设备中心模块编辑，删除，查看详情，查看
|
2025-08-01 15:14:24 +08:00 |
Vic
|
b8ffc08513
|
Merge remote-tracking branch 'origin/main'
|
2025-07-31 22:20:22 +08:00 |
|
Vic
|
23fb041a08
|
信息检索模块新增爬虫设置、检索信息列表展示、信息详情查看
|
2025-07-31 22:16:28 +08:00 |
|
Mr.j
|
1d16db937c
|
实现设备中心模块的页面搭建和分页查询以及手动新增弹窗页面
|
2025-07-31 17:32:21 +08:00 |