Commit Graph
56 Commits
Author SHA1 Message Date
李鹏宇 e4c1335a01 pengyuthon wechat 2024-12-14 14:20:35 +08:00
ONIONZHAOXI b916216c98 yuthon模块添加图片 2024-07-16 16:55:18 +08:00
ONIONZHAOXI 1fd4691c7f 7月16日,对yuthon模块加入图片并改成#d3a964颜色 2024-07-16 16:48:19 +08:00
李鹏宇 3ff9dc93ff 更新 2024-07-14 23:01:51 +08:00
ONION af00263fee 收发文模块 2024-07-13 16:07:19 +08:00
李鹏宇 c9d3d50cf1 议题管理 2024-07-11 16:38:46 +08:00
ONIONZHAOXI 9e1f626384 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_zhang 2024-07-10 18:12:16 +08:00
ONIONZHAOXI 51ed96aaad 审批假期 2024-07-10 18:11:23 +08:00
ONION eb1534f343 拓展菜单 2024-07-10 12:15:50 +08:00
ONION 943bb5bba5 拓展菜单 2024-07-10 12:04:07 +08:00
李鹏宇 f3a4f6d12d 调整 2024-07-09 16:58:16 +08:00
ONION f02e1607b7 假期类型配置 2024-07-09 16:09:33 +08:00
李鹏宇 e3c5ef11c8 调整 2024-07-09 10:54:14 +08:00
李鹏宇 dec326d0dc !96 zhang
Merge pull request !96 from 李鹏宇/dev_zhang
2024-07-04 02:48:23 +00:00
ONIONZHAOXI df3659ae2f 7月4日:对议题库的tree视图增加根据状态显示不同颜色功能,附加文档功能 2024-07-04 10:46:29 +08:00
ONION 408950dec7 收发文管理 2024-07-03 12:43:08 +08:00
pengyuthon 936f70e039 企业微信 通步 2024-07-01 20:41:30 +08:00
pengyuthon 03a6eb2ff7 议题相关 2024-06-27 15:37:08 +08:00
pengyuthon b2bb6ec37c 议题相关 2024-06-27 15:33:17 +08:00
pengyuthon ed4bb19768 议题相关 2024-06-27 15:24:00 +08:00
pengyuthon 1337189e45 议题相关 2024-06-27 14:59:25 +08:00
pengyuthon 0e2a3dafa5 议题相关 2024-06-27 14:16:47 +08:00
pengyuthon 0683b98344 审批 2024-06-11 15:40:52 +08:00
ONION d4bfed9cca res.company预置,yuthon_approval批准自动时间 2024-06-02 11:39:09 +08:00
ljm 1846f44437 !51 审批 分类可以展示与不展示
Merge pull request !51 from ljm
2024-06-01 14:25:12 +00:00
ljmwkx 2a86825c88 审批 审批意见簿 2024-06-01 22:24:02 +08:00
pengyuthon de8fdeacd9 审批 2024-06-01 22:15:23 +08:00
ljmwkx 680c4570f7 审批 隐藏 2024-06-01 22:01:00 +08:00
ljmwkx 30ae0aaad8 审批 审批意见簿 2024-06-01 20:40:36 +08:00
ljmwkx 17cb36389c 审批 自动带过来 2024-06-01 18:07:31 +08:00
pengyuthon 013bd24239 审批 2024-06-01 17:15:27 +08:00
pengyuthon 8a4b28f97f 审批 2024-06-01 15:34:49 +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 8ecf9a9642 审批 2024-05-31 18:37:33 +08: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
李鹏宇 fb96d3495f !32 采购审批
Merge pull request !32 from 李鹏宇/dev-pengyuthon
2024-05-30 11:02:31 +00:00
pengyuthon 928ba9dd58 审批采购 2024-05-30 19:00:39 +08:00
ljmwkx 0ed581cb5e 审批 进度 2024-05-30 18:58:04 +08: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
ljmwkx a4e769fa35 审批 签字 2024-05-29 21:41:10 +08:00
ljmwkx cc63c0ef4d 审批 确认 拒绝 2024-05-29 21:11:21 +08:00
ljmwkx ba78325bfa 审批 确认 2024-05-29 20:59:59 +08:00
pengyuthon 10b74b7189 代码优化 2024-05-29 16:13:44 +08:00
pengyuthon c93dbedf65 审批二开 2024-05-28 20:05:16 +08:00
pengyuthon ca79e6c698 审批二开 2024-05-27 18:35:32 +08:00