qt
/
salary-management-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,944 Commits 181 Branches 0 Tags 9.3 MiB
Commit Graph

1933 Commits

Author SHA1 Message Date
黎永顺 d73372e5c4 feature/2.15.1.2407.01-权限 2024-10-08 10:07:23 +08:00
黎永顺 e92f06bce2 Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试 2024-09-30 10:30:46 +08:00
黎永顺 3107914834 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-30 10:30:32 +08:00
黎永顺 9c318d22b7 hotfix/2.15.1.2409.01 2024-09-29 10:57:22 +08:00
黎永顺 c7a1b1e321 Merge branch 'feature/2.15.1.2407.01-权限' into custom/领悦业务线 2024-09-27 18:42:40 +08:00
黎永顺 198668654a feature/2.15.1.2407.01-权限 2024-09-27 18:38:37 +08:00
黎永顺 0683625850 Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限 
# Conflicts:
#	pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
#	pc4mobx/hrmSalary/pages/variableSalary/index.js
 2024-09-27 18:35:25 +08:00
黎永顺 d4763dc2d2 feature/2.15.1.2407.01-权限 2024-09-27 18:30:31 +08:00
黎永顺 ce711f9c97 feature/2.15.1.2407.01-权限 2024-09-27 16:45:47 +08:00
黎永顺 6c99d5fbad Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限 2024-09-27 16:21:35 +08:00
黎永顺 8996fa8d79 feature/2.15.1.2407.01-权限 2024-09-27 16:20:28 +08:00
黎永顺 b4a966ea20 feature/2.15.1.2407.01-权限 2024-09-27 15:32:21 +08:00
黎永顺 e5d43e7dc5 feature/2.15.1.2407.01-权限 2024-09-27 13:38:48 +08:00
黎永顺 9a33cc96c6 Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线 2024-09-26 18:04:11 +08:00
黎永顺 5d5215609a Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 17:59:43 +08:00
黎永顺 e09fbb332f feature/2.15.1.2407.01-权限 2024-09-26 17:59:14 +08:00
黎永顺 f1183af3e2 feature/2.15.1.2407.01-权限 2024-09-26 17:56:41 +08:00
黎永顺 929f285be2 feature/2.15.1.2407.01-权限 2024-09-26 17:50:15 +08:00
黎永顺 143d2ef8f8 Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线 
# Conflicts:
#	pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
#	pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
#	pc4mobx/hrmSalary/components/CustomBrowser/index.js
#	pc4mobx/hrmSalary/components/CustomBrowser/index.less
#	pc4mobx/hrmSalary/index.js
 2024-09-26 17:27:24 +08:00
黎永顺 8c19e33592 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 17:09:42 +08:00
黎永顺 666ec8f9be feature/2.15.1.2407.01-权限 2024-09-26 17:06:08 +08:00
黎永顺 5093ff88a7 Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试 2024-09-26 10:06:14 +08:00
黎永顺 112988ceba feature/2.15.1.2407.01-权限 2024-09-26 10:01:49 +08:00
黎永顺 a7e67b9358 Merge branch 'feature/2.15.1.2407.01-薪资项目以及字段管理页面改造' into feature/2.15.1.2407.01-权限 
# Conflicts:
#	pc4mobx/hrmSalary/pages/salaryItem/index.js
 2024-09-25 18:01:35 +08:00
