Commit Graph

2128 Commits

Author SHA1 Message Date
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