修改bug

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',

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);
       },
     },

src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue

@@ -48,7 +48,7 @@
   const formRef = ref();
   const isYl = ref<boolean>(false);
   const useForm = Form.useForm;
-  const emit = defineEmits(['register', 'ok']);
+  const emit = defineEmits(['register', 'ok','closeLoading']);
   const formData = reactive<Record<string, any>>({
     id: '',
     filePath: '',
@@ -100,7 +100,8 @@
    */
   async function submitForm() {
     // 触发表单验证
-    await validate();
+    // var t = await validate();
+    
     confirmLoading.value = true;
     const isUpdate = ref<boolean>(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');
+      },
     });
   }
 

src/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue

@@ -1,6 +1,6 @@
 <template>
-  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
-    <ZyInfoStudentForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ZyInfoStudentForm>
+  <a-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit }, loading: loading  }" @cancel="handleCancel" cancelText="关闭">
+    <ZyInfoStudentForm ref="registerForm" @closeLoading="closeLoading" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></ZyInfoStudentForm>
   </a-modal>
 </template>
 
@@ -11,6 +11,7 @@
   const title = ref<string>('');
   const width = ref<number>(800);
   const visible = ref<boolean>(false);
+  const loading = ref<boolean>(false);
   const disableSubmit = ref<boolean>(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');
   }