pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,112 Commits 7 Branches 0 Tags
00a6d8086d2d3164e4fba388d69e66b39e460653
Commit Graph
10112 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ONION ab7f648659 考勤字段添加 2024-06-27 10:18:57 +08:00
ONION 4052212e25 Merge branch 'dev' into dev_hong 2024-06-26 19:18:48 +08:00
pengyuthon 9c9acaef0e ljm 企业微信 扫码登陆 居中 2024-06-26 18:44:31 +08:00
pengyuthon 3087ca21b6 ljm 企业微信 扫码登陆 居中 2024-06-25 22:44:38 +08:00
ljm 578c70dbdf !81 菜单排序 
Merge pull request !81 from ljm
 2024-06-24 15:04:35 +00:00
ljmwkx c8b5879c43 菜单排序 2024-06-24 23:03:33 +08:00
ljm 5784d3acee !80 菜单排序 
Merge pull request !80 from ljm
 2024-06-24 14:57:56 +00:00
pengyuthon a6a70fae65 企业微信 扫码登陆 token验证 2024-06-24 22:39:31 +08:00
ljmwkx 8fe3c8c8d2 菜单排序 2024-06-24 22:31:28 +08:00
pengyuthon 20005a1a8f 主题 2024-06-24 18:41:50 +08:00
pengyuthon bdc901aa72 主题 2024-06-24 18:32:13 +08:00
pengyuthon 90b54f8668 主题 2024-06-24 18:16:47 +08:00
ONION 2996d00e2b 多公司部门 2024-06-24 18:11:39 +08:00
李鹏宇 a00824d8ee !77 审批单筛选 
Merge pull request !77 from ONION/dev_hong
 2024-06-24 07:56:52 +00:00
ONION c113882cac 审批表单筛选 2024-06-24 15:45:10 +08:00
pengyuthon 9fae32fdcb 主题 2024-06-24 11:25:01 +08:00
pengyuthon 84dad8fa09 主题 2024-06-21 20:39:29 +08:00
李鹏宇 ff3c6cacda !76 主题优化 
Merge pull request !76 from 李鹏宇/dev
 2024-06-20 08:47:30 +00:00
pengyuthon db84904504 主题 2024-06-20 15:03:15 +08:00
pengyuthon e2886218ea 主题 2024-06-20 14:54:07 +08:00
pengyuthon 3ae1b45506 主题 2024-06-20 13:39:24 +08:00
ljm fa3f074e04 !75 登录 
Merge pull request !75 from dev
 2024-06-18 13:43:52 +00:00
ljm 1f2746db85 !74 合并 login，工作台 
Merge pull request !74 from ljm
 2024-06-18 13:42:35 +00:00
ljmwkx a4d896bd7a 合并 2024-06-18 21:37:08 +08:00
ljmwkx b59cc520f5 合并 2024-06-18 21:25:29 +08:00
李鹏宇 e553a13946 !73 test 
Merge pull request !73 from 李鹏宇/dev
 2024-06-18 08:43:58 +00:00
李鹏宇 8096b10978 !72 主角色和辅助角色 
Merge pull request !72 from dev_hong
 2024-06-18 08:41:36 +00:00
ONION ed2dd59122 主角色字段添加 2024-06-18 16:15:18 +08:00
李鹏宇 1cd6a1f866 !71 yuthon_tianhe 
Merge pull request !71 from 李鹏宇/dev
 2024-06-18 07:01:40 +00:00
pengyuthon 93d5692fa8 代码整合 2024-06-18 14:50:35 +08:00
pengyuthon 9e86876a51 代码整合 2024-06-18 14:50:18 +08:00
李鹏宇 510ed8110a !70 部门 
Merge pull request !70 from 李鹏宇/dev
 2024-06-17 10:22:41 +00:00
pengyuthon 1c57785c1e 考勤-法定节假日 2024-06-17 18:21:40 +08:00
pengyuthon 9f527098fb Merge branch 'master' into dev 2024-06-17 18:21:21 +08:00
李鹏宇 50cf9b48bc !69 部门 
Merge pull request !69 from 李鹏宇/dev_hong
 2024-06-17 10:20:41 +00:00
李鹏宇 cca5a712e4 !68 考勤权限 
Merge pull request !68 from 李鹏宇/dev_zhang
 2024-06-17 10:19:15 +00:00
ONION 687dc601eb department tree 字段隐藏 2024-06-17 17:45:15 +08:00
ONIONZHAOXI a27565dfaa 2024-6-17：在考勤列表中添加公司字段，显示员工所属公司单位 2024-06-17 17:24:12 +08:00
ONIONZHAOXI ccdfa429e4 2024-6-17：在考勤列表中添加公司字段，显示员工所属公司单位 2024-06-17 17:07:58 +08:00
李鹏宇 652d8a48e3 !67 合并总 
Merge pull request !67 from 李鹏宇/dev
 2024-06-16 10:29:32 +00:00
pengyuthon d813491abd 考勤-法定节假日 2024-06-15 18:26:49 +08:00
pengyuthon 6b146d6d50 考勤-法定节假日 2024-06-15 18:25:43 +08:00
pengyuthon 851927bd37 考勤-法定节假日 2024-06-15 14:44:52 +08:00
Songb 096297d866 [ADD] 后端主题 2024-06-15 10:04:41 +08:00
pengyuthon b5775c4f0d Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	clarity_backend_theme_bits/__manifest__.py
#	clarity_backend_theme_bits/static/src/js/WebClient.js
#	clarity_backend_theme_bits/static/src/xml/navbar/sidebar.xml
#	clarity_backend_theme_bits/static/src/xml/systray_items/user_menu.xml
#	clarity_backend_theme_bits/views/res_config_setting.xml
#	clarity_backend_theme_bits/views/res_users.xml
 2024-06-14 16:25:05 +08:00
pengyuthon d6cf1ff349 审批 2024-06-14 16:24:02 +08:00
pengyuthon e62d4a7382 审批 2024-06-14 16:23:13 +08:00
Songb 095fab2870 [ADD] 后端主题 2024-06-14 11:52:54 +08:00
Songb efcdf51de4 PWA定制名称和logo 2024-06-14 10:22:25 +08:00
Songb 3ed9681f55 PWA定制名称和logo 2024-06-14 10:20:57 +08:00