新增添加讲师回显发薪地

This commit is contained in:
zhangsir
2024-11-01 16:22:53 +08:00
parent 343d18e918
commit 40d6c2d736
3 changed files with 16 additions and 10 deletions

View File

@@ -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 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获取讲师体系信息 //根据userid获取讲师体系信息
export const getSystemInfoByUserId = (id) => http.get(`/admin/system/getSystemInfoByUserId?id=${id}`) export const getSystemInfoByUserId = (id) => http.get(`/admin/system/getSystemInfoByUserId?id=${id}`)
//讲师搜索 //讲师搜索

View File

@@ -170,10 +170,16 @@ const searchMembers = (keyword) => {
} }
}; };
const searchMember = (keyword) => { const searchMember = (keyword) => {
getTeacherByNameOrUserNo({nameOrUserNo:keyword}).then((res) => { const obj = {
if(res.data.code == 200){ keyword,
pageNo:'1',
pageSize:'50',
departId:'',
}
getTeacherByNameOrUserNo(obj).then((res) => {
if(res.data.status == 200){
loading.value = false loading.value = false
options.value = res.data.data.list.map((item) => { options.value = res.data.result.list.map((item) => {
return { return {
value: item.realName+'/'+item.userNo, value: item.realName+'/'+item.userNo,
label: item.realName+'('+item.userNo+')'+item.orgName, label: item.realName+'('+item.userNo+')'+item.orgName,

View File

@@ -155,7 +155,8 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="讲师名称" name="name"> <a-form-item label="讲师名称" name="name">
<SearchTeacher v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgName" v-model:user="formParam.userNo" <SearchTeacher v-model:id="formParam.teacherId" v-model:value="formParam.name" v-model:orgId="formParam.orgId" v-model:lable="formParam.orgName" v-model:user="formParam.userNo"
v-model:system="tSystemNames" v-model:level="formParam.tlevelId" ></SearchTeacher> v-model:system="tSystemNames" v-model:payrollPlaceCode="formParam.payrollPlaceId"
v-model:payrollPlaceName="formParam.payrollPlace" v-model:level="formParam.tlevelId" ></SearchTeacher>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@@ -470,8 +471,8 @@
teachingTime:null, teachingTime:null,
name: null, name: null,
userNo: null, userNo: null,
payrollPlace: '北京', payrollPlace: null,
payrollPlaceId: '1001', payrollPlaceId: null,
}, },
searchdate: null, //选择时间 searchdate: null, //选择时间
allsearchdate: null, //选择时间 allsearchdate: null, //选择时间
@@ -880,8 +881,6 @@ console.log( "讲师体系id" +val);
//保存 //保存
const createTeacherDialog = async () => { const createTeacherDialog = async () => {
console.log(state.formParam,'formParam') console.log(state.formParam,'formParam')
state.formParam.payrollPlace = '北京'
state.formParam.payrollPlaceId = '1001'
state.formParam.expense = String(state.formParam.expense) state.formParam.expense = String(state.formParam.expense)
state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : "" state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : ""
state.formParam.tsystemName = state.tSystemNames.systemName state.formParam.tsystemName = state.tSystemNames.systemName
@@ -1028,7 +1027,7 @@ console.log( "讲师体系id" +val);
state.formParam.tlevelId = res.data.data.tlevelId state.formParam.tlevelId = res.data.data.tlevelId
state.formParam.name = res.data.data.name+'/'+res.data.data.userNo state.formParam.name = res.data.data.name+'/'+res.data.data.userNo
state.teachingDate = dayjs(res.data.data.teachingDate) state.teachingDate = dayjs(res.data.data.teachingDate)
state.formParam.payrollPlaceId = res.data.data.payrollPlaceId
}) })
.catch((err) => { .catch((err) => {
console.log("详情", err); console.log("详情", err);