Commit Graph

4914 Commits

Author SHA1 Message Date
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
zhangsir
343d18e918 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-11-01 11:01:42 +08:00
zhangsir
8a6d8edca0 讲师管理 2024-11-01 11:01:07 +08:00
wangxuemei
b83bd6904e 修改授课回显调整 2024-10-31 17:20:08 +08:00
zhangsir
3778c721cc 讲师费统计 2024-10-31 14:27:35 +08:00
zhangsir
4c574432da 讲师管理修改 2024-10-30 16:57:02 +08:00
zhangsir
02bcb51ff5 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage
# Conflicts:
#	src/views/lecturer/LecturerFeeStatistics.vue
#	src/views/lecturer/MonthlyStatistics.vue
2024-10-30 14:43:04 +08:00
zhangsir
cbc1b28809 讲师管理修改 2024-10-30 14:37:02 +08:00
wangxuemei
12c885fe2e 月度讲师费详情导出调整 2024-10-30 10:25:41 +08:00
wangxuemei
9c38b1632f 分页调整 2024-10-30 10:06:18 +08:00
wangxuemei
1f358f0059 授课记录修改时间调整 2024-10-29 16:07:35 +08:00
wangxuemei
1efd0901da Merge branch 'zcwy-teacher-manage' of https://codeup.aliyun.com/648097ddb583fece2f059e59/vue/fe-manage into zcwy-teacher-manage 2024-10-28 17:33:10 +08:00
wangxuemei
5b4f649fa7 授课记录调整 2024-10-28 17:32:12 +08:00
zhangsir
24660182ec 修改参数,接口报错 2024-10-28 16:54:22 +08:00
zhangsir
8b0757778d 接口报错 2024-10-28 15:04:01 +08:00
zhangsir
4d4e1d9f04 暂时提交,让后端测试 2024-10-28 10:33:26 +08:00
zhangsir
0020c1b988 Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-10-28 09:39:00 +08:00
zhangsir
10e6767300 调整导航 2024-10-28 09:38:30 +08:00
wangxuemei
1cc6a79e58 授课记录调整 2024-10-26 18:46:31 +08:00
zhangsir
b7842e24da 参数改为小写 2024-10-26 18:40:27 +08:00
zhangsir
0be9c3a61f Merge remote-tracking branch 'zcwy/zcwy-teacher-manage' into zcwy-teacher-manage 2024-10-26 18:36:09 +08:00
zhangsir
4f3816493a 暂时提交 2024-10-26 18:35:31 +08:00
wangxuemei
aaec88f706 讲师费验证调整 2024-10-26 18:05:56 +08:00