 黎永顺
|
9e75d1aca6
|
Merge branch 'feature/V2-非系统人员管理开发' into develop
|
2023-07-13 10:05:38 +08:00 |
|
黎永顺
|
eaf8e5c51e
|
非系统人员管理开发合并
|
2023-07-13 10:05:16 +08:00 |
|
黎永顺
|
981cd54262
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-13 09:38:16 +08:00 |
|
黎永顺
|
7c908c81db
|
产品-薪資核算核算页面的列表带搜索条件翻页查询不错的bug修复
|
2023-07-13 09:37:17 +08:00 |
|
黎永顺
|
ef3b74c98f
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 16:22:04 +08:00 |
|
黎永顺
|
a3e9a6e733
|
产品-工资单反馈改造
|
2023-07-12 16:18:54 +08:00 |
|
黎永顺
|
8356de0fa2
|
非系统人员开发合并
|
2023-07-12 14:34:07 +08:00 |
|
黎永顺
|
38c9d97f54
|
非系统人员开发合并
|
2023-07-12 13:43:15 +08:00 |
|
黎永顺
|
147749796a
|
产品-工资单反馈
|
2023-07-12 11:32:15 +08:00 |
|
黎永顺
|
ed53bb6a9e
|
Merge branch 'feature/工资单反馈' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mobilePayroll/index.js
# pc4mobx/hrmSalary/pages/ruleConfig/index.js
|
2023-07-12 10:19:36 +08:00 |
|
黎永顺
|
b8c8297cf0
|
产品-工资单反馈
|
2023-07-12 10:14:38 +08:00 |
|
黎永顺
|
62914e0ed0
|
非系统人员管理开发合并
|
2023-07-11 18:07:40 +08:00 |
|
黎永顺
|
cb9056c50a
|
非系统人员管理开发合并
|
2023-07-11 17:49:31 +08:00 |
|
黎永顺
|
ce50c9cf91
|
Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/payrollFiles/index.js
# pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
# pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
# pc4mobx/hrmSalary/util/index.js
|
2023-07-11 17:36:38 +08:00 |
|
黎永顺
|
eb2d77e399
|
产品-工资单反馈
|
2023-07-11 17:27:45 +08:00 |
|
黎永顺
|
facc8dd4f6
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-11 12:08:18 +08:00 |
|
黎永顺
|
a13f31eefa
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 12:08:01 +08:00 |
|
黎永顺
|
d8fdc8096b
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 11:43:05 +08:00 |
|
黎永顺
|
405e2a9bc6
|
产品-工资单模板移动端二次密码设置
|
2023-07-11 10:44:49 +08:00 |
|
黎永顺
|
986e2d7f4a
|
Merge branch 'hotfix/2.8.3.2307.01' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-11 10:11:58 +08:00 |
|
黎永顺
|
4ffa11d5a1
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-11 09:08:46 +08:00 |
|
黎永顺
|
c8fe01dfda
|
产品-薪酬统计报表echarts图标组件封装
|
2023-07-10 15:52:25 +08:00 |
|
黎永顺
|
0159fe0647
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 11:40:52 +08:00 |
|
黎永顺
|
cc4cccf111
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:39:36 +08:00 |
|
黎永顺
|
f30c80e2ef
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-10 11:01:12 +08:00 |
|
黎永顺
|
d984a105fd
|
产品-多页面列表查询人员状态传参统一修改为数组
|
2023-07-10 11:00:47 +08:00 |
|
黎永顺
|
54d23aeb57
|
Merge branch 'feature/230701-维护工具-删除档案' into release/2.8.3.2307.01
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-10 10:05:27 +08:00 |
|
黎永顺
|
448bde008f
|
Merge branch 'feature/230701-工资单定时发送任务' into release/2.8.3.2307.01
|
2023-07-10 10:04:02 +08:00 |
|
黎永顺
|
b51b408526
|
Merge branch 'feature/230701-工资单移动端查看二次密码验证设置' into develop
|
2023-07-10 09:58:49 +08:00 |
|
黎永顺
|
9226ef19b3
|
产品-移动端二次验证密码设置
|
2023-07-10 09:21:57 +08:00 |
|
黎永顺
|
424b3bbfb2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 13:45:31 +08:00 |
|
黎永顺
|
aa9c4223b6
|
产品-薪资核算弹框样式修改
|
2023-07-07 13:45:11 +08:00 |
|
黎永顺
|
b14e889d57
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-07 11:03:03 +08:00 |
|
黎永顺
|
153be5b7a7
|
产品-列表按钮数统一
|
2023-07-07 10:47:45 +08:00 |
|
黎永顺
|
8b143a937f
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 14:06:08 +08:00 |
|
黎永顺
|
ae79ab24c3
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 14:04:26 +08:00 |
|
黎永顺
|
f8c1806d50
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-05 10:55:07 +08:00 |
|
黎永顺
|
e501aa293e
|
产品-工资单模板定时发放添加薪资所属月
|
2023-07-05 10:54:39 +08:00 |
|
黎永顺
|
d2fe01c759
|
产品-工资单模板定时发放bug处理以及规则设置
|
2023-07-04 17:37:04 +08:00 |
|
黎永顺
|
d4aa7305c2
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:02:27 +08:00 |
|
黎永顺
|
ff7ef86172
|
产品-薪资核算列表样式修改
|
2023-07-04 16:02:15 +08:00 |
|
黎永顺
|
600816c98f
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 16:00:15 +08:00 |
|
黎永顺
|
0772c85c01
|
产品-薪资核算列表样式修改
|
2023-07-04 16:00:01 +08:00 |
|
黎永顺
|
0188608722
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
|
2023-07-04 15:56:23 +08:00 |
|
黎永顺
|
17a1262d46
|
产品-薪资核算列表样式修改
|
2023-07-04 15:56:06 +08:00 |
|
黎永顺
|
ac17ecccc0
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-04 15:42:54 +08:00 |
|
黎永顺
|
61ebfdf9f1
|
产品-薪酬统计报表图表组件优化
|
2023-07-04 15:42:39 +08:00 |
|
黎永顺
|
a204cc0729
|
Merge branch 'feature/230701-工资单定时发送任务' into develop
|
2023-07-04 09:11:33 +08:00 |
|
黎永顺
|
91b2e92c11
|
Merge branch 'feature/230701-列表上面操作按钮显示两个' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-07-04 09:11:17 +08:00 |
|
黎永顺
|
2ede16eee6
|
Merge branch 'hotfix/2.8.3.2307.01' into develop
|
2023-07-03 17:30:08 +08:00 |