 黎永顺
|
21ef40db3e
|
Merge branch 'release/3.0.0.2403.01' into release/3.0.0.2403.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
|
2024-03-15 15:13:18 +08:00 |
|
黎永顺
|
5e3c20edc0
|
release/3.0.0.2403.01
|
2024-03-15 09:19:59 +08:00 |
|
黎永顺
|
0771ad9ed3
|
hotfix/3.0.0.2403.01
数据采集页面导入修改重构
|
2024-03-13 17:27:49 +08:00 |
|
黎永顺
|
4c8c3e7251
|
Merge branch 'release/2.10.1.2402.01' into release/2.10.1.2402.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/employeeDetails.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/declare/declare.js
|
2024-03-06 14:42:29 +08:00 |
|
黎永顺
|
7078b1c6c4
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-23 10:13:43 +08:00 |
|
黎永顺
|
4b95f6811f
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-02-19 09:03:40 +08:00 |
|
黎永顺
|
0a680cccc2
|
Merge branch 'release/2.10.1.2401.01' into release/2.10.1.2401.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemTable.js
|
2024-02-02 13:55:08 +08:00 |
|
黎永顺
|
671f0c42b4
|
Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-30 17:38:14 +08:00 |
|
黎永顺
|
e86e4871d8
|
release/2.10.1.2401.01
|
2024-01-25 15:11:35 +08:00 |
|
黎永顺
|
9d0d04be9d
|
hotfix/2.10.1.2401.01
|
2024-01-25 14:44:12 +08:00 |
|
黎永顺
|
8f8f2a32e9
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 14:02:34 +08:00 |
|
黎永顺
|
7cb1b157eb
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 11:52:10 +08:00 |
|
黎永顺
|
9e81e8244a
|
feature/2.10.1.2401.01-页面操作日志添加
|
2024-01-25 09:16:57 +08:00 |
|
黎永顺
|
98f35401e6
|
release/2.9.10.2312.02
工资单样式修改
|
2024-01-18 14:44:24 +08:00 |
|
黎永顺
|
a33b47373d
|
Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/calculate/calculate.js
# pc4mobx/hrmSalary/pages/declare/declare.js
# pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
# pc4mobx/hrmSalary/pages/payrollRelease/index.js
|
2024-01-17 14:31:34 +08:00 |
 钱涛
|
f312e66017
|
工资单标题字体大小改为25px
|
2024-01-17 10:00:19 +08:00 |
|
黎永顺
|
1a38752cc6
|
1release/2.9.10.2312.02
|
2024-01-17 09:44:50 +08:00 |
|
黎永顺
|
93a0c76753
|
1release/2.9.10.2312.02
|
2024-01-16 16:23:29 +08:00 |
|
黎永顺
|
b5cfdb8b69
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:35:31 +08:00 |
|
黎永顺
|
43ff36d59f
|
hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
|
2024-01-15 09:34:49 +08:00 |
|
黎永顺
|
c6e71bd069
|
hotfix/2.9.10.2312.02
|
2024-01-11 14:50:28 +08:00 |
|
黎永顺
|
15bc21ecd5
|
release/2.9.10.2312.02
|
2024-01-10 14:43:07 +08:00 |
|
黎永顺
|
6a7220ffc2
|
Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02
|
2023-12-29 10:08:36 +08:00 |
|
黎永顺
|
8adcd121c6
|
hotfix/2.9.9.2312.02-个税
|
2023-12-28 20:59:05 +08:00 |
|
黎永顺
|
83c0aa08da
|
hotfix/2.9.9.2312.02-个税
|
2023-12-28 18:08:26 +08:00 |
|
黎永顺
|
707b27038c
|
Merge branch 'release/2.9.10.2312.02' into release/2.9.9.2312.02-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/cumSituation.js
# pc4mobx/hrmSalary/apis/declare.js
|
2023-12-26 14:24:05 +08:00 |
|
黎永顺
|
a59bc06d7a
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 13:25:47 +08:00 |
|
黎永顺
|
7db9e03b0d
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-20 10:18:58 +08:00 |
|
黎永顺
|
4acefa765c
|
hotfix/2.9.9.2312.01
导入组件优化
|
2023-12-12 15:19:59 +08:00 |
|
黎永顺
|
43012b2025
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 15:56:39 +08:00 |
|
黎永顺
|
3eb8c47a87
|
feature/2.9.9.2312.01-工资单查看页面重构
|
2023-12-08 13:39:55 +08:00 |
|
黎永顺
|
ce1acae344
|
Merge branch 'release/2.9.9.2312.01' into release/2.9.9.2312.01-个税
|
2023-12-05 17:16:37 +08:00 |
|
黎永顺
|
78aaac8115
|
工资单修改
|
2023-12-01 16:39:31 +08:00 |
|
黎永顺
|
80cf2835d3
|
Merge branch 'master' into release/2.9.42311.02-个税
|
2023-11-28 15:25:28 +08:00 |
|
黎永顺
|
24cf38e964
|
Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02
|
2023-11-24 14:06:48 +08:00 |
|
黎永顺
|
b1ac23227a
|
合并1101的代码以及添加个税扣缴义务人中的非系统人员配置
|
2023-11-09 10:27:20 +08:00 |
|
黎永顺
|
06895e5a36
|
Merge branch 'hotfix/2.9.42310.02' into release/2.9.42310.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/columns.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
|
2023-10-26 10:41:40 +08:00 |
|
黎永顺
|
7d09c5b55b
|
hotfix/2.9.42310.02
数据采集日期组件选择失败的bug处理
|
2023-10-25 15:45:38 +08:00 |
|
黎永顺
|
8f23fc6c8b
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
|
2023-10-23 10:57:27 +08:00 |
|
黎永顺
|
4898ff8335
|
hotfix/2.9.42310.01
|
2023-10-20 11:39:20 +08:00 |
|
黎永顺
|
bec2e5a5b2
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 11:51:41 +08:00 |
|
黎永顺
|
5031d3a032
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-19 09:42:46 +08:00 |
|
黎永顺
|
dadb749c4c
|
feature/2.9.42310.01-工资单发放页面重构
|
2023-10-18 17:12:44 +08:00 |
|
黎永顺
|
f3e1e1e166
|
Merge branch 'release/2.9.42310.01' into release/2.9.42310.01-个税
|
2023-10-08 16:14:59 +08:00 |
|
黎永顺
|
ff3dd0ea60
|
feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-25 15:35:11 +08:00 |
|
黎永顺
|
1bd7d92073
|
Merge branch 'release/2.9.42309.01' into release/2.9.42309.01-个税
# Conflicts:
# pc4mobx/hrmSalary/components/importDialog/components/impStep1.js
# pc4mobx/hrmSalary/components/importDialog/index.js
# pc4mobx/hrmSalary/components/importDialog/index.less
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2023-09-21 14:23:21 +08:00 |
|
黎永顺
|
c0c908f6eb
|
Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑）
|
2023-09-18 17:48:35 +08:00 |
|
黎永顺
|
80d819a21b
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01-个税
|
2023-09-18 13:37:41 +08:00 |
|
黎永顺
|
b52afbb7c8
|
Merge branch 'hotfix/2.9.42309.01' into release/2.9.42309.01
|
2023-09-14 14:21:45 +08:00 |
|
黎永顺
|
85867da080
|
hotfix/2.9.42309.01
|
2023-09-14 14:19:08 +08:00 |