Commit Graph

778 Commits

Author SHA1 Message Date
a2634fb4e4 优化 2025-09-17 11:56:35 +08:00
190695e682 优化 2025-09-17 10:25:32 +08:00
8a60c8c13c 1 2025-09-17 10:23:46 +08:00
3e751f787e 1 2025-09-17 10:21:28 +08:00
ljx
139eaf84cf 提交 2025-09-17 10:20:38 +08:00
ljx
ca2a95fc00 Merge branch 'dhr' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-17 10:08:21 +08:00
ljx
de0e0d5cfc 提交 2025-09-17 09:11:29 +08:00
ljx
91a0efc066 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-17 09:11:20 +08:00
dhr
0bc79fa151 0916 2025-09-16 21:23:38 +08:00
ljx
4ad2b0c6dc 提交 2025-09-16 20:25:23 +08:00
ljx
d640cd7f95 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-16 20:17:41 +08:00
18a73082ec 合并 2025-09-16 20:16:30 +08:00
ljx
6a2dc5387e 提交 2025-09-16 19:41:38 +08:00
Teo
6297c51d9a 无人机配置、我的代办logo 2025-09-16 19:32:46 +08:00
6121a06b44 合并 2025-09-16 17:20:24 +08:00
tcy
2bd3e8d2aa refactor(TeamMeetingDetailDrawer): 使用join方法优化参与人列表显示
将v-for循环显示参与人姓名改为使用数组map和join方法拼接字符串,使代码更简洁
2025-09-16 16:44:49 +08:00
Teo
ef85a3cd0f 工资计算 2025-09-16 16:08:13 +08:00
tcy
5c4b823dd0 refactor(qualityConstructionLog): 优化代码格式并添加默认排序参数
调整模板中的代码格式以提高可读性,同时在查询参数中添加默认排序字段和排序方式
2025-09-16 14:57:29 +08:00
ljx
ee7662f405 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-16 11:05:41 +08:00
ljx
525e0c95d4 提交 2025-09-16 11:05:32 +08:00
tcy
72b8f7162f fix(safetyLog): 修复安全日志页面按钮文字错误并添加排序功能
feat(safetyLog): 在安全日志详情中添加文件预览功能
新增PDF和图片文件的预览功能,优化文件展示样式

style(documentSafetyMeeting): 调整文件管理页面代码格式
统一代码缩进和换行格式,提升代码可读性
2025-09-16 10:21:54 +08:00
Teo
1ed1fcd5a1 Merge branch 'main' of http://192.168.110.2:3000/taoge/mk_system into ljj 2025-09-16 09:41:21 +08:00
Teo
275ba22157 总进度计划导入导出 2025-09-16 09:41:15 +08:00
41623c7fac 2 2025-09-16 09:03:48 +08:00
ad75e85f37 1 2025-09-15 20:15:55 +08:00
d72ee950cf 1 2025-09-15 20:15:18 +08:00
0b6dcc98e8 优化 2025-09-15 20:09:56 +08:00
dhr
cdf5dfcdae 0915 2025-09-15 20:02:32 +08:00
Teo
371c599bdf 合规性手续增加状态 2025-09-15 19:42:35 +08:00
dhr
91162f1dc4 0915 2025-09-15 19:30:07 +08:00
ljx
2ea9d901b5 修改大屏样式 2025-09-15 19:12:23 +08:00
ljx
4057a78368 修改价格格式 2025-09-15 18:04:57 +08:00
dhr
0059b3cb42 0915 2025-09-15 16:07:10 +08:00
Teo
8c7d16ee9d Merge branch 'tcy' of http://192.168.110.2:3000/taoge/mk_system into ljj 2025-09-15 11:47:06 +08:00
Teo
9301a66aa4 合并ljx 2025-09-15 11:46:48 +08:00
ljx
958b15a355 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/new_project into ljx 2025-09-15 11:43:15 +08:00
ljx
5cb8ef5e87 提交 2025-09-15 11:42:38 +08:00
Teo
5ad04a46fb 回退物资批次需求计划 2025-09-15 11:21:18 +08:00
tcy
c0b5e89341 Merge branch 'main' of http://xny.yj-3d.com:3000/taoge/mk_system into tcy 2025-09-15 10:06:05 +08:00
47ae3635ab 1 2025-09-15 10:01:55 +08:00
41a6a7ccc6 合并 2025-09-15 10:00:46 +08:00
45866c4b81 1 2025-09-15 10:00:12 +08:00
f84ec4f533 1 2025-09-15 09:59:43 +08:00
1b0b879c79 优化 2025-09-15 09:58:40 +08:00
tcy
d15c3e473b fix(qualityInspectionDetail): 修复检查文件列表未加载的问题
当存在检查文件时,现在会正确加载文件列表。之前被注释掉的代码已恢复使用。
2025-09-14 18:02:59 +08:00
tcy
5014d005fa fix(安全/质量检查): 修复整改按钮显示条件及处理逻辑
修复安全检查和质量管理模块中整改按钮的显示条件,统一使用reviewType判断
添加质量检查模块的整改和复查对话框及处理逻辑
优化代码格式和样式问题
2025-09-14 18:01:12 +08:00
Teo
e7980f0d01 采购联系单 2025-09-14 17:40:43 +08:00
tcy
357f34b316 feat(违规记录): 新增整改和复查功能
- 在API层添加addSafetyInspectionReview和addSafetyInspectionRectification方法
- 在违规记录页面增加整改和复查操作按钮
- 新增处理对话框用于提交整改措施和复查情况
2025-09-14 16:56:27 +08:00
ljx
1524f48e3d 1 2025-09-14 16:25:24 +08:00
ljx
58a78f9da4 1\ 2025-09-14 16:25:03 +08:00