qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,096 Commits 181 Branches 0 Tags 9.3 MiB
Commit Graph

1082 Commits

Author SHA1 Message Date
黎永顺 a6150192f0 调差功能 2022-12-05 14:28:38 +08:00
黎永顺 62cccbc7ac 调差功能 2022-12-05 14:21:08 +08:00
黎永顺 d54f829f72 调差功能 2022-12-05 13:54:30 +08:00
黎永顺 c2e8cd8dae Merge branch 'feature/v2-工资单部分发放和部分撤回-1208' into develop 2022-12-05 09:05:20 +08:00
黎永顺 b17796f0ab 个税扣缴义务人恢复删除功能 2022-12-03 17:28:11 +08:00
黎永顺 479cea2967 工资单部分发放和部分撤回功能完成 2022-12-03 17:23:43 +08:00
黎永顺 29abd303af 工资单1 2022-12-02 16:52:35 +08:00
黎永顺 41c400c329 工资单 2022-12-02 16:42:58 +08:00
黎永顺 5e23404b32 工资单 2022-12-02 16:12:11 +08:00
黎永顺 42e959c579 Merge branch 'hotfix/v2-1202' into develop 2022-12-02 14:38:33 +08:00
黎永顺 915462919a 薪资账套抽屉页面表格样式修改 2022-12-02 14:38:17 +08:00
黎永顺 a4dbd0cc4b 工资单发放部分发放和部分撤回 2022-12-02 14:27:39 +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
黎永顺 3ac1e4ea6b 修改退差人员选择框 2022-11-28 16:24:33 +08:00
黎永顺 1f9e071b25 修改退差人员选择框 2022-11-28 11:17:38 +08:00
黎永顺 3068ee9cd8 修改添加自定义薪资项目保存参数 2022-11-25 17:56:55 +08:00
黎永顺 7d3abf70bf 退差添加人员组件 2022-11-25 17:37:26 +08:00
黎永顺 b3f9ddcd11 退差删除分页查询的问题 2022-11-25 13:46:51 +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
黎永顺 ea41f65246 Merge branch 'feature/v2-社保福利档案退差-1124' into develop 2022-11-25 12:36:47 +08:00
黎永顺 3b5c8e1ec9 4 2022-11-25 12:36:24 +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
黎永顺 6410ac43e2 Merge branch 'feature/v2-社保福利档案退差-1124' into develop 2022-11-25 11:09:06 +08:00
黎永顺 7af6df0972 12 2022-11-25 11:08:49 +08:00
黎永顺 21dd8e3e22 Merge branch 'feature/v2-社保福利档案退差-1124' into develop 2022-11-25 11:03:34 +08:00
黎永顺 9b6454bdd2 1 2022-11-25 11:03:19 +08:00
黎永顺 760437734f Merge branch 'feature/v2-社保福利档案退差-1124' into develop 2022-11-25 09:51:28 +08:00
黎永顺 f86d5a34e0 社保福利台账详情页面退差功能对接 2022-11-25 09:50:53 +08:00
黎永顺 75dbe7c096 Merge branch 'hotfix/v2-1124' into develop 2022-11-24 19:06:10 +08:00
黎永顺 b1efea87a3 薪资核算添加核算人员的功能 2022-11-24 19:05:54 +08:00
黎永顺 9890188410 Merge branch 'feature/v2-社保福利档案退差-1124' into develop 2022-11-24 18:45:59 +08:00
黎永顺 7b083101c2 Merge branch 'hotfix/v2-1124' into develop 2022-11-24 18:45:44 +08:00
黎永顺 23b44a0b4c 社保福利台账详情页面退差功能对接 2022-11-24 18:45:12 +08:00
黎永顺 ca29007a00 薪资核算添加核算人员的功能 2022-11-24 18:17:12 +08:00
黎永顺 fbcb7f6db2 Merge branch 'hotfix/v2-1124' into develop 2022-11-24 17:40:44 +08:00
黎永顺 c040469ee1 社保福利台账详情页面退差功能对接 2022-11-24 17:40:13 +08:00
黎永顺 c6f170d373 薪资核算添加核算人员的功能 2022-11-24 17:37:16 +08:00
黎永顺 32072512a9 薪资核算添加核算人员的功能 2022-11-24 17:36:00 +08:00
黎永顺 510f13009d 社保福利台账详情页面退差功能对接 2022-11-24 15:56:10 +08:00
黎永顺 f8169a9080 个税扣缴义务人添加搜索框 2022-11-23 16:50:43 +08:00
黎永顺 c468ff35ff 个税扣缴义务人添加同步人员范围的功能 2022-11-23 15:42:51 +08:00
黎永顺 25e76718d2 社保福利档案退差功能 2022-11-23 15:12:19 +08:00
黎永顺 04a368c731 禅道bug132、133 2022-11-21 17:50:06 +08:00
黎永顺 676a90bd51 Merge branch 'hotfix/v2-1114' 2022-11-21 09:24:00 +08:00
黎永顺 5619598e7e 聚正润农薪资核算页面新建薪资核算弹框样式修改 2022-11-18 16:26:15 +08:00
黎永顺 06ec3c69ba Merge branch 'hotfix/v2-1114' into develop 2022-11-17 19:08:21 +08:00
黎永顺 06b722e4a3 1 2022-11-17 19:06:42 +08:00
黎永顺 f3b504208c Merge branch 'hotfix/v2-1114' into develop 2022-11-17 18:55:45 +08:00
黎永顺 80bc646682 1 2022-11-17 18:55:29 +08:00
黎永顺 d3a8360f00 Merge branch 'hotfix/v2-1114' into develop 2022-11-17 16:36:28 +08:00
黎永顺 848598daf3 1 2022-11-17 16:36:02 +08:00
黎永顺 d0c91c697c Merge branch 'hotfix/v2-1114' into develop 2022-11-17 16:35:03 +08:00
黎永顺 bde6840850 社保福利台账页面操作列的问题解决 2022-11-17 16:34:22 +08:00
黎永顺 cc4d9df1e1 社保福利档案页面编辑报错解决 2022-11-17 16:30:06 +08:00
黎永顺 7dbd09c1b0 Merge branch 'feature/v2-薪资项目添加可见性-1124' into develop 2022-11-17 14:19:13 +08:00
黎永顺 97b0efb583 Merge branch 'feature/v2-薪资档案调薪编辑-1117' into develop 2022-11-17 14:19:02 +08:00
黎永顺 9632a5190e 薪资核算解锁锁定的功能 2022-11-17 14:18:02 +08:00
黎永顺 68069df58b 薪资核算解锁锁定的功能 2022-11-17 14:17:34 +08:00
黎永顺 ea9359c728 其他免税扣除页面添加沿用上月的功能 2022-11-16 17:29:01 +08:00
黎永顺 a0021e7102 薪资档案记录编辑保存接口参数对接 2022-11-16 17:15:35 +08:00
黎永顺 79d1f42a12 薪资账套新增时切换上一步页面列表可删除数据回显失败的bug修复 2022-11-16 17:08:16 +08:00
黎永顺 165ee3d7ba 薪资核算页面列表头添加所有按钮 2022-11-16 16:40:37 +08:00
黎永顺 7560e00afb 薪资项目管理页面的新建自定义薪资项目的页面选择sql的弹框新增页面切换外部数据源时添加确认询问框 2022-11-16 15:44:59 +08:00
黎永顺 9e9cce1a05 薪资档案调薪记录删除添加确认框 2022-11-15 18:18:00 +08:00
黎永顺 990fd642ff 薪资项目分权 2022-11-15 17:31:57 +08:00
黎永顺 a5213cb370 薪资档案的发薪员工页面的调薪记录添加编辑和删除的功能 2022-11-15 15:42:09 +08:00
黎永顺 0d04b38ab6 个税扣缴义务人切换新增和编辑弹框的编辑人项显隐 2022-11-15 09:43:38 +08:00
黎永顺 dcb2f5f864 社保福利方案社保编辑报错的bug解决 2022-11-10 17:24:56 +08:00
黎永顺 b52a734e03 薪资账套添加人员删除人员列表分页报错的bug 2022-11-10 16:41:53 +08:00
黎永顺 20e6c3aa7e 薪资账套添加人员全选报错的问题 2022-11-10 15:01:44 +08:00
黎永顺 d05778f9f9 薪资档案列表列固定 2022-11-10 11:40:26 +08:00
黎永顺 35633d753e 新增人员添加全选的按钮 2022-11-10 09:19:09 +08:00
黎永顺 a348e5e3db 自定义薪资项目的sql添加开启解密的配置项 2022-11-09 14:37:14 +08:00
黎永顺 e0e19348ca Merge branch 'hotfix/v2-1107' into develop 2022-11-09 14:34:12 +08:00
黎永顺 224eeeda42 Merge branch 'feature/v2-报税规则配置-1108' into develop 2022-11-09 14:31:57 +08:00
黎永顺 477d94af6a Merge branch 'feature/v2-应用配置-1107' into develop 2022-11-09 14:30:43 +08:00
黎永顺 5508fcb9da Merge branch 'feature/v2-专项附加扣除-1103' into develop 2022-11-09 14:29:24 +08:00
黎永顺 b187b17263 添加报税规则 2022-11-08 16:39:29 +08:00
黎永顺 596392a102 专项附加扣除页面查询报错的解决 2022-11-08 15:47:20 +08:00
黎永顺 0e4587d18d 专项附加扣除导入字段的匹配 2022-11-08 09:08:34 +08:00
18652063575 24750339c4 新增自定义项的保存添加函数的防抖 2022-11-07 15:38:36 +08:00
18652063575 8e133ea43a 累计专项扣除页面添加一键累计的功能 2022-11-07 15:29:46 +08:00
18652063575 8040e2fa27 应用配置添加是否显示脱敏表人员信息的配置项完成 2022-11-07 14:23:24 +08:00
18652063575 d9a6a70012 Merge branch 'hotfix/v2-1107' into feature/v2-应用配置-1107 2022-11-07 14:15:01 +08:00
18652063575 5cb02fd0b4 应用配置添加是否显示脱敏表人员信息的配置项 2022-11-07 14:12:13 +08:00
18652063575 7a9672b8a4 社保福利档案页面修改基础信息标题 2022-11-07 14:03:45 +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 12d6fc73cf 社保福利档案切换tab bug处理 2022-11-04 15:56:49 +08:00
18652063575 926c9685b2 接口联调 2022-11-04 14:40:37 +08:00
18652063575 f24960f64b Merge branch 'develop' into release 2022-11-04 14:09:12 +08:00
18652063575 e355096bb3 Merge branch 'feature/v2-数据采集-1024' into release 2022-11-04 14:09:00 +08:00
18652063575 f8e59efbbe 接口联调 2022-11-04 14:08:19 +08:00
18652063575 ba11b69e31 社保福利档案接口修改 2022-11-04 13:51:41 +08:00
18652063575 ca04e5405d 专项附加扣除接口联调 2022-11-04 11:33:58 +08:00
18652063575 3390630d74 提示语组件样式修改 2022-11-04 09:26:38 +08:00
18652063575 459ec32c68 薪资档案页面接口联调的页面添加防抖 2022-11-03 21:03:33 +08:00
18652063575 985eb1edb0 薪资核算的页面添加防抖 2022-11-03 20:38:57 +08:00
18652063575 8353002429 社保福利档案页面添加提示语 2022-11-03 17:58:24 +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 ba19d16604 Merge branch 'hotfix/v2-bug修复-1031' into develop 2022-11-02 15:18:21 +08:00
18652063575 3722694d80 薪资项目管理列表数据处理 2022-11-02 15:18:03 +08:00
18652063575 5124c16af3 Merge branch 'feature/v2-薪资项目公式添加-1026' into develop 2022-11-02 13:59:54 +08:00
18652063575 c287818eec 薪资项目管理列表数据处理 2022-11-02 13:59:35 +08:00
18652063575 5a27891e29 Merge branch 'feature/v2-薪资项目公式添加-1026' into develop 2022-11-02 13:44:52 +08:00
18652063575 a7d31d4c31 Merge branch 'hotfix/v2-bug修复-1031' into develop 2022-11-02 13:44:38 +08:00
18652063575 0110c3d19c 个税扣缴义务人页面编辑权限按钮的问题 2022-11-02 13:44:24 +08:00
18652063575 ee6a6893d9 Merge branch 'feature/v2-数据采集-1024' into develop 2022-11-02 11:39:52 +08:00
18652063575 66debb4708 数据采集新增编辑错误信息 提示 2022-11-02 10:41:12 +08:00
18652063575 77abf14b61 Merge branch 'feature/v2-数据采集-1024' into develop 2022-11-02 09:49:18 +08:00
18652063575 d09230b2ca 数据采集编辑接口报错的处理 2022-11-02 09:49:03 +08:00
18652063575 3cbf306843 Merge branch 'feature/v2-数据采集-1024' into develop 2022-11-02 09:28:55 +08:00
18652063575 794cfc1615 数据采集列表操作列表宽度 2022-11-02 09:28:27 +08:00
18652063575 1e6aa4e131 Merge branch 'feature/v2-数据采集-1024' into develop 2022-11-01 17:18:57 +08:00
18652063575 bd0923e3a6 数据采集列表操作列表宽度 2022-11-01 17:18:41 +08:00
18652063575 0fec6c8a93 Merge branch 'feature/v2-数据采集-1024' into develop 2022-11-01 17:12:51 +08:00
18652063575 fc99452207 考勤字段列表添加序号列 2022-11-01 16:52:55 +08:00
18652063575 abd8f2b9f4 社保福利档案页面的接口联调 2022-11-01 15:50:54 +08:00
18652063575 8a964d7e40 数据采集接口联调 2022-11-01 14:06:06 +08:00
18652063575 023f70e692 社保福利档案接口对接 2022-11-01 10:35:59 +08:00
18652063575 3c5b564ccb 社保福利档案接口对接 2022-10-31 17:58:56 +08:00
18652063575 d4ecfb3a1e 数据采集接口对接 2022-10-31 17:35:21 +08:00
18652063575 24b24c2652 社保福利档案页面添加提示语 2022-10-31 14:49:24 +08:00
18652063575 8008c0855a 数据采集接口联调 2022-10-31 13:55:49 +08:00
18652063575 e8dbd3e350 hotfix/v2-bug修复-1024 2022-10-31 09:12:18 +08:00
18652063575 08ab6de7a4 hotfix/v2-bug修复-1024 2022-10-28 17:12:03 +08:00
18652063575 91a1319138 feature/v2-薪资项目公式添加-1026 2022-10-27 15:07:47 +08:00
18652063575 558db4220b hotfix/v2-bug修复-1024 2022-10-27 13:58:23 +08:00
18652063575 3bef480242 公式修改 2022-10-27 10:29:13 +08:00
18652063575 216f8c8b93 禅道bug的修复 2022-10-27 09:46:28 +08:00
18652063575 aa7ec55294 禅道bug的修复 2022-10-26 18:40:25 +08:00
18652063575 54da9eb8cd 薪资项目公式 2022-10-26 17:55:16 +08:00
18652063575 1075625170 社保福利台账详情页面查询的bug 2022-10-26 16:54:15 +08:00
18652063575 df079f762f 薪资项目管理的公式修改 2022-10-26 16:38:09 +08:00
18652063575 86f002a636 加密设置添加确认弹框 2022-10-26 15:46:39 +08:00
18652063575 6b3c8aa272 社保福利档案的待减员页面去掉删除待办的按钮 2022-10-26 13:56:28 +08:00
18652063575 ced585e164 薪资档案页面导入功能接口联调 2022-10-25 17:13:58 +08:00
18652063575 0305c24556 薪资档案页面添加导入的功能 2022-10-24 18:45:04 +08:00
18652063575 8fa3b0918c 数据采集页面添加新建功能 2022-10-24 18:42:15 +08:00
18652063575 7384d124b2 工资单发放页面报错的bug处理 2022-10-24 11:24:09 +08:00
18652063575 c3d72e9fae 福利台账-正常缴纳需要刷新页面才能显示数据列表 2022-10-24 09:28:28 +08:00
18652063575 c4c24dd159 薪资档案以及社保福利档案页面部分bug修复 2022-10-20 17:53:26 +08:00
18652063575 d7fcdd2637 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00
18652063575 284761360f 加密设置功能添加 2022-10-10 15:02:46 +08:00
18652063575 8da3d30a69 社保福利台账线下对比功能完善 2022-09-29 16:35:41 +08:00
18652063575 f6d9328344 注释掉社保福利台账添加线下对比 2022-09-29 15:46:38 +08:00
18652063575 1d1ced8d77 社保福利台账添加线下对比的页面功能 2022-09-29 15:45:23 +08:00
18652063575 85441a1f69 1 2022-09-19 13:36:36 +08:00
18652063575 3808d0b625 考勤查看页面报错 2022-09-16 17:25:31 +08:00
18652063575 5e1dac0554 接口异常报错提示 2022-09-16 11:30:13 +08:00
18652063575 3131de6446 接口异常报错提示 2022-09-15 17:57:38 +08:00
18652063575 756ca0cb74 新增系统配置页面以及新增和编辑接口功能 2022-09-15 16:58:49 +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 ef9f8478a7 bug的修正 2022-09-01 17:52:00 +08:00
liyongshun 6768649ac4 bug的修正 2022-08-25 17:54:18 +08:00
liyongshun ad13e078e4 部门选择添加树形选择 2022-08-16 10:10:59 +08:00
liyongshun 8a047f7786 init gitlab 2022-08-15 10:20:48 +08:00
liyongshun 67f0de658a 薪资核算页面表格替换antd4.x的table组件 2022-08-11 17:38:03 +08:00
liyongshun e243085a0d 员工福利档案页面添加编辑抽屉页面样式重构，以及修改页面参数回调的bug 2022-08-04 17:07:09 +08:00
liyongshun ae3af8e59e 薪资项目管理页面添加sql项的数据源选项 2022-08-03 17:54:47 +08:00
liyongshun f8f485c6a7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:17:08 +08:00
liyongshun 2097d2faf7 薪资核算详情页面添加高级搜索的功能以及添加列表头公式查看的接口 2022-08-02 18:16:49 +08:00
liyongshun cac473595e 薪资核算详情页面表格样式错位的bug解决 2022-07-29 16:45:46 +08:00
liyongshun e329e381ea 薪资核算详情页面导入失败的bug处理以及表格列固定之后，样式错位的bug解决 2022-07-29 11:44:19 +08:00
liyongshun f3bf85dcf5 社保福利档案页面导入暂时注释掉带数据的导入功能 2022-07-28 17:50:57 +08:00
liyongshun 9fb20ad59c 隐藏社保福利方案页面删除按钮 2022-07-28 17:26:20 +08:00
liyongshun d774de6a64 薪资账套编辑页面修改 2022-07-28 17:16:40 +08:00
liyongshun 8f11093483 社保福利档案添加能带出数据的按钮 2022-07-25 18:02:36 +08:00
liyongshun 134653fac6 薪资发放页面添加进度条弹框组件 2022-07-21 17:34:10 +08:00
liyongshun c6d9082986 社保福利档案编辑的bug 2022-07-20 15:02:55 +08:00
liyongshun 6ff45ec2a1 社保福利台账页面的bug修改 2022-07-20 10:33:23 +08:00
liyongshun a80fc0c66c 薪资查看页面添加权限 2022-07-12 18:15:27 +08:00
liyongshun 3e944ded89 我的薪资福利添加权限功能 2022-07-12 17:39:57 +08:00
liyongshun 2225275881 测试 2022-07-12 16:13:13 +08:00
liyongshun cc0b91b2d8 表格文字超出处理 2022-07-12 16:01:56 +08:00
liyongshun c9722919fe 薪资核算编辑框权限 2022-07-11 18:21:47 +08:00
liyongshun e22fa6429f 社保福利档案页面编辑页面组件样式的修改以及数据回填失败的bug处理 2022-07-07 17:58:00 +08:00
liyongshun 561900ae49 个税申报申报表bug的修复 2022-07-06 18:11:54 +08:00
liyongshun 6579751717 替换个税扣缴义务人接口和分页bug的修改 2022-07-05 16:35:42 +08:00
liyongshun f762fd5a9a 薪资账套周期联动 2022-07-04 19:03:14 +08:00
liyongshun c2757fd1f4 社保福利档案表格分页的bug 2022-07-04 13:56:15 +08:00
liyongshun f32848121c 列表样式 2022-06-30 17:36:37 +08:00
liyongshun 732f3e1607 操作按钮权限的bug 2022-06-30 14:21:18 +08:00
liyongshun f89ada73db 精度丢失的bug 2022-06-30 11:28:13 +08:00
liyongshun 4164c8b06a 去掉工资单发放权限阿牛 2022-06-29 17:24:30 +08:00
liyongshun 65be568847 测试bug的修复 2022-06-29 17:04:01 +08:00
liyongshun 5f66d08a39 修改薪资核算查询日期报错的bug 2022-06-29 14:02:06 +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 bac1e217a2 Merge branch 'release' into release-zhongjiang 2022-06-28 18:08:26 +08:00
liyongshun a258a2f342 bug 2022-06-28 18:07:41 +08:00
MustangDeng 4d46a7ca90 发起流程修改 2022-06-27 18:01:30 +08:00
liyongshun 0da6205159 Merge branch 'release' into release-zhongjiang 2022-06-27 10:38:01 +08:00
liyongshun aa165e70da 修改导出的bug 2022-06-27 10:35:39 +08:00
liyongshun c582fb2182 工资单发放bug的修复 2022-06-24 11:59:29 +08:00
liyongshun 8a3ff43bb4 中江代码 2022-06-23 16:47:00 +08:00
liyongshun 7e1ed1b848 Merge branch 'release' into release-zhongjiang 2022-06-23 16:35:33 +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 60a97f9736 编辑权限 2022-06-21 17:35:19 +08:00
liyongshun 22ea7b0786 Merge branch 'fenquan' into liys_dev 2022-06-21 15:55:22 +08:00
liyongshun a51e8f32da 固定列表表格样式修改 2022-06-21 15:54:39 +08:00
liyongshun 78b12043aa 页面操作按钮权限的控制 2022-06-21 14:27:16 +08:00
liyongshun 314ffff8ec 表格应用替换 2022-06-21 11:57:09 +08:00
liyongshun 2a8aac2068 添加页面操作按钮操作权限 2022-06-21 11:33:00 +08:00
liyongshun a91ce27139 注释薪资核算详情页的表格固定列 2022-06-21 09:41:54 +08:00
MustangDeng b2c63bb610 Merge branch 'fenquan' into release-zhongjiang 2022-06-20 16:23:18 +08:00
MustangDeng 1a6007a8da 往期累计抽屉数据宽度 2022-06-20 16:22:44 +08:00
liyongshun ae70da48be 修改权限的接口 2022-06-20 13:51:55 +08:00
liyongshun aaeb4b9459 Merge branch 'fenquan' into release-zhongjiang 2022-06-17 17:20:51 +08:00
liyongshun bbb4189700 薪资账套复制添加个税扣缴义务人参数 2022-06-17 17:12:21 +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 70a5d3ae7b fix bug 48 - 56 2022-06-16 20:58:54 +08:00
MustangDeng 1e21df35e6 Merge branch 'fenquan' into release-zhongjiang 2022-06-16 16:27:52 +08:00
MustangDeng e31dbd18d8 保存问题 2022-06-16 16:27:15 +08:00
MustangDeng b2ce5ba467 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 18:31:50 +08:00
MustangDeng 2adc0ee33a 导入参数校验 2022-06-15 18:31:10 +08:00
MustangDeng 8f9150e1a1 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 16:21:30 +08:00
MustangDeng 1ce692421a 编辑Modal 2022-06-15 16:20:59 +08:00
MustangDeng 123ba900e7 Merge branch 'fenquan' into release-zhongjiang 2022-06-15 09:42:20 +08:00
MustangDeng 711beb5cff 个税扣缴调整弹窗高度 2022-06-15 09:39:48 +08:00
MustangDeng b60a69a63c Merge branch 'fenquan' into release-zhongjiang 2022-06-15 09:11:11 +08:00
MustangDeng 3a7b2339d5 空值情况处理 2022-06-15 09:10:08 +08:00
MustangDeng 86c56e2140 Merge branch 'fenquan' into release-zhongjiang 2022-06-14 16:53:29 +08:00
MustangDeng a39b9d606a 工资单模板删除项目 2022-06-14 16:51:26 +08:00
MustangDeng b407adc724 页面优化 2022-06-14 16:21:50 +08:00
MustangDeng 0ce5d93199 Merge branch 'fenquan' into release-zhongjiang 2022-06-14 14:11:24 +08:00
liyongshun f3f07a4612 下载模板地址的区分 2022-06-14 11:32:35 +08:00
liyongshun b5dc616ba6 Merge branch 'fenquan' of gitee.com:MustangDeng/salary-management-front-end into fenquan 2022-06-14 11:18:40 +08:00
liyongshun 3413f8fc0b 导入字段的添加 2022-06-14 11:18:37 +08:00
MustangDeng c4502f1e1b 工资单模板 2022-06-14 11:17:03 +08:00
MustangDeng 6ae75883b0 编译问题处理 2022-06-14 10:23:38 +08:00
MustangDeng 029876f694 账套列表 2022-06-14 10:16:04 +08:00
MustangDeng 697b799b32 显示列定制 2022-06-13 18:08:45 +08:00
MustangDeng 5decf617a6 工资单页面定制 2022-06-13 16:31:08 +08:00
MustangDeng 6fda61cf83 fix bug 2022-06-13 10:22:49 +08:00
MustangDeng 4ae6db4e2b fix 其他免税 2022-06-10 17:29:46 +08:00
MustangDeng 1889a4818d Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan 2022-06-10 14:21:28 +08:00
MustangDeng a71ab9793e 个税申报表详情列表 2022-06-10 14:21:07 +08:00
liyongshun 8dcf736db6 薪资账套的编辑bug修复，以及薪资档案模块上传下载模板添加个参数 2022-06-09 18:34:24 +08:00
MustangDeng 47af2543b0 Merge branch 'fenquan' of https://gitee.com/MustangDeng/salary-management-front-end into fenquan 2022-06-09 18:30:39 +08:00
MustangDeng aebb43b461 福利台账分权 2022-06-09 18:30:19 +08:00
liyongshun cd801cb5c7 账套列表编辑权限的田间 2022-06-08 18:42:01 +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 31756873d9 扣缴人修改 2022-06-07 18:19:24 +08:00
MustangDeng 55731caafe 合并分支 2022-06-07 14:42:44 +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 d9c2aef5ae todo 2022-06-07 10:22:06 +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 9940be40ed 工资单预览调整 2022-05-31 19:05:29 +08:00
MustangDeng 936ac9bd3f 工资单bug修复 2022-05-31 18:51:23 +08:00
MustangDeng 55f732c1fc 台账归档页面刷新 2022-05-31 16:37:35 +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 6adf1a83fa bug 2022-05-30 09:38:45 +08:00
MustangDeng 5df78a31d8 福利台账页面 2022-05-26 14:34:41 +08:00
MustangDeng f4ac00ddbd 补交 2022-05-26 09:46:28 +08:00
MustangDeng 709deef5a6 福利核算刷新页面 2022-05-25 13:54:07 +08:00
MustangDeng 1823149ae2 bug修复 2022-05-24 23:55:12 +08:00
MustangDeng 33e5009585 bug修改 2022-05-24 15:39:09 +08:00
MustangDeng c2439f2628 福利台账问题修复 2022-05-19 16:30:21 +08:00
MustangDeng 45e72e723f bug修复 2022-05-19 15:13:31 +08:00
MustangDeng 4701ada4dc 福利方案bug处理 2022-05-18 17:10:12 +08:00
MustangDeng 6b178ebaea 福利 2022-05-18 09:21:42 +08:00
MustangDeng 16de38a423 账套问题处理 2022-05-13 15:25:21 +08:00
MustangDeng 91c1907b1b 薪资项目管理bug处理 2022-05-13 13:33:14 +08:00
MustangDeng 7dc2b1d33e 导入框初始化 2022-05-12 17:04:33 +08:00
MustangDeng 09862cafac 修复bug 2022-05-10 17:45:03 +08:00
MustangDeng b2d5b1a90c 修复bug 2022-05-10 15:31:13 +08:00
MustangDeng ca2f9d6319 Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev 2022-05-09 15:53:54 +08:00
MustangDeng b963ec6641 福利档案导入 2022-05-09 15:53:36 +08:00
liyongshun 8b966e6cfb Merge branch 'dev' of gitee.com:MustangDeng/salary-management-front-end into dev 2022-05-09 15:10:52 +08:00
liyongshun 8b5aa25d38 福利列表数据删除跳转的bug 2022-05-09 15:10:49 +08:00
MustangDeng 9517e97bad 福利档案 2022-05-09 14:23:43 +08:00
MustangDeng d6b7357949 Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev 2022-05-07 14:47:31 +08:00
MustangDeng c85c2ec66f 福利导入 2022-05-07 14:47:14 +08:00
liyongshun d03b16dd76 多行文本指定位置添加内容 2022-05-06 12:25:32 +08:00
MustangDeng b573e6edf6 0505bug 2022-05-06 10:11:45 +08:00
MustangDeng e4e4f791eb 工资单预览模板 2022-05-05 16:10:22 +08:00
MustangDeng 00f867914a 工资单预览 2022-05-05 15:53:35 +08:00
MustangDeng ae3ee29592 往期累计情况 2022-05-05 12:17:12 +08:00
MustangDeng 515c7bab01 20220505 2022-05-05 09:13:38 +08:00
MustangDeng 7cef5512ae 预览 2022-04-27 19:27:23 +08:00
MustangDeng fd13d72510 导入优化 2022-04-27 14:25:59 +08:00
MustangDeng 4310a8c307 核算列表 2022-04-27 11:14:20 +08:00
MustangDeng e37f3acd1b 账套人员信息删除bug修改 2022-04-26 16:50:09 +08:00
MustangDeng 5df55a6724 核算导入导出 2022-04-26 16:35:07 +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 82b6c05819 Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev 2022-04-24 14:50:58 +08:00
MustangDeng f8beaa83bd 核算操作刷新页面 2022-04-24 14:50:44 +08:00
liyongshun 94912c0bf2 Merge branch 'dev' of gitee.com:MustangDeng/salary-management-front-end into dev 2022-04-22 19:09:04 +08:00
liyongshun 0206d8f1a9 页面分页的bug 2022-04-22 19:09:02 +08:00
MustangDeng 08ce3de564 账套删除 2022-04-22 18:12:16 +08:00
MustangDeng 8bf8b58065 考勤字段列表 2022-04-22 17:00:10 +08:00
MustangDeng 046be5bf5e Merge branch 'dev' of https://gitee.com/MustangDeng/salary-management-front-end into dev 2022-04-22 14:52:10 +08:00
MustangDeng 9eeaf2d9e9 我的工资单 2022-04-22 14:51:51 +08:00
liyongshun 05334065c2 社会福利台账页面完成 2022-04-22 14:35:51 +08:00
MustangDeng d2dd726b20 工资单列表 2022-04-21 16:51:51 +08:00
MustangDeng 3794c2c36d 福利档案 2022-04-21 14:59:34 +08:00
MustangDeng 1fb586fe40 工资单 2022-04-20 19:24:14 +08:00
MustangDeng bd21135a22 账套公式,个税申报表 2022-04-20 15:28:40 +08:00
MustangDeng 9bb84614c7 薪资项目 2022-04-19 19:55:16 +08:00
MustangDeng 96b5e0317e 核算查看页面接口对接 2022-04-19 16:34:19 +08:00
MustangDeng 9795747582 核算接口对接 2022-04-19 14:45:29 +08:00
MustangDeng d9ae14068a 薪资项目问题处理 2022-04-19 10:11:40 +08:00
MustangDeng 829bda2c1f 薪资项目保存 2022-04-18 16:57:42 +08:00
MustangDeng d5588c19f7 公式 2022-04-18 15:33:19 +08:00
MustangDeng 082cbe1955 公式 2022-04-18 11:42:45 +08:00
MustangDeng 78dda90119 工资单初版 2022-04-18 09:31:06 +08:00
MustangDeng 6c839787c5 列表接口对接 2022-04-16 13:13:41 +08:00
MustangDeng 5b743bc4a9 工资单模板接口对接 2022-04-14 19:32:57 +08:00
MustangDeng 7f08c6ae5c 新增工资单模板 2022-04-13 16:56:31 +08:00
MustangDeng 49ea369fcd 工资单模块开始 2022-04-12 18:29:28 +08:00
MustangDeng 1907c2982a 调薪记录列别 2022-04-08 09:26:58 +08:00
MustangDeng 06254eb2b2 调薪操作 2022-04-07 18:35:09 +08:00
MustangDeng 59dd3a95c7 个税义务人调整 2022-04-07 13:39:21 +08:00
MustangDeng cec7489a85 薪资档案薪资项目保存问题 2022-04-07 09:59:04 +08:00
MustangDeng 15d3eb6e15 薪资档案接口对接 2022-04-07 09:41:16 +08:00
MustangDeng c9110014c8 个税义务人保存 2022-04-06 15:36:31 +08:00
MustangDeng b678ec91e6 验证 2022-04-06 14:26:16 +08:00
MustangDeng 32d0578be2 薪资方案 2022-04-02 17:34:40 +08:00
MustangDeng 3ee405ec39 自定义福利编辑 2022-04-01 15:02:18 +08:00
MustangDeng 7c07f6c591 导出 2022-04-01 13:54:24 +08:00
MustangDeng 7104035b17 programme insert 2022-04-01 10:39:01 +08:00
MustangDeng f77ce9dc98 salaryFile 2022-04-01 10:24:55 +08:00
MustangDeng c3e701f3b6 方案修改 2022-04-01 09:28:05 +08:00
MustangDeng d964f349f1 ledger 2022-03-31 21:03:17 +08:00
MustangDeng c517a80b87 archives 2022-03-31 15:32:11 +08:00
MustangDeng 4ec71f11ce 薪资账套 2022-03-30 20:04:34 +08:00
MustangDeng 5734b1001c 保存薪资项目 2022-03-29 17:33:54 +08:00
MustangDeng fbe5a338ef 自定义列 2022-03-28 10:53:19 +08:00
MustangDeng e67a33af72 账套 2022-03-25 16:41:59 +08:00
MustangDeng bbbc645400 薪资项目 2022-03-25 10:47:01 +08:00
MustangDeng 2fa2957129 薪资项目 2022-03-24 16:58:57 +08:00
MustangDeng 8251303da2 薪资项目 2022-03-24 14:18:45 +08:00
MustangDeng 229808f467 薪资项目管理 2022-03-24 11:28:57 +08:00
MustangDeng 1768c5bc70 添加系统项目 2022-03-24 10:32:14 +08:00
MustangDeng c84976ce58 错误提示 2022-03-23 19:38:10 +08:00
MustangDeng ddbedca83b 薪资项目列表 2022-03-23 16:39:45 +08:00
MustangDeng de6736d01c 考勤引用列表 2022-03-23 16:17:58 +08:00
MustangDeng 4ef5703828 引用设置 2022-03-23 16:01:10 +08:00
MustangDeng 5ec5d31c12 导入表头设置 2022-03-23 14:19:45 +08:00
MustangDeng 218d648f33 设置表头 2022-03-23 13:11:01 +08:00
MustangDeng 22a1a64275 字段设置搜索 2022-03-22 20:14:52 +08:00
MustangDeng 79ac8960af 字段设置 2022-03-22 20:06:36 +08:00
MustangDeng 9c57f58212 考勤字段 2022-03-22 18:53:05 +08:00
MustangDeng 7c8dabaf8d 自定义福利表单 2022-03-22 16:53:39 +08:00
MustangDeng c020cc5a80 基础社保福利方案 2022-03-21 19:54:16 +08:00
MustangDeng be4051e5ea programme 2022-03-21 17:43:26 +08:00
MustangDeng 1e13b98152 对接接口钱 2022-03-21 14:01:15 +08:00
MustangDeng 19c6148508 系统薪资项目 2022-03-18 15:04:34 +08:00
MustangDeng 2d0784d71b 薪资项目列表 2022-03-18 14:47:49 +08:00
MustangDeng 92168b55ad 工资单显示设置 2022-03-18 14:16:52 +08:00
MustangDeng 34b9dd6cda 个税申报白鸥 2022-03-18 10:38:43 +08:00
MustangDeng 9ea15a3218 工资单发放 2022-03-18 09:41:48 +08:00
MustangDeng 02f041bd9f 工资单详情 2022-03-17 22:38:00 +08:00
MustangDeng 619bbe96c1 发放工资单列表 2022-03-17 20:08:59 +08:00
MustangDeng 320e693605 薪资档案 2022-03-17 18:57:56 +08:00
MustangDeng 96b2181510 slideSalaryItem 2022-03-17 18:40:47 +08:00
MustangDeng 1e27494a78 editAgentModal 2022-03-17 17:53:35 +08:00
MustangDeng e9f78c0ed6 调薪对话框 2022-03-17 17:18:42 +08:00
MustangDeng ebde1a9261 薪资核算 2022-03-17 16:22:32 +08:00
MustangDeng ec98e1e168 compareDetail 2022-03-17 16:08:04 +08:00
MustangDeng 621d58a6d6 归档详情 2022-03-17 15:02:59 +08:00
MustangDeng 75dc9b4694 editSalaryDetail 2022-03-17 14:11:11 +08:00
MustangDeng fe3bdef771 异常信息 2022-03-17 12:30:37 +08:00
MustangDeng aaa02b4437 薪资核算页面 2022-03-17 10:54:58 +08:00
MustangDeng 9153ce934b 人员确认页面 2022-03-16 16:21:28 +08:00
MustangDeng ec3dc66655 薪资账套静态页面完成 2022-03-16 13:45:35 +08:00
MustangDeng 32cf147cc0 slide 2022-03-16 13:28:34 +08:00
MustangDeng 3b2b25cbde ledger formSlide step 2022-03-16 10:41:38 +08:00
MustangDeng d7b1269f3a 薪资账套slideStep1 2022-03-15 17:50:54 +08:00
MustangDeng 87dadb967f 考勤引用静态页面 2022-03-15 13:59:36 +08:00
MustangDeng 0a35202baa 考情数据查看页面 2022-03-15 11:06:56 +08:00
MustangDeng 3e0975af12 考勤引用弹窗 2022-03-14 18:58:02 +08:00
MustangDeng 236a6952a4 考勤数据导入 2022-03-14 17:07:26 +08:00
MustangDeng 7c2ad81d2f 考勤列表 2022-03-14 14:08:22 +08:00
MustangDeng 8aa62f5864 editSlideContent日期不显示问题处理 2022-03-14 11:07:17 +08:00
MustangDeng f5a46964dd 社保方案list 2022-03-12 17:07:11 +08:00
MustangDeng 5af7225b24 往期 2022-03-12 13:12:21 +08:00
MustangDeng f7caa2b7cb 其他免除扣除 2022-03-11 17:19:25 +08:00
MustangDeng 2d981f7253 累计专项明细 2022-03-11 17:01:50 +08:00
MustangDeng 6ea3bfef6e import modal 改造 2022-03-11 16:13:36 +08:00
MustangDeng 7cdc3ed9b2 累计专项扣除 2022-03-11 11:02:10 +08:00
MustangDeng a0634feaef 其他扣除 2022-03-11 10:44:42 +08:00
MustangDeng f51b63f582 累计专项附加扣除 2022-03-11 10:04:16 +08:00
MustangDeng 7491713ffc 导出主表明细 2022-03-10 19:28:35 +08:00
MustangDeng 59f1ca0975 导出全部 2022-03-10 18:10:14 +08:00
MustangDeng 9f78eb6115 导入 2022-03-10 16:28:49 +08:00
MustangDeng f72c1670f0 slide topLabelBar 2022-03-10 13:51:13 +08:00
MustangDeng 8ffb9e519a 路由修改 2022-03-10 10:58:26 +08:00
MustangDeng 7776827c45 页面导入初版 2022-03-10 09:40:31 +08:00
MustangDeng 1de3de5fb5 cumDeduct列表及查询 2022-03-08 16:45:33 +08:00
MustangDeng 1cf526c994 累计专项附加扣除页面列表搜索 2022-03-08 16:07:27 +08:00
MustangDeng 8af2c0b4da 弹出框静态页面 2022-03-07 19:33:56 +08:00
MustangDeng fd59f9ba01 导入数据提示框 2022-03-04 15:23:07 +08:00
MustangDeng 0f7c6320bc 个税税率表页面功能结束 2022-03-03 15:28:00 +08:00
MustangDeng 5082b4192e 查看详情 2022-03-03 14:19:11 +08:00
MustangDeng 132f49e8d6 slide列表删除 2022-03-03 10:56:07 +08:00
MustangDeng 62f2566562 个税税率表列表，新增 2022-03-03 09:58:25 +08:00
MustangDeng 141f315d54 个税税率表列表查询 2022-03-02 13:35:29 +08:00
MustangDeng 975d1e2049 个税扣缴义务人页面 2022-03-02 10:00:54 +08:00
MustangDeng 93a07d6ff2 接口绑定之前 2022-03-01 09:42:00 +08:00
MustangDeng 133ded0044 组件抽离 2022-02-28 16:14:45 +08:00
MustangDeng c9832d1926 个税扣缴义务人页面组件重构 2022-02-28 15:57:34 +08:00
MustangDeng cf1c6d03fa 个税扣缴义务人前端静态页面 2022-02-28 15:11:53 +08:00
MustangDeng 2aca805178 apis 2022-02-28 09:29:46 +08:00
MustangDeng 35ede9dd67 2022-02-25 2022-02-25 09:24:56 +08:00