Commit Graph

1110 Commits

Author SHA1 Message Date
黎永顺 ff3dd0ea60 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-25 15:35:11 +08:00
黎永顺 2c56e8dc06 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-25 09:43:03 +08:00
黎永顺 9084c20717 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 19:34:16 +08:00
黎永顺 cf38c91be8 Merge branch 'feature/2.9.42309.01-社保福利档案添加非系统人员列表' into feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 18:42:37 +08:00
黎永顺 1ee6650234 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 18:42:27 +08:00
黎永顺 c0c908f6eb Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 17:48:35 +08:00
黎永顺 1c7ad4e871 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 16:59:21 +08:00
黎永顺 98054b3c8d feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 15:05:25 +08:00
黎永顺 e10e39e630 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 13:37:00 +08:00
黎永顺 e2be082a54 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-18 10:40:30 +08:00
黎永顺 f29d985e64 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-15 16:53:17 +08:00
黎永顺 707ca40f05 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-15 11:14:39 +08:00
黎永顺 d008654bf8 hotfix/2.9.42309.01 2023-09-14 15:50:24 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 4769df4cfd feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 14:05:40 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 ef16acd638 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 11:41:29 +08:00
黎永顺 2b282b4211 hotfix/2.9.42309.01 2023-09-14 10:37:39 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造(页面编辑) 2023-09-14 10:25:22 +08:00
黎永顺 5ce2f5bf31 hotfix/2.9.42308.02 2023-09-12 11:14:51 +08:00
黎永顺 f5d42d8f75 Merge branch 'hotfix/2.9.42308.02' 2023-09-08 13:53:42 +08:00
黎永顺 8da781193a hotfix/2.9.42308.02 2023-09-08 13:53:11 +08:00
黎永顺 96f65e42b0 feature/2.9.42309.01-社保福利档案添加非系统人员列表 2023-09-06 14:54:45 +08:00
黎永顺 ce462fe51a hotfix/2.9.42308.02 2023-09-06 14:27:23 +08:00
黎永顺 f593e97207 feature社保福利档案添加非系统人员列表 2023-09-06 10:19:35 +08:00
黎永顺 bb1e328c92 feature社保福利档案添加非系统人员列表 2023-09-05 16:49:26 +08:00
黎永顺 2a40afb7b4 feature社保福利档案添加非系统人员列表 2023-09-05 15:14:05 +08:00
黎永顺 bc3632e054 薪资档案发薪员工页面的调薪页面重构 2023-09-04 18:13:19 +08:00
黎永顺 6043159976 薪资档案发薪员工页面的调薪页面重构 2023-09-04 16:48:36 +08:00
黎永顺 242b96321a 样式优化 2023-09-01 14:06:32 +08:00
黎永顺 5b6480f076 hotfix/2.9.42308.02-工资单模板设置名称保存失败bug修复 2023-09-01 11:08:35 +08:00
黎永顺 cae8d86cd6 规则设置-加解密修改为默认开启 2023-09-01 09:29:49 +08:00
黎永顺 a5ba6d91b9 Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02 2023-08-31 15:04:47 +08:00
黎永顺 a5e0ca3084 薪资项目公式保存参数修改 2023-08-31 15:02:56 +08:00
黎永顺 b6ac297242 hotfix-社保福利档案以及薪资档案的导入下载模板功能优化 2023-08-31 11:15:32 +08:00
黎永顺 f65b7979d7 hotfix-薪资核算详情页面编辑刷新分页的bug 2023-08-31 09:40:09 +08:00
黎永顺 ecc2021916 2.9.42308.02bug修复 2023-08-29 14:24:43 +08:00
黎永顺 78e08d7c26 系统数字输入框保留小数位数配置 2023-08-25 16:12:05 +08:00
黎永顺 4462753f28 Merge branch 'release/2.8.3.2308.01' into hotfix/2.9.42308.02 2023-08-25 15:39:49 +08:00
黎永顺 25ce139a0c 产品-工资单产看页面dom渲染顺序优化 2023-08-21 10:53:19 +08:00
黎永顺 a22f3ade1f Merge branch 'hotfix/2.9.42308.02' into release/2.9.42308.02 2023-08-18 10:19:06 +08:00
黎永顺 8871b8ed2c hotfix/2.9.42308.02 2023-08-18 10:18:53 +08:00
黎永顺 67c09305aa Merge branch 'release/2.8.3.2308.01' 2023-08-18 09:27:03 +08:00
黎永顺 49dce1c871 代码合并 2023-08-17 13:45:21 +08:00
黎永顺 38e2b1b61b Merge branch 'feature/2.8.3.230801-非系统人员管理导入' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/payroll/stepForm/salaryItemSettings.js
2023-08-17 08:43:43 +08:00
黎永顺 9633bcabfb Merge branch 'feature/2.8.3.2308.01-社保福利方案自定义方案添加删除功能' into release/2.8.3.2308.01 2023-08-17 08:38:06 +08:00
黎永顺 290c3e51d3 Merge branch 'feature/2.8.3.2308-薪资账套薪资项目项添加编辑的功能' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/salaryItemForm.js
2023-08-17 08:37:56 +08:00
黎永顺 6d10c01f0c Merge branch 'feature/2.8.3.2307.02-工资单模板添加发放薪资项目名称修改的功能' into release/2.8.3.2308.01
# Conflicts:
#	pc4mobx/hrmSalary/stores/payroll.js
2023-08-17 08:36:27 +08:00
黎永顺 2527f75298 字段管理新增修改 2023-08-16 10:30:37 +08:00
黎永顺 5adfa47b5b bug修改-断点 2023-08-11 17:34:42 +08:00