Commit Graph

533 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 ace2bcb8b5 薪资账套修改 2023-01-18 09:22:14 +08:00
黎永顺 d6f7d3c19b 高版本表格组件修改 2023-01-16 11:39:49 +08:00
黎永顺 8fd6579dfd 薪资账套报错bug 2023-01-13 17:30:24 +08:00
黎永顺 1acb46788b 社保档案的bug修改 2023-01-13 09:33:46 +08:00
黎永顺 814eefa1de 福利台账,正常缴纳月添加编辑的功能 2023-01-10 13:51:14 +08:00
黎永顺 69961a6c15 应用设置页面新增修改项 2023-01-09 15:02:26 +08:00
黎永顺 e24078ba1c 薪资档案查询参数修改 2023-01-09 14:30:19 +08:00
黎永顺 5c6db20caa 工资单模板预览页面空白 2023-01-09 14:04:08 +08:00
黎永顺 0a3e2f8b02 往期累计情况页面查询丢失日期的bug修改 2023-01-09 09:40:50 +08:00
黎永顺 b0604f854c 薪资账套报错 2023-01-05 15:03:03 +08:00
黎永顺 d48dcd234b 往期累计情况页面loading的问题 2023-01-05 09:45:50 +08:00
黎永顺 50c29dd093 往期累计情况一键清除提示语修改 2023-01-04 17:47:20 +08:00
黎永顺 107d1025db 调差列表样式修改 2022-12-30 09:05:47 +08:00
黎永顺 462cea820c 工资单模板bug修复 2022-12-29 11:20:01 +08:00
黎永顺 657704f8ea 社保核算报错 2022-12-28 16:38:59 +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