Commit Graph

2579 Commits

Author SHA1 Message Date
Harryxzy 6c8aded0da 港湾审批流程 2023-12-11 11:35:21 +08:00
Harryxzy eb5c5c1b26 审批流程合计列 2023-12-11 11:08:30 +08:00
Harryxzy 3099fb2eb1 发放时间 改为 工资单发放时间 2023-12-05 17:20:39 +08:00
Harryxzy 33bbb18f7d Merge branch 'release/2.9.9.2312.01' into custom/上海港湾 2023-11-29 17:10:48 +08:00
Harryxzy b6f0c4a0b3 上海港湾 下级工资单树 2023-11-29 15:18:20 +08:00
Harryxzy 2fd1ef78f5 上海港湾 下级工资单根据层级结构展示 2023-11-29 13:41:55 +08:00
钱涛 3ab8840ccd 增加搜索条件颗粒度 2023-11-24 16:49:54 +08:00
钱涛 f77b4c063b 去除文化遗产 2023-11-23 10:25:33 +08:00
钱涛 a143b4fba5 新增工资单模板短信字段 2023-11-23 09:31:09 +08:00
钱涛 e0f7ec3256 申报表提示日期优化 2023-11-22 16:37:48 +08:00
钱涛 f16f93fd43 过滤pdf中的空或0值 2023-11-22 14:06:34 +08:00
钱涛 afabde3b18 短信模板配置 2023-11-22 10:54:32 +08:00
钱涛 addd937b7b Merge branch 'feature/支持工资单短信' into release/2.9.8.2311.02 2023-11-22 10:40:30 +08:00
sy 30e6bed471 Merge remote-tracking branch 'remotes/origin/feature/231001-福利档案基数调整记录' into release/2.9.8.2311.02 2023-11-22 09:38:16 +08:00
钱涛 118e95465d 短信模板脚本 2023-11-21 16:17:47 +08:00
Harryxzy 1d52069e11 Merge branch 'fix/核算结果导入超过1000' into release/2.9.8.2311.02 2023-11-20 11:22:11 +08:00
Harryxzy a237f75d79 核算结果超过1000导入bug 2023-11-20 11:21:58 +08:00
Harryxzy c8838f2528 Merge branch 'fix/薪资核算编辑保存BUG' into fix/核算结果导入超过1000 2023-11-20 11:21:14 +08:00
Harryxzy d01634d39c Merge branch 'fix/核算结果导入超过1000' into release/2.9.8.2311.02 2023-11-20 11:10:37 +08:00
Harryxzy 301144214a 薪资核算编辑保存时删除了隐藏项目 2023-11-20 11:09:43 +08:00
Harryxzy 2656ce7c90 薪资核算结果导入超过1000报错 2023-11-20 10:56:03 +08:00
钱涛 a2f63dee2b 短信模板设置接口 2023-11-16 15:42:11 +08:00
钱涛 e1a4e275ff 短信模板设置接口 2023-11-16 15:41:29 +08:00
钱涛 c0e311bf57 不使用系统算税支持重新核算之前月份 2023-11-16 11:42:02 +08:00
钱涛 3de1e62f6b 短信模板 2023-11-16 11:38:21 +08:00
钱涛 d2127cccff 短信模板 2023-11-15 13:32:37 +08:00
Harryxzy a8a0482221 上海港湾fix 2023-11-14 10:29:53 +08:00
钱涛 7f68931cc5 获取考勤假期余额 2023-11-13 17:23:33 +08:00
钱涛 7befa9f408 获取考勤假期余额 2023-11-13 17:23:09 +08:00
钱涛 443f2a749e Merge branch 'release/3.0.0.2311.01' into release/2.9.8.2311.01 2023-11-13 17:20:04 +08:00
Harryxzy c58c8eca71 上海港湾fix 2023-11-13 17:15:23 +08:00
钱涛 2c12b10171 1、减少人员bug
2、档案项目输入bug
2023-11-13 17:12:25 +08:00
钱涛 f3bc735fae 短信发送 2023-11-13 16:52:19 +08:00
Harryxzy 37d47c9b68 中江账套改造temp 2023-11-13 15:28:58 +08:00
钱涛 8eefec2e57 跳过考勤报表假期余额权限 2023-11-13 11:15:49 +08:00
钱涛 3dc5cc3a44 修改报表bug 2023-11-10 14:22:58 +08:00
钱涛 eb61811766 假期余额 2023-11-10 10:55:38 +08:00
钱涛 d86b00e5f7 清除加解密状态 2023-11-09 17:01:08 +08:00
钱涛 9ec0daa3f6 加密描述 2023-11-09 16:40:30 +08:00
Harryxzy c88db43e55 Merge remote-tracking branch 'origin/release/3.0.0.2311.01' into release/3.0.0.2311.01 2023-11-09 16:19:35 +08:00
Harryxzy 025cb73a21 Merge branch 'feature/231101_返聘action' into release/3.0.0.2311.01 2023-11-09 16:18:00 +08:00
钱涛 0cfbe05c54 报表日期 2023-11-09 16:14:35 +08:00
钱涛 675e5d7972 扩展人员属性 2023-11-09 11:34:00 +08:00
钱涛 e677207eac 新增统计维度展示 2023-11-08 15:59:54 +08:00
钱涛 d2ac1aec23 修改维度展示 2023-11-08 09:38:24 +08:00
钱涛 61d0e0f659 去除无效代码 2023-11-07 20:14:23 +08:00
钱涛 fbd19ecf75 缓存 2023-11-07 19:11:16 +08:00
钱涛 00f806a8e9 Merge branch 'release/3.0.0.2311.01' into feature/报表支持自定义维度 2023-11-07 19:06:57 +08:00
钱涛 bcee3c5e5a 人员属性扩展 2023-11-07 19:06:43 +08:00
钱涛 5f371a8e58 报表复制 2023-11-07 15:55:03 +08:00