From 1af37d148da5e15093e85079dd4db54d25ac5a4e Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Fri, 8 Jul 2022 10:10:44 +0800
Subject: [PATCH] bug

---
 src/views/components/rangeInput.vue           |  8 +++++--
 src/views/modules/base/epidemic/antiInfo.vue  | 24 +++++++++++++++----
 .../base/epidemic/veroFocus/veroFocusAdd.vue  |  2 ++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/components/rangeInput.vue b/src/views/components/rangeInput.vue
index 42fbea23..5c726a67 100644
--- a/src/views/components/rangeInput.vue
+++ b/src/views/components/rangeInput.vue
@@ -52,13 +52,16 @@ export default {
   },
   data () {
     let checkAge = (rule, value, callback) => {
+      // debugger
       if (value === '') {
         callback(new Error('请输入内容'))
       } else {
-        if (value < this.inputForm.start) {
+        if (parseInt(value) < parseInt(this.inputForm.start)) {
           callback(new Error('结束值不能小于开始值'))
+        } else {
+          callback()
         }
-        callback()
+
       }
     }
     return {
@@ -85,6 +88,7 @@ export default {
   },
   methods: {
     handleChange (val) {
+
       // if ()
       this.$emit('change', { ...this.inputForm })
     },
diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue
index 3be76486..dcfe9e2d 100644
--- a/src/views/modules/base/epidemic/antiInfo.vue
+++ b/src/views/modules/base/epidemic/antiInfo.vue
@@ -114,7 +114,7 @@
           <el-form-item label="年龄"
                         prop="age">
             <inputRange v-model="searchForm.age"
-                        type="range"
+                        type="num"
                         @change="handleAgeChange" />
 
           </el-form-item>
@@ -157,6 +157,7 @@
       <el-table class="table"
                 :data="tableData"
                 border
+                ref="ref_table"
                 :height="tableHeight"
                 v-loading="tableLoading"
                 :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
@@ -199,6 +200,12 @@
                          label="身份证号"
                          width="180">
         </el-table-column>
+        <el-table-column prop="birthDay"
+                         header-align="center"
+                         align="center"
+                         label="出生日期"
+                         width="140">
+        </el-table-column>
         <el-table-column prop="vaccineCount"
                          header-align="center"
                          align="center"
@@ -563,16 +570,25 @@ export default {
     await this.loadTable()
     this.sHeight = this.$refs.div_search.offsetHeight + 230
   },
+  activated () {
+    this.$refs['ref_table'].doLayout()
+  },
 
   methods: {
     handleAgeChange (val) {
       console.log('val----age---', val)
-      if (val.end) {
-        const s = this.computedBirth(val.end)
+      if (val.start) {
         const e = this.computedBirth(val.start)
-        this.searchForm.startBirthDay = s
         this.searchForm.endBirthDay = e
 
+      } else {
+        this.searchForm.endBirthDay = ''
+      }
+      if (val.end) {
+        const s = this.computedBirth(val.end)
+        this.searchForm.startBirthDay = s
+      } else {
+        this.searchForm.startBirthDay = ''
       }
     },
 
diff --git a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
index 64d94a37..b72f1499 100644
--- a/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
+++ b/src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
@@ -740,6 +740,8 @@ export default {
     },
 
     resetSearch () {
+      this.startDate = ''
+      this.endDate = ''
       this.formDataSearch = {
         gridId: '',
         vaccineCount: undefined,