Commit Graph

127 Commits

Author SHA1 Message Date
Mr.j e3ec37fa79 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-11 11:14:16 +08:00
Mr.j 281c99edd5 连接本地服务器 2025-08-11 11:07:32 +08:00
Mr.j 48632707cc 实现了消息中心显示最新申请消息,并可以查看消息然后点击跳转到具体的审批台 2025-08-11 10:54:45 +08:00
chabai ff2c80e1e8 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-11 10:44:10 +08:00
chabai 45fe56a4f9 放弃跟踪 2025-08-11 10:43:06 +08:00
admin123 2ca37ad3c9 更新 .env.production 2025-08-11 10:38:27 +08:00
admin123 50e93bf8be 更新 .env.production 2025-08-11 10:31:42 +08:00
chabai 40ae745dfb 商务模块的文件夹结构优化成树形层级结构 2025-08-11 10:24:17 +08:00
马诗敏 a80a23fd74 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-10 20:46:42 +08:00
马诗敏 3fc298de9b 完善团队成员明细展示 2025-08-10 20:41:24 +08:00
何德超 a1966feef6 视频监测原数据管理原型 2025-08-10 20:23:18 +08:00
何德超 b3778ec7c2 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-10 20:19:57 +08:00
何德超 3dd794d7f0 形变接口原型 2025-08-10 20:10:47 +08:00
Maple 16743cfc7f fix:支出合同的编辑功能实现 2025-08-08 17:59:38 +08:00
Mr.j d5929bdc2d Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 17:49:24 +08:00
Mr.j a0912edc6a 实现申请采购推送信息到审批台出现语音提示和闪烁提示 2025-08-08 17:35:49 +08:00
chabai 0401a28037 完善商务模块文件上传功能 2025-08-08 17:02:32 +08:00
chabai 196a5d864a Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 16:40:10 +08:00
chabai 099b3ee406 实现商务模块可以选择多个文件上传 2025-08-08 16:40:05 +08:00
Mr.j 37d2d21318 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 16:37:46 +08:00
Mr.j f7641f6439 完善审批台接收推送信息 2025-08-08 16:37:36 +08:00
Maple f870f50be0 fix:收入合同的编辑功能实现 2025-08-08 15:51:17 +08:00
Mr.j 5a13911694 实现审批台接收到采购申请信息 2025-08-08 15:44:56 +08:00
马诗敏 ae29bb661f 修改团队成员管理bug 2025-08-08 15:23:57 +08:00
mashimin a79c4f3489 项目中控台 2025-08-08 14:26:22 +08:00
chabai aa3e6c732c Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 13:51:36 +08:00
chabai fdd20e9a9b 开发商务模块的文件预览功能 2025-08-08 13:51:32 +08:00
Maple 348c0396eb fix:收入合同的详情以及显示,以及完成和后端api的调用。 2025-08-08 10:49:58 +08:00
Mr.j 0d515ab87f Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 10:28:17 +08:00
chabai e098cfd8fa 开发商务模块文件预览功能 2025-08-08 10:26:36 +08:00
Mr.j 478aaf4a0a Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-08 10:24:59 +08:00
Mr.j 68b98eea7b 优化有两个资产管理菜单 2025-08-08 10:21:37 +08:00
Mr.j d6f87cd0db 优化审批台的搜索框看不清的问题 2025-08-07 17:38:41 +08:00
Mr.j e83579dc57 完成审批台基础页面搭建并实现查询功能 2025-08-07 16:46:44 +08:00
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