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

270 Commits

Author SHA1 Message Date
黎永顺 90470c3a57 feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列 2024-10-11 17:06:54 +08:00
黎永顺 255e8d8760 feature/2.15.1.2407.01-权限 2024-10-09 10:22:00 +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
黎永顺 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
黎永顺 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
黎永顺 02b085c051 权限 2024-09-20 16:30:12 +08:00
黎永顺 3bbe58562c custom/领悦 2024-09-14 10:42:45 +08:00
黎永顺 658f4fa64f custom/领悦 2024-09-14 09:55:54 +08:00
黎永顺 3f65ce2e1c custom/领悦 2024-09-13 17:35:14 +08:00
黎永顺 f6e9153e3a custom/领悦 2024-09-13 15:22:16 +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
黎永顺 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
黎永顺 5a494893c7 custom/领悦 2024-09-06 13:18:52 +08:00
黎永顺 2064cc4111 custom/领悦 2024-09-05 10:07:22 +08:00
黎永顺 64c56fc280 custom/领悦 2024-09-03 16:19:42 +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
黎永顺 b7e29df781 feature/2.15.1.2407.01-导入工具 2024-08-19 16:39:14 +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
黎永顺 f730cba8de feature/2.15.1.2407.01-导入工具 2024-08-16 16:37:45 +08:00
黎永顺 e8625fd0ef feature/2.15.1.2407.01-导入工具 2024-08-15 16:29:21 +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
黎永顺 9479a4ba9a feature/2.15.1.2407.01-导入工具 2024-08-13 14:33:10 +08:00
黎永顺 74ba398c90 feature/2.15.1.2407.01-导入工具 2024-08-12 16:56:51 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 1a2bf2bc6e 0release/2.14.3.2406.01 2024-06-05 09:10:04 +08:00
黎永顺 aaf733fdd2 hotfix/2.12.1.2404.02 
薪酬统计报表合计行展示列表优化
 2024-05-10 16:33:02 +08:00
黎永顺 0241c017b8 hotfix/2.12.1.2404.02 
更多按钮
 2024-04-24 10:42:04 +08:00
黎永顺 bd3aa05c29 hotfix/2.12.1.2403.02 2024-04-07 13:59:51 +08:00
黎永顺 80acc5f18a hotfix/2.12.1.2403.02 2024-03-18 16:03:04 +08:00
黎永顺 5e3c20edc0 release/3.0.0.2403.01 2024-03-15 09:19:59 +08:00
黎永顺 0771ad9ed3 hotfix/3.0.0.2403.01 
数据采集页面导入修改重构
 2024-03-13 17:27:49 +08:00
黎永顺 7078b1c6c4 feature/2.10.1.2401.01-页面操作日志添加 2024-02-23 10:13:43 +08:00
黎永顺 4b95f6811f feature/2.10.1.2401.01-页面操作日志添加 2024-02-19 09:03:40 +08:00
黎永顺 671f0c42b4 Merge branch 'release/2.10.1.2401.01' into feature/2.10.1.2401.01-页面操作日志添加 2024-01-30 17:38:14 +08:00
黎永顺 e86e4871d8 release/2.10.1.2401.01 2024-01-25 15:11:35 +08:00
黎永顺 9d0d04be9d hotfix/2.10.1.2401.01 2024-01-25 14:44:12 +08:00
黎永顺 8f8f2a32e9 feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 14:02:34 +08:00
黎永顺 7cb1b157eb feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 11:52:10 +08:00
黎永顺 9e81e8244a feature/2.10.1.2401.01-页面操作日志添加 2024-01-25 09:16:57 +08:00
黎永顺 98f35401e6 release/2.9.10.2312.02 
工资单样式修改
 2024-01-18 14:44:24 +08:00
钱涛 f312e66017 工资单标题字体大小改为25px 2024-01-17 10:00:19 +08:00
黎永顺 1a38752cc6 1release/2.9.10.2312.02 2024-01-17 09:44:50 +08:00
黎永顺 93a0c76753 1release/2.9.10.2312.02 2024-01-16 16:23:29 +08:00
黎永顺 b5cfdb8b69 hotfix/2.9.10.2312.02 
工资单查看-移动端备注信息展示错误的修改
 2024-01-15 09:35:31 +08:00
黎永顺 43ff36d59f hotfix/2.9.10.2312.02 
工资单查看-移动端备注信息展示错误的修改
 2024-01-15 09:34:49 +08:00
黎永顺 c6e71bd069 hotfix/2.9.10.2312.02 2024-01-11 14:50:28 +08:00
黎永顺 15bc21ecd5 release/2.9.10.2312.02 2024-01-10 14:43:07 +08:00
黎永顺 6a7220ffc2 Merge branch 'feature/2.9.9.2312.01-工资单查看页面重构' into release/2.9.10.2312.02 2023-12-29 10:08:36 +08:00
黎永顺 a59bc06d7a feature/2.9.9.2312.01-工资单查看页面重构 2023-12-20 13:25:47 +08:00
黎永顺 7db9e03b0d feature/2.9.9.2312.01-工资单查看页面重构 2023-12-20 10:18:58 +08:00
黎永顺 4acefa765c hotfix/2.9.9.2312.01 
导入组件优化
 2023-12-12 15:19:59 +08:00
