Commit Graph

180 Commits

Author SHA1 Message Date
crushing1111 63660000bf 任务跟踪表格样式统一 2025-08-13 17:24:39 +08:00
crushing1111 b504f7f755 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 16:58:30 +08:00
crushing1111 78961f6ce9 任务跟踪表格等 2025-08-13 16:58:03 +08:00
chabai b2f09d3474 初步重构智能商务模块代码,但还存在一些bug 2025-08-13 16:55:48 +08:00
Mr.j 5f676536dd Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 16:46:17 +08:00
Mr.j 11ca3ae4a6 实现点击确认收货后直接入库 2025-08-13 16:46:14 +08:00
Maple a3aaf7da07 fix:施工立项新建项目的时候的字段修改 2025-08-13 16:21:33 +08:00
chabai 79b8eb340f 智能商务模块可以调整左侧栏的宽度 2025-08-13 14:44:02 +08:00
chabai b1206e916e Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 14:30:20 +08:00
chabai 2e5cbe31e5 优化智能商务模块对的文件分页和页面布局 2025-08-13 14:27:43 +08:00
crushing1111 3675669f76 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 14:26:27 +08:00
crushing1111 e81a9430b5 样式统一 2025-08-13 14:26:19 +08:00
Mr.j aa40502f82 完善支付弹窗和到货弹窗 2025-08-13 14:22:11 +08:00
Mr.j f1faa6df05 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 11:28:48 +08:00
Mr.j da6e158cc3 设备采购模块添加收货状态和支付状态 2025-08-13 11:25:55 +08:00
crushing1111 922be6e641 添加任务表单样式恢复 2025-08-13 11:05:25 +08:00
crushing1111 ffc60ff63e 测试提交 2025-08-13 10:39:00 +08:00
crushing1111 3d8f85c3ec Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 10:35:45 +08:00
马诗敏 c657fed236 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 10:25:33 +08:00
crushing1111 f438b4d253 测试 2025-08-13 10:24:24 +08:00
Mr.j bac2e99f0d 实现设备中心添加设备类型弹窗页面以及另外搭建完成设备盘库页面 2025-08-13 10:17:19 +08:00
crushing1111 daad25838b 任务管理 2025-08-13 10:07:11 +08:00
Maple 7dbd6f1d2e fix:111 2025-08-13 09:45:39 +08:00
Maple d2b70943d1 Merge remote-tracking branch 'origin/devlopment' into devlopment
# Conflicts:
#	src/types/components.d.ts
2025-08-13 09:37:18 +08:00
Maple 7fd44d4b10 fix: 按照要求修复了一下菜单栏 2025-08-13 09:33:54 +08:00
马诗敏 e526e80de3 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 09:31:36 +08:00
Mr.j b1b34e630f Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-13 09:30:16 +08:00
Mr.j 513e050622 修复设备管理相关功能分页查询表格无法顺利下拉和分页条不固定问题 2025-08-13 09:30:09 +08:00
马诗敏 0e11328392 更新项目中控台布局 2025-08-13 08:59:20 +08:00
何德超 79bd72febb CircularProgress 2025-08-12 21:21:53 +08:00
何德超 9d6086726d Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-12 17:59:35 +08:00
Mr.j 05f09ad207 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-12 17:49:48 +08:00
何德超 eba5e68e2f 净空前端,在原数据管理右边标签页,后端需同步配置才有用 2025-08-12 17:49:00 +08:00
Mr.j 8631ead0b1 修复设备管理相关功能分页查询无法分页和正确获取总页数的问题 2025-08-12 17:48:54 +08:00
马诗敏 7c455f59eb Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-12 17:34:37 +08:00
Maple cc525c45b7 fix: 合同页面的日期优化,然后合同结算的时候也进行了优化 2025-08-12 17:28:17 +08:00
马诗敏 848eb02ec6 补交 2025-08-12 17:05:33 +08:00
马诗敏 25f57a4adb 项目筛选由两个增加至八个,增加质量管理,安全管理,现场管理 2025-08-12 17:02:50 +08:00
chabai 3fb4cc0950 智能商务模块适配主题切换 2025-08-12 15:50:05 +08:00
Maple f1da2f0077 add: 订单管理的前端页面添加了,但是因为暂时不清楚订单的字段那些,后端也没有相对应的接口。 2025-08-12 14:51:23 +08:00
Maple 7fa5beee2f add: 订单管理的前端页面添加了,但是因为暂时不清楚订单的字段那些,后端也没有相对应的接口。 2025-08-12 14:43:44 +08:00
Mr.j a790551325 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-12 14:26:05 +08:00
Mr.j 6a531706e1 把审批信息放在个人中心所在下拉框消息中心里,铃铛图标处改为聊天消息 2025-08-12 14:25:58 +08:00
chabai b6cb51a5e9 商务数据库信息模块更名为智能商务,初步实现文件排序功能 2025-08-12 14:18:00 +08:00
Maple 3657b1914c fix:合同功能修复,添加产品服务字段 2025-08-12 10:50:04 +08:00
Maple baef368840 fix:支出合同和收入合同的完善,修复了一些bug 2025-08-12 10:27:00 +08:00
Mr.j 33eb03121d Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-11 17:10:58 +08:00
Mr.j 9933ad7206 修复设备采购状态图无法顺利依据流程变化的问题 2025-08-11 17:10:52 +08:00
马诗敏 60b164f0c8 Merge branch 'devlopment' of http://pms.dtyx.net:3000/wuxueyu/Industrial-image-management-system---web into devlopment 2025-08-11 15:55:50 +08:00
马诗敏 e60e4cf095 实现团队成员更新功能和筛选功能 2025-08-11 15:54:44 +08:00