【修改】 任务编号隐藏,添加逻辑为年月日+任务数量+1

This commit is contained in:
dlaren
2025-08-17 21:55:11 +08:00
parent e34b931798
commit bdf32f83b7
14 changed files with 738 additions and 955 deletions

View File

@@ -1,29 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -46,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -60,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -76,58 +54,48 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskName: '', taskName: '',
taskNum:'', taskNum: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '1', taskType: '1',
isTemplate: 1, isTemplate: 1,
@@ -136,82 +104,76 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -219,21 +181,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -1,30 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -47,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -61,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -77,58 +54,48 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskName: '', taskName: '',
taskNum:'', taskNum: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '6', taskType: '6',
isTemplate: 1, isTemplate: 1,
@@ -137,82 +104,76 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -220,21 +181,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -1,29 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -46,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -60,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -76,58 +54,48 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskName: '', taskName: '',
taskNum:'', taskNum: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '2', taskType: '2',
isTemplate: 1, isTemplate: 1,
@@ -136,81 +104,75 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -218,21 +180,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -1,29 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -46,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -60,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -76,58 +54,48 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskName: '', taskName: '',
taskNum:'', taskNum: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '5', taskType: '5',
isTemplate: 1, isTemplate: 1,
@@ -136,81 +104,75 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -218,21 +180,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -1,29 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -46,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -60,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -76,58 +54,48 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskName: '', taskName: '',
taskNum:'', taskNum: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '4', taskType: '4',
isTemplate: 1, isTemplate: 1,
@@ -136,81 +104,75 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -218,21 +180,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -1,29 +1,15 @@
<!-- 编辑弹窗 --> <!-- 编辑弹窗 -->
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" @open="handleOpen" center>
<el-form <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
ref="formRef" <!-- <el-form-item label="任务编号" prop="taskNum">
:model="form" <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
:rules="rules" </el-form-item> -->
label-width="80px"
@submit.prevent=""
>
<el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled/>
</el-form-item>
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
clearable
v-model="form.taskName"
placeholder="请输入任务名称"
/>
</el-form-item> </el-form-item>
<el-form-item label="专业" prop="taskSpecialty"> <el-form-item label="专业" prop="taskSpecialty">
<el-select <el-select v-model="form.taskSpecialty" placeholder="请选择专业" clearable>
v-model="form.taskSpecialty"
placeholder="请选择专业"
clearable
>
<el-option <el-option
v-for="item in specialtyOptions" v-for="item in specialtyOptions"
:key="item.value" :key="item.value"
@@ -46,11 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate">
<el-form-item label="是否为模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -60,13 +42,9 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="form.status"> <el-radio-group v-model="form.status">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_STATUS)"
@@ -76,57 +54,47 @@
{{ dict.label }} {{ dict.label }}
</el-radio> </el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="handleCancel">取消</el-button> <el-button @click="handleCancel">取消</el-button>
<el-button type="primary" :loading="loading" @click="save"> <el-button type="primary" :loading="loading" @click="save"> 保存 </el-button>
保存
</el-button>
</template> </template>
</Dialog> </Dialog>
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, nextTick } from 'vue'; import { ref, reactive, nextTick } from 'vue'
import { onMounted } from 'vue'; import { onMounted } from 'vue'
import { useFormData } from '@/utils/use-form-data'; import { useFormData } from '@/utils/use-form-data'
import { addTask, updateTask,getSpecialtyList } from '@/api/system/task'; import { addTask, updateTask, getSpecialtyList } from '@/api/system/task'
import { DICT_TYPE, getIntDictOptions } from '@/utils/dict' import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
const props = defineProps({ const props = defineProps({
/** 修改回显的数据 */ /** 修改回显的数据 */
data: Object data: Object
}); })
// 专业选项列表 // 专业选项列表
const specialtyOptions = ref([]); const specialtyOptions = ref([])
const emit = defineEmits(['done']); const emit = defineEmits(['done'])
const message = useMessage() // 消息弹窗
const message = useMessage() // 消息弹窗 /** 弹窗是否打开 */
const visible = defineModel({ type: Boolean })
/** 弹窗是否打开 */ /** 是否是修改 */
const visible = defineModel({ type: Boolean }); const isUpdate = ref(false)
/** 是否是修改 */ /** 提交状态 */
const isUpdate = ref(false); const loading = ref(false)
/** 提交状态 */ /** 表单实例 */
const loading = ref(false); const formRef = ref(null)
/** 表单实例 */ /** 表单数据 */
const formRef = ref(null); const [form, resetFields, assignFields] = useFormData({
/** 表单数据 */
const [form, resetFields, assignFields] = useFormData({
taskId: void 0, taskId: void 0,
taskNum:'', taskNum: '',
taskName: '', taskName: '',
taskSpecialty: '', taskSpecialty: '',
taskType: '3', taskType: '3',
@@ -136,81 +104,75 @@ const specialtyOptions = ref([]);
updateBy: '', updateBy: '',
deptId: '', deptId: '',
userId: '' userId: ''
}); })
/** 表单验证规则 */ /** 表单验证规则 */
const rules = reactive({ const rules = reactive({
taskName: [ taskName: [{ required: true, message: '任务名称不能为空', trigger: 'blur' }],
{ required: true, message: '任务名称不能为空', trigger: 'blur' }
],
// taskSpecialty: [ // taskSpecialty: [
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [ isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
{ required: true, message: '请选择是否为模板', trigger: 'change' } status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
], })
status: [
{ required: true, message: '请选择是否启用', trigger: 'change' }
]
});
/** 关闭弹窗 */ /** 关闭弹窗 */
const handleCancel = () => { const handleCancel = () => {
visible.value = false; visible.value = false
}; }
// 获取专业下拉列表 // 获取专业下拉列表
const fetchSpecialtyOptions = async () => { const fetchSpecialtyOptions = async () => {
try { try {
const data = await getSpecialtyList(); const data = await getSpecialtyList()
// 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...] // 假设返回格式为 [{ label: '计算机', value: 'computer' }, ...]
// 过滤空字符串并转成下拉格式 // 过滤空字符串并转成下拉格式
console.log(data) console.log(data)
specialtyOptions.value = data specialtyOptions.value = data
.filter(item => item) // 过滤空字符串 .filter((item) => item) // 过滤空字符串
.map(item => ({ .map((item) => ({
label: item, label: item,
value: item value: item
})); }))
} catch (e) { } catch (e) {
message.error('获取专业列表失败:' + e.message); message.error('获取专业列表失败:' + e.message)
} }
}; }
/** 保存编辑 */ /** 保存编辑 */
const save = () => { const save = () => {
formRef.value?.validate?.((valid) => { formRef.value?.validate?.((valid) => {
if (!valid) { if (!valid) {
return; return
} }
loading.value = true; loading.value = true
const saveOrUpdate = isUpdate.value ? updateTask : addTask; const saveOrUpdate = isUpdate.value ? updateTask : addTask
saveOrUpdate(form) saveOrUpdate(form)
.then((msg) => { .then((msg) => {
loading.value = false; loading.value = false
message.success('修改成功'); message.success('修改成功')
handleCancel(); handleCancel()
emit('done'); emit('done')
}) })
.catch((e) => { .catch((e) => {
loading.value = false; loading.value = false
message.error(e.message); message.error(e.message)
}); })
}); })
}; }
/** 弹窗打开事件 */ /** 弹窗打开事件 */
const open = async (type: 'create' | 'update', data?: any) => { const open = async (type: 'create' | 'update', data?: any) => {
console.log(data+"datadatadata") console.log(data + 'datadatadata')
if (data) { if (data) {
assignFields(data); assignFields(data)
isUpdate.value = true; isUpdate.value = true
} else { } else {
resetFields(); resetFields()
isUpdate.value = false; isUpdate.value = false
} }
// 设置批次为 当前时间 + 5位随机数 // 设置批次为 当前时间 + 5位随机数
const now = new Date(); const now = new Date()
const pad = (n) => n.toString().padStart(2, '0'); const pad = (n) => n.toString().padStart(2, '0')
const datetimeStr = [ const datetimeStr = [
now.getFullYear(), now.getFullYear(),
pad(now.getMonth() + 1), pad(now.getMonth() + 1),
@@ -218,21 +180,23 @@ const open = async (type: 'create' | 'update', data?: any) => {
pad(now.getHours()), pad(now.getHours()),
pad(now.getMinutes()), pad(now.getMinutes()),
pad(now.getSeconds()) pad(now.getSeconds())
].join(''); ].join('')
const randomNum = Math.floor(Math.random() * 100000).toString().padStart(5, '0'); const randomNum = Math.floor(Math.random() * 100000)
.toString()
.padStart(5, '0')
//taskNum 赋值 randomNum //taskNum 赋值 randomNum
// 把 taskNum 设置为当前时间+随机数 // 把 taskNum 设置为当前时间+随机数
form.taskNum = `${datetimeStr}${randomNum}`; form.taskNum = `${datetimeStr}${randomNum}`
nextTick(() => { nextTick(() => {
nextTick(() => { nextTick(() => {
formRef.value?.clearValidate?.(); formRef.value?.clearValidate?.()
}); })
}); })
}; }
onMounted(() => { onMounted(() => {
fetchSpecialtyOptions(); fetchSpecialtyOptions()
}); })
defineExpose({ open }) defineExpose({ open })
</script> </script>

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>

View File

@@ -2,9 +2,9 @@
<template> <template>
<Dialog v-model="visible" :title="'添加试卷任务'" width="460" center> <Dialog v-model="visible" :title="'添加试卷任务'" width="460" center>
<el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent=""> <el-form ref="formRef" :model="form" :rules="rules" label-width="80px" @submit.prevent="">
<el-form-item label="任务编号" prop="taskNum"> <!-- <el-form-item label="任务编号" prop="taskNum">
<el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled /> <el-input clearable v-model="form.taskNum" placeholder="请输入编号" disabled />
</el-form-item> </el-form-item> -->
<el-form-item label="任务名称" prop="taskName"> <el-form-item label="任务名称" prop="taskName">
<el-input clearable v-model="form.taskName" placeholder="请输入任务名称" /> <el-input clearable v-model="form.taskName" placeholder="请输入任务名称" />
</el-form-item> </el-form-item>
@@ -32,7 +32,7 @@
</el-form-item> --> </el-form-item> -->
<el-form-item label="是否模板" prop="isTemplate"> <el-form-item label="是否模板" prop="isTemplate">
<el-radio-group v-model="form.isTemplate"> <el-radio-group v-model="form.isTemplate">
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)" v-for="dict in getIntDictOptions(DICT_TYPE.SYS_YES_NO)"
@@ -112,7 +112,7 @@ const rules = reactive({
// { required: true, message: '请选择专业', trigger: 'change' } // { required: true, message: '请选择专业', trigger: 'change' }
// ], // ],
isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }], isTemplate: [{ required: true, message: '请选择是否模板', trigger: 'change' }],
status: [{ required: true, message: '请选择是否启用', trigger: 'change' }] status: [{ required: true, message: '请选择是否启用', trigger: 'change' }]
}) })

View File

@@ -82,7 +82,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="次数" align="center" prop="count" /> <el-table-column label="次数" align="center" prop="count" />
<el-table-column label="是否模板" align="center" prop="isTemplate" > <el-table-column label="是否模板" align="center" prop="isTemplate" >
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" /> <dict-tag :type="DICT_TYPE.SYS_YES_NO" :value="scope.row.isTemplate" />
</template> </template>