Commit Graph

48 Commits

Author SHA1 Message Date
lys 62300a9f3d custom/网联清算有限公司(0401) 2025-12-05 15:04:40 +08:00
lys 61ff174303 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 2025-09-12 09:58:22 +08:00
lys 915e946c3e release/2.19.1.2501.01 2025-09-12 09:57:54 +08:00
lys b0e7cbfc41 release/3.0.1.2504.01-合并业务线 2025-06-12 10:37:23 +08:00
lys 4ca0a4b756 Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2504.01-合并业务线 2025-04-23 17:41:18 +08:00
lys 9a50947d8a release/2.19.1.2501.01 2025-04-23 17:34:46 +08:00
lys d652b2cdc6 release/2.19.1.2501.01 2025-04-23 16:13:49 +08:00
lys 2357ee50a6 Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
#	pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
2025-02-12 15:25:54 +08:00
lys 7fd6edb02d feature/2.19.1.2501.01-套打功能 2025-02-07 16:44:09 +08:00
lys 7c317607ea Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
2025-01-22 11:13:55 +08:00
lys 13dc35f122 release/2.19.1.2501.01 2025-01-03 17:14:33 +08:00
lys 9740a9ef77 release/2.19.1.2501.01 2025-01-03 15:50:59 +08:00
lys 2c03908885 release/2.18.2.2412.02 2025-01-03 15:49:53 +08:00
lys 368542a52b Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
#	pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
#	pc4mobx/hrmSalary/pages/ledgerPage/index.less
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
2024-10-25 09:43:15 +08:00
lys 4b125994f7 release/2.16.1.2410.01 2024-10-17 11:17:55 +08:00
黎永顺 394d7152f4 feature/2.15.1.2407.01-权限 2024-09-12 13:13:51 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 a6f382a36b feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 10:24:15 +08:00
黎永顺 1a38752cc6 1release/2.9.10.2312.02 2024-01-17 09:44:50 +08:00
黎永顺 5a90471e74 1release/2.9.10.2312.02 2024-01-16 09:32:12 +08:00
黎永顺 5895cf793c hotfix/2.9.10.2312.02
工资单查看-移动端备注信息展示错误的修改
2024-01-15 10:15:41 +08:00
黎永顺 ca5b60f6aa feature/2.9.42310.01-个税申报表页面重构 2023-10-12 13:57:14 +08:00
黎永顺 4d91a9b365 产品-个税申报表添加撤回的功能 2023-06-12 14:51:09 +08:00
黎永顺 473ce9e204 个税申报表页面分页bug 2023-03-29 14:29:05 +08:00
黎永顺 c95cdb5887 个税申报表查看详情页面参数渲染问题修改 2023-03-08 17:39:40 +08:00
黎永顺 d77a3f5fca 薪酬页面滚动的修改 2023-02-13 10:41:40 +08:00
黎永顺 691358a9e2 统一系统右键 2022-12-01 14:28:30 +08:00
18652063575 aa7ec55294 禅道bug的修复 2022-10-26 18:40:25 +08:00
18652063575 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
18652063575 0cec0873fe 统一所有页面你的弹框以及抽屉头部组件 2022-09-13 16:39:15 +08:00
18652063575 a55847e656 bug的修正 2022-09-09 10:29:12 +08:00
liyongshun 134653fac6 薪资发放页面添加进度条弹框组件 2022-07-21 17:34:10 +08:00
liyongshun 561900ae49 个税申报申报表bug的修复 2022-07-06 18:11:54 +08:00
liyongshun f89ada73db 精度丢失的bug 2022-06-30 11:28:13 +08:00
liyongshun 78b12043aa 页面操作按钮权限的控制 2022-06-21 14:27:16 +08:00
liyongshun adc089b033 注释个税申报的个税申报人选项 2022-06-07 18:48:25 +08:00
liyongshun f5b947c80c Merge branch 'liys_dev' into fenquan 2022-06-07 18:37:35 +08:00
liyongshun 9193e6b2e9 bug修改 2022-06-07 18:24:05 +08:00
MustangDeng c7128fcfb0 bug修改 2022-06-07 09:08:36 +08:00
MustangDeng c9cda1fdfc bug 处理 2022-06-02 13:51:45 +08:00
MustangDeng 95166a6534 bug修复 2022-05-30 17:30:53 +08:00
MustangDeng 9fbf1e988e 列表加载 2022-04-25 17:18:58 +08:00
MustangDeng 3fbfa85d34 日期区间 2022-04-25 10:03:07 +08:00
MustangDeng c382c9ce53 分页逻辑调整 2022-04-24 17:52:38 +08:00
MustangDeng d2dd726b20 工资单列表 2022-04-21 16:51:51 +08:00
MustangDeng bd21135a22 账套公式,个税申报表 2022-04-20 15:28:40 +08:00
MustangDeng 34b9dd6cda 个税申报白鸥 2022-03-18 10:38:43 +08:00
MustangDeng 8ffb9e519a 路由修改 2022-03-10 10:58:26 +08:00