Commit Graph

4836 Commits

Author SHA1 Message Date
zhangsir
04a39f7f27 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage
# Conflicts:
#	src/views/lecturer/InsideTeaching.vue
2024-11-14 20:46:25 +08:00
zhangsir
51b0e75fe3 讲师管理bug 2024-11-14 20:44:26 +08:00
wangxuemei
1b2cbe8d7a 授课记录调整 2024-11-14 18:13:05 +08:00
wangxuemei
49a9fd32db Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-11-14 14:09:09 +08:00
wangxuemei
fabce0717b 外部授课录入方式调整 2024-11-14 14:06:53 +08:00
zhangsir
28bb396a6b Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-14 14:05:57 +08:00
zhangsir
5c3d8ecbea 讲师管理bug 2024-11-14 14:05:13 +08:00
wangxuemei
9e5591f72a Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-11-14 13:52:24 +08:00
wangxuemei
95016ab86d 外部授课新增手机号入参 2024-11-14 13:49:53 +08:00
zhangsir
2ad3530d99 讲师管理bug 2024-11-13 20:28:47 +08:00
zhangsir
49252a1ad7 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-13 16:42:04 +08:00
zhangsir
0c0dfff74b 讲师管理bug 2024-11-13 16:41:26 +08:00
wangxuemei
c5325bb342 Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-11-13 14:46:56 +08:00
wangxuemei
bff32b295b 讲师体系 2024-11-13 14:40:48 +08:00
wangxuemei
aa27a245d8 导出数据调整 2024-11-13 14:38:00 +08:00
zhangsir
5c76f6411f 讲师管理bug 2024-11-13 13:19:25 +08:00
zhangsir
fd3563858c 讲师管理bug 2024-11-12 18:53:19 +08:00
zhangsir
fd1f306510 讲师管理bug 2024-11-12 16:18:30 +08:00
zhangsir
841369c4a2 讲师管理培训发生组织修改bug 2024-11-12 11:10:47 +08:00
zhangsir
572d39d3bb 讲师管理 2024-11-11 19:08:17 +08:00
zhangsir
6b4412aa9a 讲师管理 2024-11-11 17:04:11 +08:00
zhangsir
e3b897dc1f 培训发生组织担当修改 2024-11-11 14:49:28 +08:00
zhangsir
2419208d95 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage
# Conflicts:
#	src/views/lecturer/InsideTeaching.vue
2024-11-11 11:14:10 +08:00
zhangsir
dabca2e636 新增讲师接口修改 2024-11-11 11:08:49 +08:00
wangxuemei
b91b8b4dd0 时间日期调整 2024-11-10 18:44:28 +08:00
wangxuemei
4f7c496cb7 Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-11-10 18:17:33 +08:00
wangxuemei
d4952e28a1 导出文件限制 2024-11-10 18:15:40 +08:00
wangxuemei
56342f7e9f 授课记录体系id 调整 2024-11-10 18:15:03 +08:00
zhangsir
8a2078cd06 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage
# Conflicts:
#	src/views/lecturer/LookInsideLecturer.vue
2024-11-10 16:15:05 +08:00
zhangsir
ff81e2d19b 讲师管理新增讲师修改bug 2024-11-10 16:12:24 +08:00
wangxuemei
9a7f38fbb9 外部讲师调整 2024-11-10 15:21:04 +08:00
wangxuemei
4b8f436ef8 Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-11-10 09:58:43 +08:00
wangxuemei
fcbb734067 查看讲师调整 2024-11-08 18:22:47 +08:00
zhangsir
19ff546928 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-08 18:15:25 +08:00
zhangsir
cb3d0ab9eb 讲师管理新增讲师修改bug 2024-11-08 18:14:40 +08:00
wangxuemei
8d94b98c12 讲师查看 无内容显示调整 2024-11-08 17:56:03 +08:00
wangxuemei
a48d873951 回车键调整 2024-11-08 17:21:00 +08:00
zhangsir
6fb020dbd5 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-08 15:08:01 +08:00
zhangsir
cc6e483762 讲师管理 2024-11-08 15:07:29 +08:00
wangxuemei
9f9605233d 课程编号调整 2024-11-07 11:25:40 +08:00
wangxuemei
78e67448ea 内容分类传参调整 2024-11-07 08:56:52 +08:00
zhangsir
8c846fb111 讲师管理 2024-11-06 18:51:13 +08:00
zhangsir
11af2977c2 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-05 19:45:59 +08:00
zhangsir
d0d8eaea90 讲师管理审批 2024-11-05 19:45:16 +08:00
wangxuemei
07715dfd10 讲师细节调整 2024-11-05 17:05:16 +08:00
wangxuemei
6182bd1a3e 授课记录调整 2024-11-05 15:48:48 +08:00
zhangsir
5ee9a77b07 讲师管理审批编辑页面实现 2024-11-03 17:13:56 +08:00
zhangsir
36bfce4200 接口名修改 2024-11-01 17:31:14 +08:00
zhangsir
2fd65ec31b 培训发生组织根节点 2024-11-01 17:29:35 +08:00
zhangsir
40d6c2d736 新增添加讲师回显发薪地 2024-11-01 16:22:53 +08:00