Browse Source

修复选择shortcuts后查询不出检验结果的问题

lighter 1 year ago
parent
commit
dbe13cacd9
1 changed files with 29 additions and 21 deletions
  1. 29 21
      src/views/hospital-service/check-exam/CheckExamIndex.vue

+ 29 - 21
src/views/hospital-service/check-exam/CheckExamIndex.vue

@@ -65,20 +65,24 @@ const chosenShortcut = ref('oneWeek')
 const onConfirmShortcuts = () => {
   switch (chosenShortcut.value) {
     case 'oneWeek':
-      makeOffset(7)
-      queryInspectionIndex(date.value[0], date.value[1])
+      makeOffset(7).then((range) => {
+        queryInspectionIndex(range[0], range[1])
+      })
       return
     case 'threeMonths':
-      makeOffset(90)
-      queryInspectionIndex(date.value[0], date.value[1])
+      makeOffset(90).then((range) => {
+        queryInspectionIndex(range[0], range[1])
+      })
       return;
     case 'halfYear':
-      makeOffset(183)
-      queryInspectionIndex(date.value[0], date.value[1])
+      makeOffset(183).then((range) => {
+        queryInspectionIndex(range[0], range[1])
+      })
       return
     case 'oneYear':
-      makeOffset(365)
-      queryInspectionIndex(date.value[0], date.value[1])
+      makeOffset(365).then((range) => {
+        queryInspectionIndex(range[0], range[1])
+      })
       return;
     default:
       showDateRange.value = true
@@ -87,12 +91,13 @@ const onConfirmShortcuts = () => {
 }
 
 const makeOffset = (offsetDays) => {
-  const range = ['', '']
-  const temp = getDateRangeByOffsetDays(offsetDays)
-  range[0] = temp.start
-  range[1] = temp.end
-  store.commit('SET_EXAMDATERANGE', range)
-  date.value = range[0] + ' - ' + range[1]
+  return new Promise((resolve, reject) => {
+    const temp = getDateRangeByOffsetDays(offsetDays)
+    const range = [temp.start, temp.end]
+    store.commit('SET_EXAMDATERANGE', range)
+    date.value = range[0] + ' - ' + range[1]
+    resolve(range)
+  })
 }
 
 const showDateRange = ref(false)
@@ -122,14 +127,17 @@ const queryInspectionIndex = (start, end) => {
 }
 
 onMounted(() => {
-  const range = store.state.examDateRange
-  if (range.length === 0) {
-    makeOffset(30)
+  let storeRange = store.state.examDateRange
+  if (storeRange.length === 0) {
+    makeOffset(30).then((range) => {
+      date.value = range[0] + ' - ' + range[1]
+      queryInspectionIndex(range[0], range[1])
+    })
   } else {
-    date.value = range[0] + ' - ' + range[1]
-  }
-  if (examIndex.value.length === 0) {
-    queryInspectionIndex(range[0], range[1])
+    date.value = storeRange[0] + ' - ' + storeRange[1]
+    if (examIndex.value.length === 0) {
+      queryInspectionIndex(storeRange[0], storeRange[1])
+    }
   }
 })
 </script>