Commit Graph

51 Commits

Author SHA1 Message Date
黎永顺 95f5043393 Merge branch 'feature/2.19.1.2501.01-PC端Token验证' into custom/新美光(0401)
# Conflicts:
#	pc4mobx/hrmSalary/components/captchaModal/index.js
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
2026-03-18 14:21:08 +08:00
lys 693c436d4a Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 2025-05-20 16:50:29 +08:00
lys 9e26192aa2 release/2.19.1.2501.01 2025-05-09 19:14:38 +08:00
lys abbf593c99 feature/2.19.1.2501.01-验证码验证 2025-04-25 15:58:01 +08:00
lys 40c7a4f7a0 feature/2.19.1.2501.01-PC端Token验证 2025-04-25 13:55:23 +08:00
lys fad6c3a2b1 Merge branch 'feature/2.19.1.2501.01-验证码验证' into feature/2.19.1.2501.01-PC端Token验证
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
2025-04-25 13:40:44 +08:00
lys 04b3415353 release/2.19.1.2501.01 2025-04-25 13:38:43 +08:00
lys ae7785ff6e feature/2.19.1.2501.01-PC端Token验证 2025-04-18 11:39:11 +08:00
lys cd0706fe23 Merge branch 'feature/2.19.1.2501.01-移动端查看工资单密码设置' into feature/2.19.1.2501.01-PC端Token验证
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
2025-04-18 11:30:56 +08:00
lys 554cf4b6b3 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:44:30 +08:00
lys b01d280644 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 17:12:53 +08:00
lys 5ab71a3492 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 15:56:32 +08:00
lys aaf00ace3c feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 15:13:40 +08:00
lys 94c9a39f9f feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 14:23:31 +08:00
lys fab27c99ed feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-17 09:54:03 +08:00
lys 55ccd83916 feature/2.19.1.2501.01-移动端查看工资单密码设置 2025-04-16 16:22:51 +08:00
lys 83607e1c0d feature/2.19.1.2501.01-PC端Token验证 2025-04-15 16:54:11 +08:00
lys 51d9c58888 release/2.19.1.2501.01 2025-04-15 16:27:19 +08:00
lys e09f4da1cf release/2.17.1.2411.01 2024-11-13 10:19:57 +08:00
lys e9f4d9b043 release/2.16.1.2410.01 2024-11-06 11:06:55 +08:00
黎永顺 bd811da894 hotfix/2.14.2.2405.02
工资单查看报错
2024-05-28 11:42:26 +08:00
黎永顺 817f9767fc feature/2.10.1.2401.01-工资单配置反馈开关 2024-01-30 16:57:21 +08:00
黎永顺 eb9d043d74 feature/2.10.1.2401.01-工资单模板复制以及移动端地址配置 2024-01-24 16:29:27 +08:00
黎永顺 b5dba954c6 feature/2.9.9.2312.01-工资单查看页面重构 2023-12-12 13:41:59 +08:00
黎永顺 43012b2025 feature/2.9.9.2312.01-工资单查看页面重构 2023-12-08 15:56:39 +08:00
黎永顺 2b4b5623bc hotfix/2.9.9.2312.01
查看薪資核算页面添加权限,移动端薪资查看修改
2023-12-06 18:28:02 +08:00
黎永顺 04ab495c25 hotfix/2.9.9.2312.01 2023-12-01 17:22:34 +08:00
黎永顺 f2027627f4 hotfix/2.9.42310.01 2023-10-12 14:08:48 +08:00
黎永顺 d67b8bc6ab hotfix/2.9.42310.01 2023-10-11 18:23:19 +08:00
黎永顺 dd9d429a81 hotfix/2.9.42310.01
工资单查看权限
2023-10-11 16:23:55 +08:00
黎永顺 8da781193a hotfix/2.9.42308.02 2023-09-08 13:53:11 +08:00
黎永顺 25ce139a0c 产品-工资单产看页面dom渲染顺序优化 2023-08-21 10:53:19 +08:00
黎永顺 d5a625d4c8 产品-release/2.8.3.2307.02bug修复 2023-07-20 17:03:20 +08:00
黎永顺 70bd93ef2f Merge branch 'release/2.8.3.2307.01' into feature/2.8.3.2307.02-工资单反馈
# Conflicts:
#	pc4mobx/hrmSalary/pages/mobilePayroll/index.js
#	pc4mobx/hrmSalary/pages/payroll/stepForm/baseInformForm.js
#	pc4mobx/hrmSalary/pages/ruleConfig/index.js
2023-07-17 17:09:27 +08:00
黎永顺 2af9059775 产品-工资单反馈跳转验证 2023-07-17 14:43:01 +08:00
黎永顺 4fa57ba637 产品-工资单反馈开发 2023-07-17 11:43:14 +08:00
黎永顺 aff963b5c6 工资单反馈功能新增 2023-07-13 14:45:25 +08:00
黎永顺 b8c8297cf0 产品-工资单反馈 2023-07-12 10:14:38 +08:00
黎永顺 9226ef19b3 产品-移动端二次验证密码设置 2023-07-10 09:21:57 +08:00
黎永顺 dc27a3e491 产品-工资单发放查看页面空白的问题处理 2023-06-29 14:59:24 +08:00
黎永顺 229884d9ed Merge branch 'feature/0612-工资单水印设置' into release/2.8.3.2306.02 2023-06-26 11:30:35 +08:00
黎永顺 fca33c32c1 产品-工资单移动端查看添加二次验证 2023-06-16 17:23:08 +08:00
黎永顺 d71b879290 产品-工资单验证方式 2023-06-16 16:34:03 +08:00
黎永顺 eecd18cfa5 产品-工资单发放移动端页面权限认证 2023-05-18 09:06:17 +08:00
黎永顺 7ea5936829 产品薪资账套-薪资账套中的薪资项目bug修改 2023-04-10 15:53:53 +08:00
黎永顺 4e6f727727 薪资项目列表操作权限修改 2023-02-15 14:18:20 +08:00
18652063575 7384d124b2 工资单发放页面报错的bug处理 2022-10-24 11:24:09 +08:00
18652063575 a55847e656 bug的修正 2022-09-09 10:29:12 +08:00
18652063575 938fb94743 bug的修正 2022-09-08 17:04:36 +08:00
liyongshun a80fc0c66c 薪资查看页面添加权限 2022-07-12 18:15:27 +08:00