diff --git a/src/api/Teaching.js b/src/api/Teaching.js index 728a090c..18e2cff8 100644 --- a/src/api/Teaching.js +++ b/src/api/Teaching.js @@ -1,4 +1,5 @@ import http from "./config"; +import {getCookieForName} from "@/api/method"; //列表查询内部讲师授课记录 export const getNewInTeacherCourseList = (obj) => http.post('/admin/teacher/getNewInTeacherCourseList', obj) //内部讲师授课记录详情 @@ -25,4 +26,9 @@ export const getOuterTeacherCourseDetail = (obj) => http.post(`/admin/teacher/ge //新增外部授课记录 export const insertOutTeaherCourse = (obj) => http.post('/admin/teacher/insertOutTeaherCourse', obj) //讲师费发放情况 -export const getCharges = (obj) => http.post('/teacher/fee/getCharges', obj) +export const getCharges = (obj) => http.post('/admin/teacher/fee/getCharges', obj) +//上传组件 +export const teacherUpload = (data) => + http.post("/admin/teacher/teacherUpload", data, { + headers: { "Content-Type": "multipart/form-data",token:getCookieForName("token") }, + }); diff --git a/src/api/lecturerFeeManagement.js b/src/api/lecturerFeeManagement.js index b89dd6a2..f1086457 100644 --- a/src/api/lecturerFeeManagement.js +++ b/src/api/lecturerFeeManagement.js @@ -1,6 +1,6 @@ import http from "./config"; // 获取讲师费列表 -export const getTeacherFeeList = (params) => http.get('/teacher/fee/getTeacherFeeList', {params}) +export const getTeacherFeeList = (obj) => http.post('/teacher/fee/getTeacherFeeList',obj) //获取讲师费详情 export const getTeacherFeeDetail= (obj) => http.post('/teacher/fee/getTeacherFeeDetail',obj) //添加讲师费 diff --git a/src/components/BreadCrumb.vue b/src/components/BreadCrumb.vue index 5f15d6c4..21e16300 100644 --- a/src/components/BreadCrumb.vue +++ b/src/components/BreadCrumb.vue @@ -109,7 +109,7 @@ ]; } if ( - n.indexOf("/insidelecturer") !== -1 + n.indexOf("/lecturerlist") !== -1 ) { state.list = [ { @@ -117,51 +117,23 @@ href: "", }, { - name: "内部讲师", + name: "讲师列表", href: "", }, ]; } if ( - n.indexOf("/externallecturer") !== -1 + n.indexOf("/teachingrecord") !== -1 ) { state.list = [ { name: "讲师管理", href: "", }, - { - name: "外部讲师", - href: "", - }, - ]; - } - if ( - n.indexOf("/insideteaching") !== -1 - ) { - state.list = [ { name: "授课记录", href: "", }, - { - name: "内部授课", - href: "", - }, - ]; - } - if ( - n.indexOf("/externalteaching") !== -1 - ) { - state.list = [ - { - name: "授课记录", - href: "", - }, - { - name: "外部授课", - href: "", - }, ]; } if ( @@ -169,7 +141,7 @@ ) { state.list = [ { - name: "讲师费", + name: "讲师管理", href: "", }, { @@ -177,12 +149,13 @@ href: "", }, ]; - }if ( + } + if ( n.indexOf("/lecturerfeestatistics") !== -1 ) { state.list = [ { - name: "讲师费", + name: "讲师管理", href: "", }, { @@ -191,6 +164,33 @@ }, ]; } + if ( + n.indexOf("/organization") !== -1 + ) { + state.list = [ + { + name: "讲师管理", + href: "", + }, + { + name: "归属组织管理", + href: "", + }, + ]; + }if ( + n.indexOf("/lecturerSystem") !== -1 + ) { + state.list = [ + { + name: "讲师管理", + href: "", + }, + { + name: "讲师体系管理", + href: "", + }, + ]; + } if ( n.indexOf("/projectadd") !== -1 || n.indexOf("/ProjectAdd") !== -1 diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index e786b41b..58ad9b0a 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -123,7 +123,7 @@ - avatar + avatar
@@ -158,11 +158,10 @@ - @@ -261,7 +260,8 @@ 上传导入文件 - {{ item.name }} + {{ formParam.filesList }} +
@@ -540,7 +540,8 @@ import SearchTeacher from "@/components/project/SearchTeacher"; import { message } from "ant-design-vue"; import { useRouter } from "vue-router"; import { getTeacherSystemList, getTeacherList, getPayRollPlace, getLevel, insertTeacher, deleteInTeacher, updateInTeacher, getTeacherById, updateTeacherState } from "../../api/Lecturer"; -import { fileUp } from "../../api/indexEval"; + import { fileUp } from "../../api/indexEval"; +import { teacherUpload } from "../../api/Teaching"; import { getCookieForName } from "@/api/method"; // import {getProjSt} from "../../api/indexProjStu"; import AddContent from "../../components/project/AddContent.vue" @@ -593,7 +594,7 @@ export default { name: null, certStatus: 0,//认证状态 defaultteachingTime: '0', - // photo: 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' + photo: 'https://p0.itc.cn/q_70/images01/20211013/f45d91616a364d6ea9c42a8db69734aa.png' }, searchParam: { currentPage: 1, @@ -614,21 +615,7 @@ export default { }, activeName: 'first' }) - const headers = { token: getCookieForName("token") }; - //图片上传 - // const photo = ref('') - const beforeUpload = (file) => { - const isJpgOrPng = - file.type === "image/jpg" || - file.type === "image/jpeg" || - file.type === "image/png" || - file.type === "image/bmp" || - file.type === "image/gif"; - if (!isJpgOrPng) { - message.error("仅支持jpg、gif、png、jpeg、bmp格式!"); - return false; - } - watch(() => state.formParam.description, (val) => { + watch(() => state.formParam.description, (val) => { console.log(val, 'description') }) watch(() => state.formParam.workExperience, (val) => { @@ -644,6 +631,20 @@ export default { // state.formParam.neworgName= state.formParam.neworgName[state.formParam.neworgName.length-1] // } }) + const headers = { token: getCookieForName("token") }; + //图片上传 + // const photo = ref('') + const beforeUpload = (file) => { + const isJpgOrPng = + file.type === "image/jpg" || + file.type === "image/jpeg" || + file.type === "image/png" || + file.type === "image/bmp" || + file.type === "image/gif"; + if (!isJpgOrPng) { + message.error("仅支持jpg、gif、png、jpeg、bmp格式!"); + return false; + } let isLt1M = file.size < 500000; console.log(file.size, isLt1M) if (!isLt1M) { @@ -667,8 +668,6 @@ export default { }; //附件上传 const beforeUpload2 = (file) => { - console.log(6765555); - console.log(file); const fileType = [ "pdf", ]; @@ -682,15 +681,17 @@ export default { const formData = new FormData(); formData.append("file", file); console.log(file); - fileUp(formData).then((res) => { + teacherUpload(formData).then((res) => { if (res.data.code === 200) { - state.formParam.filesList = [res.data.data]; + // state.formParam.filesList = [res.data.data]; + state.formParam.filesList = file.name console.log(state.formParam.filesList); // state.hasImgName = res.data.data; } }); return false; }; + //附件上传交互 const handleupdialog = () => { state.updialog = true diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index d9d0f95e..f74a3c7f 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -77,9 +77,9 @@ - - + -->
@@ -144,7 +144,7 @@ - @@ -270,11 +270,11 @@ 讲师信息 - {{ formParam.teacher }} + {{ formParam.teacherName }} {{ formParam.userNo }} - {{ formParam.departId }} - {{ formParam.systemId }} - {{ formParam.levelId }} + {{ formParam.organizationName }} + {{ formParam.systemName }} + {{ formParam.levelName }} {{ formParam.entryType == 0 ? '系统生成' : formParam.entryType == 1 ? '手动录入' : '' }} {{ formParam.type == 1 ? '项目开课' : formParam.type == 2 ? '路径开课' : formParam.type == 3 @@ -287,7 +287,7 @@ {{ formParam.beginTime }} {{ formParam.studys }} {{ formParam.score }} - {{ formParam.id }} + {{ formParam.sysType1 }} {{ formParam.remark }}
@@ -667,8 +667,8 @@ export default { }, { title: '内容分类', - dataIndex: 'teaching', - key: 'teaching', + dataIndex: 'sysType1', + key: 'sysType1', elipsis: true, align: "center", width: 120, }, @@ -931,7 +931,7 @@ export default { // state.userNoid = record.userNo state.lookTeacherId = record.teacherId // // alert(record.grade) - TeacherSystem(record) + TeacherSystem1(record) gettableDatas(record) // let id = record.userNo // router.push({ path: '/insideteachingdetail', query: { id } }) @@ -942,16 +942,9 @@ export default { } //内部授课详情 const TeacherSystem = (record) => { - // getTeacherCourseList( state.lookTeacherId).then((res) => { - // console.log("内部授课详情", res.data); - // state.formParam= res.data.data - // }) - // .catch((err) => { - // console.log("内部授课详情", err); - // }); state.formParam = { teacherType: '0', - teacher: record.teacher, + teacherName: record.teacherName, userNo: record.userNo, departId: record.departId, systemId: record.systemId, @@ -969,6 +962,29 @@ export default { entryType: record.entryType } console.log(state.formParam) + } + //内部授课详情 + const TeacherSystem1 = (record) => { + state.formParam = { + teacherType: '0', + teacherName: record.teacherName, + userNo: record.userNo, + organizationName: record.organizationName, + systemName: record.systemName, + levelName: record.levelName, + type: record.type, + name: record.name, + 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 + } + console.log(state.formParam) } const column = ref([{ title: '基准课酬 ', @@ -1176,6 +1192,7 @@ export default { // getStu LecturerSystemLista, TeacherSystem, + TeacherSystem1, getOrganizationLista, getOrganizationList, searchTimeChange, cancelTeachingDialog, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 9038375a..cf6370db 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -10,10 +10,9 @@ placeholder="请输入工号/讲师姓名进行检索" allowClear showSearch> -->
- + +
@@ -158,10 +157,8 @@ - + @@ -410,7 +407,7 @@ DownloadOutlined } from '@ant-design/icons-vue'; import ImportWork from "../../components/project/ImportWork.vue"; - import ProjectManager from "@/components/project/ProjectManagerNew" + import SearchTeacher from "@/components/project/SearchTeacher"; import {getTeacherFeeList,getTeacherFeeDetail,addTeacherFee ,updateTeacherFee,updateStatusSubmit,approveTeacherFee,getTrainOrg,getTeacherLevel} from "../../api/lecturerFeeManagement";4 import { getTeacherExpertise,getTeacherSystemList,getLevel,getPayRollPlace,fileUp } from "../../api/Lecturer"; // lecturerFeeManagement @@ -424,7 +421,7 @@ UploadOutlined,//图标--导出 DownloadOutlined,//图标-导入 FolderAddOutlined,//图标--新增 - ProjectManager + SearchTeacher }, setup() { const formRef = ref(); diff --git a/src/views/projectcenter/ProjectManage copy.vue b/src/views/projectcenter/ProjectManage copy.vue new file mode 100644 index 00000000..0bec868e --- /dev/null +++ b/src/views/projectcenter/ProjectManage copy.vue @@ -0,0 +1,2721 @@ + + + + diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index f08c84bd..0bec868e 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -5,39 +5,62 @@
- - +
- - + +
- - + +
- - +
-
- - -
-
- - - -
-
- - +
+
创建时间:
+ +
@@ -51,821 +74,1738 @@
-
+
-
新增讲师
+
创建项目
-
-
- -
导出
-
-
- -
- -