386 Commits

Author	SHA1	Message	Date
lys	88f3397ff8	Merge branch 'release/3.0.0.2502.01-合并业务线' into custom/领悦业务线 ... # Conflicts: # pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js # pc4mobx/hrmSalary/layout.js	2025-02-21 17:00:56 +08:00
lys	54adc6cc2e	release/3.0.0.2502.01-合并业务线	2025-02-18 15:42:40 +08:00
lys	e34dbca6f7	custom/领悦业务线	2025-02-14 11:41:49 +08:00
lys	ef218c277f	Merge branch 'feature/2.15.2.2411.01业务线' into custom/领悦业务线 ... # Conflicts: # pc4mobx/hrmSalary/index.js	2024-12-03 11:36:07 +08:00
lys	18a87cb45c	feature/2.15.2.2411.01业务线-数据推送	2024-11-20 15:30:14 +08:00
lys	4473d8dad5	feature/2.15.2.2411.01业务线-数据推送	2024-11-19 09:56:29 +08:00
lys	5014859171	Merge branch 'release/2.17.1.2411.01' into feature/测试 ... # Conflicts: # pc4mobx/hrmSalary/index.js # pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js # pc4mobx/hrmSalary/pages/dataAcquisition/layout.js # pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js # pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js # pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js # pc4mobx/hrmSalary/pages/salaryItem/index.js	2024-11-15 15:06:16 +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	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	97a5d37044	feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能	2024-11-07 16:06:48 +08:00
lys	27ec1ae5ef	feature/2.16.1.2410.01-薪资项目管理页面重构	2024-11-06 10:33:25 +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	38a8d6aeaf	Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线	2024-10-21 17:56:21 +08:00
lys	73de6b8417	Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试 ... # Conflicts: # pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js # pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js # pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js # pc4mobx/hrmSalary/pages/variableSalary/components/searchPannel/index.js # pc4mobx/hrmSalary/pages/variableSalary/index.js # pc4mobx/hrmSalary/pages/variableSalary/index.less	2024-10-16 11:11:23 +08:00
黎永顺	b954e1696e	release/2.15.2.2409.01	2024-10-14 16:02:12 +08:00
黎永顺	1b8ff1030c	Merge branch 'custom/领悦' into custom/领悦业务线 ... # Conflicts: # pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js	2024-10-12 15:49:49 +08:00
黎永顺	925394e814	custom/领悦	2024-10-12 13:38:20 +08:00
黎永顺	90470c3a57	feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列	2024-10-11 17:06:54 +08:00
黎永顺	44fb334837	custom/领悦	2024-10-10 16:29:36 +08:00
黎永顺	94a4d3a930	feature/2.15.1.2407.01-权限	2024-10-09 14:51:55 +08:00
黎永顺	dd82ecf445	feature/2.15.1.2407.01-权限	2024-10-08 17:57:10 +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
黎永顺	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
黎永顺	2d15f19ddd	custom/西安秦华天燃气	2024-09-24 16:49:45 +08:00
黎永顺	02b085c051	权限	2024-09-20 16:30:12 +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
黎永顺	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
黎永顺	f843a8cc32	custom/领悦	2024-08-30 14:22:23 +08:00
黎永顺	e333c34ff4	custom/领悦	2024-08-28 16:25:15 +08:00
黎永顺	cc81d8c9bd	feature/2.15.1.2407.01-权限	2024-08-20 18:07:03 +08:00
黎永顺	50b4426a75	feature/2.15.1.2407.01-薪资项目以及字段管理页面改造	2024-08-20 14:02:33 +08:00
黎永顺	9d99557f4b	feature/2.15.1.2407.01-浮动薪酬	2024-08-12 09:24:11 +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
黎永顺	531e975820	feature/2.15.1.2407.01-权限	2024-08-05 16:16:21 +08:00
黎永顺	b349327088	feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能	2024-07-15 17:14:55 +08:00
黎永顺	210e788b38	Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03	2024-06-26 10:03:13 +08:00
黎永顺	da6a8266f6	hotfix/2.14.2.2406.02	2024-06-26 10:02:45 +08:00
黎永顺	e0b6dc4585	feature/2.14.4.2406.02-工资单发放预览	2024-06-17 16:47:08 +08:00
黎永顺	fb64d5e344	hotfix/2.14.2.2405.02	2024-05-21 17:33:47 +08:00
黎永顺	78142d32fe	hotfix/2.12.1.2404.02	2024-05-11 11:33:09 +08:00
黎永顺	166dfa6979	hotfix/2.12.1.2404.02	2024-05-11 11:09:13 +08:00
黎永顺	10e981d0d3	feature/2.12.1.2404.02-薪资账套配置流程审批	2024-04-25 14:26:06 +08:00
黎永顺	a768470afb	feature/2.12.1.2403.02-个税-外籍人员信息报送	2024-03-29 10:19:33 +08:00
黎永顺	8d58561b88	feature/2.12.1.2403.02-薪酬统计报表配置项以及薪资明细的开发 ... 1、补算的页面完成 2、薪酬统计报表-薪资报表的页面开发	2024-03-26 17:07:21 +08:00
黎永顺	a7e75331e1	hotfix/2.12.1.2403.02 ... 1、工资单发放-查看详情-高级搜索 部门能多选， 多选分部 2、社保福利台账：正常缴纳、补缴、退差、补差 高级搜索增加部门筛选，多分部筛选	2024-03-21 13:49:18 +08:00
黎永顺	5e3c20edc0	release/3.0.0.2403.01	2024-03-15 09:19:59 +08:00
黎永顺	ac479676e0	release/2.10.1.2402.01-个税	2024-02-23 17:38:42 +08:00
黎永顺	eec52e34c1	Merge branch 'feature/2.10.1.2401.01-社保福利方案重构' into release/2.10.1.2401.02	2024-02-20 15:53:18 +08:00