黎永顺 5ec07d20e0 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-09-25 15:37:02 +08:00
黎永顺 a4fffbcbd4 release/2.15.2.2409.01 2024-09-25 14:11:46 +08:00
黎永顺 f2b17872f7 release/2.15.2.2409.01 2024-09-25 11:12:53 +08:00
黎永顺 32940c9bcf feature/2.15.1.2407.01-权 2024-09-25 10:46:55 +08:00
黎永顺 fd188c9f51 feature/2.15.1.2407.01-权限 2024-09-25 10:02:46 +08:00
黎永顺 2d15f19ddd custom/西安秦华天燃气 2024-09-24 16:49:45 +08:00
黎永顺 fd067b653f feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-09-24 10:53:41 +08:00
黎永顺 2664903959 release/2.15.2.2409.01 2024-09-23 16:25:46 +08:00
黎永顺 7821a990e9 custom/领悦 2024-09-23 16:18:58 +08:00
黎永顺 efa75925ad 权限 2024-09-23 16:15:22 +08:00
黎永顺 f6f3a42333 权限 2024-09-23 10:37:10 +08:00
黎永顺 02b085c051 权限 2024-09-20 16:30:12 +08:00
黎永顺 e9abaa26bb 权限 2024-09-19 10:36:04 +08:00
黎永顺 f1f4258090 feature/2.15.1.2407.01-权限 2024-09-14 18:01:11 +08:00
黎永顺 4999cc12bf Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-14 15:55:46 +08:00
黎永顺 15cc213c8c custom/大成 2024-09-14 15:52:12 +08:00
黎永顺 b597bdd2bb feature/2.15.1.2407.01-权限 2024-09-14 14:28:58 +08:00
黎永顺 1ea3529b5a custom/领悦 2024-09-14 13:56:02 +08:00
黎永顺 50a73b29eb feature/2.15.1.2407.01-权限 2024-09-14 13:31:45 +08:00
黎永顺 1dca1d7268 feature/2.15.1.2407.01-权限 2024-09-14 13:31:12 +08:00
黎永顺 5de04424d2 feature/2.15.1.2407.01-权限 2024-09-14 13:18:18 +08:00
黎永顺 6928f89df6 feature/2.15.1.2407.01-权限 2024-09-14 11:41:31 +08:00
黎永顺 1c1aac66d7 hotfix/2.15.1.2409.01 
浮动薪酬模块页面样式调整
 2024-09-14 11:15:25 +08:00
黎永顺 c738ba0c6f Merge branch 'release/2.15.2.2409.01' into hotfix/2.15.1.2409.01 2024-09-14 10:43:55 +08:00
黎永顺 3bbe58562c custom/领悦 2024-09-14 10:42:45 +08:00
黎永顺 658f4fa64f custom/领悦 2024-09-14 09:55:54 +08:00
黎永顺 7ac7a58f7e Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限 2024-09-13 17:35:58 +08:00
黎永顺 3f65ce2e1c custom/领悦 2024-09-13 17:35:14 +08:00
黎永顺 f780662b1b hotfix/2.15.1.2407.01 2024-09-13 15:52:15 +08:00
黎永顺 99ebca78d0 hotfix/2.15.1.2407.01 2024-09-13 15:45:43 +08:00
黎永顺 f6e9153e3a custom/领悦 2024-09-13 15:22:16 +08:00
黎永顺 d7b1c173c2 feature/2.15.1.2407.01-权限 2024-09-13 14:11:26 +08:00
黎永顺 687371ab39 Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
 2024-09-13 11:18:48 +08:00
