sy
|
7f0d87a017
|
Merge remote-tracking branch 'remotes/origin/feature/v4-siArchivesChangeByTaxRange-0302' into release/2.6.3.2303.01
|
2023-03-02 18:14:19 +08:00 |
 钱涛
|
26b8996d42
|
公司名
|
2023-03-02 17:59:58 +08:00 |
Harryxzy
|
3f0160ebe5
|
Merge remote-tracking branch 'origin/release/2.6.3.2303.01' into release/2.6.3.2303.01
|
2023-03-02 17:19:44 +08:00 |
|
Harryxzy
|
50e1f2c432
|
Merge branch 'fix/V3_exportAddWorkCode' into release/2.6.3.2303.01
|
2023-03-02 17:18:10 +08:00 |
|
钱涛
|
6de22b142d
|
1、工资单模板
2、一键累计
|
2023-03-02 17:11:42 +08:00 |
|
钱涛
|
fd9b592384
|
修复核算未分类项目不显示
|
2023-03-02 11:25:25 +08:00 |
|
Harryxzy
|
e7f2d7b496
|
薪资档案导出，添加工号
|
2023-03-01 16:19:09 +08:00 |
|
钱涛
|
14bee7f6d5
|
修复未分类无法保存
|
2023-03-01 09:58:55 +08:00 |
|
钱涛
|
0138351665
|
修复账套项目可删除
|
2023-02-27 17:51:26 +08:00 |
|
sy
|
0e164b7989
|
薪酬系统-社保福利，福利档案增量数据处理直接在个税扣缴义务人人员范围变更时触发，不需打开福利档案列表触发
|
2023-02-24 13:53:57 +08:00 |
|
钱涛
|
a8cb586358
|
公式删除校验
|
2023-02-23 15:48:18 +08:00 |
|
钱涛
|
1c2028f551
|
公式删除优化
|
2023-02-23 14:52:24 +08:00 |
|
钱涛
|
e3c1efcc47
|
sql操作的扩展
|
2023-02-23 09:19:34 +08:00 |
|
钱涛
|
ee5e5fa127
|
调薪说明
|
2023-02-22 19:12:53 +08:00 |
|
钱涛
|
41c56b1bd4
|
调薪说明
|
2023-02-22 19:07:13 +08:00 |
|
钱涛
|
5f9a7af0fa
|
修复数据采集按部门搜索
|
2023-02-22 17:58:19 +08:00 |
|
sy
|
1a5afd6c6d
|
Merge branch 'feature/v4-siFunctionImprove2-0228' into release/2.6.2.2302.02
|
2023-02-22 14:10:46 +08:00 |
|
钱涛
|
49cd56e359
|
档案列表重构
|
2023-02-21 18:05:58 +08:00 |
|
钱涛
|
cb484b8ff9
|
回算项公式使用不可删除
|
2023-02-21 17:19:32 +08:00 |
|
钱涛
|
eac70e7cde
|
薪资项目和社保福利方案分权
|
2023-02-21 17:02:39 +08:00 |
|
钱涛
|
187e60ec15
|
薪资项目分权
|
2023-02-21 16:39:17 +08:00 |
|
钱涛
|
77cff0ba24
|
档案字段被公式引用不允许删除
|
2023-02-17 18:03:46 +08:00 |
|
钱涛
|
bccdd07ba0
|
修改名称对应修改公式
|
2023-02-17 17:52:29 +08:00 |
|
钱涛
|
c7d1bbfa35
|
更新名称
|
2023-02-17 17:19:17 +08:00 |
|
钱涛
|
dc24b03efd
|
薪资项目删除校验
|
2023-02-17 15:58:33 +08:00 |
|
钱涛
|
abeb4d891d
|
薪资项目删除校验
|
2023-02-17 14:37:59 +08:00 |
|
钱涛
|
da9b548480
|
公式
|
2023-02-17 10:54:18 +08:00 |
|
钱涛
|
1d0a02554e
|
公式
|
2023-02-16 14:53:03 +08:00 |
|
钱涛
|
1bdc304ddf
|
清除公式
|
2023-02-16 09:16:00 +08:00 |
|
钱涛
|
a2e9c482a4
|
修复账套根据名称查询bug
去除调整前后值的限制
|
2023-02-15 16:38:54 +08:00 |
|
sy
|
7da1bfff6b
|
薪酬系统-福利台账，核算明细导出时企业年金单位数值有误相关问题修复
|
2023-02-15 09:55:33 +08:00 |
|
钱涛
|
4f0dc060ee
|
Merge branch 'feature/档案调整为空时不生效' into release/2.6.2.2302.02
|
2023-02-14 16:00:05 +08:00 |
|
钱涛
|
0337db02df
|
Merge branch 'feature/通过扣缴义务人和uid获取人员档案' into release/2.6.2.2302.02
|
2023-02-14 15:37:17 +08:00 |
|
钱涛
|
dee7c11eda
|
修复账套新增异常
|
2023-02-14 10:53:58 +08:00 |
|
钱涛
|
44819a0903
|
工资单后台校验
|
2023-02-13 17:25:13 +08:00 |
|
钱涛
|
2748f04d0a
|
档案为空不生效
|
2023-02-13 17:23:05 +08:00 |
|
钱涛
|
8b594c1882
|
自发起调薪流程
|
2023-02-13 14:53:35 +08:00 |
|
Harryxzy
|
3b657db52a
|
线下对比Oracle导入报错
|
2023-02-10 09:59:18 +08:00 |
|
Harryxzy
|
d30870e28d
|
调薪不支持字符
|
2023-02-09 19:24:25 +08:00 |
|
Harryxzy
|
cbc1c13e4d
|
Merge branch 'feature/V3-TaxAgentImport_AddState-0209' into release/2.6.1.2301.02
|
2023-02-09 17:40:49 +08:00 |
|
钱涛
|
8d011d8d49
|
Merge branch 'feature/账套群组不变' into release/2.6.1.2301.02
|
2023-02-09 17:32:00 +08:00 |
|
钱涛
|
995689bb1d
|
Merge branch 'feature/考勤引用本身报表' into release/2.6.1.2301.02
|
2023-02-09 17:31:42 +08:00 |
fcli
|
308a44a9a6
|
Merge remote-tracking branch 'origin/feature/SalaryItemAuth&FieldManage' into release/2.6.1.2301.02
|
2023-02-09 17:23:07 +08:00 |
|
钱涛
|
2c37086e70
|
账套群组保持不变
|
2023-02-09 15:33:35 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
Harryxzy
|
22027cde6b
|
Merge branch 'fix/MySalaryPageBug' into release/2.6.1.2301.02
|
2023-02-08 12:14:39 +08:00 |
|
Harryxzy
|
091221d0d4
|
我的薪资福利分页BUG
|
2023-02-08 12:12:45 +08:00 |
|
fcli
|
0a1198f17d
|
fix: 个税扣缴义务人范围非空判断
|
2023-02-06 17:16:11 +08:00 |
|
钱涛
|
2ff5ff0dce
|
考勤列表和导出
|
2023-02-06 16:28:56 +08:00 |
|
钱涛
|
cdfced412f
|
Merge branch 'feature/年终奖' into release/2.6.1.2301.02
|
2023-02-02 16:13:05 +08:00 |