 lys
|
64b6a23310
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
|
2024-11-25 15:00:33 +08:00 |
|
lys
|
a5cc09a2c5
|
release/2.17.1.2411.01
|
2024-11-20 16:25:59 +08:00 |
|
lys
|
55bbe0ca39
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:52:14 +08:00 |
|
lys
|
f6471f881e
|
release/2.17.1.2411.01-个税
|
2024-11-19 14:27:53 +08:00 |
|
lys
|
d5ecc6ae74
|
Merge branch 'release/2.17.1.2411.01' into release/2.17.1.2411.01-个税
# Conflicts:
# pc4mobx/hrmSalary/apis/ledger.js
# pc4mobx/hrmSalary/pages/calculate/doCalc/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
|
2024-11-19 13:40:34 +08:00 |
|
lys
|
8a0998e26c
|
release/2.17.1.2411.01
|
2024-11-19 10:54:33 +08:00 |
|
lys
|
2261cf3104
|
release/2.17.1.2411.01
|
2024-11-19 10:31:10 +08:00 |
|
lys
|
b0a45c9bbe
|
Merge branch 'feature/2.16.1.2410.01-薪资账套配置流程审批' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-14 09:36:26 +08:00 |
|
lys
|
e09f4da1cf
|
release/2.17.1.2411.01
|
2024-11-13 10:19:57 +08:00 |
|
lys
|
712b45453a
|
Merge branch 'feature/2.16.1.2410.01-次账号' into release/2.17.1.2411.01
# Conflicts:
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-11-12 18:05:44 +08:00 |
|
lys
|
3869a0a51b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 18:02:48 +08:00 |
|
lys
|
4383e14491
|
Merge branch 'release/2.16.1.2410.01' into release/2.16.1.2410.01-个税
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/components/reportList.js
|
2024-11-12 18:01:30 +08:00 |
|
lys
|
24cadda23f
|
release/2.16.1.2410.01
|
2024-11-12 17:58:50 +08:00 |
|
lys
|
6993e5655a
|
Merge branch 'feature/2.16.1.2410.01-薪资项目管理页面重构' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 13:49:41 +08:00 |
|
lys
|
8003e68796
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-12 13:49:18 +08:00 |
|
lys
|
01d1d3b0bd
|
Merge branch 'feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能' into release/2.16.1.2410.01
|
2024-11-11 14:43:34 +08:00 |
|
lys
|
3654e2a378
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-11 14:43:17 +08:00 |
|
lys
|
7063732d6f
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 16:01:18 +08:00 |
|
lys
|
3fbe08ab2e
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 15:16:09 +08:00 |
|
lys
|
5abe35ca60
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 10:27:47 +08:00 |
|
lys
|
641c5f367f
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-08 10:02:24 +08:00 |
|
lys
|
bd81fe44b2
|
release/2.16.1.2410.01
薪资档案添加调薪日期的泛微选择
|
2024-11-07 16:15:45 +08:00 |
|
lys
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
0abeee25f3
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 09:23:46 +08:00 |
|
lys
|
e9f4d9b043
|
release/2.16.1.2410.01
|
2024-11-06 11:06:55 +08:00 |
|
lys
|
27ec1ae5ef
|
feature/2.16.1.2410.01-薪资项目管理页面重构
|
2024-11-06 10:33:25 +08:00 |
|
lys
|
5df1e3f0c1
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-数据采集重构
|
2024-11-06 09:23:10 +08:00 |
|
lys
|
83d14f6d82
|
release/2.16.1.2410.01
日志组件优化
|
2024-11-05 17:33:34 +08:00 |
|
lys
|
6563e6b5df
|
release/2.16.1.2410.01
|
2024-11-05 16:26:17 +08:00 |
|
lys
|
1a02222bd3
|
feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-11-04 18:01:33 +08:00 |
|
lys
|
88dc06c35e
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-次账号
|
2024-11-04 17:26:04 +08:00 |
|
lys
|
df4971fd27
|
release/2.16.1.2410.01
|
2024-11-01 18:28:12 +08:00 |
|
lys
|
98ca4cb03f
|
release/2.16.1.2410.01
|
2024-11-01 16:03:57 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +08:00 |
|
lys
|
728e683777
|
Merge branch 'feature/2.16.1.2410.01-数据采集重构' into feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-10-31 17:32:30 +08:00 |
|
lys
|
b461a2c801
|
custom/汇通建设
|
2024-10-31 17:05:24 +08:00 |
|
lys
|
f126179d1d
|
Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
# pc4mobx/hrmSalary/apis/calculate.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-10-31 17:02:27 +08:00 |
|
lys
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
lys
|
8488f54aac
|
release/2.16.1.2410.01
|
2024-10-29 09:21:38 +08:00 |
|
lys
|
444c9b19ab
|
release/2.16.1.2410.01
工资单模板设置添加薪资所属年的设置
|
2024-10-25 17:04:45 +08:00 |
|
lys
|
c10e6fb3ee
|
feature/2.16.1.2410.01-次账号
|
2024-10-25 11:46:00 +08:00 |
|
lys
|
02ff34c202
|
release/2.16.1.2410.01
|
2024-10-23 09:51:02 +08:00 |
|
lys
|
cfdc0cd5a0
|
release/2.16.1.2410.01
|
2024-10-22 14:53:36 +08:00 |
|
lys
|
9d2fd951ef
|
release/2.16.1.2410.01-个税
|
2024-10-18 16:49:52 +08:00 |
|
lys
|
15acb33aa0
|
release/2.16.1.2410.01-个税
|
2024-10-18 15:47:24 +08:00 |
|
lys
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +08:00 |
|
lys
|
8c5b0acffa
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 11:51:06 +08:00 |