黎永顺 3f0502aabf feature/2.15.1.2407.01-权限 2024-09-13 11:12:53 +08:00
黎永顺 85cdbbe8b2 custom/大成 2024-09-12 17:50:19 +08:00
黎永顺 4a386102ef feature/2.15.1.2407.01-权限 2024-09-12 16:34:39 +08:00
黎永顺 3c33fc7a3a feature/2.15.1.2407.01-权限 2024-09-12 13:53:47 +08:00
黎永顺 394d7152f4 feature/2.15.1.2407.01-权限 2024-09-12 13:13:51 +08:00
黎永顺 b99a2069d4 feature/2.15.1.2407.01-权限 2024-09-11 18:37:01 +08:00
黎永顺 6586f68d58 Merge branch 'release/2.15.1.2407.01' into feature/2.15.1.2407.01-权限 2024-09-10 16:34:12 +08:00
黎永顺 c07a43b8f8 feature/2.15.1.2407.01-权限 2024-09-10 16:33:21 +08:00
黎永顺 66f6cbc403 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-10 12:54:45 +08:00
黎永顺 3fae1f1a9d hotfix/2.15.1.2407.01 2024-09-10 12:52:25 +08:00
黎永顺 e8d0006cbb feature/2.15.1.2407.01-权限 2024-09-10 12:50:40 +08:00
黎永顺 9759a529f5 feature/2.15.1.2407.01-权限 2024-09-10 12:23:18 +08:00
黎永顺 34bf2c8c52 feature/2.15.1.2407.01-权限 2024-09-09 09:35:02 +08:00
黎永顺 a56ee784db feature/2.15.1.2407.01-权限 2024-09-06 15:45:57 +08:00
黎永顺 2be7896e4e custom/领悦 2024-09-06 14:16:34 +08:00
黎永顺 a729826c8d feature/2.15.1.2407.01-权限 2024-09-06 14:15:39 +08:00
黎永顺 6e3d716afd feature/2.15.1.2407.01-权限 2024-09-06 13:30:09 +08:00
黎永顺 5a494893c7 custom/领悦 2024-09-06 13:18:52 +08:00
黎永顺 4976f29240 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-09-05 10:13:37 +08:00
黎永顺 76da4dd1e1 hotfix/2.15.1.2407.01 2024-09-05 10:13:03 +08:00
黎永顺 2064cc4111 custom/领悦 2024-09-05 10:07:22 +08:00
黎永顺 724c4bb53b feature/2.15.1.2407.01-权限 2024-09-03 16:34:22 +08:00
黎永顺 64c56fc280 custom/领悦 2024-09-03 16:19:42 +08:00
黎永顺 841be03462 Merge branch 'feature/2.15.1.2407.01-社保档案保存校验' into release/2.15.1.2407.01 2024-09-03 09:24:02 +08:00
黎永顺 4385b8c6b2 custom/领悦 2024-09-02 14:00:22 +08:00
黎永顺 f843a8cc32 custom/领悦 2024-08-30 14:22:23 +08:00
黎永顺 5717c1e635 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-30 13:42:43 +08:00
黎永顺 bf197d455e hotfix/2.15.1.2407.01 
薪酬统计报表数据穿透接口参数修改
 2024-08-30 13:42:21 +08:00
