From 0b9e8a88c5f23886a18616c83c7649a34445a7eb Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Wed, 11 Oct 2023 15:43:29 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/toCarryOutLegislativeReforms/components/queryForm.vue | 95 +++++++++++++++++++++++++++--------------------
1 files changed, 54 insertions(+), 41 deletions(-)
diff --git a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
index 2e8e7df..5acefb7 100644
--- a/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
+++ b/src/views/toCarryOutLegislativeReforms/components/queryForm.vue
@@ -2,23 +2,38 @@
<div>
<div class="search-form">
<el-form :inline="true" :model="formData" class="demo-form-inline">
- <el-form-item label="���������������">
+ <el-form-item label="���������������">
+ <el-input v-model="formData.allocationNum" placeholder="���������������" size="small" clearable />
+ </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-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-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>
- </el-form-item>
- <el-form-item v-if="searchType==='reform'" 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>
</el-form-item>
@@ -42,6 +57,7 @@
/>
</el-select>
</el-form-item>
+
<el-form-item label="���������������">
<el-select v-model="formData.changeType" placeholder="���������" clearable size="small">
<el-option
@@ -52,18 +68,18 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="���������������">
- <el-date-picker
- v-model="valueTime"
- clearable
- type="daterange"
- value-format="yyyy-MM-dd"
- range-separator="���"
- start-placeholder="������������"
- end-placeholder="������������"
- />
+ <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>
</el-form-item>
- <el-form-item v-if="searchType==='reform'" label="���������������">
+
+ <el-form-item label="���������������">
<el-select v-model="formData.isInvalid " placeholder="���������" clearable size="small">
<el-option
v-for="item in Dic.yesOrNo"
@@ -73,19 +89,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-if="searchType==='delay'" label="���������������">
- <el-select v-model="formData.state" placeholder="���������" clearable size="small">
- <el-option
- v-for="item in Dic.allocationExtensionApproveEnum"
- :key="item.value"
- :label="item.name"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
<el-form-item>
<el-button type="primary" size="small" @click="onSubmit">������</el-button>
- <el-button v-if="searchType==='reform'" type="primary" size="small" @click="handleAdd">������</el-button>
+ <el-button type="primary" size="small" @click="handleAdd">������</el-button>
</el-form-item>
</el-form>
</div>
@@ -99,7 +105,9 @@
},
data() {
return {
- formData: {},
+ formData: {
+ isInvalid: 0
+ },
unitList: [],
Dic: JSON.parse(localStorage.getItem('dict')),
polluteList: [],
@@ -132,10 +140,6 @@
})
},
onSubmit() {
- if (this.valueTime.length > 0) {
- this.formData.endTime = this.valueTime[1]
- this.formData.startTime = this.valueTime[0]
- }
this.$emit('handleSearch', this.formData)
},
handleAdd() {
@@ -148,9 +152,18 @@
<style scoped lang="scss">
.search-form {
margin: 20px;
-
- /deep/.el-select {
- width: 120px;
+ margin-bottom: 0px;
+ /deep/ .el-input__suffix{
+ right: 20;
}
+ /deep/ .el-form-item__content{
+ width: auto;
+ }
+}
+/deep/.el-form-item__label{
+ font-size: 16px;
+}
+/deep/.el-form-item{
+ margin-bottom: 5px;
}
</style>
--
Gitblit v1.8.0