diff --git a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.api.ts b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.api.ts index df6f809..b2ffd5c 100644 --- a/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.api.ts +++ b/src/views/kc/kcTingkeBmd/checkuser/CheckUserTool.api.ts @@ -4,7 +4,7 @@ import { useMessage } from "/@/hooks/web/useMessage"; const { createConfirm } = useMessage(); enum Api { - list = '/config/kcExportConfigTpkwcqkjzglx/list2', + list = '/config/kcExportConfigTpkwcqkjzglx/list3', save='/config/kcExportConfigTpkwcqkjzglx/add', edit='/config/kcExportConfigTpkwcqkjzglx/edit', deleteOne = '/config/kcExportConfigTpkwcqkjzglx/delete', diff --git a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue index 283fcd5..e1bfc35 100644 --- a/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue +++ b/src/views/kc/kcZzYbtkb/KcZzYbtkbList.vue @@ -104,7 +104,7 @@ fixed: 'right', }, beforeFetch: (params) => { - params.column = '',params.order = '';//新生成的默认不带排序 + params.column = 'createTime',params.order = 'desc';//新生成的默认不带排序 return Object.assign(params, queryParam.value); }, }, diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue index aafde3a..c5c320c 100644 --- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue @@ -48,7 +48,7 @@ const formRef = ref(); const isYl = ref(false); const useForm = Form.useForm; - const emit = defineEmits(['register', 'ok']); + const emit = defineEmits(['register', 'ok','closeLoading']); const formData = reactive>({ id: '', filePath: '', @@ -100,7 +100,8 @@ */ async function submitForm() { // 触发表单验证 - await validate(); + // var t = await validate(); + confirmLoading.value = true; const isUpdate = ref(false); //时间格式化 @@ -119,6 +120,12 @@ } } } + if(!model.filePath){ + emit('closeLoading'); + confirmLoading.value = false; + createMessage.warning("请上传作业附件"); + return; + } createConfirm({ iconType: 'warning', title: '确认提交', @@ -128,17 +135,23 @@ onOk: () => { zyscStu(model, isUpdate.value) .then((res) => { - if (res.success) { - createMessage.success(res.message); - emit('ok'); - } else { - createMessage.warning(res.message); - } + emit('ok'); + emit('closeLoading'); + // if (res.success) { + // createMessage.success(res.message); + // } else { + // createMessage.warning(res.message); + // } }) .finally(() => { confirmLoading.value = false; + emit('closeLoading'); }); - } + }, + onCancel: () => { + confirmLoading.value = false; + emit('closeLoading'); + }, }); } diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue index b7a7dab..860d204 100644 --- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue @@ -1,6 +1,6 @@ @@ -11,6 +11,7 @@ const title = ref(''); const width = ref(800); const visible = ref(false); + const loading = ref(false); const disableSubmit = ref(false); const registerForm = ref(); const emit = defineEmits(['register', 'success']); @@ -33,6 +34,7 @@ function edit(record) { title.value = disableSubmit.value ? '预览' : '编辑'; visible.value = true; + loading.value = false; nextTick(() => { registerForm.value.edit(record); }); @@ -42,13 +44,21 @@ * 确定按钮点击事件 */ function handleOk() { + loading.value = true; registerForm.value.submitForm(); } + /** + * 确定按钮点击事件 + */ + function closeLoading() { + loading.value = false; + } /** * form保存回调事件 */ function submitCallback() { + loading.value = false; handleCancel(); emit('success'); }