state.formParam.name,(val)=>{
+ state.formParam.userNo = val?.split('/')[1]
+ }
)
+
//切换筛选
const handlemoreid=()=>{
if(state.moreid==1){
@@ -866,6 +884,7 @@ console.log( "讲师体系id" +val);
};
// 添加讲师费
const addTeacher = () => {
+ cancel()
state.teacherdialog = true;
state.vf = true
state.teacherdialogtitle = '添加讲师费'
@@ -896,6 +915,7 @@ console.log( "讲师体系id" +val);
}
//保存
const createTeacherDialog = async () => {
+ state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD").toString() : ""
state.formParam.tSystemName = state.tSystemNames.systemName
const formItemNames = Object.keys(rules);
for(let i=0;i
{
message.success("修改成功");
@@ -990,7 +1009,7 @@ console.log( "讲师体系id" +val);
const cancel = () => {
state.formParam ={
name:null,
- teacherId:null,
+ userNo:null,
orgName:null,
tSystemName:null,
tLevelId:null,
@@ -1083,10 +1102,21 @@ console.log( "讲师体系id" +val);
};
const clearNonNumber = () => {
state.formParam.defaultTeachingTime = state.formParam.defaultTeachingTime.replace(/\D/g, '');
+ state.formParam.expense = state.formParam.levelPay*state.formParam.defaultTeachingTime
+ }
+ const clearstudysNumber = () => {
+ state.formParam.studys = state.formParam.studys.replace(/\D/g, '');
+ }
+ const clearscoreNumber= () => {
+ state.formParam.score = state.formParam.score.replace(/\D/g, '');
+ }
+ const clearlevelPayNumber = () => {
+ state.formParam.levelPay = state.formParam.levelPay.replace(/\D/g, '');
+ state.formParam.expense = state.formParam.levelPay*state.formParam.defaultTeachingTime
}
const rules = {
name: [{ required: true, message:'',log: '讲师不能为空' }],
- teacherId: [{ required: true, message: '',log:'讲师工号不能为空' }],
+ userNo: [{ required: true, message: '',log:'讲师工号不能为空' }],
orgName: [{ required: true, message: '',log:'讲师组织不能为空' }],
tSystemName: [{ required: true, message:'',log: '讲师体系不能为空' }],
tLevelId: [{ required: true, message:'',log: ' 讲师级别 不能为空' }],
@@ -1101,12 +1131,7 @@ console.log( "讲师体系id" +val);
expense: [{ required: true, message: '',log:'计划费用不能为空' }],
}
- function managerChange(e, l, d, t, orgName) {
- console.log(e, l);
- state.searchParam.userNo = d;
- state.searchParam.userNo = t;
- // state.searchParam.trainorgName=orgName
- }
+
const handleImport = () => {
state.showWork = true
}
@@ -1119,7 +1144,8 @@ const cancelallFeedialog= ()=>{
const searchResetdrawer=()=>{
state.searchall={
name:null,
- status:null,
+ beginTime: null,
+ endTime: null,
pageNo: "1",
pageSize: "10",
}
@@ -1130,7 +1156,9 @@ const searchSubmitdrawer=()=>{
}
const allFeeList=()=>{
state.tableLoadings=true
- let objA = {...state.searchall};
+ let objA = { ...state.searchall };
+ objA.beginTime = state.allsearchdate ? dayjs(state.allsearchdate[0]).format("YYYY-MM-DD") : "",
+ objA.endTime = state.allsearchdate ? dayjs(state.allsearchdate[1]).format("YYYY-MM-DD") : "",
getTeacherFeeList(objA)
.then((res) => {
tableDatas.value = res.data.data.records
@@ -1365,7 +1393,6 @@ const column = ref([
beforeUpload2,
closeDeleteTeacher,
cancelTeachingDialog,
- managerChange,
courseTypeList,
// searchTimeChange,
handlemoreid,
@@ -1407,6 +1434,9 @@ const column = ref([
tableDatas,
handleformlevel,
validateField,
+ clearstudysNumber,
+ clearscoreNumber,
+ clearlevelPayNumber,
}
},
};
diff --git a/src/views/lecturer/LookExternalLecturer.vue b/src/views/lecturer/LookExternalLecturer.vue
index 1b549105..b3146bb2 100644
--- a/src/views/lecturer/LookExternalLecturer.vue
+++ b/src/views/lecturer/LookExternalLecturer.vue
@@ -36,7 +36,7 @@ ExternalLecturer
-
+
{{formParam.remark===null?'--':formParam.remark}}
@@ -242,7 +242,7 @@ export default{
state.teacherrecordsLoading = true
state.teacherrecords.name = state.formParam.name
let obj = { ...state.teacherrecords }
-
+ console.log(111111111111111111112222222222222222)
// api接口
getNewInTeacherCourseList(obj).then((res) => {
teacherrecordstableData.value = res.data.data.records
diff --git a/src/views/lecturer/LookInsideLecturer.vue b/src/views/lecturer/LookInsideLecturer.vue
index 23384edc..2c48ef24 100644
--- a/src/views/lecturer/LookInsideLecturer.vue
+++ b/src/views/lecturer/LookInsideLecturer.vue
@@ -57,11 +57,16 @@
-
- {{formParam.description ===null ? ' --' :formParam.description}}
- {{formParam.workExperience ===null?'--':formParam.workExperience}}
- {{formParam.courses===null?'--':formParam.courses}}
- {{formParam.expertise===null?'--':formParam.expertise}}
+
+
+
+
+
+
+
+
+
+ {{formParam.expertiseNames===null?'':formParam.expertiseNames}}
@@ -166,17 +171,13 @@ export default{
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]
- // }
state.formParam = objA
state.formParam.photo = state.formParam.photo ===null ?boe : state.formParam.photo
state.teacherrepromo.userId=res.data.data.id
console.log(state.teacherrepromo.id);
getteacherrecordstableData()
- getpromotionrecordstableData()
+ promotionrecordstableData.value = res.data.data.records.levelLogList
+ // getpromotionrecordstableData()
})
.catch((err) => {
console.log("内部讲师详情", err);
@@ -302,6 +303,7 @@ export default{
teacherrecordstableData.value = res.data.data.records
state.teacherrecordstableDataTotal = Number(res.data.data.total);
state.teacherrecordsLoading = false
+
})
};
//授课翻页
@@ -312,7 +314,7 @@ export default{
//晋级记录翻页
const teacherrepromoPagination = (page) => {
state.teacherrepromo.pageNo = page;
- getpromotionrecordstableData();
+ // getpromotionrecordstableData();
};
//晋级记录列表
const promotionrecordsColumns = ref([
@@ -348,15 +350,15 @@ export default{
//晋级记录列表数据
const promotionrecordstableData = ref([
])
- const getpromotionrecordstableData = () => {
- state.promotionrecordsLoading = true
- // state.teacherrepromo.kid = state.kid
- getTeacherLogList(state.teacherrepromo).then((res) => {
- promotionrecordstableData.value = res.data.data.records
- state.teacherrepromotableDataTotal = Number(res.data.data.total);
- })
- state.promotionrecordsLoading = false
- };
+ // const getpromotionrecordstableData = () => {
+ // state.promotionrecordsLoading = true
+ // // state.teacherrepromo.kid = state.kid
+ // getTeacherLogList(state.teacherrepromo).then((res) => {
+ // promotionrecordstableData.value = res.data.data.records
+ // state.teacherrepromotableDataTotal = Number(res.data.data.total);
+ // })
+ // state.promotionrecordsLoading = false
+ // };
const goback = ()=>{
router.back()
}
@@ -392,7 +394,7 @@ const handleup = ()=>{
teacherrepromoPagination,
promotionrecordsColumns,
promotionrecordstableData,
- getpromotionrecordstableData,
+ // getpromotionrecordstableData,
}
}
}