From 9eb85404a96658d83fc0168f306adabb8c1c992e Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Tue, 14 Nov 2023 10:31:03 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/queryForm.vue | 95 +++++++++++++----------------------------------
1 files changed, 26 insertions(+), 69 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
index 5acefb7..509d71e 100644
--- a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -7,86 +7,42 @@
</el-form-item>
<el-form-item label="���������������">
- <el-date-picker
- v-model="formData.startTime"
- style="width:92%"
- size="small"
- value-format="yyyy-MM-dd"
- type="date"
- placeholder="������������"
- />
+ <el-date-picker v-model="formData.startTime" style="width:92%" size="small" value-format="yyyy-MM-dd" type="date" placeholder="������������" />
</el-form-item>
<el-form-item label="���������������">
- <el-date-picker
- v-model="formData.endTime"
- style="width:92%"
- size="small"
- value-format="yyyy-MM-dd"
- type="date"
- placeholder="������������"
- />
+ <el-date-picker v-model="formData.endTime" style="width:92%" size="small" value-format="yyyy-MM-dd" type="date" placeholder="������������" />
</el-form-item>
<el-form-item label="���������������" class="rddd">
- <el-select v-model="formData.unitId" size="small" clearable placeholder="���������">
- <el-option
- v-for="item in unitList"
- :key="item.unitId"
- :label="item.unitName"
- :value="item.unitId"
- />
+ <el-select v-model="formData.unitId" size="small" clearable multiple collapse-tags placeholder="���������">
+ <el-option v-for="item in unitList" :key="item.unitId" :label="item.unitName" :value="item.unitId" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
- <el-select v-model="formData.polluteType" size="small" clearable placeholder="���������">
- <el-option
- v-for="item in polluteList"
- :key="item.dataKey"
- :label="item.dataValue"
- :value="item.dataKey"
- />
+ <el-select v-model="formData.polluteType" size="small" clearable multiple collapse-tags placeholder="���������">
+ <el-option v-for="item in polluteList" :key="item.dataKey" :label="item.dataValue" :value="item.dataKey" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
<el-select v-model="formData.investigationType" size="small" clearable placeholder="���������">
- <el-option
- v-for="item in Dic.investigationEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
+ <el-option v-for="item in Dic.investigationEnum" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
<el-select v-model="formData.changeType" placeholder="���������" clearable size="small">
- <el-option
- v-for="item in Dic.changeEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
+ <el-option v-for="item in Dic.changeEnum" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
- <el-select v-model="formData.state" size="small" clearable placeholder="���������">
- <el-option
- v-for="item in Dic.allocationApproveEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
+ <el-select v-model="formData.state" size="small" clearable multiple collapse-tags placeholder="���������">
+ <el-option v-for="item in Dic.allocationApproveEnum" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="���������������">
<el-select v-model="formData.isInvalid " placeholder="���������" clearable size="small">
- <el-option
- v-for="item in Dic.yesOrNo"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
+ <el-option v-for="item in Dic.yesOrNo" :key="item.value" :label="item.name" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item>
@@ -106,7 +62,7 @@
data() {
return {
formData: {
- isInvalid: 0
+ isInvalid: null
},
unitList: [],
Dic: JSON.parse(localStorage.getItem('dict')),
@@ -119,7 +75,6 @@
created() {
this.getUnitList()
this.getContaminateList()
- console.log('searchType', this.searchType)
},
methods: {
// ������������������list
@@ -127,19 +82,21 @@
this.$request({
url: '/allocation/unit',
method: 'get'
- }).then((res) => {
+ }).then(res => {
this.unitList = res.data
+ this.formData.isInvalid = 0
})
},
getContaminateList() {
this.$request({
url: '/allocation/contaminate',
method: 'get'
- }).then((res) => {
+ }).then(res => {
this.polluteList = res.data
})
},
onSubmit() {
+ console.log('formData', this.formData)
this.$emit('handleSearch', this.formData)
},
handleAdd() {
@@ -151,19 +108,19 @@
<style scoped lang="scss">
.search-form {
- margin: 20px;
- margin-bottom: 0px;
- /deep/ .el-input__suffix{
- right: 20;
- }
- /deep/ .el-form-item__content{
- width: auto;
- }
+ margin: 20px;
+ margin-bottom: 0px;
+ /deep/ .el-input__suffix {
+ right: 20;
+ }
+ /deep/ .el-form-item__content {
+ width: auto;
+ }
}
-/deep/.el-form-item__label{
+/deep/.el-form-item__label {
font-size: 16px;
}
-/deep/.el-form-item{
+/deep/.el-form-item {
margin-bottom: 5px;
}
</style>
--
Gitblit v1.8.0