Commit Graph
114 Commits
Author SHA1 Message Date
pengyuthon de8fdeacd9 审批 2024-06-01 22:15:23 +08:00
ljm fecc7e74c0 !49 审批 分类可以展示与不展示
Merge pull request !49 from ljm/ljm
2024-06-01 14:11:10 +00:00
李鹏宇 148e5c50ee !48 审批
Merge pull request !48 from dev_hong
2024-06-01 14:10:11 +00:00
ONION d92a71a872 修改通用等 2024-06-01 22:08:25 +08:00
ONION a83f77c26c 修改通用等 2024-06-01 22:05:29 +08:00
ljmwkx 680c4570f7 审批 隐藏 2024-06-01 22:01:00 +08:00
ljm 2e3ea03be4 !47 审批 审批意见簿
Merge pull request !47 from ljm/ljm
2024-06-01 12:42:46 +00:00
ljmwkx 30ae0aaad8 审批 审批意见簿 2024-06-01 20:40:36 +08:00
ljm ade58c4b30 !46 审批 审批类型自动带过来审批流程和审批流程的审批人
Merge pull request !46 from ljm/ljm
2024-06-01 10:10:45 +00:00
ljmwkx 17cb36389c 审批 自动带过来 2024-06-01 18:07:31 +08:00
李鹏宇 3a0a793918 !45 审批二开
Merge pull request !45 from 李鹏宇/dev-pengyuthon
2024-06-01 09:16:06 +00:00
pengyuthon 013bd24239 审批 2024-06-01 17:15:27 +08:00
李鹏宇 fe1724dbbd !44 审批二开
Merge pull request !44 from 李鹏宇/dev-pengyuthon
2024-06-01 07:35:23 +00:00
pengyuthon 8a4b28f97f 审批 2024-06-01 15:34:49 +08:00
李鹏宇 2285dd4839 !43 审批二开
Merge pull request !43 from 李鹏宇/dev-pengyuthon
2024-06-01 07:25:22 +00:00
pengyuthon 81126bdc6b 审批 2024-06-01 15:20:30 +08:00
李鹏宇 bbb4b4764e !42 审批二开
Merge pull request !42 from 李鹏宇/dev_hong
2024-05-31 14:13:18 +00:00
李鹏宇 d9e23995e0 Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev_hong
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2024-05-31 14:13:04 +00:00
李鹏宇 6df6032e36 !41 审批
Merge pull request !41 from dev_qi
2024-05-31 14:09:31 +00:00
ONION 246ef5bf58 审批表 2024-05-31 22:05:25 +08:00
ONION 9301a0b2c4 琦4张表 2024-05-31 22:04:16 +08:00
李鹏宇 76b55bf266 !40 审批二开
Merge pull request !40 from 李鹏宇/dev-pengyuthon
2024-05-31 11:31:39 +00:00
pengyuthon 23715f9098 审批 2024-05-31 19:30:52 +08:00
pengyuthon 703c659104 Merge branch 'master' into dev-pengyuthon
# Conflicts:
#	tianhe_approvals/__manifest__.py
#	tianhe_approvals/data/approval_category_type_data.xml
#	tianhe_approvals/models/inherit_approval_category.py
#	yuthon_approval/views/demo_approval_request.xml
2024-05-31 19:25:23 +08:00
pengyuthon 062fb5d882 审批 2024-05-31 18:53:32 +08:00
pengyuthon 8ecf9a9642 审批 2024-05-31 18:37:33 +08:00
李鹏宇 a2b18746e2 !36 审批
Merge pull request !36 from 李鹏宇/dev_zhang
2024-05-31 10:37:15 +00:00
李鹏宇 5fca28e3bd Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev_zhang
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2024-05-31 10:36:48 +00:00
ONIONZHAOXI 8f5da0427a 制作表格样式,党总支发文、董事会议题申报表、公文发文(子企业)、公文发文、公文发文、会议文档,6个表格 2024-05-31 17:43:25 +08:00
李鹏宇 1e068c965f !34 none
Merge pull request !34 from dev-pengyuthon
2024-05-31 08:07:59 +00:00
pengyuthon 207ee2d8d6 审批采购 2024-05-31 16:06:06 +08:00
李鹏宇 eeb2b1c67b !33 tianhe_approvals
Merge pull request !33 from dev_hong
2024-05-31 08:02:35 +00:00
ONION eb38688526 审批表 2024-05-31 15:56:54 +08:00
李鹏宇 fb96d3495f !32 采购审批
Merge pull request !32 from 李鹏宇/dev-pengyuthon
2024-05-30 11:02:31 +00:00
pengyuthon 1cbb43e702 审批采购 2024-05-30 19:01:17 +08:00
pengyuthon 928ba9dd58 审批采购 2024-05-30 19:00:39 +08:00
ljm 012a3d318b !31 审批 流程 用户
Merge pull request !31 from ljm/ljm
2024-05-30 11:00:24 +00:00
ljmwkx 0ed581cb5e 审批 进度 2024-05-30 18:58:04 +08:00
李鹏宇 81d2f86bb0 !30 审批二开
Merge pull request !30 from dev-pengyuthon
2024-05-30 06:20:42 +00:00
pengyuthon fa4a29ef37 审批二开 2024-05-30 14:16:04 +08:00
ljm a16d8bd7ab !29 审批 流 汇总审批人
Merge pull request !29 from ljm
2024-05-29 14:14:20 +00:00
ljmwkx 19b6822cc2 审批 签字 2024-05-29 22:12:53 +08:00
李鹏宇 d0924d0752 !28 审批二开
Merge pull request !28 from 李鹏宇/dev-pengyuthon
2024-05-29 14:03:30 +00:00
pengyuthon 30c77faf32 审批二开 2024-05-29 22:02:27 +08:00
ljm 2506dda867 !27 审批 签字
Merge pull request !27 from ljm
2024-05-29 13:41:50 +00:00
ljmwkx a4e769fa35 审批 签字 2024-05-29 21:41:10 +08:00
ljm d02d4f7e79 !26 审批 拒绝 确认
Merge pull request !26 from ljm
2024-05-29 13:12:41 +00:00
ljmwkx cc63c0ef4d 审批 确认 拒绝 2024-05-29 21:11:21 +08:00
ljm fcec883c17 !25 审批确认
Merge pull request !25 from ljm
2024-05-29 13:01:26 +00:00
ljmwkx ba78325bfa 审批 确认 2024-05-29 20:59:59 +08:00