 黎永顺
|
167caa4f5b
|
薪酬統計新功能开发
|
2023-04-12 15:53:32 +08:00 |
|
黎永顺
|
8fe5f201c6
|
薪酬統計
|
2023-04-12 10:47:51 +08:00 |
|
黎永顺
|
6846e81498
|
产品-薪酬分析统计
|
2023-04-11 14:34:17 +08:00 |
|
黎永顺
|
dfae2661a6
|
产品功能-薪酬统计分析
|
2023-04-11 13:41:56 +08:00 |
|
黎永顺
|
e2ce9eb457
|
Merge branch 'feature/V2-社保福利台账核算总计行' into develop
|
2023-04-10 15:58:27 +08:00 |
|
黎永顺
|
7ea5936829
|
产品薪资账套-薪资账套中的薪资项目bug修改
|
2023-04-10 15:53:53 +08:00 |
|
黎永顺
|
f9eb7b9a1d
|
产品薪资账套-社保福利台账核算总计行
|
2023-04-07 17:27:20 +08:00 |
|
黎永顺
|
43d00a4232
|
产品薪资账套-薪资项目tab下的列表隐藏列操作的bug修复
|
2023-04-07 13:51:06 +08:00 |
|
黎永顺
|
cefe6ee46d
|
数据采集模块四个页面的导出全部功能添加参数的筛选功能以及薪资核算页面的带条件导出全部的功能
|
2023-04-06 17:07:22 +08:00 |
|
黎永顺
|
37f60c2875
|
社保福利台账详情页面替换表格，添加合计行
|
2023-04-06 13:30:23 +08:00 |
|
黎永顺
|
444857a0d8
|
社保福利台账详情页面替换表格，添加合计行
|
2023-04-06 11:24:47 +08:00 |
|
黎永顺
|
a336a63b73
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:14:09 +08:00 |
|
黎永顺
|
9cacf05b6d
|
薪酬产品-往期累计情况（工资、薪金）添加个人公积金编辑项以及其他模块bug修复
|
2023-04-04 17:13:58 +08:00 |
|
黎永顺
|
cbf784a2e9
|
Merge branch 'feature/V2-薪资档案取消待停薪功能' into develop
|
2023-03-30 13:57:02 +08:00 |
|
黎永顺
|
473ce9e204
|
个税申报表页面分页bug
|
2023-03-29 14:29:05 +08:00 |
|
黎永顺
|
bd6242f413
|
薪资档案待停薪页面添加取消待办的功能
|
2023-03-29 09:28:55 +08:00 |
|
黎永顺
|
98fba85bdd
|
薪资档案待停薪页面添加取消待办的功能
|
2023-03-28 15:13:14 +08:00 |
|
黎永顺
|
3368f121fd
|
薪资核算详情导入缓存功能
|
2023-03-28 09:47:45 +08:00 |
|
黎永顺
|
8f1b7ae7c1
|
关联人员分页的问题
|
2023-03-27 14:03:26 +08:00 |
|
黎永顺
|
20c49b92d8
|
薪资项目管理新建自定义薪资项目，选择公式（公式内容为空）保存后，公式内薪资项目为空无法引用
|
2023-03-22 15:10:58 +08:00 |
|
黎永顺
|
09ee398bfc
|
优化
|
2023-03-20 18:00:36 +08:00 |
|
黎永顺
|
a3d11cf249
|
产品-薪资档案页面待停薪列表添加取消待办的功能
|
2023-03-20 14:45:09 +08:00 |
|
黎永顺
|
785ecf9ae8
|
产品-薪资核算详情页面的导入添加额外字段添加缓存的功能
|
2023-03-17 17:52:27 +08:00 |
|
黎永顺
|
7c330c2675
|
工资单发放页面列表优化
|
2023-03-17 14:36:45 +08:00 |
|
黎永顺
|
328ad2b1d4
|
Merge branch 'hotfix/v2-03-16' into develop
|
2023-03-17 11:09:11 +08:00 |
|
黎永顺
|
4b241b2816
|
非系统人员管理开发
|
2023-03-17 11:00:58 +08:00 |
|
黎永顺
|
a1b8fc3f51
|
非系统人员管理开发
|
2023-03-16 18:32:24 +08:00 |
|
黎永顺
|
fa581dd2ad
|
社保福利臺站-添加合计行数据
|
2023-03-16 17:33:06 +08:00 |
|
黎永顺
|
6babf486e3
|
社保福利台账详情页面添加合计行列表
|
2023-03-16 17:03:24 +08:00 |
|
黎永顺
|
4c545d74ca
|
非系统人员修改
|
2023-03-16 11:44:12 +08:00 |
|
黎永顺
|
fb3b4c7d59
|
非系统人员修改
|
2023-03-16 11:03:52 +08:00 |
|
黎永顺
|
49fb957550
|
非系统人员功能开发
|
2023-03-16 09:05:34 +08:00 |
|
黎永顺
|
2384398ce9
|
产品-社保福利方案列表渲染修改
|
2023-03-15 17:23:08 +08:00 |
|
黎永顺
|
79ea27233f
|
工资单发放页面接口优化
|
2023-03-15 14:36:09 +08:00 |
|
黎永顺
|
e14ebaacad
|
非系统人员管理开发
|
2023-03-15 14:21:26 +08:00 |
|
黎永顺
|
39d526d59e
|
社保福利档案bug修复
|
2023-03-15 10:18:38 +08:00 |
|
黎永顺
|
efadb541f5
|
非系统人员管理-新功能开发
|
2023-03-14 18:14:23 +08:00 |
|
黎永顺
|
eb207921cd
|
非系统人员管理-新功能开发
|
2023-03-13 14:40:19 +08:00 |
|
黎永顺
|
a6cf191c29
|
非系统人员管理-新功能开发
|
2023-03-13 10:43:25 +08:00 |
|
黎永顺
|
c6d02c80c4
|
薪资账套-基本信息修改
|
2023-03-13 09:18:17 +08:00 |
|
黎永顺
|
a94c534f76
|
Merge branch 'hotfix/v2-03-09' into develop
|
2023-03-10 14:35:36 +08:00 |
|
黎永顺
|
8c2afc8787
|
Merge branch 'feature/v2-薪资账套-薪资项目项移动到大类新功能开发' into develop
|
2023-03-10 14:35:07 +08:00 |
|
黎永顺
|
1bb37fa085
|
薪资账套-薪资项目移动到功能bug修复
|
2023-03-10 14:34:35 +08:00 |
|
黎永顺
|
afd39f37d8
|
禅道bug修改
|
2023-03-10 14:09:50 +08:00 |
|
黎永顺
|
c46582560e
|
Merge branch 'feature/v2-数据采集-考勤引用页面重构' into develop
|
2023-03-10 11:43:44 +08:00 |
|
黎永顺
|
884b4c2d18
|
Merge branch 'feature/v2-薪资账套-薪资项目项移动到大类新功能开发' into develop
|
2023-03-10 11:43:25 +08:00 |
|
黎永顺
|
bfc8a2c475
|
Merge branch 'hotfix/v2-03-09' into develop
|
2023-03-10 11:43:02 +08:00 |
|
黎永顺
|
a21405341c
|
移动至
|
2023-03-10 11:42:33 +08:00 |
|
黎永顺
|
69bf6982a0
|
薪资账套-薪资项目预览功能页面调整
|
2023-03-10 10:36:44 +08:00 |
|
黎永顺
|
bd1de3531f
|
Merge branch 'feature/v2-薪资账套-薪资项目项移动到大类新功能开发' into develop
|
2023-03-08 18:58:44 +08:00 |
|
黎永顺
|
3d7850431a
|
薪资账套-薪资项目移动
|
2023-03-08 18:58:22 +08:00 |
|
黎永顺
|
7a4604a860
|
数据采集-考勤引用页面重构
|
2023-03-08 18:35:27 +08:00 |
|
黎永顺
|
2457f659c4
|
薪资账套-薪资项目项移动到大类新功能开发
|
2023-03-08 18:01:36 +08:00 |
|
黎永顺
|
c95cdb5887
|
个税申报表查看详情页面参数渲染问题修改
|
2023-03-08 17:39:40 +08:00 |
|
黎永顺
|
8437c29a88
|
薪资账套-薪资项目移动到功能
|
2023-03-08 17:35:24 +08:00 |
|
黎永顺
|
f166ae83fa
|
薪资账套-薪资项目移动到功能
|
2023-03-08 17:12:17 +08:00 |
|
黎永顺
|
96ae39c241
|
薪资账套-薪资项目移动到功能
|
2023-03-08 16:15:04 +08:00 |
|
黎永顺
|
2dd2175ea2
|
薪资账套-薪资项目公式保存bug
|
2023-03-08 15:57:00 +08:00 |
|
黎永顺
|
2e9d4490cc
|
薪资账套-薪资项目新功能开发
|
2023-03-08 15:42:10 +08:00 |
|
黎永顺
|
7500887660
|
数据采集-考勤引用页面重构
|
2023-03-08 15:03:08 +08:00 |
|
黎永顺
|
72959ca015
|
数据采集-考勤引用页面重构
|
2023-03-08 13:54:27 +08:00 |
|
黎永顺
|
8f8ffa5714
|
薪资档案页面回复列定制功能
|
2023-03-07 18:07:33 +08:00 |
|
黎永顺
|
24f1d6ddd0
|
薪资账套bug修复
|
2023-03-07 16:15:17 +08:00 |
|
黎永顺
|
6d5258daa5
|
数据采集-考勤引用页面重构
|
2023-03-07 14:47:47 +08:00 |
|
黎永顺
|
28a23e3cb1
|
薪资项目管理页面接口参数调整
|
2023-03-06 17:23:25 +08:00 |
|
黎永顺
|
1fc70a9978
|
数据采集-考勤引用页面重构
|
2023-03-06 17:13:08 +08:00 |
|
黎永顺
|
da841c8dcc
|
薪资账套-保存去掉薪资项目的功能内容项
|
2023-03-06 15:18:22 +08:00 |
|
黎永顺
|
34dd145e00
|
数据采集-考勤引用页面重构
|
2023-03-06 15:08:50 +08:00 |
|
黎永顺
|
33e96c4437
|
数据采集-考勤引用页面重构
|
2023-03-06 15:06:56 +08:00 |
|
黎永顺
|
64375f681d
|
数据采集-考勤引用页面重构
|
2023-03-03 17:33:11 +08:00 |
|
黎永顺
|
7907fd5a83
|
数据采集-考勤引用页面重构
|
2023-03-03 16:29:52 +08:00 |
|
黎永顺
|
1d2705931f
|
我的薪资福利页面查询优化
|
2023-03-03 14:20:43 +08:00 |
|
黎永顺
|
8b1b16d5e4
|
工资单背景图片去掉
|
2023-03-03 09:19:18 +08:00 |
|
黎永顺
|
a0b83d7770
|
工资单背景图片去掉
|
2023-03-03 09:14:35 +08:00 |
|
黎永顺
|
57da206fcb
|
系统bug处理
|
2023-03-02 19:13:40 +08:00 |
|
黎永顺
|
266681cbc8
|
系统bug处理
|
2023-03-02 18:57:30 +08:00 |
|
黎永顺
|
10721ecba0
|
社保福利方案-自定义方案页面重构
|
2023-03-02 18:44:36 +08:00 |
|
黎永顺
|
64dd62cc83
|
工资单模板背景bug修改
|
2023-03-02 17:23:23 +08:00 |
|
黎永顺
|
c902c32140
|
考勤引用模块页面重构
|
2023-03-02 14:07:36 +08:00 |
|
黎永顺
|
77c763d421
|
bug
修复
|
2023-03-02 09:38:29 +08:00 |
|
黎永顺
|
e9b6fd32b6
|
bug
修复
|
2023-03-02 09:34:04 +08:00 |
|
黎永顺
|
5d4f763316
|
bug
修复
|
2023-03-01 18:29:28 +08:00 |
|
黎永顺
|
3d67ee671f
|
考勤引用页面重构
|
2023-03-01 18:07:49 +08:00 |
|
黎永顺
|
fe71ce161b
|
考勤引用页面重构
|
2023-03-01 16:28:34 +08:00 |
|
黎永顺
|
c9560ae679
|
考勤引用页面重构
|
2023-03-01 15:23:56 +08:00 |
|
黎永顺
|
36e0e40bdd
|
考勤引用页面重构
|
2023-03-01 11:15:28 +08:00 |
|
黎永顺
|
c60ed4da78
|
bug修复
|
2023-03-01 10:11:11 +08:00 |
|
黎永顺
|
33ac08515e
|
bug修复
|
2023-03-01 09:05:57 +08:00 |
|
黎永顺
|
ef7e7d4ae5
|
bug修复
|
2023-02-28 18:16:17 +08:00 |
|
黎永顺
|
cf1f12451e
|
弹框样式修改
|
2023-02-28 10:43:50 +08:00 |
|
黎永顺
|
aaff69de31
|
工资单查看详情页面列表滚动
|
2023-02-28 09:59:21 +08:00 |
|
黎永顺
|
ee712a5056
|
社保福利档案日期控件修改
|
2023-02-28 09:26:54 +08:00 |
|
黎永顺
|
8a859da6fe
|
薪资账套已有bug修复
|
2023-02-27 18:59:18 +08:00 |
|
黎永顺
|
3d783247e9
|
薪资账套已有bug修复
|
2023-02-27 18:28:05 +08:00 |
|
黎永顺
|
70d15cd06e
|
薪资项目管理按钮权限的修改
|
2023-02-27 13:28:49 +08:00 |
|
黎永顺
|
de7180882d
|
薪资项目管理按钮权限的修改
|
2023-02-27 13:23:41 +08:00 |
|
黎永顺
|
7539c60af5
|
社保福利方案表格固定的bug处理
|
2023-02-27 09:16:57 +08:00 |
|
黎永顺
|
bbc855d6bd
|
已知bug修复
|
2023-02-24 15:52:19 +08:00 |
|
黎永顺
|
df7c8b943f
|
考勤引用页面重构
|
2023-02-24 11:05:52 +08:00 |
|
黎永顺
|
667aa8808d
|
考勤引用页面重构
|
2023-02-23 17:25:45 +08:00 |
|
黎永顺
|
94a8a6f05a
|
社保福利方案修改
|
2023-02-23 16:43:14 +08:00 |
|
黎永顺
|
172af786ed
|
221环境测试出的bug修复
|
2023-02-23 15:59:28 +08:00 |
|
黎永顺
|
2cbcb414fb
|
禅道bug修复回归
|
2023-02-22 19:16:34 +08:00 |
|
黎永顺
|
e89c2f92f4
|
Merge branch 'feature/V2-数据采集页面重构' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
|
2023-02-22 17:26:36 +08:00 |
|
黎永顺
|
a77c800995
|
数据采集页面重构
|
2023-02-22 14:00:34 +08:00 |
|
黎永顺
|
ccb9297e6c
|
数据采集页面重构
|
2023-02-22 13:36:59 +08:00 |
|
黎永顺
|
d1e0460e39
|
bug修复
|
2023-02-22 10:39:47 +08:00 |
|
黎永顺
|
3694b009a4
|
Merge branch 'feature/V2-社保福利档案新增编辑页面重构' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/accumulationFundForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/otherForm.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/archives/socialSecurityForm.js
|
2023-02-22 09:13:05 +08:00 |
|
黎永顺
|
87024ceda9
|
数据采集页面重构
|
2023-02-21 18:05:54 +08:00 |
|
黎永顺
|
a11ad9d7d1
|
数据采集页面重构
|
2023-02-21 09:57:44 +08:00 |
|
黎永顺
|
9518d46dba
|
薪资项目管理页面修改
|
2023-02-20 14:35:54 +08:00 |
|
黎永顺
|
b6849400d7
|
数据采集页面重构
|
2023-02-20 14:28:08 +08:00 |
|
黎永顺
|
6cff75a9b5
|
数据采集页面重构
|
2023-02-20 13:21:04 +08:00 |
|
黎永顺
|
1674f9071f
|
数据采集页面重构
|
2023-02-20 10:53:45 +08:00 |
|
黎永顺
|
38f25e5a95
|
数据采集页面重构
|
2023-02-20 10:24:40 +08:00 |
|
黎永顺
|
751659d569
|
数据采集页面重构
|
2023-02-20 09:44:00 +08:00 |
|
黎永顺
|
3affb156b9
|
数据采集页面重构
|
2023-02-20 09:41:36 +08:00 |
|
黎永顺
|
67b211e656
|
数据采集页面重构
|
2023-02-17 17:21:05 +08:00 |
|
黎永顺
|
9369fc383c
|
薪资账套修改
|
2023-02-17 11:18:09 +08:00 |
|
黎永顺
|
2b6157788d
|
测试表格固定
|
2023-02-17 10:59:04 +08:00 |
|
黎永顺
|
7aee66760e
|
薪资项目管理以及字段管理页面修改
|
2023-02-17 10:05:30 +08:00 |
|
黎永顺
|
68302f7c3d
|
Merge branch 'hotfix/V2-0216' into develop
|
2023-02-17 09:20:09 +08:00 |
|
黎永顺
|
1ea8eb9e9d
|
薪资项目管理以及字段管理页面修改
|
2023-02-17 09:20:03 +08:00 |
|
黎永顺
|
68ce529eff
|
社保福利档案新增编辑页面重构
|
2023-02-16 17:20:45 +08:00 |
|
黎永顺
|
c93d68f451
|
薪资项目修改
|
2023-02-16 16:28:40 +08:00 |
|
黎永顺
|
3cbc12373a
|
社保福利档案新增编辑页面重构
|
2023-02-16 16:20:45 +08:00 |
|
黎永顺
|
b16cf18498
|
数据采集页面删除所选问题修复
|
2023-02-16 11:34:06 +08:00 |
|
黎永顺
|
6af7012e51
|
合并分支
|
2023-02-16 09:12:47 +08:00 |
|
黎永顺
|
b12ebdcf32
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
|
2023-02-15 18:50:16 +08:00 |
|
黎永顺
|
a219206bc2
|
薪资账套修改
|
2023-02-15 18:47:37 +08:00 |
|
黎永顺
|
aa801b1ef8
|
薪资账套修改
|
2023-02-15 17:46:55 +08:00 |
|
黎永顺
|
c99bbbcb6d
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2023-02-15 17:28:02 +08:00 |
|
黎永顺
|
efe05c530b
|
薪资项目修改
|
2023-02-15 17:21:49 +08:00 |
|
黎永顺
|
4ee0165885
|
社保福利档案新增编辑页面重构
|
2023-02-15 17:20:38 +08:00 |
|
黎永顺
|
ff692d5157
|
薪资项目修改
|
2023-02-15 16:54:23 +08:00 |
|
黎永顺
|
c789fd09d3
|
社保福利档案新增编辑页面重构
|
2023-02-15 15:02:14 +08:00 |
|
黎永顺
|
c795325da4
|
社保福利档案新增编辑页面重构
|
2023-02-15 14:37:40 +08:00 |
|
黎永顺
|
4e6f727727
|
薪资项目列表操作权限修改
|
2023-02-15 14:18:20 +08:00 |
|
黎永顺
|
4e29ad25a2
|
社保福利档案新增编辑页面重构
|
2023-02-15 11:37:13 +08:00 |
|
黎永顺
|
03a432266b
|
社保福利档案新增编辑页面重构
|
2023-02-15 10:13:34 +08:00 |
|
黎永顺
|
f2030e971f
|
社保福利档案新增编辑页面重构
|
2023-02-15 09:46:59 +08:00 |
|
黎永顺
|
661cc02ed4
|
社保福利档案新增编辑页面重构
|
2023-02-14 17:32:37 +08:00 |
|
黎永顺
|
d2590ecf8f
|
Merge branch 'release'
|
2023-02-14 16:23:19 +08:00 |
|
黎永顺
|
bb649ce6e3
|
薪资核算以及社保福利台账详情页面修改
|
2023-02-14 16:21:48 +08:00 |
|
黎永顺
|
e99fb4a756
|
Merge branch 'hotfix/V2-0216'
|
2023-02-14 15:38:23 +08:00 |
|
黎永顺
|
570493267e
|
薪资账套修改
|
2023-02-14 15:38:04 +08:00 |
|
黎永顺
|
e3f4cebe57
|
社保福利档案新增编辑页面重构
|
2023-02-14 14:59:55 +08:00 |
|
黎永顺
|
7c4e2f5588
|
社保福利档案新增编辑页面重构
|
2023-02-14 14:32:02 +08:00 |
|
黎永顺
|
4ce7eca139
|
社保福利档案新增编辑页面重构
|
2023-02-14 13:38:19 +08:00 |
|
黎永顺
|
9501a55f7c
|
Merge branch 'hotfix/V2-0216'
|
2023-02-13 17:33:00 +08:00 |
|
黎永顺
|
c22e326fd7
|
工资单问题
|
2023-02-13 17:31:52 +08:00 |
|
黎永顺
|
a665200b9c
|
Merge branch 'hotfix/V2-0216' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/mySalary/index.js
|
2023-02-13 17:29:06 +08:00 |
|
黎永顺
|
f39f70de25
|
社保福利档案小数点问题
|
2023-02-13 17:24:36 +08:00 |
|
黎永顺
|
38ca2cc421
|
社保福利档案页面重构
|
2023-02-13 16:38:15 +08:00 |
|
黎永顺
|
f6f786b33f
|
社保福利档案页面重构
|
2023-02-13 16:00:14 +08:00 |
|
黎永顺
|
d77a3f5fca
|
薪酬页面滚动的修改
|
2023-02-13 10:41:40 +08:00 |
|
黎永顺
|
84791cc69f
|
线下对比页面修改
|
2023-02-10 14:55:12 +08:00 |
|
黎永顺
|
df12fae609
|
字段管理页面修改
|
2023-02-10 11:40:07 +08:00 |
|
黎永顺
|
839e1e8b20
|
字段管理页面修改
|
2023-02-10 11:13:29 +08:00 |
|
黎永顺
|
758e9ca27b
|
字段管理页面修改
|
2023-02-10 11:01:51 +08:00 |
|
黎永顺
|
a3ed213dca
|
Merge branch 'feature/V2-薪资项目管理新增编辑页面重构' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/fieldManagement/components/fieldSlide.js
# pc4mobx/hrmSalary/pages/fieldManagement/index.less
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
|
2023-02-10 10:52:47 +08:00 |
|
黎永顺
|
d60d3db993
|
薪资项目管理页面重构
|
2023-02-10 10:47:18 +08:00 |
|
黎永顺
|
faafd9874d
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 19:45:29 +08:00 |
|
黎永顺
|
8416f73376
|
薪资项目管理页面編輯报错bug处理
|
2023-02-09 19:45:08 +08:00 |
|
黎永顺
|
7578c4b09e
|
薪资项目管理页面重构
|
2023-02-09 19:34:40 +08:00 |
|
黎永顺
|
f61c4bfbb0
|
薪资项目管理页面重构
|
2023-02-09 17:24:51 +08:00 |
|
黎永顺
|
5e1cec5324
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 16:23:34 +08:00 |
|
黎永顺
|
f40d403515
|
薪资项目管理的可见性必填判断
|
2023-02-09 16:23:19 +08:00 |
|
黎永顺
|
f1ce121698
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 15:36:44 +08:00 |
|
黎永顺
|
8fe520e842
|
薪资账套已知bug修复
|
2023-02-09 15:36:23 +08:00 |
|
黎永顺
|
b2acfd61be
|
薪资项目管理新增编辑页面重构
|
2023-02-09 14:27:03 +08:00 |
|
黎永顺
|
77fa0f50cb
|
字段管理页面保存编辑接口修改
|
2023-02-09 13:16:43 +08:00 |
|
黎永顺
|
28dd4faf13
|
薪资项目管理页面重构
|
2023-02-09 13:05:22 +08:00 |
|
黎永顺
|
bab032c4a7
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-09 09:49:28 +08:00 |
|
黎永顺
|
010c3c9c96
|
薪资项目和字段管理页面中放开薪资档案引用字段
|
2023-02-09 09:49:04 +08:00 |
|
黎永顺
|
b54cb8d226
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-09 09:26:19 +08:00 |
|
黎永顺
|
2434cde0bd
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-08 17:54:22 +08:00 |
|
黎永顺
|
0d70495c4f
|
薪资账套页面薪资项目项修改
|
2023-02-08 17:54:01 +08:00 |
|
黎永顺
|
7d5c026611
|
薪资核算详情页面列表bug修改
|
2023-02-08 10:46:16 +08:00 |
|
黎永顺
|
b9e32efd1c
|
工资单模板添加分类弹框修改
|
2023-02-08 10:27:38 +08:00 |
|
黎永顺
|
93ea26dfac
|
工资单模板编辑新增页面样式调整
|
2023-02-07 15:46:15 +08:00 |
|
黎永顺
|
b8f941d575
|
新增的字段管理页面样式修改
|
2023-02-07 15:18:30 +08:00 |
|
黎永顺
|
5fc373c540
|
Merge branch 'hotfix/V2-0209' into develop
|
2023-02-07 13:40:54 +08:00 |
|
黎永顺
|
7020f1ec2e
|
薪资账套中薪资项目添加 新项时排序的问题处理
|
2023-02-07 11:25:21 +08:00 |
|
黎永顺
|
3eec4e4726
|
薪资账套中薪资项目添加 新项时排序的问题处理
|
2023-02-07 10:03:29 +08:00 |
|
黎永顺
|
95e8d0d8c5
|
薪资账套薪资项目基础信息排序bug修改
|
2023-02-06 17:10:01 +08:00 |
|
黎永顺
|
4d42ea9fbc
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-06 10:10:57 +08:00 |
|
黎永顺
|
9452bd9d64
|
工资单模板页面新增分类功能修改
|
2023-02-06 10:10:37 +08:00 |
|
黎永顺
|
db2fc4ba2e
|
工资单模板上传背景组件的样式修改
|
2023-02-03 11:24:17 +08:00 |
|
黎永顺
|
2a1e152492
|
Merge branch 'feature/V2-工资单模板添加新增薪资项目大类的功能' into develop
|
2023-02-03 10:29:48 +08:00 |
|
黎永顺
|
e20c25e691
|
Merge branch 'feature/V2-社保福利方案新增字段' into develop
|
2023-02-03 10:29:08 +08:00 |
|
黎永顺
|
b72dcc3e6b
|
薪资项目管理页面分页的bug
|
2023-02-03 10:12:53 +08:00 |
|
黎永顺
|
5a73aee25b
|
工资单模板新增bug修改
|
2023-02-03 09:21:51 +08:00 |
|
黎永顺
|
a1f7537337
|
工资单模板添加新增薪资项目大类的功能
|
2023-02-02 18:59:55 +08:00 |
|
黎永顺
|
7ea4a6f6a8
|
工资单模板添加新增薪资项目大类的功能
|
2023-02-02 14:46:39 +08:00 |
|
黎永顺
|
b234e78b2f
|
社保福利方案新增字段
|
2023-02-01 17:57:21 +08:00 |
|
黎永顺
|
a74d887d6a
|
样式调整
|
2023-02-01 11:21:00 +08:00 |
|
黎永顺
|
464f986f62
|
去除打印信息
|
2023-01-31 11:26:37 +08:00 |
|
黎永顺
|
4f55e755cb
|
去除打印信息
|
2023-01-31 10:32:49 +08:00 |
|
黎永顺
|
5c0a909f07
|
Merge branch 'hotfix/feature-v2-0202' into develop
|
2023-01-31 10:27:26 +08:00 |
|
黎永顺
|
688bc7afe4
|
Merge branch 'feature/v2-字段管理页面-0120' into develop
|
2023-01-31 10:27:18 +08:00 |
|
黎永顺
|
e9b0a50019
|
字段管理页面
|
2023-01-31 10:25:07 +08:00 |
|
黎永顺
|
c4c17113ce
|
字段管理页面
|
2023-01-31 10:14:10 +08:00 |
|
黎永顺
|
33bb4b9814
|
薪资账套修改
|
2023-01-30 10:53:47 +08:00 |
|
黎永顺
|
0d0a9fc31e
|
薪资账套修改
|
2023-01-30 09:39:40 +08:00 |
|
黎永顺
|
42ee5f0cd8
|
薪资核算修改
|
2023-01-29 15:52:46 +08:00 |
|
黎永顺
|
117d1561c2
|
按钮图标
|
2023-01-29 14:46:38 +08:00 |
|
黎永顺
|
f53e8a733d
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-28 17:54:28 +08:00 |
|
黎永顺
|
6e8b446b16
|
按钮图标
|
2023-01-28 17:54:09 +08:00 |
|
黎永顺
|
73e8357e22
|
字段管理
|
2023-01-28 13:42:32 +08:00 |
|
黎永顺
|
cd897394b6
|
字段管理
|
2023-01-28 10:10:00 +08:00 |
|
黎永顺
|
8048f11d07
|
Merge branch 'hotfix/feature-v2-0119' into develop
|
2023-01-18 10:27:50 +08:00 |
|
黎永顺
|
ace2bcb8b5
|
薪资账套修改
|
2023-01-18 09:22:14 +08:00 |
|
黎永顺
|
f4bc18d64f
|
Merge branch 'hotfix/feature-v2-0119' into develop
|
2023-01-16 11:40:08 +08:00 |
|
黎永顺
|
d6f7d3c19b
|
高版本表格组件修改
|
2023-01-16 11:39:49 +08:00 |
|
黎永顺
|
578851b80c
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-13 17:30:43 +08:00 |
|
黎永顺
|
8fd6579dfd
|
薪资账套报错bug
|
2023-01-13 17:30:24 +08:00 |
|
黎永顺
|
fdf51fe32f
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-13 09:33:58 +08:00 |
|
黎永顺
|
1acb46788b
|
社保档案的bug修改
|
2023-01-13 09:33:46 +08:00 |
|
黎永顺
|
df15c64d18
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-12 09:41:32 +08:00 |
|
黎永顺
|
0598d4ee95
|
Merge branch 'hotfix/feature-v2-0112' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
|
2023-01-12 09:40:50 +08:00 |
|
黎永顺
|
8a51c05c30
|
人员导入报错信息不提示
|
2023-01-11 13:33:52 +08:00 |
|
黎永顺
|
814eefa1de
|
福利台账，正常缴纳月添加编辑的功能
|
2023-01-10 13:51:14 +08:00 |
|
黎永顺
|
a618931e50
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-09 16:30:52 +08:00 |
|
黎永顺
|
03d282f0f3
|
薪资账套关联人员添加导入人员的功能
|
2023-01-09 16:30:26 +08:00 |
|
黎永顺
|
37471efc71
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 15:02:50 +08:00 |
|
黎永顺
|
69961a6c15
|
应用设置页面新增修改项
|
2023-01-09 15:02:26 +08:00 |
|
黎永顺
|
b9a864a30e
|
Merge branch 'feature/v2-个税扣缴义务人人员范围添加导入功能' into develop
|
2023-01-09 14:35:48 +08:00 |
|
黎永顺
|
b3eb3bd779
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 14:30:38 +08:00 |
|
黎永顺
|
e24078ba1c
|
薪资档案查询参数修改
|
2023-01-09 14:30:19 +08:00 |
|
黎永顺
|
5c6db20caa
|
工资单模板预览页面空白
|
2023-01-09 14:04:08 +08:00 |
|
黎永顺
|
3c6306638d
|
个税扣缴义务人添加导入人员范围的功能
|
2023-01-09 11:16:01 +08:00 |
|
黎永顺
|
7f5609550d
|
Merge branch 'hotfix/feature-v2-0112' into develop
|
2023-01-09 09:41:07 +08:00 |
|
黎永顺
|
0a3e2f8b02
|
往期累计情况页面查询丢失日期的bug修改
|
2023-01-09 09:40:50 +08:00 |
|
黎永顺
|
811adfe9f6
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-06 09:36:37 +08:00 |
|
黎永顺
|
7d4c8361c0
|
公式测试bug的修复
|
2023-01-06 09:35:34 +08:00 |
|
黎永顺
|
7c65f2b7d3
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-05 15:03:22 +08:00 |
|
黎永顺
|
b0604f854c
|
薪资账套报错
|
2023-01-05 15:03:03 +08:00 |
|
黎永顺
|
7d06f4a749
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-05 09:46:04 +08:00 |
|
黎永顺
|
d48dcd234b
|
往期累计情况页面loading的问题
|
2023-01-05 09:45:50 +08:00 |
|
黎永顺
|
d67dff3c76
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-04 17:47:41 +08:00 |
|
黎永顺
|
50c29dd093
|
往期累计情况一键清除提示语修改
|
2023-01-04 17:47:20 +08:00 |
|
黎永顺
|
f0d7ec8f5b
|
Merge branch 'feature/v2-社保福利台账补缴新增' into develop
|
2023-01-04 15:47:16 +08:00 |
|
黎永顺
|
fc8f5a4625
|
新增补缴必填项提示
|
2023-01-04 15:46:32 +08:00 |
|
黎永顺
|
6a573cd1aa
|
Merge branch 'feature/v2-社保福利台账补缴新增' into develop
|
2023-01-04 14:37:37 +08:00 |
|
黎永顺
|
4f89a7ef4f
|
新增补缴添加空值判断
|
2023-01-04 14:37:19 +08:00 |
|
黎永顺
|
3fc605ccb8
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-04 11:39:18 +08:00 |
|
黎永顺
|
a83d261c20
|
薪资项目测试
|
2023-01-04 11:39:00 +08:00 |
|
黎永顺
|
61c139ffcf
|
Merge branch 'feature/v2-薪资项目公式测试' into develop
|
2023-01-04 11:19:32 +08:00 |
|
黎永顺
|
77b1ae17ed
|
薪资项目测试
|
2023-01-04 11:19:22 +08:00 |
|
黎永顺
|
9017297bc0
|
薪资项目测试
|
2023-01-04 09:46:20 +08:00 |
|
黎永顺
|
72acbe6485
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2023-01-03 17:19:36 +08:00 |
|
黎永顺
|
62f36c4d42
|
补缴新增功能完成
|
2023-01-03 16:52:15 +08:00 |
|
黎永顺
|
5274e5fc1d
|
补缴新增功能完成
|
2023-01-03 16:50:03 +08:00 |
|
黎永顺
|
a7daf5e3c0
|
补缴新增功能完成
|
2023-01-03 16:46:26 +08:00 |
|
黎永顺
|
f013923285
|
薪资项目公式添加测试
|
2023-01-03 10:36:13 +08:00 |
|
黎永顺
|
9101769934
|
补缴新增
|
2023-01-03 10:08:52 +08:00 |
|
黎永顺
|
107d1025db
|
调差列表样式修改
|
2022-12-30 09:05:47 +08:00 |
|
黎永顺
|
ded592b1eb
|
Merge branch 'hotfix/feature-v2-1229' into develop
|
2022-12-29 16:41:10 +08:00 |
|
黎永顺
|
a7ec29a30a
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 16:41:04 +08:00 |
|
黎永顺
|
c7b28eb2e2
|
调差单条保存的优化
|
2022-12-29 16:40:53 +08:00 |
|
黎永顺
|
55a2fbc5a5
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 15:34:39 +08:00 |
|
黎永顺
|
992bba159d
|
调差NaN的bug
|
2022-12-29 15:34:20 +08:00 |
|
黎永顺
|
462cea820c
|
工资单模板bug修复
|
2022-12-29 11:20:01 +08:00 |
|
黎永顺
|
9f2beca0a4
|
Merge branch 'feature/v2-社保福利台账调差默认设置' into develop
|
2022-12-29 09:52:44 +08:00 |
|
黎永顺
|
657704f8ea
|
社保核算报错
|
2022-12-28 16:38:59 +08:00 |
|
黎永顺
|
755ef54c21
|
调差保存默认
|
2022-12-28 11:40:51 +08:00 |
|
黎永顺
|
506490116f
|
调差保存默认
|
2022-12-27 13:46:00 +08:00 |
|
黎永顺
|
8fa65f4efb
|
工资单模板预览报错
|
2022-12-23 17:30:59 +08:00 |
|
黎永顺
|
e058b3b658
|
Merge branch 'release'
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
|
2022-12-22 13:36:09 +08:00 |
|
黎永顺
|
3170ed0ea9
|
Merge branch 'develop' into release
|
2022-12-21 15:29:45 +08:00 |
|
黎永顺
|
0bb52e145a
|
添加成本中心跳转连接
|
2022-12-20 17:22:28 +08:00 |
|
黎永顺
|
957a4f4746
|
社保福利方案详情bug修改
|
2022-12-20 10:52:24 +08:00 |
|
黎永顺
|
6337355943
|
Merge branch 'feature/V2-薪资账套页面重构-1222' into develop
|
2022-12-19 14:56:07 +08:00 |
|
黎永顺
|
7c3af0ad5b
|
部分bug修改
|
2022-12-19 14:55:46 +08:00 |
|
黎永顺
|
d974fe73aa
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-16 17:37:10 +08:00 |
|
黎永顺
|
0894f91765
|
优化薪资档案
|
2022-12-16 17:36:56 +08:00 |
|
黎永顺
|
e0217ff455
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-16 17:00:42 +08:00 |
|
黎永顺
|
5b66b538b8
|
优化薪资档案
|
2022-12-16 17:00:24 +08:00 |
|
黎永顺
|
42ec1c6918
|
补差功能完善
|
2022-12-16 16:19:30 +08:00 |
|
黎永顺
|
abd34580a5
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regression.js
|
2022-12-16 16:15:08 +08:00 |
|
黎永顺
|
4f0a24fe25
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-16 16:09:17 +08:00 |
|
黎永顺
|
28b34fa112
|
薪资账套中薪资项目调换位置保存不生效
|
2022-12-16 16:07:04 +08:00 |
|
黎永顺
|
26457c01e6
|
社保福利台账核算详情页面添加补差的功能
|
2022-12-16 15:38:39 +08:00 |
|
黎永顺
|
ae881a1f37
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-16 11:05:24 +08:00 |
|
黎永顺
|
00f87ba5e5
|
薪资账套非空判断
|
2022-12-16 11:05:07 +08:00 |
|
黎永顺
|
9b6c8ed544
|
社保福利台账详情页面的补缴添加编辑功能
|
2022-12-16 10:47:59 +08:00 |
|
黎永顺
|
a0b87fa275
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 16:22:26 +08:00 |
|
黎永顺
|
47bc638cdb
|
薪资核算页面bug修复
|
2022-12-15 16:21:56 +08:00 |
|
黎永顺
|
953a6de120
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 12:00:06 +08:00 |
|
黎永顺
|
78b8d796f0
|
薪资账套页面重构
|
2022-12-15 11:59:45 +08:00 |
|
黎永顺
|
c7773749e4
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-15 10:08:10 +08:00 |
|
黎永顺
|
11120294d9
|
薪资账套页面重构
|
2022-12-15 10:07:05 +08:00 |
|
黎永顺
|
0cdca9c448
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/formalFormModal.js
|
2022-12-14 19:41:43 +08:00 |
|
黎永顺
|
d44b5d279d
|
薪资账套页面重构,薪资核算页面添加回算功能以及核算详情页面添加补发已发tab
|
2022-12-14 19:40:05 +08:00 |
|
黎永顺
|
98c628798a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-14 15:39:24 +08:00 |
|
黎永顺
|
0023d1314b
|
Merge branch 'feature/V2-薪资账套页面重构-1208' into develop
|
2022-12-14 15:38:21 +08:00 |
|
黎永顺
|
bbb91b438a
|
薪资账套页面重构
|
2022-12-14 15:37:55 +08:00 |
|
黎永顺
|
a193ed6690
|
薪资账套页面重构
|
2022-12-13 16:10:48 +08:00 |
|
黎永顺
|
6ca09c7fae
|
1
|
2022-12-12 17:26:44 +08:00 |
|
黎永顺
|
6a885877e6
|
1
|
2022-12-12 17:14:14 +08:00 |
|
黎永顺
|
783d1532aa
|
1
|
2022-12-12 16:42:31 +08:00 |
|
黎永顺
|
61b595404f
|
薪资账套页面重构
|
2022-12-12 16:36:08 +08:00 |
|
黎永顺
|
9e3739d816
|
薪资账套页面重构
|
2022-12-12 16:35:19 +08:00 |
|
黎永顺
|
906e2dd40e
|
往期累计情况导出全部url添加月份参数
|
2022-12-12 16:17:06 +08:00 |
|
黎永顺
|
6d9787d924
|
薪资账套页面重构
|
2022-12-12 16:10:11 +08:00 |
|
黎永顺
|
2de636febc
|
薪资账套页面重构
|
2022-12-12 15:16:10 +08:00 |
|
黎永顺
|
7c266deda3
|
保存薪资项目报错
|
2022-12-12 14:57:05 +08:00 |
|
黎永顺
|
a7028943ed
|
薪资账套页面重构
|
2022-12-12 14:15:58 +08:00 |
|
黎永顺
|
fa45739e66
|
薪资账套页面重构
|
2022-12-12 11:38:43 +08:00 |
|
黎永顺
|
1e0c47364f
|
薪资账套页面重构
|
2022-12-12 10:24:07 +08:00 |
|
黎永顺
|
ac8c1ee43a
|
薪资账套页面重构
|
2022-12-09 15:26:21 +08:00 |
|
黎永顺
|
665f3a0119
|
薪资账套中薪资项目排序报错的bug
|
2022-12-09 14:48:51 +08:00 |
|
黎永顺
|
c6d6693198
|
薪资账套页面重构
|
2022-12-09 14:16:11 +08:00 |
|
黎永顺
|
a73e26128e
|
社保福利讨账接口调整
|
2022-12-08 17:29:15 +08:00 |
|
黎永顺
|
76120a7a54
|
薪资账套重构
|
2022-12-08 17:27:04 +08:00 |
|
黎永顺
|
b3532b6bd0
|
薪资账套重构
|
2022-12-08 17:18:56 +08:00 |
|
黎永顺
|
1d64220c7c
|
薪资账套重构
|
2022-12-08 16:58:32 +08:00 |
|
黎永顺
|
645ec864f3
|
薪资账套重构
|
2022-12-08 16:43:55 +08:00 |
|
黎永顺
|
7baf97e20f
|
薪资账套重构
|
2022-12-08 15:48:46 +08:00 |
|
黎永顺
|
d6fde20bd1
|
调差功能修改
|
2022-12-08 13:55:52 +08:00 |
|
黎永顺
|
b7a08279f4
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into develop
|
2022-12-08 13:47:36 +08:00 |
|
黎永顺
|
65867fe57c
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-08 13:47:16 +08:00 |
|
黎永顺
|
e1b80cd21f
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 13:45:01 +08:00 |
|
黎永顺
|
fc07b6d46b
|
调差功能修改
|
2022-12-08 13:44:35 +08:00 |
|
黎永顺
|
f215a54a36
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 11:42:33 +08:00 |
|
黎永顺
|
33ef783d2b
|
调差功能修改
|
2022-12-08 11:42:08 +08:00 |
|
黎永顺
|
5b768dde10
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-08 10:37:00 +08:00 |
|
黎永顺
|
a41a37db67
|
调差功能修改
|
2022-12-08 10:36:36 +08:00 |
|
黎永顺
|
ebfd3386c5
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into release
|
2022-12-08 10:29:28 +08:00 |
|
黎永顺
|
4fd8d91124
|
个税扣缴义务人恢复删除功能
|
2022-12-08 10:28:59 +08:00 |
|
黎永顺
|
bebc1c8c98
|
社保福利档案调差修改
|
2022-12-08 10:11:11 +08:00 |
|
黎永顺
|
1747ed903c
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into release
|
2022-12-07 17:53:41 +08:00 |
|
黎永顺
|
a378879fa0
|
Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into release
|
2022-12-07 17:53:13 +08:00 |
|
黎永顺
|
e9c869fca8
|
社保福利档案调差功能bug修复
|
2022-12-07 17:52:50 +08:00 |
|
黎永顺
|
0e53183958
|
工资单部分发放和部分撤回
|
2022-12-07 17:43:39 +08:00 |
|
黎永顺
|
53d418fe78
|
薪资账套页面重构
|
2022-12-07 17:06:00 +08:00 |
|
黎永顺
|
aac9b4580e
|
Merge branch 'hotfix/v2-工资单模板添加1208' into develop
# Conflicts:
# pc4mobx/hrmSalary/apis/payroll.js
# pc4mobx/hrmSalary/pages/payroll/index.js
# pc4mobx/hrmSalary/stores/payroll.js
|
2022-12-07 15:43:35 +08:00 |
|
黎永顺
|
7627c4f6a4
|
工资单模板添加补发工资单模版
|
2022-12-07 15:14:20 +08:00 |
|
黎永顺
|
b12d3862a0
|
薪资账套页面页面重构
|
2022-12-07 14:40:07 +08:00 |
|
黎永顺
|
593140b54f
|
工资单模板修改
|
2022-12-07 14:15:46 +08:00 |
|
黎永顺
|
0bd6f6964a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-06 16:11:41 +08:00 |
|
黎永顺
|
e8a8b0a75c
|
保存退差提示语修改
|
2022-12-06 16:11:27 +08:00 |
|
黎永顺
|
2631e8065e
|
薪资账套页面重构
|
2022-12-06 16:06:35 +08:00 |
|
黎永顺
|
2d78222cf5
|
福利台账-重新核算后调差页面需要刷新才能删除
|
2022-12-06 15:44:29 +08:00 |
|
黎永顺
|
499fe647a2
|
福利台账-调差页面点击保存时校验有误
|
2022-12-06 15:18:40 +08:00 |
|
黎永顺
|
4825d0cd49
|
工资单模板修改
|
2022-12-06 15:04:57 +08:00 |
|
黎永顺
|
4413484c0a
|
Merge branch 'feature/v2-社保福利档案调差退差-1208' into develop
|
2022-12-06 11:34:53 +08:00 |
|
黎永顺
|
648957dcab
|
Merge branch 'hotfix/v2-1208' into develop
|
2022-12-06 11:34:39 +08:00 |
|
黎永顺
|
672e697170
|
调差功能完成保存功能
|
2022-12-06 11:34:19 +08:00 |