 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 |