This commit is contained in:
zhoutianchi
2026-01-20 17:33:16 +08:00
parent 39c07a03ee
commit a3752dd583
6 changed files with 54 additions and 45 deletions

View File

@@ -8,4 +8,4 @@ VITE_OPEN=true
ENV=development
# ADMIN 服务地址
VITE_ADMIN_PROXY_PATH = http://scj-v3.zhxy.link/api
VITE_ADMIN_PROXY_PATH = http://localhost:9999

View File

@@ -1,6 +1,6 @@
<template>
<el-dialog v-model="visible" :title="dataForm.id ? $t('common.editBtn') : $t('common.addBtn')" width="600">
<el-form ref="dicDialogFormRef" :model="dataForm" label-width="90px" :rules="dataRules" v-loading="loading">
<el-form ref="dicDialogFormRef" :model="dataForm" label-width="120px" :rules="dataRules" v-loading="loading">
<el-form-item :label="$t('dictItem.dictType')" prop="dictType">
<el-input v-model="dataForm.dictType" clearable disabled
:placeholder="$t('dictItem.inputDictTypeTip')"></el-input>
@@ -22,6 +22,10 @@
<el-input type="textarea" maxlength="100" :rows="3" v-model="dataForm.remarks"
:placeholder="$t('dictItem.inputRemarksTip')"></el-input>
</el-form-item>
<el-form-item label="前端样式代码" prop="fontCss">
<el-input maxlength="100" v-model="dataForm.fontCss"
placeholder="前端样式代码"></el-input>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">

View File

@@ -21,7 +21,7 @@
<script>
import { ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { updateInfo } from '/@/api/recruit/recruitstudentsignup'
// import { updateInfo } from '/@/api/recruit/recruitstudentsignup'
export default {
name: 'DelayPayTimeDialog',
@@ -41,19 +41,19 @@ export default {
}
const handleSave = () => {
ElMessageBox.confirm('是否确认进度延迟收费操作?请谨慎操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
return updateInfo({ delayPaymentTime: delayPayTime.value, id: currentId.value })
}).then(() => {
visible.value = false
ElMessage.success('延迟收费修改成功')
emit('refresh')
}).catch(() => {
// 用户取消操作
})
// ElMessageBox.confirm('是否确认进度延迟收费操作?请谨慎操作', '提示', {
// confirmButtonText: '确定',
// cancelButtonText: '取消',
// type: 'warning'
// }).then(() => {
// return updateInfo({ delayPaymentTime: delayPayTime.value, id: currentId.value })
// }).then(() => {
// visible.value = false
// ElMessage.success('延迟收费修改成功')
// emit('refresh')
// }).catch(() => {
// // 用户取消操作
// })
}
const handleClose = () => {

View File

@@ -590,8 +590,11 @@
<template #footer v-if="type==1">
<div class="dialog-footer">
<el-button @click="visible = false">取消</el-button>
<el-button type="primary" @click="dataFormSubmit(20)" v-if="canSubmit">确认录取</el-button>
<el-button type="danger" plain @click="dataFormSubmit(-20)" v-if="canSubmit">驳回录取</el-button>
<el-button type="primary" @click="dataFormSubmit(20)" v-auth="'recruit_recruitstudentsignup_add'" v-if="canSubmit&&!dataForm.id">保存并送审</el-button>
<el-button type="primary" @click="dataFormSubmit" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">保存</el-button>
<el-button type="primary" @click="dataFormSubmit('20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">确认录取</el-button>
<el-button type="danger" plain @click="dataFormSubmit('-20')" v-auth="'signup_info_exam'" v-if="canSubmit&&dataForm.id">驳回录取</el-button>
</div>
</template>
@@ -1237,10 +1240,11 @@ const changeM = (id: string) => {
}
// 表单提交
const dataFormSubmit = (state: number) => {
dataForm.auditStatus = String(state)
const dataFormSubmit = (state: string) => {
dataForm.auditStatus = state
let submitTitle = "确认通过该学生的报名申请么?"
if (state == -20) {
if(state){
if (state == "-20") {
submitTitle = "确认驳回该学生的报名申请么?"
} else {
if (!dataForm.confirmedMajor) {
@@ -1251,6 +1255,8 @@ const dataFormSubmit = (state: number) => {
return
}
}
}
if (dataForm.degreeOfEducation == '1' && (dataForm.score == undefined || dataForm.score == '')) {
ElNotification.error({
title: '错误',

View File

@@ -11,7 +11,7 @@
<template #default="{ visible }">
<template v-if="visible">
<el-form-item label="招生计划" prop="groupId">
<el-select v-model="dataForm.groupId" filterable clearable placeholder="请选择招生计划" @change="chanMajor">
<el-select v-model="dataForm.groupId" filterable clearable placeholder="请选择招生计划" >
<el-option
v-for="item in planList"
:key="item.id"
@@ -1069,12 +1069,12 @@ const handlePushCity = (id: string) => {
// 重新推送
const handleRePush = (row: any) => {
messageBox.confirm('是否确认重新推送本条数据?请谨慎操作').then(() => {
return rePushApi({ id: row.id })
}).then(() => {
message.success('推送成功')
getDataList()
})
// messageBox.confirm('是否确认重新推送本条数据?请谨慎操作').then(() => {
// return rePushApi({ id: row.id })
// }).then(() => {
// message.success('推送成功')
// getDataList()
// })
}
// 延迟缴费
@@ -1221,7 +1221,6 @@ const init = async () => {
if (planList.value.length > 0) {
dataForm.groupId = planList.value[0].id
getDataList()
chanMajor()
}
})

View File

@@ -488,7 +488,7 @@ import {
classPage,
leaveSchool,
rePush,
updateInfo,
// updateInfo,
yjOut,
toWord,
sureLQTZ,
@@ -1058,13 +1058,13 @@ const delayPayTimeSet = (row: any) => {
}
const updateInfoHandle = () => {
useMessageBox().confirm('是否确认进度延迟收费操作?请谨慎操作').then(() => {
return updateInfo({ delayPaymentTime: delayPayTime.value, id: id.value })
}).then(() => {
delayPayTimeVisible.value = false
message.success('延迟收费修改成功')
getDataList()
})
// useMessageBox().confirm('是否确认进度延迟收费操作?请谨慎操作').then(() => {
// return updateInfo({ delayPaymentTime: delayPayTime.value, id: id.value })
// }).then(() => {
// delayPayTimeVisible.value = false
// message.success('延迟收费修改成功')
// getDataList()
// })
}
const updateFS = () => {