Commit Graph

1082 Commits

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