joshen
|
a80be22a7d
|
Merge branch '250507-bugfix-shl' into test20250220
|
2025-05-07 14:02:43 +08:00 |
|
sunhonglai
|
78eadc5a46
|
修改搜索键
|
2025-05-07 14:01:36 +08:00 |
|
joshen
|
5d8b69a7b8
|
Merge branch '250507-bugfix-shl' into test20250220
|
2025-05-07 13:46:26 +08:00 |
|
sunhonglai
|
abefb88f3b
|
修改搜索顺序
|
2025-05-07 13:44:06 +08:00 |
|
joshen
|
8e660939b0
|
Merge branch '250507-bugfix-shl' into test20250220
|
2025-05-07 13:10:55 +08:00 |
|
sunhonglai
|
7f243b3154
|
szx-1090需求
|
2025-05-07 13:06:19 +08:00 |
|
sunhonglai
|
da7dca34a1
|
szx-1087需求
|
2025-05-07 10:35:51 +08:00 |
|
joshen
|
0b4c0cb2d3
|
Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220
|
2025-04-30 17:42:18 +08:00 |
|
wangjh12
|
f9ec0cb65f
|
报告
|
2025-04-30 17:41:43 +08:00 |
|
joshen
|
f87bf9252c
|
Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220
|
2025-04-30 17:18:29 +08:00 |
|
wangjh12
|
4a449f3857
|
报告
|
2025-04-30 17:15:52 +08:00 |
|
wangjh12
|
3b824b19d4
|
报告
|
2025-04-30 17:10:27 +08:00 |
|
wangjh12
|
c88bb82754
|
报告
|
2025-04-30 17:01:50 +08:00 |
|
joshen
|
b644c672a3
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-30 14:44:12 +08:00 |
|
sunhonglai
|
033da81cbb
|
新增去除全部
|
2025-04-30 14:43:29 +08:00 |
|
joshen
|
209098b71c
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-30 14:07:37 +08:00 |
|
sunhonglai
|
587ba14edf
|
修改选项样式和新增去除全部
|
2025-04-30 14:05:19 +08:00 |
|
joshen
|
ac3f3d4169
|
Merge remote-tracking branch 'yx/250429-report-wjh' into test20250220
|
2025-04-30 14:03:16 +08:00 |
|
joshen
|
c86ef3aece
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-30 13:04:25 +08:00 |
|
sunhonglai
|
7ed95ed624
|
修改SZX-1087和SZX-1088问题
|
2025-04-30 11:56:43 +08:00 |
|
wangjh12
|
0ac164064c
|
报告
|
2025-04-30 09:35:33 +08:00 |
|
joshen
|
7c1bd0cd05
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 14:52:42 +08:00 |
|
sunhonglai
|
4fef83123b
|
讲师组织倒排
|
2025-04-28 14:52:16 +08:00 |
|
joshen
|
3d8297ce04
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 14:47:53 +08:00 |
|
sunhonglai
|
e83591be45
|
讲师组织倒排
|
2025-04-28 14:46:26 +08:00 |
|
joshen
|
e5680e3121
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 14:29:05 +08:00 |
|
sunhonglai
|
044b20e02d
|
修改验证提示文案
|
2025-04-28 14:28:12 +08:00 |
|
joshen
|
7502538bd9
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 14:17:58 +08:00 |
|
sunhonglai
|
c58220107b
|
恢复原提示,优化增训发生组织搜索
|
2025-04-28 14:17:33 +08:00 |
|
sunhonglai
|
ed592bd0b9
|
恢复原提示
|
2025-04-28 14:08:17 +08:00 |
|
joshen
|
3411f214bd
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 13:51:39 +08:00 |
|
sunhonglai
|
e9af9a5349
|
SZX-1091 修改删除显示控制和placehold显示
|
2025-04-28 13:51:17 +08:00 |
|
joshen
|
d57c6afbf2
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-28 11:40:35 +08:00 |
|
sunhonglai
|
7551d8ad6d
|
SZX-1091 优化讲师份部份页面
|
2025-04-28 11:39:30 +08:00 |
|
joshen
|
2e0c89b570
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-27 14:33:42 +08:00 |
|
sunhonglai
|
93ba27d1fe
|
修改讲师体系,需要重置讲师级别
|
2025-04-27 14:32:29 +08:00 |
|
joshen
|
fdfa85e2f4
|
Merge branch '250427-bugfix-shl' into test20250220
|
2025-04-27 14:13:33 +08:00 |
|
sunhonglai
|
809eb3cafa
|
去掉悬浮无用代码
|
2025-04-27 13:40:39 +08:00 |
|
sunhonglai
|
6d425982cc
|
Merge remote-tracking branch 'origin/250403-szx-1017-shl' into 250403-szx-1017-shl
|
2025-04-27 13:27:10 +08:00 |
|
sunhonglai
|
48f5fa1ac5
|
修改讲师体系搜索联动处理
|
2025-04-27 13:25:56 +08:00 |
|
joshen
|
ee69294683
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 11:03:30 +08:00 |
|
sunhonglai
|
4aec11a4e1
|
修改鼠标悬停提示处理
|
2025-04-27 11:00:41 +08:00 |
|
joshen
|
747fcda67d
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 10:22:05 +08:00 |
|
sunhonglai
|
d79c628711
|
修改鼠标悬停提示处理
|
2025-04-27 10:19:25 +08:00 |
|
joshen
|
a89d64fce1
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 08:47:36 +08:00 |
|
sunhonglai
|
a836f9d0ec
|
修改id参数
|
2025-04-27 08:46:17 +08:00 |
|
joshen
|
42c56c14d4
|
Merge branch '250403-szx-1017-shl' into test20250220
|
2025-04-27 08:32:50 +08:00 |
|
sunhonglai
|
b93faa3761
|
培训发生组织审批中心增加提交按钮
|
2025-04-25 15:44:23 +08:00 |
|
joshen
|
4a2589afb8
|
Merge branch '250403-szx-1017-shl' into test20250220
# Conflicts:
# src/views/courselibrary/CoursewareManage.vue
|
2025-04-03 11:07:41 +08:00 |
|
sunhonglai
|
1a667ac821
|
页面新增字段展示
|
2025-04-03 11:00:17 +08:00 |
|