hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-17 23:06:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

讲师管理，授课记录 调整

Browse Source
This commit is contained in:
wangxuemei
2024-10-14 18:58:51 +08:00
parent d2cb5d4067
commit a944283500
11 changed files with 236 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/api/Lecturer.js
View File

@@ -7,23 +7,27 @@ import http from "./config";
* @FilePath: /fe-manage/src/api/indexProjStu.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
// 获取内部讲师体系列表
// 获取讲师体系列表
//VUE_APP_BASE_API /manageApi
export const getTeacherSystemList = (obj) => http.post('/admin/teacher/getSystem', obj)
// 获取内部讲师列表
export const getTeacherList = (obj) => http.post('/admin/teacher/getInTeacherList', obj)
export const getTeacherSystemList = (obj) => http.get( '/admin/ststem/list', {params: obj})
//获取讲师级别
export const getLevel = (obj) => http.get('/admin/ststem/getLevelList', {params: obj})
// 获取讲师列表
export const getTeacherList = (obj) => http.get('/admin/teacher/list' ,{params: obj})
//讲师详情
export const getTeacherById= (obj) => http.get('/admin/teacher/queryById',{params: obj})
//删除讲师
export const deleteInTeacher= (obj) => http.post('/admin/teacher/delById',obj)
//新增讲师
export const insertTeacher = (obj) => http.post('/admin/teacher/addTeacher' ,obj)
//修改讲师
export const updateInTeacher = (obj) => http.post('/admin/teacher/editTeacher' ,obj)
//删除内部讲师
// export const deleteInTeacher= (obj) => http.post(`/admin/teacher/delById?id=${obj}`)
//获取内部讲师发薪地
export const getPayRollPlace = (obj) => http.post('/admin/teacher/getPayRollPlace', obj)
//获取内部讲师级别
export const getLevel = (obj) => http.post('/admin/teacher/getNewLevel', obj)
//新增内部讲师
export const insertTeacher = (obj) => http.post('/admin/teacher/insertInTeacher' ,obj)
//修改 内部讲师
export const updateInTeacher = (obj) => http.post('/admin/teacher/updateInTeacher' ,obj)
//内部讲师详情
export const getTeacherById= (obj) => http.post(`/admin/teacher/getTeacherById?id=${obj}`)
//删除内部讲师
export const deleteInTeacher= (obj) => http.post(`/admin/teacher/deleteInTeacher?id=${obj}`)
//修改内部讲师状态
export const updateTeacherState = (obj) => http.post('/admin/teacher/update-status' ,obj)
//获取内部讲师授课记录

27
src/api/Teaching.js
View File

@@ -1,24 +1,25 @@
import http from "./config";
import {getCookieForName} from "@/api/method";
//列表查询内部讲师授课记录
export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj)
//内部讲师授课记录详情
// export const getTeacherCourseList = (obj) => http.post(`/admin/teacher/getTeacherCourseList?id=${obj}`)
export const getTeacherCourseList = (obj) => http.post('/admin/teacher/getTeacherCourseList', obj)
//列表查询授课记录
export const getNewInTeacherCourseList = (obj) => http.get('/admin/teacherRecord/list', {params: obj})
//新增授课记录
export const insertInTeacherCourse = (obj) => http.post('/admin/teacherRecord/addTeacher', obj)
//删除讲师授课记录
export const deleteInTeacherCourse= (obj) => http.post('/admin/teacherRecord/delById' ,obj)
//修改讲师授课记录
export const updateInTeacherCourse = (obj) => http.post('/admin/teacherRecord/editTeacher', obj)
//讲师授课记录详情
export const getTeacherCourseList = (obj) => http.get('/admin/teacherRecord/queryById', {params: obj})
//获取培训组织
export const getOrganization = (obj) => http.get ('/admin/affiliation/list', {params: obj})
//授课记录导出
export const getexport = (obj) => http.post('/lesson_records/export', obj)
//授课记录导入
export const importTeacherCourseRecord = (obj) => http.post('/importTeacherCourseRecord', obj)
//获取所属组织
export const getOrganization = (obj) => http.post('/admin/teacher/getOrganization', obj)
//获取开课场地
export const getAddress = (obj) => http.post('/admin/teacher/getAddress', obj)
//新增内部授课记录
export const insertInTeacherCourse = (obj) => http.post('/admin/teacher/insertInTeacherCourse', obj)
//修改内部讲师授课记录
export const updateInTeacherCourse = (obj) => http.post('/admin/teacher/updateInTeacherCourse', obj)
//删除讲师授课记录
export const deleteInTeacherCourse= (obj) => http.post('/admin/teacher/deleteInTeacherCourse' ,obj)
//外部讲师授课记录
export const getOuterTeacherCourseList = (obj) => http.post('/admin/teacher/getOuterTeacherCourseList', obj)
//获取外部授课记录详情

56
src/views/lecturer/ExternalLecturer.vue
View File

