diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js
index 22de65ac..64e25096 100644
--- a/src/api/Lecturer.js
+++ b/src/api/Lecturer.js
@@ -47,7 +47,8 @@ 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=1000&keyword=`)
//根据姓名工号查询讲师
-export const getTeacherByNameOrUserNo = (obj) => https.get(`/user/tacherList?keyword=${obj.nameOrUserNo}&pageNo=1&pageSize=50&departId=`)
+export const getTeacherByNameOrUserNo = (obj) => https.post(`/user/tacherList`,obj)
+// export const getTeacherByNameOrUserNo = (obj) => https.post(`/user/tacherList?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 51b62a3f..c215c0c4 100644
--- a/src/components/project/SearchTeacher.vue
+++ b/src/components/project/SearchTeacher.vue
@@ -170,10 +170,16 @@ const searchMembers = (keyword) => {
}
};
const searchMember = (keyword) => {
- getTeacherByNameOrUserNo({nameOrUserNo:keyword}).then((res) => {
- if(res.data.code == 200){
+ const obj = {
+ keyword,
+ pageNo:'1',
+ pageSize:'50',
+ departId:'',
+ }
+ getTeacherByNameOrUserNo(obj).then((res) => {
+ if(res.data.status == 200){
loading.value = false
- options.value = res.data.data.list.map((item) => {
+ options.value = res.data.result.list.map((item) => {
return {
value: item.realName+'/'+item.userNo,
label: item.realName+'('+item.userNo+')'+item.orgName,
diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue
index 65f1bb27..ce058425 100644
--- a/src/views/lecturer/LecturerFee.vue
+++ b/src/views/lecturer/LecturerFee.vue
@@ -155,7 +155,8 @@
+ v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
+ v-model:payrollPlaceName="formParam.payrollPlace" v-model:level="formParam.tlevelId" >
@@ -470,8 +471,8 @@
teachingTime:null,
name: null,
userNo: null,
- payrollPlace: '北京',
- payrollPlaceId: '1001',
+ payrollPlace: null,
+ payrollPlaceId: null,
},
searchdate: null, //选择时间
allsearchdate: null, //选择时间
@@ -880,8 +881,6 @@ console.log( "讲师体系id" +val);
//保存
const createTeacherDialog = async () => {
console.log(state.formParam,'formParam')
- state.formParam.payrollPlace = '北京'
- state.formParam.payrollPlaceId = '1001'
state.formParam.expense = String(state.formParam.expense)
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : ""
state.formParam.tsystemName = state.tSystemNames.systemName
@@ -1028,7 +1027,7 @@ console.log( "讲师体系id" +val);
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)
-
+ state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
})
.catch((err) => {
console.log("详情", err);