merge code pull

src/views/stuwork/classmasterresume/form.vue

@@ -57,7 +57,8 @@
               placeholder="选择开始时间"
               format="YYYY-MM-DD"
               value-format="YYYY-MM-DD HH:mm:ss"
-              style="width: 100%" />
+              style="width: 100%"
+              @change="handleBeginTimeChange" />
           </el-form-item>
         </el-col>
 
@@ -148,7 +149,23 @@ const dataRules = ref({
     { required: true, message: '开始时间不能为空', trigger: 'blur' }
   ],
   endTime: [
-    { required: true, message: '结束时间不能为空', trigger: 'blur' }
+    { required: true, message: '结束时间不能为空', trigger: 'blur' },
+    {
+      validator: (rule: any, value: any, callback: any) => {
+        if (!value || !form.beginTime) {
+          callback()
+          return
+        }
+        const beginTime = new Date(form.beginTime).getTime()
+        const endTime = new Date(value).getTime()
+        if (endTime < beginTime) {
+          callback(new Error('结束时间不能小于开始时间'))
+        } else {
+          callback()
+        }
+      },
+      trigger: 'blur'
+    }
   ],
   resumeRemark: [
     { required: true, message: '履历备注不能为空', trigger: 'blur' }
@@ -196,6 +213,15 @@ const handleClassChange = (classCode: string) => {
   }
 }
 
+// 开始时间变化时，重新验证结束时间
+const handleBeginTimeChange = () => {
+  if (form.endTime) {
+    nextTick(() => {
+      dataFormRef.value?.validateField('endTime')
+    })
+  }
+}
+
 // 打开弹窗
 const openDialog = (idOrData?: string | any) => {
   visible.value = true
@@ -246,6 +272,16 @@ const onSubmit = async () => {
   const valid = await dataFormRef.value.validate().catch(() => {});
   if (!valid) return false;
 
+  // 前端验证：结束时间必须大于等于开始时间
+  if (form.beginTime && form.endTime) {
+    const beginTime = new Date(form.beginTime).getTime()
+    const endTime = new Date(form.endTime).getTime()
+    if (endTime < beginTime) {
+      useMessage().error('结束时间不能小于开始时间')
+      return false
+    }
+  }
+
   try {
     loading.value = true;
     form.id ? await putObj(form) : await addObj(form);
@@ -253,7 +289,11 @@ const onSubmit = async () => {
     visible.value = false;
     emit('refresh');
   } catch (err: any) {
-    useMessage().error(err.msg || '操作失败');
+    // 响应拦截器已经处理了错误提示，这里不再重复提示
+    // 但如果错误信息为空，则显示默认提示
+    if (!err.msg) {
+      useMessage().error('操作失败');
+    }
   } finally {
     loading.value = false;
   }