diff --git a/src/views/admin/system/dept/index.vue b/src/views/admin/system/dept/index.vue index 5723be5..694711a 100644 --- a/src/views/admin/system/dept/index.vue +++ b/src/views/admin/system/dept/index.vue @@ -128,3 +128,8 @@ const resetQuery = () => { queryRef.value.resetFields(); }; + \ No newline at end of file diff --git a/src/views/recruit/recruitstudentsignup/detaiform.vue b/src/views/recruit/recruitstudentsignup/detaiform.vue index 2889c35..c39bb1c 100644 --- a/src/views/recruit/recruitstudentsignup/detaiform.vue +++ b/src/views/recruit/recruitstudentsignup/detaiform.vue @@ -671,8 +671,9 @@ 取消 保存并送审 保存 - 确认录取 - 驳回录取 + 确认录取 + 强制录取 + 驳回 @@ -1493,7 +1494,7 @@ const updateTuitionByMajorAndEducation = () => { } // 表单提交 -const dataFormSubmit = (state: string) => { +const dataFormSubmit = (state: string,force:any) => { dataForm.auditStatus = state let submitTitle = "确认通过该学生的报名申请么?" // 新增模式 @@ -1545,6 +1546,7 @@ const dataFormSubmit = (state: string) => { canSubmit.value = false if (dataForm.id) { // 编辑模式 + dataForm.force=force putObj(dataForm).then(() => { message.success('操作成功') visible.value = false diff --git a/src/views/recruit/recruitstudentsignup/majorChange.vue b/src/views/recruit/recruitstudentsignup/majorChange.vue index b96a15f..db1eee5 100644 --- a/src/views/recruit/recruitstudentsignup/majorChange.vue +++ b/src/views/recruit/recruitstudentsignup/majorChange.vue @@ -102,7 +102,8 @@ @@ -272,12 +273,13 @@ const changeCM = (id: string) => { // 表单提交 -const dataFormSubmit = async () => { +const dataFormSubmit = async (force:any) => { const titleText = "确认调整录取专业么?" if (dataForm.confirmedMajor == dataForm.newConfirmedMajor) { message.error('新专业不能和原专业相同') return } + dataForm.force=force try { await messageBox.confirm(titleText) dataFormRef.value?.validate((valid: boolean) => { diff --git a/src/views/recruit/recruitstudentsignup/update.vue b/src/views/recruit/recruitstudentsignup/update.vue index a03ed1e..19165c4 100644 --- a/src/views/recruit/recruitstudentsignup/update.vue +++ b/src/views/recruit/recruitstudentsignup/update.vue @@ -183,9 +183,10 @@ @@ -412,13 +413,14 @@ const initData = () => { } // 表单提交 -const dataFormSubmit = (submitType: string) => { +const dataFormSubmit = (submitType: string,force:any) => { if ((dataForm.zlshRemark == '' || !dataForm.zlshRemark) && submitType == '3') { message.error('请填写驳回理由') return } dataForm.zlsh = submitType canSubmit.value = false + dataForm.force=force materialExam(dataForm).then(() => { message.success('操作成功') visible.value = false diff --git a/src/views/recruit/recruitstudentsignupturnover/index.vue b/src/views/recruit/recruitstudentsignupturnover/index.vue index e1e6b73..0ba093b 100644 --- a/src/views/recruit/recruitstudentsignupturnover/index.vue +++ b/src/views/recruit/recruitstudentsignupturnover/index.vue @@ -201,7 +201,8 @@ @@ -273,7 +274,8 @@ const exarmForm = reactive({ isMajorChange: '', examRemark: '', groupId: '', - remarks: '' + remarks: '', + force:false }) // 表单验证规则 @@ -340,11 +342,11 @@ const cancelPlace = () => { } // 保存审核 -const update = async () => { +const update = async (force:any) => { try { const valid = await exarmFormRef.value?.validate().catch(() => {}) if (!valid) return - + exarmForm.force=force await putObj(exarmForm) message.success('审核成功') majorChangeVisible.value = false