From 2a0b51d6a26bad855794a4cef0e85d9e1716c0e8 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Fri, 15 Nov 2024 11:15:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=B2=E5=B8=88=E7=AE=A1=E7=90=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/Lecturer.js | 2 +- src/views/lecturer/InsideLecturer.vue | 13 ++-- src/views/lecturer/LecturerFee.vue | 101 ++++++++++++++++---------- 3 files changed, 72 insertions(+), 44 deletions(-) diff --git a/src/api/Lecturer.js b/src/api/Lecturer.js index 2cd97ac8..287e9404 100644 --- a/src/api/Lecturer.js +++ b/src/api/Lecturer.js @@ -82,4 +82,4 @@ export const isConfirm = (obj) => http.post('/admin/expenseBill/isConfirm',obj) //培训发生组织根节点列表 export const parentList = () => http.get('/admin/affiliation/parentList') //讲师级别获取 -export const getAllLevelList = () => http.get(' /admin/system/getAllLevelList') +export const getAllLevelList = () => http.get('/admin/system/getAllLevelList') diff --git a/src/views/lecturer/InsideLecturer.vue b/src/views/lecturer/InsideLecturer.vue index 273ecca7..91978a42 100644 --- a/src/views/lecturer/InsideLecturer.vue +++ b/src/views/lecturer/InsideLecturer.vue @@ -127,12 +127,13 @@ avatar -
+ avatar +
@@ -449,7 +450,7 @@ export default { certStatus: 0,//认证状态 defaultTeachingTime: null, teacherType:1, - photo: avatar, + photo: null, orgLists: [], certification: null, certificationName: null, @@ -633,7 +634,7 @@ export default { let array = []; arr.map((value) => { let obj = { - value: value.levelCode, + value: value.levelName, label: value.levelName, }; array.push(obj); @@ -903,7 +904,7 @@ export default { cancel() state.teacherdialog = true; state.teacherdialogtitle = '新增讲师' - state.formParam.photo = avatar + state.formParam.photo = null state.formParam.status = '1' state.vf = true } @@ -1195,7 +1196,7 @@ export default { state.formParam.description = state.formParam.description === null ? '' : state.formParam.description state.formParam.workExp0erience = state.formParam.workExperience === null ? '' : state.formParam.workExperience state.formParam.courses = state.formParam.courses === null ? '' : state.formParam.courses - state.formParam.photo = state.formParam.photo === null ? avatar : state.formParam.photo + // state.formParam.photo = state.formParam.photo === null ? avatar : state.formParam.photo state.tSystemNames.systemName = res.data.data.tsystemName state.tSystemNames.systemId = res.data.data.tsystemId state.tSystemNames.systemCode = res.data.data.systemCode diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index b92f0a0e..70c820ec 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -179,15 +179,15 @@ - + - - + @@ -243,37 +243,37 @@ + + + + + + + + + @blur="clearNonNumber" placeholder="请输入授课分钟数" allowClear showSearch suffix="分钟"> {{ (formParam.teachingTime / 60).toFixed(2) }}小时 0.00小时 - - - - - - - - - + placeholder="请输入参训人数" allowClear showSearch > @@ -281,27 +281,35 @@ - - + + - - + + - + + + + + + + - + @@ -445,7 +453,8 @@ import ConfirmLecturer from "@/components/project/ConfirmLecturer" import BatchLecturer from "@/components/project/BatchLecturer" import { queryTrainOrg,} from "../../api/organization"; - import dialog from '@/utils/dialog' + import dialog from '@/utils/dialog'; + import OrgClass from "@/components/project/OrgClass"; export default { name: "LecturerFee", components: { @@ -458,6 +467,7 @@ ImportWork, ConfirmLecturer, BatchLecturer, + OrgClass, }, setup() { const formRef = ref(); @@ -501,6 +511,8 @@ userNo: null, payrollPlace: null, payrollPlaceId: null, + sourceBelongId: null, + sourceBelongFullName: null, }, searchdate: null, //选择时间 allsearchdate: null, //选择时间 @@ -607,7 +619,7 @@ getAllLevelList().then((res) => { let array = []; arr.map((value) => { let obj = { - value: value.levelCode, + value: value.levelName, label: value.levelName, }; array.push(obj); @@ -967,7 +979,6 @@ getAllLevelList().then((res) => { //保存 const createTeacherDialog = async () => { console.log(state.formParam,'formParam') - state.formParam.expense = String(state.formParam.expense) state.formParam.teachingDate=state.teachingDate ? dayjs(state.teachingDate).format("YYYY-MM-DD HH:mm").toString() : "" state.formParam.tsystemName = state.tSystemNames.systemName state.formParam.tsystemId = state.tSystemNames.systemId @@ -978,6 +989,7 @@ getAllLevelList().then((res) => { return message.error(rules[formItemNames[i]][0].log) } } + state.formParam.expense = String(state.formParam.expense) state.formParam.orgName = state.formParam.orgNames state.formParam = {...state.formParam,...state.tSystemNames} state.formParam.name = state.formParam?.name?.split('/')[0] @@ -1087,6 +1099,8 @@ getAllLevelList().then((res) => { payableExpense:null, expense:null, remark:null, + sourceBelongId: null, + sourceBelongFullName: null, } state.id = null state.teachingDate=null @@ -1195,18 +1209,29 @@ getAllLevelList().then((res) => { } }; const clearNonNumber = () => { - state.formParam.teachingTime = state.formParam.teachingTime.replace(/\D/g, ''); - state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime + state.formParam.teachingTime = state.formParam.teachingTime?.replace(/\D/g, ''); + state.formParam.teachingTime = state.formParam.teachingTime?.slice(0,8); + state.formParam.teachingTime == 0 && (state.formParam.teachingTime = null); + state.formParam.teachingTime && state.formParam.levelPay && (state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime); } const clearstudysNumber = () => { state.formParam.studys = state.formParam.studys.replace(/\D/g, ''); } const clearscoreNumber= () => { - state.formParam.score = state.formParam.score.replace(/\D/g, ''); + state.formParam.score = state.formParam.score?.replace(/\D/g, ''); + state.formParam.score == 0 && (state.formParam.score = null); + state.formParam.score > 10 && (state.formParam.score = 10); + } + const payExpense = () => { + state.formParam.payableExpense = state.formParam.payableExpense?.replace(/\D/g, ''); + state.formParam.payableExpense = state.formParam.payableExpense?.slice(0,8); + state.formParam.payableExpense == 0 && (state.formParam.payableExpense = null); } const clearlevelPayNumber = () => { - state.formParam.levelPay = state.formParam.levelPay.replace(/\D/g, ''); - state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime + state.formParam.levelPay = state.formParam.levelPay?.replace(/\D/g, ''); + state.formParam.levelPay = state.formParam.levelPay?.slice(0,8); + state.formParam.levelPay == 0 && (state.formParam.levelPay = null); + state.formParam.levelPay&&state.formParam.teachingTime && (state.formParam.expense = state.formParam.levelPay*state.formParam.teachingTime) } const rules = { name: [{ required: true, message:'',log: '讲师不能为空' }], @@ -1216,12 +1241,13 @@ getAllLevelList().then((res) => { tlevelName: [{ required: true, message:'',log: ' 讲师级别不能为空' }], payrollPlace: [{ required: true, message:'',log: '讲师发薪地不能为空' }], courseType: [{ required: true, message: '',log:'费用类型不能为空' }], - courseName: [{ required: true, message:'',log: '课程名称不能为空' }], + courseName: [{ required: true, message:'',log: '课程归属组织不能为空' }], + sourceBelongId: [{ required: true, message: '',log:'费用来源不能为空' }], teachingDate: [{ required: true, message:'',log: '授课日期不能为空' }], teachingTime: [{ required: true, message:'',log: ' 授课时长不能为空' }], studys: [{ required: true, message: '',log:' 参训人数不能为空' }], score: [{ required: true, message:'',log: ' 评分不能为空' }], - levelPay: [{ required: true, message:'',log: '课酬基准 不能为空' }], + levelPay: [{ required: true, message:'',log: '课酬基准不能为空' }], expense: [{ required: true, message: '',log:'计划费用不能为空' }], } @@ -1521,6 +1547,7 @@ const column = ref([ clearstudysNumber, clearscoreNumber, clearlevelPayNumber, + payExpense, } }, };