jiangyy 3 years ago
parent
commit
1af37d148d
  1. 8
      src/views/components/rangeInput.vue
  2. 24
      src/views/modules/base/epidemic/antiInfo.vue
  3. 2
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

8
src/views/components/rangeInput.vue

@ -52,14 +52,17 @@ export default {
}, },
data () { data () {
let checkAge = (rule, value, callback) => { let checkAge = (rule, value, callback) => {
// debugger
if (value === '') { if (value === '') {
callback(new Error('请输入内容')) callback(new Error('请输入内容'))
} else { } else {
if (value < this.inputForm.start) { if (parseInt(value) < parseInt(this.inputForm.start)) {
callback(new Error('结束值不能小于开始值')) callback(new Error('结束值不能小于开始值'))
} } else {
callback() callback()
} }
}
} }
return { return {
inputForm: { ...this.value }, inputForm: { ...this.value },
@ -85,6 +88,7 @@ export default {
}, },
methods: { methods: {
handleChange (val) { handleChange (val) {
// if () // if ()
this.$emit('change', { ...this.inputForm }) this.$emit('change', { ...this.inputForm })
}, },

24
src/views/modules/base/epidemic/antiInfo.vue

@ -114,7 +114,7 @@
<el-form-item label="年龄" <el-form-item label="年龄"
prop="age"> prop="age">
<inputRange v-model="searchForm.age" <inputRange v-model="searchForm.age"
type="range" type="num"
@change="handleAgeChange" /> @change="handleAgeChange" />
</el-form-item> </el-form-item>
@ -157,6 +157,7 @@
<el-table class="table" <el-table class="table"
:data="tableData" :data="tableData"
border border
ref="ref_table"
:height="tableHeight" :height="tableHeight"
v-loading="tableLoading" v-loading="tableLoading"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
@ -199,6 +200,12 @@
label="身份证号" label="身份证号"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="birthDay"
header-align="center"
align="center"
label="出生日期"
width="140">
</el-table-column>
<el-table-column prop="vaccineCount" <el-table-column prop="vaccineCount"
header-align="center" header-align="center"
align="center" align="center"
@ -563,16 +570,25 @@ export default {
await this.loadTable() await this.loadTable()
this.sHeight = this.$refs.div_search.offsetHeight + 230 this.sHeight = this.$refs.div_search.offsetHeight + 230
}, },
activated () {
this.$refs['ref_table'].doLayout()
},
methods: { methods: {
handleAgeChange (val) { handleAgeChange (val) {
console.log('val----age---', val) console.log('val----age---', val)
if (val.end) { if (val.start) {
const s = this.computedBirth(val.end)
const e = this.computedBirth(val.start) const e = this.computedBirth(val.start)
this.searchForm.startBirthDay = s
this.searchForm.endBirthDay = e 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 = ''
} }
}, },

2
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@ -740,6 +740,8 @@ export default {
}, },
resetSearch () { resetSearch () {
this.startDate = ''
this.endDate = ''
this.formDataSearch = { this.formDataSearch = {
gridId: '', gridId: '',
vaccineCount: undefined, vaccineCount: undefined,

Loading…
Cancel
Save