Browse Source

开始时间不能大于结束时间

lifanagju_citu 4 months ago
parent
commit
86189dc95c

+ 4 - 0
pagesA/resumeAnalysis/components/educationExp.vue

@@ -133,6 +133,10 @@ const submit = async () => {
     // if (!valid) return { id: props.id, data: null}
     const startTime = convertYearMonthToTimestamp(formData.value.startTime)
     const endTime = convertYearMonthToTimestamp(formData.value.endTime)
+    if (startTime > endTime) {
+      uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+      return
+    }
     return { id: props.id, data: { ...formData.value, startTime, endTime }}
   } catch (error) {
     return { text: props.text }

+ 4 - 0
pagesA/resumeAnalysis/components/trainingExperience.vue

@@ -93,6 +93,10 @@ const submit = async () => {
     // if (!valid) return { id: props.id, data: null}
     const startTime = convertYearMonthToTimestamp(formData.value.startTime)
     const endTime = convertYearMonthToTimestamp(formData.value.endTime)
+    if (startTime > endTime) {
+      uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+      return
+    }
     return { id: props.id, data: { ...formData.value, startTime, endTime }}
   } catch (error) {
     return { text: props.text }

+ 4 - 0
pagesA/resumeAnalysis/components/workExperience.vue

@@ -138,6 +138,10 @@ const submit = async () => {
     //
     const startTime = convertYearMonthToTimestamp(formData.value.startTime)
     const endTime = sofar.value.length ? null : convertYearMonthToTimestamp(formData.value.endTime)
+    if (endTime && startTime > endTime) {
+      uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+      return
+    }
     return { id: props.id, data: { ...formData.value, startTime, endTime }}
   } catch (error) {
     return { text: props.text }

+ 7 - 3
pagesA/resumeOnline/educationExp.vue

@@ -125,9 +125,13 @@ const submit = async () => {
   formData.value.majorId = searchData.value.major.find(e => e.nameCn === formData.value.major)?.id
   formData.value.schoolId = searchData.value.school.find(e => e.value === formData.value.schoolName)?.key
   try {
-    formData.value.startTime = convertYearMonthToTimestamp(formData.value.startTime)
-    formData.value.endTime = convertYearMonthToTimestamp(formData.value.endTime)
-    await saveResumeEduExp(formData.value)
+    const startTime = convertYearMonthToTimestamp(formData.value.startTime)
+    const endTime = convertYearMonthToTimestamp(formData.value.endTime)
+    if (startTime > endTime) {
+      uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+      return
+    }
+    await saveResumeEduExp({ ...formData.value, startTime, endTime })
     uni.showToast({
 			icon: 'success',
 			title: '保存成功'

+ 7 - 3
pagesA/resumeOnline/trainingExperience.vue

@@ -81,10 +81,14 @@ onLoad((options) => {
 const submit = async () => {
   const valid = await unref(form).validate()
   if (!valid) return
-  formData.value.startTime = convertYearMonthToTimestamp(formData.value.startTime)
-  formData.value.endTime = convertYearMonthToTimestamp(formData.value.endTime)
+	const startTime = convertYearMonthToTimestamp(formData.value.startTime)
+	const endTime = convertYearMonthToTimestamp(formData.value.endTime)
+	if (startTime > endTime) {
+    uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+		return
+	}
   try {
-    await saveResumeTrainExp(formData.value)
+		await saveResumeTrainExp({ ...formData.value, startTime, endTime })
     uni.showToast({
 			icon: 'success',
 			title: '保存成功'

+ 10 - 4
pagesA/resumeOnline/workExperience.vue

@@ -125,11 +125,17 @@ const submit = async () => {
   if (!valid) return
   formData.value.enterpriseId = searchData.value.enterprise.find(e => e.value === formData.value.enterpriseName)?.key
   formData.value.positionId = searchData.value.position.find(e => e.nameCn === formData.value.positionName)?.id
-  formData.value.startTime = convertYearMonthToTimestamp(formData.value.startTime)
-  formData.value.endTime = sofar.value.length ? null : convertYearMonthToTimestamp(formData.value.endTime)
-  if (!formData.value.endTime && !sofar.value.length) return uni.showToast({ icon: 'none', title: '请选择结束时间' })
+
+  const startTime = convertYearMonthToTimestamp(formData.value.startTime)
+  const endTime = sofar.value.length ? null : convertYearMonthToTimestamp(formData.value.endTime)
+  if (!endTime && !sofar.value.length) return uni.showToast({ icon: 'none', title: '请选择结束时间' })
+  if (endTime && startTime > endTime) {
+    uni.showToast({ icon: 'none', title: '开始时间不能大于结束时间' })
+    return
+  }
+
   try {
-    await saveResumeWorkExp(formData.value)
+		await saveResumeWorkExp({ ...formData.value, startTime, endTime })
     uni.showToast({
 			icon: 'success',
 			title: '保存成功'