diff --git a/src/views/lecturer/ExternalTeaching.vue b/src/views/lecturer/ExternalTeaching.vue index f5741069..94ad96c1 100644 --- a/src/views/lecturer/ExternalTeaching.vue +++ b/src/views/lecturer/ExternalTeaching.vue @@ -277,7 +277,7 @@ - @@ -455,7 +455,7 @@ export default { teachingDate: null, teacherId:null, mobile:null, - score: 0 + score: null }, searchdate: undefined, //选择时间 searchParam: { @@ -894,7 +894,7 @@ export default { name: null, type: null, teaching: null, - score: 0, + score: null, remark: null, teachingDate: null, teacherId:null @@ -976,10 +976,10 @@ const sendName=()=>{ state.formParam.courseName = state.formParam.courseName.replace(/\s/g, ''); } const blurScore = () => { - !state.formParam.score && (state.formParam.score = '0') + // !state.formParam.score && (state.formParam.score = '0') } const focusScore = () => { - state.formParam.score == 0 && (state.formParam.score = null) + // state.formParam.score == 0 && (state.formParam.score = null) } const sendRemark=()=>{ state.formParam.remark = state.formParam.remark.replace(/\s/g, ''); diff --git a/src/views/lecturer/InsideTeaching.vue b/src/views/lecturer/InsideTeaching.vue index 47331030..b3c46fe7 100644 --- a/src/views/lecturer/InsideTeaching.vue +++ b/src/views/lecturer/InsideTeaching.vue @@ -340,7 +340,7 @@ - @@ -1165,7 +1165,7 @@ export default { courseName: null, teaching: null, studys: null, - score: 0, + score: null, type: null, remark: null, trainOrgId: null, @@ -1392,10 +1392,10 @@ export default { state.formParam.score = state.formParam.score.replace(/\D/g, ''); } const blurScore = () => { - !state.formParam.score && (state.formParam.score = '0') + // !state.formParam.score && (state.formParam.score = '0') } const focusScore = () => { - state.formParam.score == 0 && (state.formParam.score = null) + // state.formParam.score == 0 && (state.formParam.score = null) } const clearstudysNumber = () => { state.formParam.studys = state.formParam.studys.replace(/\D/g, ''); diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index 4ce6b338..72762c49 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -316,7 +316,7 @@ /> 评分 - diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 25d8514b..8bc9c9bf 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -172,7 +172,7 @@ -
取消 - 确定 + 提交
@@ -481,7 +481,7 @@ ellipsis: true, align: "center", width: 120, - customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}}, + // customCell: (record) => {return{style:{color:['#67C23A','#F56C6C'][record.status]}}}, customRender: (value) => { switch (value.record.status) { case 0: @@ -598,9 +598,14 @@ }) } //取消按钮 清空输入的数据 - const cancelTeachingDialog = () => { + const cancelTeachingDialog = (val) => { if(state.teachingdialog = true ) { + console.log(val,'valllllll') + if(val == 1){ + submit(state.formParam) + return + } state.teachingdialog = false cancel() } @@ -705,10 +710,13 @@ if(res.data.code == 200){ message.success('提交成功') getTableDate(); - + cancel() + state.teachingdialog = false } }).catch(err=>{ message.destroy() + cancel() + state.teachingdialog = false message.error(err.data.msg) }) } diff --git a/src/views/lecturer/LecturerFee.vue b/src/views/lecturer/LecturerFee.vue index 4f4b7f37..9c492c66 100644 --- a/src/views/lecturer/LecturerFee.vue +++ b/src/views/lecturer/LecturerFee.vue @@ -398,7 +398,7 @@ /> 评分 - @@ -1454,7 +1454,7 @@ getAllLevelList().then((res) => { const clearscoreNumber= () => { 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'); + // state.formParam.score > 10 && (state.formParam.score = '10'); } const payExpense = () => { state.formParam.payableExpense = state.formParam.payableExpense?.replace(/\D/g, '');