diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue index 0941de7c9..bf41ee1f4 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/list.vue @@ -31,7 +31,7 @@ 审核状态: {{ displayListItem(item, 'CheckStatus') || '--' }} - + @@ -89,6 +89,7 @@ 同意 不同意 + 取消 @@ -177,8 +178,7 @@ export default { methods: { // 页面初始化 - async init() { - console.log(this.GET_GLOBAL('loginUser')) + async init() { if(['教师','管理员'].includes(this.GET_GLOBAL('loginUser').Description)){ this.checkDisable = false } @@ -288,25 +288,41 @@ export default { return case 'checkAgree': - // if (!(await this.CONFIRM('删除项目', '确定要删除该项吗?', true))) { - // return - // } - this.modal = false - const postData = { - keyValue:this.selectItem.Id, - strEntity:JSON.stringify({ - ...this.selectItem, - CheckStatus:id, - CheckUserNo:this.GET_GLOBAL('loginUser').account, - CheckUserId:this.GET_GLOBAL('loginUser').userId, - }) - } - this.HTTP_POST('learun/adms/stuleavemanagement/savecheck',postData , '提交失败').then(success => { - if(!success) { return } - this.TOAST('提交成功', 'success') - this.refreshList() - }) + this.modal = false + const postData = { + keyValue:this.selectItem.Id, + strEntity:JSON.stringify({ + ...this.selectItem, + CheckStatus:id, + CheckUserNo:this.GET_GLOBAL('loginUser').account, + CheckUserId:this.GET_GLOBAL('loginUser').userId, + }) + } + this.HTTP_POST('learun/adms/stuleavemanagement/savecheck',postData , '提交失败').then(success => { + if(!success) { return } + this.TOAST('提交成功', 'success') + this.refreshList() + }) return + + case 'submit': + if (!(await this.CONFIRM('提交申请', '是否确认提交请假申请?', true))) { + return + } + const postdata = { + keyValue:id.Id, + strEntity:JSON.stringify(id) + } + + this.HTTP_POST('learun/adms/stuleavemanagement/submit', postdata, '表单提交保存失败').then(success => { + this.HIDE_LOADING() + if (!success) { + return + } + this.TOAST('提交保存成功') + this.refreshList() + }) + return default: return diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue index 0b39a438f..5f790a45a 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/EducationalAdministration/StuAttendanceLeave/single.vue @@ -57,12 +57,12 @@