黎永顺 1fb7b07b22 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-29 15:28:23 +08:00
黎永顺 21ead59420 hotfix/2.15.1.2407.01 2024-08-29 15:21:37 +08:00
黎永顺 9f2f7f0678 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-29 09:46:07 +08:00
黎永顺 7de7d189ae custom/领悦 2024-08-28 17:06:15 +08:00
黎永顺 e333c34ff4 custom/领悦 2024-08-28 16:25:15 +08:00
黎永顺 4810a09f29 hotfix/2.15.1.2407.01 2024-08-28 14:57:34 +08:00
黎永顺 fe0cd8e541 custom/领悦 2024-08-28 14:46:00 +08:00
黎永顺 c25586045a custom/领悦 2024-08-28 13:42:32 +08:00
黎永顺 8f6f762a44 custom/领悦 2024-08-22 17:53:18 +08:00
黎永顺 772ef95416 custom/领悦 2024-08-22 17:40:15 +08:00
黎永顺 69fd955592 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-22 15:44:34 +08:00
黎永顺 b91f35418e feature/2.15.1.2407.01-权限 2024-08-22 15:42:35 +08:00
黎永顺 b0d790f988 feature/2.15.1.2407.01-权限 2024-08-21 16:00:28 +08:00
黎永顺 cc81d8c9bd feature/2.15.1.2407.01-权限 2024-08-20 18:07:03 +08:00
黎永顺 b7c5ae22f3 feature/2.15.1.2407.01-权限 2024-08-20 16:48:02 +08:00
黎永顺 848282cfc8 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 15:35:33 +08:00
黎永顺 673c2ba908 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 15:27:03 +08:00
黎永顺 fdf82d883d feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 14:10:27 +08:00
黎永顺 50b4426a75 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 14:02:33 +08:00
黎永顺 421fca99cc Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01 2024-08-20 13:37:39 +08:00
黎永顺 f03c187796 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 13:37:09 +08:00
黎永顺 aaf2914e20 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 11:25:09 +08:00
黎永顺 b932d4dd19 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 11:09:29 +08:00
黎永顺 3cff712ae9 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-20 10:35:32 +08:00
黎永顺 c0b517201f feature/2.15.1.2407.01-社保档案保存校验 2024-08-20 10:07:29 +08:00
黎永顺 63eb373025 hotfix/2.15.1.2407.01 2024-08-20 09:23:41 +08:00
黎永顺 96f6135aba hotfix/2.15.1.2407.01 2024-08-19 17:32:49 +08:00
黎永顺 b7e29df781 feature/2.15.1.2407.01-导入工具 2024-08-19 16:39:14 +08:00
黎永顺 55d39d6523 feature/2.15.1.2407.01-社保档案保存校验 2024-08-19 16:37:46 +08:00
黎永顺 a3f40f506d hotfix/2.15.1.2407.01 2024-08-19 16:28:53 +08:00
黎永顺 dfcd27771f feature/2.15.1.2407.01-社保档案保存校验 2024-08-19 15:01:53 +08:00
黎永顺 d31ae5a030 feature/2.15.1.2407.01-导入工具 2024-08-19 10:43:30 +08:00
黎永顺 6a56cee090 feature/2.15.1.2407.01-导入工具 2024-08-19 10:42:54 +08:00
黎永顺 1d26ef8176 feature/2.15.1.2407.01-导入工具 2024-08-19 10:27:02 +08:00
黎永顺 a101de8355 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-19 09:10:47 +08:00
黎永顺 6ec8cb76ce feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-16 17:06:42 +08:00
黎永顺 f730cba8de feature/2.15.1.2407.01-导入工具 2024-08-16 16:37:45 +08:00
黎永顺 b9e7b37439 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-16 16:19:21 +08:00
黎永顺 d1fc6e4ea0 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-16 16:19:00 +08:00
黎永顺 fd3d8b5ec4 feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-16 16:18:08 +08:00
黎永顺 87aa53955f feature/2.15.1.2407.01-薪资项目以及字段管理页面改造 2024-08-16 15:05:51 +08:00
黎永顺 3d55619813 hotfix/2.15.1.2407.01 2024-08-15 17:43:03 +08:00
黎永顺 e8625fd0ef feature/2.15.1.2407.01-导入工具 2024-08-15 16:29:21 +08:00
黎永顺 ae665fb72d feature/2.15.1.2407.01-浮动薪酬 2024-08-15 16:01:00 +08:00
黎永顺 5009cd5955 hotfix/2.15.1.2407.01 2024-08-15 15:43:52 +08:00
黎永顺 4be61e9179 feature/2.15.1.2407.01-浮动薪酬 2024-08-15 15:24:00 +08:00
黎永顺 37f7a3bd6b Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-15 11:05:09 +08:00
黎永顺 5c9f954adb hotfix/2.15.1.2407.01 2024-08-15 11:04:14 +08:00
黎永顺 f984cd3f59 hotfix/2.15.1.2407.01 2024-08-15 11:01:26 +08:00
黎永顺 23e9a6ba42 hotfix/2.15.1.2407.01 2024-08-15 10:28:18 +08:00
黎永顺 bbc11b0609 feature/2.15.1.2407.01-浮动薪酬 2024-08-14 11:26:00 +08:00
黎永顺 54352aad95 feature/2.15.1.2407.01-浮动薪酬 2024-08-13 17:58:28 +08:00
黎永顺 44c63e874a Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-13 16:14:28 +08:00
黎永顺 d9fc164504 hotfix/2.15.1.2407.01 2024-08-13 16:12:43 +08:00
黎永顺 9479a4ba9a feature/2.15.1.2407.01-导入工具 2024-08-13 14:33:10 +08:00
黎永顺 a2c1fbd485 Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01 2024-08-12 16:57:53 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 f05c43d011 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 14:58:36 +08:00
黎永顺 df2283d0f4 feature/2.15.1.2407.01-浮动薪酬 2024-08-12 11:12:10 +08:00
黎永顺 4a5f5b6e7a feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:56:58 +08:00
黎永顺 8c038c8d74 Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:27:43 +08:00
黎永顺 9d99557f4b feature/2.15.1.2407.01-浮动薪酬 2024-08-12 09:24:11 +08:00
黎永顺 86de787ed4 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 18:24:45 +08:00
黎永顺 70fe54efb7 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 17:32:54 +08:00
黎永顺 36d90b35a6 feature/2.15.1.2407.01-浮动薪酬 2024-08-08 14:36:11 +08:00