From dabca2e6364c99b9739f22ea207b10d9d4abb51a Mon Sep 17 00:00:00 2001 From: zhangsir Date: Mon, 11 Nov 2024 11:08:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=B2=E5=B8=88=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Lecturer.js | 2 +- src/components/project/SearchTeacher.vue | 47 +++++++++++++++++++++--- src/views/lecturer/InsideLecturer.vue | 2 +- src/views/lecturer/InsideTeaching.vue | 22 +++++------ src/views/lecturer/LecturerAPPEdit.vue | 20 +++++----- src/views/lecturer/LecturerFee.vue | 21 ++++++----- 6 files changed, 76 insertions(+), 38 deletions(-) diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 46e75425..71f7edf7 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -47,7 +47,7 @@ export const fileUp = (obj) => http.post('/file/upload', obj) //组织树查询讲师 export const getTeacherByDepartId = (obj) => http.get(`/admin/thirdApi/user/list?departId=${obj.organizationId}&pageNo=1&pageSize=100&keyword=`) //根据姓名工号查询讲师 -export const getTeacherByNameOrUserNo = (obj) => https.post(`/user/teacherList`,obj) +export const getTeacherByNameOrUserNo = (obj) => https.post(`/user/noTeacherList`,obj) // export const getTeacherByNameOrUserNo = (obj) => https.post(`/user/teacherList?keyword=${obj.nameOrUserNo}&pageNo=1&pageSize=50&departId=`) //根据userid获取讲师体系信息 export const getSystemInfoByUserId = (id) => http.get(`/admin/system/getSystemInfoByUserId?id=${id}`) diff --git a/src/components/project/SearchTeacher.vue b/src/components/project/SearchTeacher.vue index 56c8cb27..71229b67 100644 --- a/src/components/project/SearchTeacher.vue +++ b/src/components/project/SearchTeacher.vue @@ -68,7 +68,7 @@ import { ref,defineProps,defineEmits,watch,onMounted } from 'vue'; import { request, useRequest} from "@/api/request"; import { message } from "ant-design-vue" import { ORG_CHILD_LIST, ORG_LIST,USER_LIST_PAGE} from "@/api/apis"; -import { getTeacherByDepartId,getTeacherByNameOrUserNo,getSystemInfoByUserId } from "@/api/Lecturer"; +import { getTeacherByDepartId,getTeacherByNameOrUserNo,getSystemInfoByUserId,getTeacherList } from "@/api/Lecturer"; import { ZoomInOutlined,UserOutlined } from '@ant-design/icons-vue'; const props = defineProps({ value:{ @@ -110,6 +110,10 @@ const props = defineProps({ disabled: { type: Boolean, default: false, + }, + lecturer: { + type: Boolean, + default: false, } }) const emit = defineEmits(['update:value','update:lable','update:system','update:level','update:newlable','update:orgId','update:id','update:payrollPlaceCode','update:payrollPlaceName']) @@ -154,6 +158,7 @@ const handleChange = (e,l) => { neworgName.value= orgName.value.split('/') neworgName.value= neworgName.value[ neworgName.value.length-1] } + emit('tlevel',l) }; function debounce(func, wait) { let timeout; @@ -181,7 +186,7 @@ const searchMember = (keyword) => { pageSize:'50', departId:'', } - getTeacherByNameOrUserNo(obj).then((res) => { + props.lecturer && getTeacherByNameOrUserNo(obj).then((res) => { if(res.data.status == 200){ loading.value = false options.value = res.data.result.list.map((item) => { @@ -205,6 +210,36 @@ const searchMember = (keyword) => { }).catch(()=>{ loading.value = false }) + const params = { + pageNo: 1, + pageSize: 50, + name: keyword + } + !props.lecturer && getTeacherList(params).then(res=>{ + console.log(res,'ressss') + if(res.data.code == 200){ + loading.value = false + options.value = res.data.data.records.map((item) => { + return { + value: item.name+'/'+item.userNo, + label: item.name+'('+item.userNo+')'+item.tsystemName, + system: item.name+'('+item.userNo+')'+item.tsystemName, + level: item.name+'('+item.userNo+')'+item.sLevelName, + key: item.id, + orgName: item.orgName, + orgId: item.departId, + tSystemName:item.tsystemName, + sLevelName:item.sLevelName, + payrollPlaceCode: item.payrollPlaceCode, + payrollPlaceName:item.payrollPlaceName, + tlevelName: item.tlevelName, //讲师级别 + tlevelId: item.tlevelId, //讲师级别id + } + }) + } + }).catch(()=>{ + loading.value = false + }) }; const debounceObject = debounce(searchMember, 1500); const filterOption = (input, option) => { @@ -313,10 +348,10 @@ watch(()=>teacherId.value,(val)=>{ getSystemInfoByUserId(teacherId.value).then(res=>{ if(res.data.code == 200){ systemName.value = { - systemId:res.data.data.id, - systemName:res.data.data.systemName, - systemCode:res.data.data.systemCode, - levelVoList: res.data.data.levelVoList.map(item=>{ + systemId:res.data.data?.id, + systemName:res.data.data?.systemName, + systemCode:res.data.data?.systemCode, + levelVoList: res.data.data?.levelVoList?.map(item=>{ return ( item.label = item.levelName, item.value = item.id, diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 97d3098b..6778da52 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -144,7 +144,7 @@ - diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index ce6d4868..9bb73d40 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -160,7 +160,7 @@ - @@ -188,10 +188,10 @@ - - - + + + @@ -886,6 +886,10 @@ export default { }); }); } + const tlevelChange = (e) => { + state.formParam.tlevelName = e?.tlevelName + state.formParam.tlevelId = e?.tlevelId + } //保存 const createTeacherDialog = async () => { state.formParam.teacherName = state.formParam.name?.split('/')[0] @@ -1137,7 +1141,7 @@ export default { const rules = { name: [{ required: true, message:'',log: '讲师不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], - tlevelId: [{ required: true, message: '',log:'讲师级别不能为空' }], + tlevelName: [{ required: true, message: '',log:'讲师级别不能为空' }], tsystemName: [{ required: true, message: '',log:'讲师体系不能为空' }], courseTypeId: [{ required: true, message: '',log:'内容分类不能为空' }], courseName: [{ required: true, message: '',log:'课程名称不能为空' }], @@ -1152,10 +1156,6 @@ export default { // state.searchParam.name = t; // // state.searchParam.trainorgName=orgName // } - const handleformlevel = (val) => { - state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName - state.formParam.tlevelId = state.tSystemNames.levelVoList.find(item=>item.id===val)?.id - } //导出功能 const handleExport = () => { window.open( @@ -1233,7 +1233,6 @@ const enterPressHadlerSearch = e => { enterPressHadlerSearch, treetype, validateField, - handleformlevel, // managerChange, clearNonNumber, clearscoreNumber, @@ -1267,6 +1266,7 @@ const enterPressHadlerSearch = e => { handleModify, closeDeleteTeacher, createTeacherDialog, + tlevelChange, getTableDate, //list接口数据调用 // getStu LecturerSystemLista, diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index a01dd863..7be16677 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -73,7 +73,7 @@ - @@ -109,10 +109,10 @@ - - - + + + @@ -422,8 +422,9 @@ export default { { value: '4', label: "作业员如模培训" }, ]) const formRef = ref(); - const handleformlevel = (val) => { - state.formParam.tlevelName = state.tSystemNames?.levelVoList?.find(item=>item.id===val)?.levelName + const tlevelChange = (e) => { + state.formParam.tlevelName = e?.tlevelName + state.formParam.tlevelId = e?.tlevelId } watch(()=>state.formParam.name,(val)=>{ state.formParam.userNo = val?.split('/')[1] @@ -502,7 +503,7 @@ export default { userNo: [{ required: true, message: '',log:'讲师工号不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], tsystemName: [{ required: true, message:'',log: '讲师体系不能为空' }], - tlevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], + tlevelName: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], payrollPlace: [{ required: true, message:'',log: '讲师发薪地 不能为空' }], courseType: [{ required: true, message: '',log:'费用类型不能为空' }], courseName: [{ required: true, message:'',log: '课程名称不能为空' }], @@ -547,6 +548,7 @@ export default { state.tSystemNames.systemCode = res.data.data.systemCode state.tSystemNames.levelVoList = res.data.data.levelVoList state.formParam.tlevelName = res.data.data.tlevelName + state.formParam.tlevelId = res.data.data.tlevelId state.formParam.name = res.data.data.name+'/'+res.data.data.userNo state.teachingDate = dayjs(res.data.data.teachingDate) }).catch((err) => { @@ -657,7 +659,7 @@ export default { rules, recome, validateField, - handleformlevel, + tlevelChange, createTeacherDialog, cancelTeacherDialog, formRef, diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index d32a8dc0..28684ebe 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -161,7 +161,7 @@ - @@ -203,10 +203,10 @@ - - - + + + @@ -1106,7 +1106,7 @@ console.log( "讲师体系id" +val); userNo: [{ required: true, message: '',log:'讲师工号不能为空' }], orgName: [{ required: true, message: '',log:'讲师组织不能为空' }], tsystemName: [{ required: true, message:'',log: '讲师体系不能为空' }], - tlevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], + tlevelName: [{ required: true, message:'',log: ' 讲师级别 不能为空' }], payrollPlace: [{ required: true, message:'',log: '讲师发薪地 不能为空' }], courseType: [{ required: true, message: '',log:'费用类型不能为空' }], courseName: [{ required: true, message:'',log: '课程名称不能为空' }], @@ -1304,9 +1304,10 @@ const column = ref([ }, ]) - const handleformlevel = (val) => { - state.formParam.tlevelName = state.tSystemNames.levelVoList.find(item=>item.id===val)?.levelName - } + const tlevelChange = (e) => { + state.formParam.tlevelName = e?.tlevelName + state.formParam.tlevelId = e?.tlevelId + } //导出功能 const handleExport = ()=>{ window.open ( @@ -1406,7 +1407,7 @@ const column = ref([ selectedRowKeys, column, tableDatas, - handleformlevel, + tlevelChange, validateField, clearstudysNumber, clearscoreNumber,