Merge branch 'master' of gitlab.gavelinfo.com:lisu/sgaqgl-vue

# Conflicts:
#	src/views/contingency/contingencyplan/index.vue

src/views/contingency/contingencyplan/index.vue

@@ -30,6 +30,12 @@
                     </el-select>
       					</div>
       				</el-col>
+				<el-col :span="12" class="search-col">
+					<div class="search-item">
+						<span class="search-span">名称:</span>
+						<el-input v-model="queryParams.yljhName"></el-input>
+					</div>
+				</el-col>
 			</el-row>
 		</div>
 		<!-- 按钮操作-->
@@ -92,7 +98,8 @@
 			/* 查询参数*/
 			queryParams: {
 				year: '',
-        quarter:''
+        quarter:'',
+				yljhName: ''
 			},
 			/* 表格标题对应参数*/
 			tableTitle: [