From 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 15:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 12482b5..b46642e 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,8 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">
- 搴熸皵
- </div>
+ <div class="search-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -26,6 +24,16 @@
</el-select>
</el-form-item>
<el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
+ <el-option
+ v-for="item in enterpriseSubunitsTypeOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="涓夌骇鍗曚綅" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
@@ -158,7 +166,7 @@
{ name: '姝ｅ父', value: '2' },
{ name: '瓒呮爣', value: '3' },
{ name: '寮傚父', value: '4' },
- { name: '鍋滀骇', value: '4' }
+ { name: '鍋滀骇', value: '5' }
]
}
},
@@ -184,6 +192,7 @@
enterpriseSubunitsType (val) {
},
+ // 涓夌骇鍗曚綅绛涢��
async handleSearch () {
const param = {
pipelineType: this.form.pipelineType,
--
Gitblit v1.8.0