 黎永顺
|
4477d04fb1
|
Merge branch 'release/2.15.1.2407.01-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declareDetail/components/paymentBtn.js
# pc4mobx/hrmSalary/pages/declareDetail/components/paymentFeedbackBtn.js
# pc4mobx/hrmSalary/pages/declareDetail/index.js
|
2024-08-08 17:37:18 +08:00 |
|
黎永顺
|
3ee2ece60d
|
hotfix/2.14.2.2406.02
|
2024-06-26 10:07:45 +08:00 |
|
黎永顺
|
da6a8266f6
|
hotfix/2.14.2.2406.02
|
2024-06-26 10:02:45 +08:00 |
|
黎永顺
|
8636d3a17a
|
Merge branch 'release/2.14.1.2405.01-个税' into custom-艾志工业-合并个税
|
2024-05-21 13:45:46 +08:00 |
|
黎永顺
|
a04be74c9c
|
hotfix/2.12.1.2404.02
|
2024-05-13 17:06:41 +08:00 |
|
黎永顺
|
e88b5f8974
|
Merge branch 'release/2.12.1.2404.02-个税' into custom-艾志工业-合并个税
|
2024-05-08 14:10:19 +08:00 |
|
黎永顺
|
f1670a0380
|
hotfix/2.12.1.2404.02
档案tab总数显示的优化
|
2024-04-26 14:57:06 +08:00 |
|
黎永顺
|
b38d056c8e
|
Merge branch 'release/2.12.1.2403.02-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/pages/payrollFiles/salaryFiles.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfarePlan/config.js
|
2024-04-12 17:47:26 +08:00 |
|
黎永顺
|
342aeed953
|
多语言bug
|
2024-04-02 17:45:59 +08:00 |
|
黎永顺
|
dc0137913f
|
Merge branch 'release/2.12.1.2403.02-个税' into custom-艾志工业-合并个税
|
2024-04-02 13:54:06 +08:00 |
|
黎永顺
|
8af1f0a79a
|
hotfix/2.12.1.2403.02
完成导入报错的问题处理
|
2024-03-19 17:55:37 +08:00 |
|
黎永顺
|
99e7161b07
|
custom-艾志工业-合并个税
|
2024-03-19 13:55:42 +08:00 |
|
黎永顺
|
a0b0d19ee2
|
Merge branch 'release/3.0.0.2403.01-个税' into custom-艾志工业-合并个税
|
2024-03-12 13:31:27 +08:00 |
|
黎永顺
|
20796bc14c
|
Merge branch 'hotfix/2.10.1.2402.01' into release/3.0.0.2403.01
|
2024-03-12 09:37:44 +08:00 |
|
黎永顺
|
e4d272481c
|
hotfix/3.0.0.2403.01
工资单设置添加失效设置
|
2024-03-11 17:19:20 +08:00 |
|
黎永顺
|
52dd9cccf8
|
Merge branch 'release/2.10.1.2402.01-个税' into custom-艾志工业-合并个税
|
2024-03-08 10:25:25 +08:00 |
|
黎永顺
|
f732bcaafb
|
Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
# pc4mobx/hrmSalary/stores/baseForm.js
|
2024-03-05 14:38:57 +08:00 |
|
黎永顺
|
194e575e25
|
hotfix/2.10.1.2402.01
|
2024-02-27 16:33:50 +08:00 |
|
黎永顺
|
02201018b8
|
custom-艾志工业-合并个税
薪资档案代码合并
|
2024-02-26 15:47:42 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
382c9b556e
|
Merge branch 'release/2.10.1.2401.02-个税' into custom-艾志工业-合并个税
|
2024-02-22 14:46:35 +08:00 |
|
黎永顺
|
949b907e89
|
Merge branch 'release/2.10.1.2401.02' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-21 10:50:36 +08:00 |
|
黎永顺
|
dc624af9bd
|
feature/2.10.1.2401.01-社保福利方案重构
|
2024-02-05 14:53:38 +08:00 |
|
黎永顺
|
a6f382a36b
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-31 10:24:15 +08:00 |
|
黎永顺
|
095a833084
|
release/2.10.1.2401.01
|
2024-01-29 10:39:12 +08:00 |
|
黎永顺
|
240cb316a1
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:57:30 +08:00 |
|
黎永顺
|
eb0ed15a15
|
feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置
|
2024-01-26 09:38:08 +08:00 |
|
黎永顺
|
4242856f0e
|
release/2.10.1.2401.01
薪资档案-非系统人员调薪修改
|
2024-01-25 16:11:00 +08:00 |
|
黎永顺
|
a07823c74a
|
0release/2.10.1.2401.01
|
2024-01-25 14:15:32 +08:00 |
|
黎永顺
|
38b7806b49
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-16 09:28:37 +08:00 |
|
黎永顺
|
30c73ccf88
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-15 18:18:26 +08:00 |
Harryxzy
|
12531b4ab3
|
240112temp2
|
2024-01-12 14:49:57 +08:00 |
|
Harryxzy
|
2ae026a657
|
240112temp
|
2024-01-12 14:49:24 +08:00 |
|
黎永顺
|
252d4e0ff7
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-09 17:42:40 +08:00 |
|
黎永顺
|
c01c03f1b0
|
feature/2.9.10.2312.02-薪资档案页面重构
|
2024-01-08 16:05:00 +08:00 |
|
黎永顺
|
8c5de14999
|
custom-艾志工业-合并个税
薪资档案添加始末日期字段
|
2023-12-28 18:47:50 +08:00 |
|
黎永顺
|
69f199cb9c
|
Merge branch 'release/2.9.42311.02-个税' into custom-艾志工业-合并个税
# Conflicts:
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
|
2023-11-30 14:10:05 +08:00 |
|
黎永顺
|
e246e10af7
|
hotfix/2.9.42310.02
|
2023-10-30 15:54:25 +08:00 |
|
黎永顺
|
7d0a4872dd
|
custom-艾志工业-合并个税
|
2023-10-30 15:43:12 +08:00 |
|
黎永顺
|
dc93634385
|
custom-甘肃金控/v2-薪资档案修改
|
2023-10-30 14:52:32 +08:00 |
|
黎永顺
|
42c6e91d2f
|
custom-艾志工业
|
2023-09-26 13:18:05 +08:00 |
|
黎永顺
|
a58da11dc3
|
hotfix/2.9.42309.01
20230920
|
2023-09-20 14:20:51 +08:00 |
|
黎永顺
|
6043159976
|
薪资档案发薪员工页面的调薪页面重构
|
2023-09-04 16:48:36 +08:00 |
|
黎永顺
|
b6ac297242
|
hotfix-社保福利档案以及薪资档案的导入下载模板功能优化
|
2023-08-31 11:15:32 +08:00 |
|
黎永顺
|
d5a625d4c8
|
产品-release/2.8.3.2307.02bug修复
|
2023-07-20 17:03:20 +08:00 |
|
黎永顺
|
c062f172f6
|
Merge branch 'feature/V2-非系统人员管理开发' into release/2.8.3.2307.02
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-20 13:47:42 +08:00 |
|
黎永顺
|
1542d8c982
|
非系统人员配置功能
|
2023-07-14 14:09:27 +08:00 |
|
黎永顺
|
aa1c3a6417
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
|
2023-07-13 15:11:06 +08:00 |
|
黎永顺
|
985b9612f6
|
薪资档案个税扣缴义务人选项修改
|
2023-07-13 15:02:57 +08:00 |
|
黎永顺
|
e83ff0dbcc
|
非系统人员管理开发合并
|
2023-07-13 10:31:45 +08:00 |