From 34475f972c47ab1706f2e7b7640f1cd9b81ae1ea Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 15 Nov 2023 10:58:21 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/queryForm.vue | 9 +++++++--
src/views/toCarryOutLegislativeReforms/reform/index.vue | 3 +--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
index b2696ed..7dbca98 100644
--- a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -41,7 +41,7 @@
</el-form-item>
<el-form-item label="���������������">
- <el-select v-model="formData.isInvalid " placeholder="���������" clearable size="small" @change="replacePerChange($event)">
+ <el-select v-model="formData.isInvalid" placeholder="���������" clearable size="small" @change="replaceIsInvalid($event)">
<el-option v-for="item in Dic.yesOrNo" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
@@ -62,7 +62,7 @@
data() {
return {
formData: {
- isInvalid: 0,
+ isInvalid: null,
state: [9, 20, 30]
},
unitList: [],
@@ -75,6 +75,7 @@
created() {
this.getUnitList()
+ this.formData.isInvalid = 0
this.getContaminateList()
},
methods: {
@@ -95,6 +96,10 @@
this.polluteList = res.data
})
},
+ replaceIsInvalid(val) {
+ this.formData.isInvalid = val
+ this.$forceUpdate()
+ },
replacePerChange(val) {
this.$forceUpdate()
},
diff --git a/src/views/toCarryOutLegislativeReforms/reform/index.vue b/src/views/toCarryOutLegislativeReforms/reform/index.vue
index 8d9a4db..9bb34ab 100644
--- a/src/views/toCarryOutLegislativeReforms/reform/index.vue
+++ b/src/views/toCarryOutLegislativeReforms/reform/index.vue
@@ -263,7 +263,7 @@
}
},
created() {
- this.handleSearch()
+ this.handleSearch({ isInvalid: 0, state: [9, 20, 30] })
this.getUnitList()
this.getContaminateList()
},
@@ -466,7 +466,6 @@
this.handleSearch(obj)
},
handleSearch(obj) {
- this.searchData.isInvalid = 0
if (obj) {
this.searchData = obj
}
--
Gitblit v1.8.0