 lys
|
fe4985fa9b
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-27 15:33:10 +08:00 |
|
lys
|
ae35d29e36
|
Merge branch 'release/2.19.1.2501.01-个税' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 15:30:43 +08:00 |
|
lys
|
20da3fd4eb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 15:30:16 +08:00 |
|
lys
|
bb3ded5692
|
release/2.19.1.2501.01
|
2025-03-27 15:28:53 +08:00 |
|
lys
|
c3284fa160
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-27 13:51:01 +08:00 |
|
lys
|
2e818defdb
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:50:25 +08:00 |
|
lys
|
10b45fdfb9
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSalaryItemNormal.js
|
2025-03-27 13:50:03 +08:00 |
|
lys
|
b443a56679
|
release/2.19.1.2501.01
|
2025-03-27 13:46:53 +08:00 |
|
lys
|
154b16ad6e
|
release/2.19.1.2503.01-业务线个税
|
2025-03-27 13:19:59 +08:00 |
|
lys
|
0d55c14f0b
|
release/2.19.1.2501.01-个税
|
2025-03-27 11:32:11 +08:00 |
|
lys
|
87870e9101
|
release/2.19.1.2501.01-个税
|
2025-03-27 10:41:22 +08:00 |
|
lys
|
1549eab2ee
|
release/2.19.1.2501.01-个税
|
2025-03-27 09:40:20 +08:00 |
|
lys
|
6a81dd9c76
|
release/2.19.1.2503.01-业务线个税
|
2025-03-26 17:19:52 +08:00 |
|
lys
|
461944eced
|
release/2.19.1.2501.01-个税
|
2025-03-26 16:47:59 +08:00 |
|
lys
|
904964ada8
|
Merge branch 'release/3.0.1.2503.01-合并业务线' into release/2.19.1.2503.01-业务线个税
# Conflicts:
# pc4mobx/hrmSalary/apis/taxAgent.js
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
# pc4mobx/hrmSalary/pages/declare/components/declareTablelist/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerBaseSetting.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerTable.js
# pc4mobx/hrmSalary/pages/salary/components/baseSettings.js
# pc4mobx/hrmSalary/pages/salary/components/comHint.js
# pc4mobx/hrmSalary/pages/salary/components/constants.js
# pc4mobx/hrmSalary/pages/salary/components/index.less
# pc4mobx/hrmSalary/pages/salary/components/personalScope.js
# pc4mobx/hrmSalary/pages/salary/components/personalScopeModal.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentSlide.js
# pc4mobx/hrmSalary/pages/salary/components/taxAgentTable.js
# pc4mobx/hrmSalary/pages/salary/components/taxDeclarationInfo.js
# pc4mobx/hrmSalary/pages/salary/taxAgent.js
# pc4mobx/hrmSalary/util/index.js
|
2025-03-26 16:16:22 +08:00 |
|
lys
|
7fcd9afbed
|
release/2.19.1.2501.01-个税
|
2025-03-26 15:46:50 +08:00 |
|
lys
|
a0c1ab548c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-26 13:44:50 +08:00 |
|
lys
|
2618a2c12f
|
release/2.19.1.2501.01
|
2025-03-26 13:44:24 +08:00 |
|
lys
|
50c6bab3c2
|
Merge branch 'feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改' into release/3.0.1.2503.01-合并业务线测试合并
|
2025-03-26 09:31:18 +08:00 |
|
lys
|
5c0996296b
|
release/3.0.1.2503.01-合并业务线
|
2025-03-25 16:33:51 +08:00 |
|
lys
|
1d341110f5
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-24 13:55:02 +08:00 |
|
lys
|
bbf362140f
|
custom/万新光学
|
2025-03-24 13:54:45 +08:00 |
|
lys
|
60747a5d78
|
release/2.19.1.2501.01-个税
|
2025-03-20 13:42:59 +08:00 |
|
lys
|
1e63f9058c
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-19 18:04:58 +08:00 |
|
lys
|
c282a71e86
|
release/2.19.1.2501.01
|
2025-03-19 18:04:38 +08:00 |
|
lys
|
a0385789cb
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-19 16:31:31 +08:00 |
|
lys
|
bb79a3f54c
|
release/3.0.1.2503.01-合并业务线
|
2025-03-19 10:40:35 +08:00 |
|
lys
|
3368323786
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01-合并业务线
|
2025-03-19 10:16:43 +08:00 |
|
lys
|
e4aaf5e8e4
|
release/2.19.1.2501.01
|
2025-03-19 09:36:12 +08:00 |
|
lys
|
f436779b9e
|
release/2.19.1.2501.01
|
2025-03-13 17:41:34 +08:00 |
|
lys
|
c690e27517
|
feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改
|
2025-03-13 17:39:51 +08:00 |
|
lys
|
2fd0dfcf50
|
feature/3.0.1.2503.01-合并业务线-社保福利台账明细整改
|
2025-03-13 15:19:40 +08:00 |
|
lys
|
f7dfcdf8a6
|
release/2.19.1.2501.01
|
2025-03-12 13:57:48 +08:00 |
|
lys
|
4a3a6766ba
|
release/3.0.1.2503.01-合并业务线
|
2025-03-12 13:56:44 +08:00 |
|
lys
|
00c212a523
|
release/3.0.1.2503.01-合并业务线
|
2025-03-12 13:56:01 +08:00 |
|
lys
|
645c9ff5eb
|
release/3.0.0.2502.01-合并业务线
|
2025-03-11 09:38:06 +08:00 |
|
lys
|
6aa12027b8
|
release/3.0.0.2502.01-合并业务线
|
2025-03-10 18:11:59 +08:00 |
|
lys
|
9f13efa0f2
|
Merge branch 'feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员' into release/3.0.0.2502.01-合并业务线
|
2025-03-10 15:31:44 +08:00 |
|
lys
|
bc79bfe16e
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-10 15:31:26 +08:00 |
|
lys
|
f7bf13bd69
|
release/3.0.0.2502.01-合并业务线
|
2025-03-10 14:50:07 +08:00 |
|
lys
|
93dde8230a
|
release/2.19.1.2501.01
|
2025-03-10 14:48:15 +08:00 |
|
lys
|
5c6ecef51a
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-06 16:13:49 +08:00 |
|
lys
|
7656d78fa0
|
feature/3.0.0.2502.01-合并业务线-社保福利台账增减人员
|
2025-03-06 15:43:43 +08:00 |
|
lys
|
c1dd08602b
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-03-04 09:10:28 +08:00 |
|
lys
|
bdfc9513c8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 18:25:52 +08:00 |
|
lys
|
f211fadcb8
|
release/3.0.0.2502.01-合并业务线
|
2025-02-27 16:53:46 +08:00 |
|
lys
|
d47d74f856
|
release/3.0.0.2502.01-合并业务线
|
2025-02-21 17:43:08 +08:00 |
|
lys
|
1672909dd7
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 13:44:55 +08:00 |
|
lys
|
c0217a2608
|
release/3.0.0.2502.01-合并业务线
|
2025-02-20 11:32:32 +08:00 |
|
lys
|
98b1c2bc08
|
release/3.0.0.2502.01-合并业务线
|
2025-02-19 16:26:58 +08:00 |
|
lys
|
2200784d4b
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 17:34:03 +08:00 |
|
lys
|
b6a0678f1a
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 17:30:21 +08:00 |
|
lys
|
7c85cbae4f
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 15:48:37 +08:00 |
|
lys
|
54adc6cc2e
|
release/3.0.0.2502.01-合并业务线
|
2025-02-18 15:42:40 +08:00 |
|
lys
|
75d7f97f1d
|
Merge branch 'release/2.19.1.2501.01' into release/3.0.0.2502.01-合并业务线
|
2025-02-18 11:37:01 +08:00 |
|
lys
|
ea084c93a2
|
release/2.19.1.2501.01
路由模式页面报错
|
2025-02-18 09:08:07 +08:00 |
|
lys
|
e344eed2d0
|
release/2.19.1.2501.01
|
2025-02-17 18:40:39 +08:00 |
|
lys
|
4d9866401e
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 18:28:35 +08:00 |
|
lys
|
921f444f80
|
feature/2.15.2.2411.01业务线-数据推送
|
2025-02-17 18:28:21 +08:00 |
|
lys
|
824f4a9e86
|
Merge branch 'feature/2.15.2.2411.01业务线-数据推送' into release/3.0.0.2502.01
|
2025-02-17 09:56:08 +08:00 |
|
lys
|
46f7b08360
|
release/2.19.1.2501.01
|
2025-02-14 10:43:36 +08:00 |
|
lys
|
c0517462e7
|
release/2.19.1.2501.01
|
2025-02-13 15:19:18 +08:00 |
|
lys
|
002cb5522b
|
release/2.19.1.2501.01
|
2025-02-13 13:28:28 +08:00 |
|
lys
|
46f685a997
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-02-12 15:47:49 +08:00 |
|
lys
|
2357ee50a6
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-12 15:25:54 +08:00 |
|
lys
|
acf1257a27
|
release/2.19.1.2501.01
|
2025-02-11 14:32:53 +08:00 |
|
lys
|
ecf34e4886
|
release/2.19.1.2501.01
|
2025-02-11 14:17:56 +08:00 |
|
lys
|
20fdfda922
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
# Conflicts:
# pc4mobx/hrmSalary/pages/declare/components/declareDialog/index.js
|
2025-02-08 17:16:08 +08:00 |
|
lys
|
eecb7f34f2
|
release/2.19.1.2501.01
|
2025-02-08 15:40:19 +08:00 |
|
lys
|
6b8b604f55
|
feature/2.19.1.2501.01-套打功能
|
2025-02-08 11:16:43 +08:00 |
|
lys
|
7fd6edb02d
|
feature/2.19.1.2501.01-套打功能
|
2025-02-07 16:44:09 +08:00 |
|
lys
|
17d29a543b
|
feature/2.19.1.2501.01-套打功能
|
2025-02-07 14:43:47 +08:00 |
|
lys
|
02276502d2
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-01-22 11:47:08 +08:00 |
|
lys
|
7c317607ea
|
Merge branch 'release/2.19.1.2501.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
|
2025-01-22 11:13:55 +08:00 |
|
lys
|
9ebba96698
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2025-01-22 11:12:20 +08:00 |
|
lys
|
811083310b
|
release/2.19.1.2501.01
|
2025-01-14 14:02:24 +08:00 |
|
lys
|
30bbcfb712
|
release/2.19.1.2501.01
|
2025-01-07 15:59:44 +08:00 |
|
lys
|
07ef0535c4
|
release/2.19.1.2501.01
|
2025-01-07 15:55:25 +08:00 |
|
lys
|
f19ceb9c0f
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-01-07 11:33:43 +08:00 |
|
lys
|
44dde8cf51
|
release/2.19.1.2501.01-个税
|
2025-01-06 18:07:39 +08:00 |
|
lys
|
21a2e21c3f
|
release/2.19.1.2501.01
|
2025-01-06 10:48:52 +08:00 |
|
lys
|
23d32f627b
|
release/2.19.1.2501.01-个税
|
2025-01-06 10:39:25 +08:00 |
|
lys
|
ac40faa79a
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-01-03 17:14:42 +08:00 |
|
lys
|
13dc35f122
|
release/2.19.1.2501.01
|
2025-01-03 17:14:33 +08:00 |
|
lys
|
9740a9ef77
|
release/2.19.1.2501.01
|
2025-01-03 15:50:59 +08:00 |
|
lys
|
2c03908885
|
release/2.18.2.2412.02
|
2025-01-03 15:49:53 +08:00 |
|
lys
|
c07ff42f9e
|
Merge branch 'release/2.19.1.2501.01' into release/2.19.1.2501.01-个税
|
2025-01-03 14:20:38 +08:00 |
|
lys
|
9c04b2adaf
|
release/2.18.2.2412.02
|
2025-01-03 11:40:39 +08:00 |
|
lys
|
5e3331b9c9
|
Merge branch 'release/2.18.2.2412.02' into release/2.18.2.2412.02-个税
|
2025-01-03 09:13:14 +08:00 |
|
lys
|
8a904aa38a
|
Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线
|
2025-01-03 09:11:47 +08:00 |
|
lys
|
4212bf9ff5
|
release/2.18.2.2412.02
|
2025-01-02 15:31:55 +08:00 |
|
lys
|
446940095e
|
release/2.18.2.2412.02
|
2025-01-02 14:32:25 +08:00 |
|
lys
|
9d8cd5c6fa
|
release/2.18.2.2412.02
|
2024-12-31 16:07:35 +08:00 |
|
lys
|
db99c081fb
|
release/2.18.2.2412.02
|
2024-12-31 15:38:09 +08:00 |
|
lys
|
a8e2a53037
|
release/2.18.2.2412.02
|
2024-12-31 15:26:54 +08:00 |
|
lys
|
cdc75b7668
|
release/2.18.2.2412.02
|
2024-12-31 15:04:09 +08:00 |
|
lys
|
2d659768ac
|
release/2.18.2.2412.02
|
2024-12-31 13:42:33 +08:00 |
|
lys
|
a3f0e27f49
|
release/2.18.2.2412.02
|
2024-12-31 09:21:25 +08:00 |
|
lys
|
457dbfab49
|
release/2.18.2.2412.02-个税
|
2024-12-31 09:18:03 +08:00 |
|
lys
|
d65245b330
|
release/2.18.2.2412.02-个税
|
2024-12-30 17:46:50 +08:00 |