@@ -11,7 +11,7 @@
</a-input>
</a-form-item >
<a-form-item class="select">
<a-select style="width: 230px" v-model:value="searchParam.status" placeholder="账号状态"
<a-select style="width: 276px" v-model:value="searchParam.status" placeholder="账号状态"
:options="AccountStatusList">
</a-select>
</a-form-item >
@@ -44,8 +44,10 @@
@click="() => handleOperate(record, String(record.courseform))">停用</a-button>
<a-button v-if="record.status == '2'" type="link"
@click="() => handleOperate(record, String(record.courseform))">启用</a-button>
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button>
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
>删除</a-button>
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
</a-space>
</template>
</template>
@@ -57,7 +59,7 @@
<div style="float: right;">
<a-pagination
v-if="tableDataTotal > 10"
:showSizeChanger="false"
:showSizeChanger="true"
:showQuickJumper="true"
:hideOnSinglePage="true"
:pageSize="searchParam.pageSize"
@@ -84,13 +86,13 @@
<div class="item_inp" style="background-color: #fff;">
<a-upload name="avatar" list-type="picture-card" class="avatar-uploader" :show-upload-list="false"
:headers="headers" :before-upload="beforeUpload" >
<img class="i_upload_img" v-if="formParam.photo" :src="formParam.photo" alt="avatar" title="更换头像" />
<div class="i_upload" v-else>
<div class="addimg">
<div class="heng"></div>
<div class="shu"></div>
<img class="i_upload_img" v-if="formParam.photo" :src="formParam.photo" alt="avatar" title="更换头像" />
<div class="i_upload" v-else>
<div class="addimg">
<div class="heng"></div>
<div class="shu"></div>
</div>
</div>
</div>
</a-upload>
<div class="i_bottom">
<div class="tip" style="margin-bottom: 10px;">
@@ -254,7 +256,7 @@ import {
FolderAddOutlined
} from '@ant-design/icons-vue';
import ProjectManager from "@/components/project/ProjectManagerNew";
import { getOutTeacherList, getOuterTeacherById, deleteInTeacher, updateInTeacher, updateTeacherState, insertTeacherOutSide, updateOutTeacher } from "../../api/Lecturer";
import { getTeacherList, getTeacherById, deleteInTeacher, updateTeacherState, insertTeacher, updateInTeacher } from "../../api/Lecturer";
import { fileUp } from "../../api/indexEval";
import {getCookieForName} from "@/api/method"
import SearchTeacher from "@/components/project/SearchTeacher";;
@@ -295,11 +297,12 @@ export default {
teacherrecordstableDataTotal: -1,//授课记录列表总条数
formParam: {
description:"",
teacherType:'1',
teacherType:'2',
photo: 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png'
},
vf:true,
searchParam: {
teacherType:2,
teacherNameOrMobel: null,//姓名
status: null,//状态
pageNo: "1",
@@ -322,12 +325,12 @@ export default {
return false;
}
let isLt1M = file.size < 2000000;
console.log(file.size, isLt1M)
if (!isLt1M) {
message.error("图片大小超过2MB!");
return false;
}
let isLt1M = file.size < 500000;
console.log(file.size, isLt1M)
if (!isLt1M) {
message.error("图片不能超过500KB! 请重新上传");
return false;
}
const formDatas = new FormData();
formDatas.append("file", file);
@@ -425,17 +428,18 @@ export default {
state.searchParam = {
pageNo: 1,
pageSize: 10,
teacherType:2,
teacherNameOrMobel: null,
status: null
};
getTableDate();
};
// List接口数据
const getTableDate = (obj) => {
const getTableDate = () => {
state.tableLoading = true
state.loading = true;
let objA = { ...state.searchParam };
getOutTeacherList(objA)
getTeacherList(objA)
.then((res) => {
tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total);
@@ -445,7 +449,7 @@ export default {
};
getTableDate()
// // 翻页
const changePagination = (page) => {
const changePagination = (page,pageSize) => {
state.searchParam.pageNo = page;
state.searchParam.pageSize = pageSize;
getTableDate();
@@ -473,7 +477,7 @@ export default {
.validate()
.then(() => {
if (state.vf == false) {
updateOutTeacher(state.formParam).then(response => {
updateInTeacher(state.formParam).then(response => {
message.success("修改成功");
state.teacherdialog = false;
cancel()
@@ -481,7 +485,7 @@ export default {
});
}
else {
insertTeacherOutSide(state.formParam)
insertTeacher(state.formParam)
.then((res) => {
message.success("保存成功");
state.teacherdialog = false;
@@ -518,7 +522,7 @@ export default {
//确认删除
const closeDeleteTeacher = () => {
//调用删除接口
deleteInTeacher(state.delTeacherId).then((res) => {
deleteInTeacher({id:state.delTeacherId}).then((res) => {
if (res.data.code == 200) {
// message.success("删除成功");
state.deleteTeacherdialog = false
@@ -562,7 +566,7 @@ export default {
//清空数据
const cancel = () => {
state.formParam = {
teacherType:'1',
teacherType:2,
photo: 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png',
name: null,
mobile: null,
@@ -600,7 +604,7 @@ export default {
}
//外部讲师详情
const TeacherSystem = () => {
getOuterTeacherById(state.id).then((res) => {
getTeacherById({id:state.id}).then((res) => {
console.log("外部讲师详情", res.data);
state.formParam = res.data.data
state.formParam.description = state.formParam.description === null ? '' : state.formParam.description

12
src/views/lecturer/ExternalTeaching.vue
View File

@@ -298,7 +298,7 @@ import ProjectManager from "@/components/project/ProjectManagerNew";
import ProjectManagerOutTeacher from "@/components/project/ProjectManagerOutTeacher";
import dayjs from "dayjs";
import { updateInTeacher, getTeacherExpertise } from "../../api/Lecturer";
import { getTeacherCourseList, getAddress, updateInTeacherCourse, deleteInTeacherCourse, insertInTeacherCourse,getOuterTeacherCourseDetail } from "../../api/Teaching";
import { getTeacherCourseList, getAddress, updateInTeacherCourse,getNewInTeacherCourseList, deleteInTeacherCourse, insertInTeacherCourse } from "../../api/Teaching";
// import {getProjSt} from "../../api/indexProjStu";
// import AddTeacher from "../../components/drawers/project/AddTeacher"
export default {
@@ -341,7 +341,7 @@ export default {
searchdate: null, //选择时间
searchParam: {
teacherNameOrUserNo:null,
teacherType:'1',
teacherType:2,
pageNo: 1,
pageSize: 10,
teacher: null,
@@ -583,7 +583,7 @@ export default {
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
teacherType:'1',
teacherType:2,
pageNo: 1,
pageSize: 10,
managerId: null,
@@ -605,7 +605,7 @@ export default {
let objA = { ...state.searchParam };
objA.startDate = state.searchParam.startDate !== null ? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD") : "",
objA.endDate = state.searchParam.endDate !== null ? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD") : "",
getTeacherCourseList(objA)
getNewInTeacherCourseList(objA)
.then((res) => {
tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total);
@@ -675,7 +675,7 @@ export default {
//调用删除接口
let obj ={
offcourseId :state.delTeacherId,
teacherType:'1'
teacherType:2
}
deleteInTeacherCourse(obj).then((res) => {
if (res.data.code == 200) {
@@ -759,7 +759,7 @@ export default {
}
//外部授课详情
const TeacherSystem = () => {
getOuterTeacherCourseDetail(state.lookTeacherId).then((res) => {
getTeacherCourseList({id:state.lookTeacherId}).then((res) => {
state.formParam = res.data.data
console.log( state.formParam);
})

162
src/views/lecturer/InsideLecturer.vue
View File

@@ -6,18 +6,18 @@
<a-form layout="inline">
<a-form-item class="select">
<!-- v-model:value="searchParam.name" -->
<a-input v-model:value="searchParam.teacherNameOrUserNo" style="width: 276px; height: 40px; border-radius: 8px"
<a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input>
</a-form-item>
<a-form-item class="select">
<a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.systemId" allowClear
<a-select style="width: 276px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId" allowClear
:options="LecturerSystemList" @change="changetlevel">
</a-select>
</a-form-item>
<!-- <div @click="handlesearchlevel"> -->
<a-form-item class="select" >
<a-select style="width: 276px" v-model:value="searchParam.sLevelName" placeholder="请选择讲师级别" allowClear
<a-select style="width: 276px" v-model:value="searchParam.tLevelId" placeholder="请选择讲师级别" allowClear
:options="getLevelList" >
<!-- :disabled="getLevelList.length !== 0 ? false : true" 禁用状态 -->
</a-select>
@@ -75,7 +75,7 @@
@expand="expandTable" :pagination="false">
<template #bodyCell="{ record, column }">
<template v-if="column.key === 'organizationName'">
<!-- <template v-if="column.key === 'organizationName'">
<a-space style="display:flex ;justify-content: space-around; ">
<a-popover>
<template #content>
@@ -84,7 +84,7 @@
<span>{{ record.neworganizationName }}</span>
</a-popover>
</a-space>
</template>
</template> -->
<template v-if="column.key === 'operation'">
<a-space>
<a-button type="link" @click="() => handleLook(record, String(record.courseform))">查看</a-button>
@@ -94,11 +94,12 @@
@click="() => handleOperate(record, String(record.courseform))">停用</a-button>
<a-button v-if="record.status == '2'" type="link"
@click="() => handleOperate(record, String(record.courseform))">启用</a-button>
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button>
<a-button type="link" @click="() => deleteModal(record, String(record.courseform))">删除</a-button>
<!-- <a-button type="link" @click="() => deleteModal(record, String(record.courseform))"
 v-if="lecturerAdmin('Lecturer-admin')">删除</a-button> -->
</a-space>
</template>
</template>
</template>
</a-table>
</div>
@@ -145,7 +146,7 @@
<a-col :span="24">
<a-form-item label="讲师名称" name="name">
<SearchTeacher v-model:value="formParam.name" v-model:lable="formParam.orgName"
v-model:system="formParam.tSystemName" v-model:level="formParam.sLevelName"></SearchTeacher>
v-model:system="formParam.tSystemName" v-model:level="formParam.tLevelId"></SearchTeacher>
</a-form-item>
</a-col>
<a-col :span="24">
@@ -174,8 +175,8 @@
</a-col>
<a-col :span="24">
<!-- <div @click="handleformlevel"> -->
<a-form-item label="讲师级别" name="sLevelName">
<a-select class="draitem" v-model:value="formParam.sLevelName" placeholder="请选择讲师级别" allowClear
<a-form-item label="讲师级别" name="tLevelId">
<a-select class="draitem" v-model:value="formParam.tLevelId" placeholder="请选择讲师级别" allowClear
:disabled="getLevelList.length !== 0 ? false : true" :options="getLevelList">
</a-select>
</a-form-item>
@@ -412,18 +413,19 @@ export default {
tableDataTotal: -1,//table列表总条数
vf: false,
formParam: {
teachenType: '0',
name: null,
certStatus: 0,//认证状态
defaultteachingTime: null,
teacherType:1,
photo: 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png'
},
searchParam: {
teacherType:1,
pageNo: 1,
// pageSize1: "10",
teacherNameOrUserNo: null,
name: null,
tSystemName: null,
sLevelName: null,
tLevelId: null,
waitStatus: null,
certStatus: null,
courses: null,
@@ -433,7 +435,8 @@ export default {
teacherrepromo: {
pageNo: "1",
pageSize: "10",
userNo: null
userNo: null,
teacherType:1
},
activeName: 'first'
})
@@ -528,14 +531,17 @@ export default {
]);
//获取讲师体系列表
const LecturerSystemLista = () => {
// console.log('点击了LecturerSystemLista')
getTeacherSystemList().then((res) => {
let obj ={
pageNo:1,
pageSize:1000,
}
getTeacherSystemList(obj).then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let arr = res.data.data.records;
let array = [];
arr.map((value) => {
let obj = {
value: value.kid,
value: value.id,
label: value.systemName,
};
array.push(obj);
@@ -554,31 +560,6 @@ export default {
}
const AddContentList = (data) => {
console.log(data, 'treedatalist')
//组件获取返回的所有值，调用以前接口，现环境不可用，示例：
// [{
// "id": "966459050400600064",
// "sysCreateAid": "952948872212635648",
// "sysCreateBy": "董瑞华",
// "sysCreateTime": "2022-04-20 22:03:13",
// "sysUpdateTime": "2022-04-20 22:03:13",
// "sysUpdateBy": "董瑞华",
// "sysVersion": 0,
// "deleted": false,
// "name": "研发",
// "parentId": "966458733088919552",
// "filter": true,
// "orderIndex": 2,
// "origin": 2,
// "status": 1,
// "total": 0,
// "sysResType": 1,
// "children": "",
// "parentName": "专业力",
// "resDataManager": "",
// "code": "966459050400600064",
// "value": "966459050400600064"
// }]
}
LecturerSystemLista()
//获取内部讲师级别
@@ -586,7 +567,7 @@ export default {
])
const changetlevel = (val) => {
console.log("讲师体系id" + val);
getLevel({ kid: val }).then((res) => {
getLevel({ id: val }).then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
@@ -612,27 +593,27 @@ export default {
{ value: 0, label: "未认证" },
{ value: 1, label: "已认证" },
])
const PlaceOfPayList = ref([
// { value: 0, label: "发薪地B1" },
])
// const PlaceOfPayList = ref([
// // { value: 0, label: "发薪地B1" },
// ])
//获取讲师发薪地列表
const PlaceOfPayLista = () => {
getPayRollPlace().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let array = [];
arr.map((value) => {
let obj = {
value: value.id,
label: value.name,
};
array.push(obj);
});
PlaceOfPayList.value = array;
}
})
}
PlaceOfPayLista()
// const PlaceOfPayLista = () => {
// getPayRollPlace().then((res) => {
// if (res.data.code === 200) {
// let arr = res.data.data;
// let array = [];
// arr.map((value) => {
// let obj = {
// value: value.id,
// label: value.name,
// };
// array.push(obj);
// });
// PlaceOfPayList.value = array;
// }
// })
// }
// PlaceOfPayLista()
const AccountStatusList = ref([
{ value: 1, label: "启用" },
{ value: 2, label: "停用" },
@@ -806,13 +787,14 @@ export default {
};
//重置
const searchReset = () => {
LecturerSystemLista()
state.searchParam = {
teacherType:1,
name: null,
userNo: null,
newdepartId: null,
tsystemname: null,
sLevelName: null,
tLevelId: null,
waitStatus: null,
certStatus: null,
salaryName: null,
@@ -825,20 +807,21 @@ export default {
getTableDate();
};
// List接口数据
const getTableDate = (obj) => {
state.tableLoading = true
const getTableDate = () => {
// state.tableLoading = true
let objA = { ...state.searchParam };
getTeacherList(objA)
.then((res) => {
// tableData.value = res.data.data.records
let objA = res.data.data.records
objA.map((item) => {
if (item.organizationName !== null) {
item.neworganizationName = item.organizationName.split('/')
item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
}
})
tableData.value = objA
tableData.value = res.data.data.records
console.log(tableData.value,'tableData.value')
// let objA = res.data.data.records
// objA.map((item) => {
// if (item.organizationName !== null) {
// item.neworganizationName = item.organizationName.split('/')
// item.neworganizationName = item.neworganizationName[item.neworganizationName.length - 1]
// }
// })
// tableData.value = objA
state.tableDataTotal = Number(res.data.data.total);
state.tableLoading = false
})
@@ -959,7 +942,7 @@ export default {
//确认删除
const closeDeleteTeacher = () => {
//调用删除接口
deleteInTeacher(state.delTeacherId).then((res) => {
deleteInTeacher({id:state.delTeacherId}).then((res) => {
if (res.data.code == 200) {
message.success("删除成功");
state.deleteInTeacherdialog = false
@@ -1004,9 +987,9 @@ export default {
status: null,
teacherType: '0',
photo: null,
teacherNameOrUserNo: null,
name: null,
newdepartId: null,
sLevelName: null,
tLevelId: null,
defaultteachingTime:null,
tSystemName: null,
certStatus: 0,
@@ -1021,7 +1004,7 @@ export default {
const rules = {
name: [{ required: true, message: '讲师不能为空' }],
newdepartId: [{ required: true, message: '组织不能为空' }],
sLevelName: [{ required: true, message: '讲师级别不能为空' }],
tLevelId: [{ required: true, message: '讲师级别不能为空' }],
tSystemName: [{ required: true, message: '讲师体系不能为空' }],
defaultteachingTime: [{ required: true, message: '' }],
certStatus: [{ required: true, message: '认证状态不能为空' }],
@@ -1038,7 +1021,7 @@ export default {
message.warning('组织不能为空')
return
}
if (state.formParam.sLevelName == null) {
if (state.formParam.tLevelId == null) {
state.log = true
message.warning('讲师级别不能为空')
return
@@ -1067,7 +1050,8 @@ export default {
}
//内部讲师详情
const TeacherSystem = () => {
getTeacherById(state.id).then((res) => {
console.log(state.id)
getTeacherById({id:state.id}).then((res) => {
if (res.data.code === 200) {
// let objA= res.data.data[0]
// if( objA.orgName !==null ){
@@ -1075,7 +1059,7 @@ export default {
// objA.neworgName= objA.neworgName[objA.neworgName.length-1]
// }
state.formParam = res.data.data[0]
state.formParam = res.data.data
state.formParam.description = state.formParam.description === null ? '' : state.formParam.description
state.formParam.workExp0erience = state.formParam.workExperience === null ? '' : state.formParam.workExperience
state.formParam.courses = state.formParam.courses === null ? '' : state.formParam.courses
@@ -1106,14 +1090,14 @@ export default {
// }
const handleformlevel = () => {
console.log('请先选择讲师体系')
if (state.formParam.systemId == undefined) {
if (state.formParam.tSystemId == undefined) {
message.warning('请先选择讲师体系')
}
}
//导出功能
const handleExport = () => {
window.open(
`${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&teacherNameOrUserNo=${state.searchParam.teacherNameOrUserNo ? state.searchParam.teacherNameOrUserNo : ""}&systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}&sLevelName=${state.searchParam.sLevelName ? state.searchParam.sLevelName : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
`${process.env.VUE_APP_BASE_API}/teacher/export?pageNo=${state.searchParam.pageNo}&pageSize=${state.searchParam.pageSize}&name=${state.searchParam.name ? state.searchParam.name : ""}&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}&tLevelId=${state.searchParam.tLevelId ? state.searchParam.tLevelId : "" }&waitStatus=${state.searchParam.waitStatus ? state.searchParam.waitStatus : ""}&certStatus=${state.searchParam.certStatus ? state.searchParam.certStatus : ""}&courses=${state.searchParam.courses ? state.searchParam.courses : ""}`
);
// this.download('lesson_records/export', {
// ...state.searchParam
@@ -1144,9 +1128,9 @@ export default {
getLevelList,
OnTheJobStatusList,
changetlevel,
PlaceOfPayLista,
// PlaceOfPayLista,
AuthenticationStatusList,
PlaceOfPayList,
// PlaceOfPayList,
AccountStatusList,
searchSubmit,
searchReset,

143
src/views/lecturer/InsideTeaching.vue
View File

@@ -5,17 +5,17 @@
<div class="filter">
<a-form layout="inline" style="min-width: 1380px;">
<a-form-item class="select">
<a-input v-model:value="searchParam.teacherNameOrUserNo" style="width: 260px; height: 40px; border-radius: 8px"
<a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input>
</a-form-item>
<a-form-item class="select">
<a-input v-model:value="searchParam.courseName" style="width: 260px; height: 40px; border-radius: 8px"
<a-input v-model:value="searchParam.courseName" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入课程名称进行搜索" allowClear showSearch>
</a-input>
</a-form-item>
<!-- <a-form-item class="select ">
<a-range-picker style="width: 260px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
<a-range-picker style="width: 276px; height: 40px; border-radius: 8px" v-model:value="searchdate" separator="至"
:placeholder="[' 开始时间', ' 结束时间']" @change="searchTimeChange" />
</a-form-item> -->
<a-form-item class="select ">
@@ -52,7 +52,7 @@
</div>
<div style="width:100%"></div>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.entryType" placeholder="录入类型"
<a-select style="width: 230px ;margin-bottom:20px" v-model:value="searchParam.createFrom" placeholder="录入类型"
:options="entryTypeList" allowClear>
</a-select>
</a-form-item>
@@ -62,12 +62,12 @@
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.systemId"
<a-select style="width: 230px" placeholder="请选择讲师体系" v-model:value="searchParam.tSystemId"
:options="LecturerSystemList" allowClear showSearch>
</a-select>
</a-form-item>
<a-form-item class="select" v-if="moreid == 2">
<a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.trainorgId"
<a-select style="width: 230px" placeholder="请选择所属组织" v-model:value="searchParam.orgId"
:options="getOrganizationList" allowClear showSearch>
</a-select>
</a-form-item>
@@ -86,7 +86,7 @@
<a-select style="width: 230px" v-model:value="searchParam.studysranges" placeholder="授课人数" :options="studysList"
allowClear showSearch>
</a-select>
<!-- <a-input v-model:value="searchParam.name" style="width: 260px; height: 40px; border-radius: 8px"
<!-- <a-input v-model:value="searchParam.name" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="授课人数" allowClear showSearch>
</a-input> -->
</a-form-item>
@@ -239,7 +239,8 @@
<a-row :gutter="16">
<a-col :span="24">
<a-form-item label="参训人数" name="studys">
<a-input v-model:value="formParam.studys" class="draitem" placeholder="0 " allowClear showSearch>
<a-input v-model:value="formParam.studys" class="draitem" placeholder="0 "
@blur="clearstudysNumber" allowClear showSearch>
</a-input>
</a-form-item>
</a-col>
@@ -276,13 +277,13 @@
<span class="line"></span>
<span>讲师信息</span>
<a-descriptions bordered :column="2" :contentStyle="rowCenter" :labelStyle="rowCenter">
<a-descriptions-item label="讲师名称">{{ formParam.teacherName }}</a-descriptions-item>
<a-descriptions-item label="讲师名称">{{ formParam.name }}</a-descriptions-item>
<a-descriptions-item label="讲师工号">{{ formParam.userNo }}</a-descriptions-item>
<a-descriptions-item label="讲师组织" :span="2">{{ formParam.organizationName }}</a-descriptions-item>
<a-descriptions-item label="讲师体系">{{ formParam.systemName }}</a-descriptions-item>
<a-descriptions-item label="讲师级别">{{ formParam.sLevelName }}</a-descriptions-item>
<a-descriptions-item label="录入方式">
{{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }}</a-descriptions-item>
{{ formParam.createFrom == 0 ? '系统生成' : formParam.createFrom == 1 ? '手动录入' : '' }}</a-descriptions-item>
<a-descriptions-item label="课程类型">{{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3
? '面授开课' : '' }}</a-descriptions-item>
<a-descriptions-item label="课程名称">{{ formParam.coursename }}</a-descriptions-item>
@@ -423,13 +424,13 @@ export default {
endDate: null, //结束时间
formParam: {
status: 1,
entryType: 1,
createFrom: 1,
duration: null,
},
startTime:null,
startDate:null,
searchParam:
{ "teacherType": "0", "pageNo": 1, "pageSize": 10, "managerId": null, "teacherNameOrUserNo": null, "entryType": null, "status": null, "trainorgId": null, "systemId": null, "endDate": null, "startDate":null, "studysranges": [], "score": null }
{ "teacherType": 1, "pageNo": 1, "pageSize": 10, "managerId": null, "name": null, "createFrom": null, "status": null, "orgId": null, "tSystemId": null, "endDate": null, "startDate":null, "studysranges": [], "score": null }
})
//获取所属组织
@@ -439,13 +440,17 @@ export default {
//获取所属组织
const getOrganizationLista = () => {
// console.log('getOrganizationList')
getOrganization().then((res) => {
let obj={
pageNo:1,
pageSize:1000
}
getOrganization(obj).then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let arr = res.data.data.records;
let array = [];
arr.map((value) => {
let obj = {
value: value.trainorgId,
value: value.id,
label: value.trainOrgName,
};
array.push(obj);
@@ -460,14 +465,17 @@ export default {
]);
//获取讲师体系列表
const LecturerSystemLista = () => {
// console.log('点击了LecturerSystemLista')
let obj ={
pageNo:1,
pageSize:1000,
}
getTeacherSystemList().then((res) => {
if (res.data.code === 200) {
let arr = res.data.data;
let arr = res.data.data.records;
let array = [];
arr.map((value) => {
let obj = {
value: value.kid,
value: value.id,
label: value.systemName,
};
array.push(obj);
@@ -567,8 +575,8 @@ export default {
{
title: '讲师姓名 ',
dataIndex: 'teacherName',
key: 'teacherName',
dataIndex: 'name',
key: 'name',
elipsis: true, align: "center",
width: 120,
},
@@ -602,18 +610,18 @@ export default {
},
{
title: '数据来源',
dataIndex: 'entryType',
key: 'entryType',
dataIndex: 'createFrom',
key: 'createFrom',
elipsis: true, align: "center",
width: 120,
customRender: (value) => {
return (
<div>
{value.record.entryType == "1" || value.record.entryType == "2"
{value.record.createFrom == "1" || value.record.createFrom == "2"
? {
"0": "系统生成",
"1": "手动录入",
}[value.record.entryType + ""] || ""
}[value.record.createFrom + ""] || ""
: "-"}
</div>
)
@@ -740,10 +748,10 @@ export default {
}
else if (state.moreid == 2) {
state.moreid = 1
state.searchParam.entryType = null
state.searchParam.createFrom = null
state.searchParam.status = '0'
state.searchParam.trainorgId = null
state.searchParam.systemId = null
state.searchParam.orgId = null
state.searchParam.tSystemId = null
state.searchParam.id = null
state.searchParam.scoreranges = []
state.searchParam.studysranges = []
@@ -774,18 +782,17 @@ export default {
const searchReset = () => {
state.searchdate= null,
state.searchParam = {
teacherType: '0',
teacherType: 1,
pageNo: 1,
pageSize: 10,
managerId: null,
teacherNameOrUserNo: null,
entryType: null,
name: null,
createFrom: null,
status: '0',
trainorgId: null,
systemId: null,
orgId: null,
tSystemId: null,
endDate: null,
startDate: null,
entryType: null,
studysranges: [],
score: null
};
@@ -797,7 +804,7 @@ export default {
let objA = { ...state.searchParam };
objA.startDate = state.searchParam.startDate !== null ? dayjs(new Date(state.searchParam.startDate).getTime()).format("YYYY-MM-DD") : "",
objA.endDate = state.searchParam.endDate !== null ? dayjs(new Date(state.searchParam.endDate).getTime()).format("YYYY-MM-DD") : "",
getTeacherCourseList(objA)
getNewInTeacherCourseList(objA)
.then((res) => {
tableData.value = res.data.data.records
state.tableDataTotal = Number(res.data.data.total);
@@ -870,7 +877,7 @@ export default {
//调用删除接口
let obj = {
offcourseId: state.delTeacherId,
teacherType: '0'
teacherType: 1
}
deleteInTeacherCourse(obj).then((res) => {
if (res.data.code == 200) {
@@ -896,7 +903,7 @@ export default {
//清空数据
const cancel = () => {
state.formParam = {
teacherType: '0',
teacherType: 1,
teacher: null,
orgName: null,
tSystemName: null,
@@ -910,7 +917,7 @@ export default {
type: null,
remark: null,
offcourseId: null,
entryType: null
createFrom: null
}
}
@@ -948,8 +955,8 @@ export default {
//内部授课详情
const TeacherSystem = (record) => {
state.formParam = {
teacherType: '0',
teacherName: record.teacherName,
teacherType: 1,
name: record.name,
userNo: record.userNo,
orgName: record.orgName,
tSystemName: record.tSystemName,
@@ -964,31 +971,37 @@ export default {
score: record.score,
studys: record.studys,
remark: record.remark,
entryType: record.entryType
createFrom: record.createFrom
}
console.log(state.formParam)
}
//内部授课详情
const TeacherSystem1 = (record) => {
state.formParam = {
teacherType: '0',
teacherName: record.teacherName,
userNo: record.userNo,
organizationName: record.organizationName,
systemName: record.systemName,
sLevelName: record.sLevelName,
type: record.type,
courseName: record.courseName,
status:record.status,
beginTime:record.beginTime,
// ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
// record.beginTime,
duration: record.duration,
score: record.score,
studys: record.studys,
remark: record.remark,
entryType: record.entryType
}
getTeacherCourseList({id:record.id}).then((res) => {
state.formParam = res.data.data
console.log( state.formParam);
})
.catch((err) => {
});
// state.formParam = {
// teacherType: 1,
// name: record.name,
// userNo: record.userNo,
// organizationName: record.organizationName,
// systemName: record.systemName,
// sLevelName: record.sLevelName,
// type: record.type,
// courseName: record.courseName,
// status:record.status,
// beginTime:record.beginTime,
// // ref< moment.Moment >(moment(record.beginTime,'YYYY-MM-DD')),
// // record.beginTime,
// duration: record.duration,
// score: record.score,
// studys: record.studys,
// remark: record.remark,
// createFrom: record.createFrom
// }
console.log(state.formParam)
}
const column = ref([{
@@ -1107,20 +1120,20 @@ export default {
window.open(
`${process.env.VUE_APP_BASE_API}/lesson_records/export?pageNo=${state.searchParam.currentPage
}&pageSize=${state.searchParam.pageSize}
&userNo=${state.searchParam.userNo ? state.searchParam.userNo : ""}
&name=${state.searchParam.name ? state.searchParam.name : ""}
&courseName=${state.searchParam.courseName ? state.searchParam.courseName : ""}
&departId=${state.searchParam.departId ? state.searchParam.departId : ""}
&systemId=${state.searchParam.systemId ? state.searchParam.systemId : ""}
&tSystemId=${state.searchParam.tSystemId ? state.searchParam.tSystemId : ""}
&startDate=${state.searchParam.startDate ? state.searchParam.startDate : ""}
&endDate=${state.searchParam.endDate ? state.searchParam.endDate : ""}
&entryType=${state.searchParam.entryType ? state.searchParam.entryType : ""}
&createFrom=${state.searchParam.createFrom ? state.searchParam.createFrom : ""}
&id=${state.searchParam.id ? state.searchParam.id : ""}
&type=${state.searchParam.type ? state.searchParam.type : ""}
&status=${state.searchParam.status ? state.searchParam.status : ""}
&studysranges=${state.searchParam.studysranges ? state.searchParam.studysranges : ""}
&scoreranges=${state.searchParam.scoreranges ? state.searchParam.scoreranges : ""}
`)
console.log(state.searchParam.userNo,state.searchParam,'参数')
console.log(state.searchParam.name,state.searchParam,'参数')
}
const handleImport = () => {
state.showWork = true
@@ -1162,11 +1175,15 @@ export default {
const clearscoreNumber = () => {
state.formParam.score = state.formParam.score.replace(/\D/g, '');
}
const clearstudysNumber = () => {
state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
}
return {
...toRefs(state),
// managerChange,
clearNonNumber,
clearscoreNumber,
clearstudysNumber,
beforeUpload2,
rules,
rule,

2
src/views/lecturer/LecturerFee.vue
View File

@@ -13,7 +13,7 @@
<a-input v-model:value="searchParam.teacherNameOrUserNo" style="width: 276px; height: 40px; border-radius: 8px"
placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch>
</a-input>
</div>
</div>
</a-form-item>
<a-form-item class="select">
<a-input v-model:value="searchParam.trainorgId" style="width: 276px; height: 40px; border-radius: 8px"

4
src/views/lecturer/LecturerFeeManagement.vue
View File

@@ -6,7 +6,7 @@
<a-tab-pane key="1" tab="讲师费管理">
<LecturerFee />
</a-tab-pane>
<a-tab-pane key="2" tab="讲师费审批">
<a-tab-pane key="2" tab="讲师费审批" >
<LecturerApproval/>
</a-tab-pane>
</a-tabs>
@@ -17,7 +17,7 @@
import { reactive, toRefs, ref, watch } from "vue";
import LecturerFee from "../lecturer/LecturerFee.vue"
import LecturerApproval from "../lecturer/LecturerApproval.vue"
export default {
export default {
name: "LecturerFeeManagement",
components: {
LecturerFee,

4
src/views/lecturer/LookExternalLecturer.vue
View File

@@ -117,9 +117,9 @@ export default{
//外部讲师详情
const TeacherSystem = () => {
getTeacherById(state.id).then((res) => {
getTeacherById({id:state.id}).then((res) => {
console.log("内部讲师详情", res.data);
state.formParam = res.data.data[0]
state.formParam = res.data.data
state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo
})
.catch((err) => {

16
src/views/lecturer/LookInsideLecturer.vue
View File

@@ -161,17 +161,17 @@ export default{
//内部讲师详情
const TeacherSystem = () => {
getTeacherById(state.id).then((res) => {
let objA= res.data.data[0]
if( objA.orgName !==null ){
objA.neworgName=objA.orgName.split('/')
getTeacherById({id:state.id}).then((res) => {
let objA= res.data.data
console.log(objA ,'11111111111')
// if( objA.orgName !==null ){
// objA.neworgName=objA.orgName.split('/')
objA.neworgName= objA.neworgName[objA.neworgName.length-1]
}
// console.log(objA ,'11111111111')
// objA.neworgName= objA.neworgName[objA.neworgName.length-1]
// }
state.formParam = objA
state.formParam.photo = state.formParam.photo ===null ? 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' : state.formParam.photo
state.teacherrepromo.userId=res.data.data[0].id
state.teacherrepromo.userId=res.data.data.id
console.log(state.teacherrepromo.id);
getpromotionrecordstableData()
})

4
src/views/lecturer/Organization.vue
View File

@@ -87,13 +87,13 @@
</a-col>
</a-row>
<a-row :gutter="16">
<a-col :span="12">
<!-- <a-col :span="12">
<a-form-item label="归属组织编号" name="trainorgId">
<a-input disabled v-model:value="formParam.trainorgId" class="draitem"
placeholder="" allowClear showSearch>
</a-input>
</a-form-item>
</a-col>
</a-col> -->
<a-col :span="12">
<a-form-item label="归属组织名称" name="trainorgName">
<a-input v-model:value="formParam.trainorgName" class="draitem"