diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue
index 8390ef2..579b637 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/grouplist.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
+      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;"/>
       <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
         搜索
       </el-button>
@@ -17,17 +17,18 @@
       fit
       highlight-current-row
       row-key="id"
-
     >
-
-      <el-table-column label="组名称" prop="GROUP_NAME" />
-
-      <el-table-column label="操作" align="center" width="800">
+      <el-table-column label="组名称" prop="GROUP_NAME"/>
+      <el-table-column label="组类型" prop="GROUP_TYPE_NAME"/>
+      <el-table-column label="操作" align="center" width="350">
         <template v-slot="{row}">
-          <el-button type="primary" icon="el-icon-thumb" @click="addAdressMember(row.ID)">通讯组成员</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.GROUP_NAME)">删除</el-button>
-          <el-button type="info" icon="el-icon-folder-add" size="mini" @click="addLowerLevel(row.ID,row.GROUP_NAME)">添加下级通讯组</el-button>
+          <el-button type="text" icon="el-icon-thumb" @click="addAdressMember(row.ID)">通讯组成员</el-button>
+          <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row)">编辑</el-button>
+          <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.GROUP_NAME)">删除
+          </el-button>
+          <el-button type="text" icon="el-icon-folder-add" size="mini" @click="addLowerLevel(row.ID,row.GROUP_NAME)">
+            添加下级通讯组
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -37,16 +38,22 @@
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
         </template>
       </div>
-      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
+      <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
     <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
-      <el-tag class="mark_up" size="medium">上级菜单：{{ proid == '0' ?'(无) 此项为顶级分组':groupname }}</el-tag>
       <el-form ref="form" :rules="rules" :model="form" label-width="110px" style="width: 500px;">
-
+        <el-form-item>
+          <el-tag class="mark_up" size="medium">上级菜单：{{ proid == '0' ? '(无) 此项为顶级分组' : groupname }}</el-tag>
+        </el-form-item>
         <el-form-item label="组名称" prop="GROUP_NAME">
-          <el-input v-model="form.GROUP_NAME" placeholder="这里输入标题..." />
-
-      </el-form-item></el-form>
+          <el-input v-model="form.GROUP_NAME" placeholder="请输入..."/>
+        </el-form-item>
+        <el-form-item label="组类型" prop="GROUP_TYPE">
+          <el-select v-model="form.GROUP_TYPE" placeholder="请选择" style="width: 100%;">
+            <el-option v-for="item in groupTypeList" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID"/>
+          </el-select>
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取 消</el-button>
         <el-button type="primary" @click="confirm">确 定</el-button>
@@ -62,6 +69,7 @@ import { requestFN } from '@/utils/request'
 
 import { Treeselect } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+
 export default {
   components: { Treeselect, Pagination },
   data() {
@@ -78,21 +86,27 @@ export default {
       dialogType: 'add',
       form: {
         GROUP_NAME: '',
-        PRO_ID: '0'
+        PRO_ID: '0',
+        GROUP_TYPE: '',
+        GROUP_TYPE_NAME: ''
       },
       rules: {
         GROUP_NAME: [
           { required: true, message: '组名称不能为空', trigger: 'blur' },
-          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }]
-
+          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        GROUP_TYPE: [
+          { required: true, message: '组类型不能为空', trigger: 'blur' }
+        ]
       },
       treeData: [],
       proid: '0',
-      groupname: ''
+      groupname: '',
+      groupTypeList: []
     }
   },
   created() {
     this.getList()
+    this.getDic()
   },
   methods: {
 
@@ -125,10 +139,11 @@ export default {
     handleEdit(v) {
       this.dialogFormEdit = true
       this.form = {
-        TITLE: v.TITLE,
-        CONTENT: v.CONTENT,
-        LEVEL: v.LEVEL,
-        ID: v.ID
+        GROUP_NAME: v.GROUP_NAME,
+        PRO_ID: v.PRO_ID,
+        ID: v.ID,
+        GROUP_TYPE: v.GROUP_TYPE,
+        GROUP_TYPE_NAME: v.GROUP_TYPE_NAME
       }
       this.dialogType = 'editUser'
       this.$refs.upload.clearFiles()
@@ -165,6 +180,7 @@ export default {
     dataSave() {
       this.listLoading = true
       this.form.PRO_ID = this.proid
+      this.form.GROUP_TYPE_NAME = this.groupTypeList.find((item) => item.DICTIONARIES_ID === this.form.GROUP_TYPE).name
       requestFN(
         '/yjcommunicate/saveGroup', this.form
       ).then((data) => {
@@ -172,6 +188,12 @@ export default {
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
+        this.form = {
+          GROUP_NAME: '',
+          PRO_ID: '0',
+          GROUP_TYPE: '',
+          GROUP_TYPE_NAME: ''
+        }
         this.getList()
       }).catch((e) => {
         this.listLoading = false
@@ -242,6 +264,14 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    getDic() {
+      requestFN('/dictionaries/listTree', { PARENT_ID: '92f2bdab1c6140618784930d1ab183af' })
+        .then((data) => {
+          this.groupTypeList = JSON.parse(data.zTreeNodes)
+        }).catch((e) => {
+          console.log(e)
+        })
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
index a6525e9..73061d9 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue
@@ -1,10 +1,19 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;" />
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      <el-row>
+        <el-form ref="form" label-width="100px">
+          <el-col :span="6">
+            <el-form-item label="名称:" prop="KEYWORDS">
+              <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 300px;" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+            <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-col>
+        </el-form>
+      </el-row>
     </div>
     <el-table ref="multipleTable" :data="varList" :header-cell-style="{'font-weight': 'bold','color': '#000'}" tooltip-effect="dark" border fit highlight-current-row>
       <el-table-column type="selection" width="55" align="center" />
@@ -672,6 +681,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetQuery() {
+      this.KEYWORDS = ''
+      this.getQuery()
     }
 
   }
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
index f7b55c5..08745aa 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue
@@ -1,15 +1,19 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-form inline>
-        <el-form-item label="机构名称：" prop="RESCUE_TEAM_NAME">
-          <el-input v-model="RESCUE_TEAM_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;"/>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
-          <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
-        </el-form-item>
-      </el-form>
+      <el-row>
+        <el-form label-width="100px">
+          <el-col :span="6">
+            <el-form-item label="机构名称：" prop="RESCUE_TEAM_NAME">
+              <el-input v-model="RESCUE_TEAM_NAME" placeholder="机构名称" class="filter-item" style="width: 300px"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">搜索</el-button>
+            <el-button class="filter-item" type="info" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+          </el-col>
+        </el-form>
+      </el-row>
     </div>
     <el-table
       ref="multipleTable"