Commit Graph
149 Commits
Author SHA1 Message Date
李鹏宇 bb5fa347cc !63 审批
Merge pull request !63 from 李鹏宇/dev_qi
2024-06-06 06:19:29 +00:00
ONION 0fb24ba973 公众号/云短信发文呈批
已全部完成
2024-06-06 14:13:24 +08:00
ONION 0c13cb0d53 费用调整申请表 发文呈批 费用支出 督办工作表 2024-06-06 13:51:16 +08:00
李鹏宇 2ecb1f912e !62 审批二开
Merge pull request !62 from 李鹏宇/dev-pengyuthon
2024-06-05 13:56:21 +00:00
pengyuthon d2821afc23 审批 2024-06-05 21:55:28 +08:00
李鹏宇 532ac72d46 !61 审批
Merge pull request !61 from 李鹏宇/dev_zhang
2024-06-05 13:48:13 +00:00
李鹏宇 23a712bbb8 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhang
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2024-06-05 13:47:59 +00:00
李鹏宇 6ece8b3174 !60 审批
Merge pull request !60 from 李鹏宇/dev_hong
2024-06-05 13:46:47 +00:00
ONIONZHAOXI e3fa36f8de 2024-6-5制作:管子间协议,开票信息审批单,业务呈批表(粮库专用),总经理办公会议议题呈批表四个表,并修改之前的bug,让字段更协调 2024-06-05 18:36:24 +08:00
ONION a9a970436e 产权变更表申请表 请假登记单 物业管理变更申请表差五张 2024-06-05 16:19:34 +08:00
李鹏宇 98e4471c62 !59 审批二开
Merge pull request !59 from 李鹏宇/dev-pengyuthon
2024-06-04 08:48:07 +00:00
pengyuthon ace2abda56 审批 2024-06-04 16:47:24 +08:00
李鹏宇 6b6057fd9d !58 审批二开
Merge pull request !58 from dev_hong
2024-06-04 08:42:30 +00:00
李鹏宇 33f2a33197 Merge branch 'master' of gitee.com:jinan-pengyusen-data/gzth into dev_hong
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2024-06-04 08:13:36 +00:00
李鹏宇 9c646558f5 !57 审批二开
Merge pull request !57 from 李鹏宇/dev_zhang
2024-06-04 08:12:23 +00:00
ONIONZHAOXI 742c0b915a 2024-6-4租赁合同审批表,修改一些细节 2024-06-04 16:09:25 +08:00
ONIONZHAOXI d6b4f6d83e 2024-6-4制作物业经营报表管理、消防安全管理、信息发布呈批表、租赁合同审批表、一共4个表单 2024-06-04 15:31:57 +08:00
ONION 4b073c2fca 工程立项,等三个表,一个py没新字段没写 2024-06-04 15:06:23 +08:00
李鹏宇 bfac561489 !56 Revert "Revert "2024-6-3制作补卡、加班、外出、销假、员工调岗、员工离职、员工转正pc和员工转正式流程审批表单,一共八个表单""
Merge pull request !56 from revert-efbb92b
2024-06-03 10:16:01 +00:00
李鹏宇 f8ecf24b4c Revert "Revert "2024-6-3制作补卡、加班、外出、销假、员工调岗、员工离职、员工转正pc和员工转正式流程审批表单,一共八个表单""
This reverts commit efbb92b91d.
2024-06-03 10:15:15 +00:00
李鹏宇 efbb92b91d Revert "2024-6-3制作补卡、加班、外出、销假、员工调岗、员工离职、员工转正pc和员工转正式流程审批表单,一共八个表单"
This reverts commit 653b8ed40b.
2024-06-03 09:56:55 +00:00
ONIONZHAOXI 653b8ed40b 2024-6-3制作补卡、加班、外出、销假、员工调岗、员工离职、员工转正pc和员工转正式流程审批表单,一共八个表单 2024-06-03 17:48:36 +08:00
李鹏宇 1ccfb5924d !55 数据调整
Merge pull request !55 from 李鹏宇/dev-pengyuthon
2024-06-02 14:32:44 +00:00
pengyuthon 00cabca3fb 审批 2024-06-02 22:30:47 +08:00
李鹏宇 61c783afdc !54 预置公司
Merge pull request !54 from dev_hong
2024-06-02 09:17:06 +00:00
李鹏宇 610f9bd2c2 !53 审批分组
Merge pull request !53 from dev_qi
2024-06-02 09:14:34 +00:00
ONION 63c7d56466 审批分组预置 2024-06-02 13:55:44 +08:00
ONION d4bfed9cca res.company预置,yuthon_approval批准自动时间 2024-06-02 11:39:09 +08:00
李鹏宇 67ca4f7024 !52 审批
Merge pull request !52 from dev-pengyuthon
2024-06-01 15:20:47 +00:00
pengyuthon 4f02645405 审批 2024-06-01 23:18:40 +08:00
pengyuthon 5e840aaedc Merge branch 'master' into dev-pengyuthon
# Conflicts:
#	yuthon_approval/views/inherit_approval_category_views.xml
2024-06-01 22:26:45 +08:00
pengyuthon f48a3c1e6f 审批 2024-06-01 22:25:52 +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
李鹏宇 df021e556f !50 审批
Merge pull request !50 from dev-pengyuthon
2024-06-01 14:16:27 +00:00
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