pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
833 Commits 7 Branches 0 Tags
2eb2f2c67ffa69921ec313f79da17032e4aa3ad0
Commit Graph
833 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
pengyuthon 0683b98344 审批 2024-06-11 15:40:52 +08:00
pengyuthon a536122c77 审批 2024-06-06 21:44:34 +08:00
pengyuthon bd397a681e 审批 2024-06-06 17:35:39 +08:00
李鹏宇 81d9b917e3 !66 审批 
Merge pull request !66 from 李鹏宇/dev_zhang
 2024-06-06 08:13:38 +00:00
ONIONZHAOXI 0ee3209c67 2024-6-6制作：用章申请，证照调用呈批，租赁合同审批单 2024-06-06 16:10:21 +08:00
李鹏宇 a64648d1e6 !65 审批 
Merge pull request !65 from 李鹏宇/dev_zhang
 2024-06-06 06:22:12 +00:00
李鹏宇 dad147cb32 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhang 
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
 2024-06-06 06:21:57 +00:00
李鹏宇 6bfbd793ec !64 审批 
Merge pull request !64 from 李鹏宇/dev_hong
 2024-06-06 06:20:59 +00:00
李鹏宇 4a112d0700 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_hong 
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
 2024-06-06 06:20:45 +00:00
李鹏宇 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
ONION 5495fbfc85 建设工程审批单 跨部门协同 收文呈批差一 2024-06-06 12:58:37 +08:00
ONIONZHAOXI 604c4c8404 2024-6-6制作：固定资产采购单、信息发布审批表、业务呈批表 2024-06-06 10:27:13 +08:00
ONIONZHAOXI dfeb6163b6 Merge branch 'dev' into dev_zhang 2024-06-05 22:28:15 +08:00
ONIONZHAOXI d0d2fd5507 Merge branch 'master' into dev_zhang 2024-06-05 22:23:41 +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