黎永顺 43012b2025 feature/2.9.9.2312.01-工资单查看页面重构 2023-12-08 15:56:39 +08:00
黎永顺 3eb8c47a87 feature/2.9.9.2312.01-工资单查看页面重构 2023-12-08 13:39:55 +08:00
黎永顺 78aaac8115 工资单修改 2023-12-01 16:39:31 +08:00
黎永顺 24cf38e964 Merge branch 'feature/2.9.42310.01-工资单发放页面重构' into release/2.9.42311.02 2023-11-24 14:06:48 +08:00
黎永顺 7d09c5b55b hotfix/2.9.42310.02 
数据采集日期组件选择失败的bug处理
 2023-10-25 15:45:38 +08:00
黎永顺 4898ff8335 hotfix/2.9.42310.01 2023-10-20 11:39:20 +08:00
黎永顺 bec2e5a5b2 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 11:51:41 +08:00
黎永顺 5031d3a032 feature/2.9.42310.01-工资单发放页面重构 2023-10-19 09:42:46 +08:00
黎永顺 dadb749c4c feature/2.9.42310.01-工资单发放页面重构 2023-10-18 17:12:44 +08:00
黎永顺 ff3dd0ea60 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-25 15:35:11 +08:00
黎永顺 c0c908f6eb Merge branch 'hotfix/2.9.42309.01' into feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-18 17:48:35 +08:00
黎永顺 85867da080 hotfix/2.9.42309.01 2023-09-14 14:19:08 +08:00
黎永顺 f18bda74f4 hotfix/2.9.42309.01 2023-09-14 11:50:22 +08:00
黎永顺 8a90d58196 feature/2.9.42309.01-薪资核算详情页面列表改造（页面编辑） 2023-09-14 10:25:22 +08:00
黎永顺 8071a62ec8 产品-社保福利方案自定义方案添加删除功能 2023-07-27 14:58:32 +08:00
黎永顺 ce50c9cf91 Merge branch 'release/2.8.3.2307.01' into feature/V2-非系统人员管理开发 
# Conflicts:
#	pc4mobx/hrmSalary/index.js
#	pc4mobx/hrmSalary/pages/payrollFiles/index.js
#	pc4mobx/hrmSalary/pages/taxAgent/personalScope.js
#	pc4mobx/hrmSalary/pages/taxAgent/slideTaxagentUser.js
#	pc4mobx/hrmSalary/util/index.js
 2023-07-11 17:36:38 +08:00
黎永顺 3d04a79fcd 产品-统一页面列表操作按钮 2023-07-03 15:42:11 +08:00
黎永顺 d71b879290 产品-工资单验证方式 2023-06-16 16:34:03 +08:00
黎永顺 ab3e5fbbf5 Merge branch 'feature/0612-工资单水印设置' into feature/0616-工资单验证方式 
# Conflicts:
#	pc4mobx/hrmSalary/apis/payroll.js
 2023-06-16 15:33:15 +08:00
黎永顺 e9546e5329 产品-工资单验证方式 2023-06-16 15:32:05 +08:00
黎永顺 a80c4a37d5 产品-工资单验证方式修改 2023-06-16 11:12:20 +08:00
黎永顺 92c73b846a 产品-工资单水印设置与预览等功能 2023-06-15 18:28:06 +08:00
黎永顺 cc17ae7b09 产品-公式编辑器bug修改 2023-05-29 16:49:45 +08:00
黎永顺 67ef55da46 产品-公式编辑器修改 2023-05-18 16:42:45 +08:00
黎永顺 ab161f8528 公式编辑器-去掉空提示语 2023-05-10 18:08:24 +08:00
黎永顺 bc48bc8180 公式编辑器修改 2023-05-09 09:57:49 +08:00
黎永顺 5c56b8ced4 产品-公式编辑器 2023-04-28 16:13:03 +08:00
黎永顺 6f0c1044ad 产品-公式编辑器 2023-04-28 16:11:56 +08:00
黎永顺 a115030072 产品-公式编辑器 2023-04-28 11:30:05 +08:00
黎永顺 d2f7aa8d00 产品-公式编辑器 2023-04-28 10:51:06 +08:00
黎永顺 f1ef12f869 产品-公式编辑器封装 2023-04-27 14:52:03 +08:00
黎永顺 11e1cc89a9 产品-公式编辑器封装 2023-04-27 10:01:57 +08:00
黎永顺 159eadc164 产品-公式编辑器封装 2023-04-27 09:34:19 +08:00
黎永顺 3fda510b57 产品-公式编辑器组件修改 2023-04-26 15:08:03 +08:00
黎永顺 6f79efe805 Merge branch 'master' into feature/V2-非系统人员管理开发 2023-04-13 17:35:01 +08:00
黎永顺 7bdf55be6a 公式编辑器组件封装 2023-04-13 16:42:57 +08:00
黎永顺 247432ebde 公式编辑器组件封装 2023-04-13 13:26:43 +08:00
黎永顺 644113efcb 公式编辑器组件封装 2023-04-13 10:00:24 +08:00
黎永顺 8f1b7ae7c1 关联人员分页的问题 2023-03-27 14:03:26 +08:00
黎永顺 fb3b4c7d59 非系统人员修改 2023-03-16 11:03:52 +08:00