Commit Graph

181 Commits

Author SHA1 Message Date
黎永顺 b72dcc3e6b 薪资项目管理页面分页的bug 2023-02-03 10:12:53 +08:00
黎永顺 8fd6579dfd 薪资账套报错bug 2023-01-13 17:30:24 +08:00
黎永顺 0a3e2f8b02 往期累计情况页面查询丢失日期的bug修改 2023-01-09 09:40:50 +08:00
黎永顺 d48dcd234b 往期累计情况页面loading的问题 2023-01-05 09:45:50 +08:00
黎永顺 50c29dd093 往期累计情况一键清除提示语修改 2023-01-04 17:47:20 +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
黎永顺 906e2dd40e 往期累计情况导出全部url添加月份参数 2022-12-12 16:17:06 +08:00
黎永顺 2d1cc3cd61 Merge branch 'hotfix/v2-1202' into develop
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/index.js
2022-12-02 10:50:19 +08:00
黎永顺 691358a9e2 统一系统右键 2022-12-01 14:28:30 +08:00
黎永顺 ce8f79eea4 Merge branch 'hotfix/v2-1124' into develop 2022-11-25 13:32:28 +08:00
黎永顺 c7a23c0017 5 2022-11-25 13:32:14 +08:00
黎永顺 693351f3d5 Merge branch 'hotfix/v2-1124' into develop 2022-11-25 11:48:06 +08:00
黎永顺 52121e2713 3 2022-11-25 11:47:29 +08:00
黎永顺 fbcb7f6db2 Merge branch 'hotfix/v2-1124' into develop 2022-11-24 17:40:44 +08:00
黎永顺 25e76718d2 社保福利档案退差功能 2022-11-23 15:12:19 +08:00
黎永顺 04a368c731 禅道bug132、133 2022-11-21 17:50:06 +08:00
黎永顺 ea9359c728 其他免税扣除页面添加沿用上月的功能 2022-11-16 17:29:01 +08:00
黎永顺 35633d753e 新增人员添加全选的按钮 2022-11-10 09:19:09 +08:00
黎永顺 596392a102 专项附加扣除页面查询报错的解决 2022-11-08 15:47:20 +08:00
黎永顺 0e4587d18d 专项附加扣除导入字段的匹配 2022-11-08 09:08:34 +08:00
18652063575 8e133ea43a 累计专项扣除页面添加一键累计的功能 2022-11-07 15:29:46 +08:00
18652063575 824508b41a 专项附加扣除模块页面接口联调完成 2022-11-07 13:58:01 +08:00
18652063575 cf315eb608 专项附加扣除模块页面接口联调完成 2022-11-07 13:57:22 +08:00
18652063575 fad63cc781 专项附加扣除接口联调 2022-11-04 16:31:24 +08:00
18652063575 f8e59efbbe 接口联调 2022-11-04 14:08:19 +08:00
18652063575 ca04e5405d 专项附加扣除接口联调 2022-11-04 11:33:58 +08:00
18652063575 b2164dbb46 Merge branch 'feature/v2-数据采集-1024' into feature/v2-专项附加扣除-1103 2022-11-03 17:53:42 +08:00
18652063575 39e6f95fef Merge branch 'hotfix/v2-bug修复-1031' into feature/v2-专项附加扣除-1103 2022-11-03 17:52:59 +08:00
18652063575 72478c3fd8 专项附加扣除模块 2022-11-03 17:52:02 +08:00
18652063575 66debb4708 数据采集新增编辑错误信息 提示 2022-11-02 10:41:12 +08:00
18652063575 d09230b2ca 数据采集编辑接口报错的处理 2022-11-02 09:49:03 +08:00
18652063575 794cfc1615 数据采集列表操作列表宽度 2022-11-02 09:28:27 +08:00
18652063575 bd0923e3a6 数据采集列表操作列表宽度 2022-11-01 17:18:41 +08:00
18652063575 fc99452207 考勤字段列表添加序号列 2022-11-01 16:52:55 +08:00
18652063575 8a964d7e40 数据采集接口联调 2022-11-01 14:06:06 +08:00
18652063575 d4ecfb3a1e 数据采集接口对接 2022-10-31 17:35:21 +08:00
18652063575 8008c0855a 数据采集接口联调 2022-10-31 13:55:49 +08:00
18652063575 8fa3b0918c 数据采集页面添加新建功能 2022-10-24 18:42:15 +08:00
18652063575 c4c24dd159 薪资档案以及社保福利档案页面部分bug修复 2022-10-20 17:53:26 +08:00
18652063575 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
18652063575 3808d0b625 考勤查看页面报错 2022-09-16 17:25:31 +08:00
18652063575 5e1dac0554 接口异常报错提示 2022-09-16 11:30:13 +08:00
18652063575 27e54073c6 统一所有页面你的弹框以及抽屉头部组件,样式bug的修改 2022-09-15 11:08:13 +08:00
18652063575 0cec0873fe 统一所有页面你的弹框以及抽屉头部组件 2022-09-13 16:39:15 +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 6768649ac4 bug的修正 2022-08-25 17:54:18 +08:00
liyongshun 67f0de658a 薪资核算页面表格替换antd4.x的table组件 2022-08-11 17:38:03 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
liyongshun 134653fac6 薪资发放页面添加进度条弹框组件 2022-07-21 17:34:10 +08:00
liyongshun 6579751717 替换个税扣缴义务人接口和分页bug的修改 2022-07-05 16:35:42 +08:00
liyongshun 732f3e1607 操作按钮权限的bug 2022-06-30 14:21:18 +08:00
liyongshun 23c6ad30ed 考勤引用分页的bug 2022-06-29 13:30:15 +08:00
liyongshun e83a05d8bb 弹框覆盖的bug修改 2022-06-29 10:13:21 +08:00
liyongshun a258a2f342 bug 2022-06-28 18:07:41 +08:00
liyongshun aa165e70da 修改导出的bug 2022-06-27 10:35:39 +08:00
liyongshun 9a6344dae1 测试bug 2022-06-23 16:20:49 +08:00
liyongshun e3d30694c3 操作菜单权限得bug修复 2022-06-22 17:14:53 +08:00
liyongshun 22ea7b0786 Merge branch 'fenquan' into liys_dev 2022-06-21 15:55:22 +08:00
liyongshun 2a8aac2068 添加页面操作按钮操作权限 2022-06-21 11:33:00 +08:00
MustangDeng 1a6007a8da 往期累计抽屉数据宽度 2022-06-20 16:22:44 +08:00
liyongshun 78adb5cf0d 测试bug的修复 2022-06-17 16:53:27 +08:00
MustangDeng 9ddb243bc4 fix bug 默认选项问题 2022-06-16 21:59:29 +08:00
MustangDeng 1837f512a3 fix bug 36 2022-06-16 21:42:08 +08:00
MustangDeng 2adc0ee33a 导入参数校验 2022-06-15 18:31:10 +08:00
liyongshun 3413f8fc0b 导入字段的添加 2022-06-14 11:18:37 +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 fc16f570b8 Merge branch 'liys_dev' into fenquan
# 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/ledger/salaryItemForm.js
#	pc4mobx/hrmSalary/pages/salaryFile/index.js
2022-06-07 10:57:02 +08:00
MustangDeng c7128fcfb0 bug修改 2022-06-07 09:08:36 +08:00
MustangDeng b94af53ed4 bug修复 2022-06-06 14:31:20 +08:00
liyongshun e552f34103 添加权限 2022-06-02 17:11:28 +08:00
liyongshun 519ddd732b Merge branch 'dev' into merge_liys_dev 2022-06-02 15:23:38 +08:00
liyongshun 17e23fc014 列表分页以及权限的修改 2022-06-02 14:48:55 +08:00
MustangDeng c9cda1fdfc bug 处理 2022-06-02 13:51:45 +08:00
MustangDeng c5b401f9f4 bug修改 2022-05-31 16:21:25 +08:00
MustangDeng 95166a6534 bug修复 2022-05-30 17:30:53 +08:00
MustangDeng 5df78a31d8 福利台账页面 2022-05-26 14:34:41 +08:00
MustangDeng 33e5009585 bug修改 2022-05-24 15:39:09 +08:00
MustangDeng 16de38a423 账套问题处理 2022-05-13 15:25:21 +08:00
MustangDeng 7dc2b1d33e 导入框初始化 2022-05-12 17:04:33 +08:00
MustangDeng b2d5b1a90c 修复bug 2022-05-10 15:31:13 +08:00
MustangDeng c85c2ec66f 福利导入 2022-05-07 14:47:14 +08:00
MustangDeng ae3ee29592 往期累计情况 2022-05-05 12:17:12 +08:00
MustangDeng 7cef5512ae 预览 2022-04-27 19:27:23 +08:00
MustangDeng 88caca1d04 考勤引用 2022-04-26 10:42:08 +08:00
MustangDeng 9fbf1e988e 列表加载 2022-04-25 17:18:58 +08:00
MustangDeng 658b10e36a 列表水平滚动条 2022-04-25 16:17:03 +08:00
MustangDeng 3ab51289d8 考勤导入 2022-04-25 14:32:51 +08:00
MustangDeng 3fbfa85d34 日期区间 2022-04-25 10:03:07 +08:00
MustangDeng fa0ff1d9b8 个税扣缴义务人 2022-04-24 19:22:33 +08:00
MustangDeng c382c9ce53 分页逻辑调整 2022-04-24 17:52:38 +08:00
MustangDeng 08ce3de564 账套删除 2022-04-22 18:12:16 +08:00
MustangDeng 8bf8b58065 考勤字段列表 2022-04-22 17:00:10 +08:00
MustangDeng 9bb84614c7 薪资项目 2022-04-19 19:55:16 +08:00
MustangDeng fbe5a338ef 自定义列 2022-03-28 10:53:19 +08:00
MustangDeng bbbc645400 薪资项目 2022-03-25 10:47:01 +08:00
MustangDeng 229808f467 薪资项目管理 2022-03-24 11:28:57 +08:00