diff --git a/src/components/project/ConfirmLecturer.vue b/src/components/project/ConfirmLecturer.vue index 69d851d5..9ff51122 100644 --- a/src/components/project/ConfirmLecturer.vue +++ b/src/components/project/ConfirmLecturer.vue @@ -150,6 +150,8 @@ const handleConfirm = () => { if(!ids.length){ return message.error('暂无可提交的数据') } + modalVisible.value = false; + emit('example',true) api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{ console.log(res,'resssss') api.submitApproval({ids:res.data?.data?.join(',')}).then(res=>{ @@ -158,12 +160,14 @@ const handleConfirm = () => { close() closeDrawer() emit('visibleFalse',false) + emit('example',false) }).catch(err=>{ message.destroy() message.error(err.data.msg) close() closeDrawer() emit('visibleFalse',false) + emit('example',false) }) }).catch(err=>{ message.destroy() @@ -485,15 +489,18 @@ const qureyDrawer = () => { dialog({ content: '是否确认讲师费信息无误?提交后按“培训发生组织”汇总至审批中心,等待验证后“提交”进入审批流程。', ok: () => { + emit('example',true) api.teacherExpenseConfirm({ids:ids?.join(',')}).then(res=>{ console.log(res,'resssss') message.success('提交成功') closeDrawer() + emit('example',false) emit('visibleFalse',false) }).catch(err=>{ message.destroy() message.error(err.data.msg) closeDrawer() + emit('example',false) emit('visibleFalse',false) }) } diff --git a/src/views/lecturer/LecturerAPPEdit.vue b/src/views/lecturer/LecturerAPPEdit.vue index d4049f82..a20c7cf3 100644 --- a/src/views/lecturer/LecturerAPPEdit.vue +++ b/src/views/lecturer/LecturerAPPEdit.vue @@ -779,6 +779,7 @@ export default { dialog({ content: '请仔细核对讲师费信息,确认无误后,将自动进入(BPM系统)审批流程', ok: ()=>{ + emits.emit('example',true) isConfirm({ id: props.id, status: 2 @@ -788,7 +789,9 @@ export default { emits.emit('successParams',true) closeDrawer(); } + emits.emit('example',false) }).catch(err=>{ + emits.emit('example',false) if(err.message=='timeout of 15000ms exceeded'){ message.destroy() message.error('请求超时,请重试') diff --git a/src/views/lecturer/LecturerApproval.vue b/src/views/lecturer/LecturerApproval.vue index 2d0b198c..e258ec80 100644 --- a/src/views/lecturer/LecturerApproval.vue +++ b/src/views/lecturer/LecturerApproval.vue @@ -227,8 +227,11 @@ - - + +
+ +
+