From 43f19b5b4d9e081e2995742c9f6a5fb08713cf29 Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Mon, 19 Aug 2024 11:30:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E7=BB=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expert_group/components/expertlist.vue    |  14 +-
 .../expert_group/components/list.vue          | 154 ++++++++++++------
 .../rescue_expert/components/list.vue         |  29 +---
 .../emergency_team/rescue_expert/index.vue    |   4 +-
 .../rescue_team/components/list.vue           |  10 +-
 .../rescue_team/components/peopleList.vue     |  17 +-
 6 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue b/src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue
index d1433e3..577bcd2 100644
--- a/src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue
+++ b/src/views/emergen_cyrescue/emergency_team/expert_group/components/expertlist.vue
@@ -18,24 +18,18 @@
         <template v-slot="{row}">
           <span>{{ row.GENDER==='0'?'男':'女' }}</span>
         </template>
-
       </el-table-column>
       <el-table-column prop="EXPERT_TYPE" label="专家类型" />
       <el-table-column prop="OFFICE_TELEPHONE" label="办公电话" />
       <el-table-column prop="MOBILE_TELEPHONE" label="移动电话" />
-
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="100">
         <template slot-scope="{row}">
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_ID,row.EXPERT_NAME)">移除专家</el-button>
+          <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_ID,row.EXPERT_NAME)">移除专家</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
-      <div>
-        <template>
-          <!--          <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>-->
-        </template>
-      </div>
+      <div/>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
 
@@ -123,7 +117,7 @@ export default {
             EXPERT_ID: id
           }
         ).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
             this.listISLOADing = false
             this.getList()
           }
diff --git a/src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue b/src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue
index 378bfcb..5c53636 100644
--- a/src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue
+++ b/src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue
@@ -1,22 +1,38 @@
 <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-form label-position="right" label-width="100px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item label="组名称:">
+              <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 250px" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="组类型:">
+              <el-select v-model="EXPERT_GROUP_TYPE" placeholder="请选择组类型..." style="width: 250px">
+                <el-option v-for="item in expertGroupType" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
+              </el-select>
+            </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-row>
+      </el-form>
     </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" />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="EXPERT_GROUP_NAME" label="组名称" />
-
-      <el-table-column label="操作" align="center" width="600">
+      <el-table-column prop="EXPERT_GROUP_TYPE_NAME" label="组类型" />
+      <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.EXPERT_GROUP_ID, '1')">查看</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EXPERT_GROUP_ID)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_GROUP_ID,row.EXPERT_GROUP_NAME)">删除</el-button>
-          <el-button type="primary" icon="el-icon-more-outline" size="mini" @click="handleGroupPeople(row.EXPERT_GROUP_ID)">专家组成员</el-button>
+          <el-button type="text" icon="el-icon-document" size="mini" @click="goList('detail', row.EXPERT_GROUP_ID, '1')">查看</el-button>
+          <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EXPERT_GROUP_ID)">编辑</el-button>
+          <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_GROUP_ID,row.EXPERT_GROUP_NAME)">删除</el-button>
+          <el-button type="text" icon="el-icon-more-outline" size="mini" @click="handleGroupPeople(row.EXPERT_GROUP_ID)">专家组成员</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -30,8 +46,7 @@
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
     <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
-      <el-form ref="form" :rules="rules" :model="form" label-width="150px">
-
+      <el-form ref="form" :rules="rules" :model="form" label-width="150px" style="margin-right: 10px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家组名称" prop="EXPERT_GROUP_NAME">
@@ -40,12 +55,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="专家组类型" prop="EXPERT_GROUP_TYPE">
-              <el-input v-model="form.EXPERT_GROUP_TYPE" placeholder="专家组类型..." />
+              <el-select v-model="form.EXPERT_GROUP_TYPE" placeholder="请选择专家组类型..." style="width: 100%">
+                <el-option v-for="item in expertGroupType" :key="item.DICTIONARIES_ID" :label="item.name" :value="item.DICTIONARIES_ID" />
+              </el-select>
             </el-form-item>
-
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家组级别" prop="EXPERT_GROUP_LEVEL">
@@ -58,7 +73,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="传真" prop="FAX">
@@ -71,7 +85,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="组建单位" prop="ESTABLISHED_UNIT">
@@ -84,7 +97,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="组建单位地址" prop="ESTABLISHED_UNIT_ADDRESS">
@@ -97,7 +109,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="负责人办公电话" prop="RESPONSIBLE_OFFICE_TELEPHONE">
@@ -105,22 +116,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
             <el-form-item label="负责人移动电话" prop="RESPONSIBLE_MOBILE_TELEPHONE">
               <el-input v-model="form.RESPONSIBLE_MOBILE_TELEPHONE" placeholder="负责人移动电话..." />
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="负责人住宅电话" prop="RESPONSIBLE_HOME_TELEPHONE">
               <el-input v-model="form.RESPONSIBLE_HOME_TELEPHONE" placeholder="负责人住宅电话..." />
             </el-form-item>
           </el-col>
-
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="联系人" prop="CONTACT_PERSON">
@@ -133,7 +140,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="联系人移动电话" prop="CONTACT_MOBILE_TELEPHONE">
@@ -146,7 +152,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="联系人电子邮箱" prop="CONTACT_EMAIL">
@@ -159,7 +164,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家组介绍" prop="EXPERT_GROUP_INTRODUCE">
@@ -172,7 +176,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取 消</el-button>
@@ -201,6 +204,7 @@ export default {
       total: 0,
       varList: [],
       KEYWORDS: '',
+      EXPERT_GROUP_TYPE: '',
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
@@ -217,7 +221,7 @@ export default {
         EXPERT_GROUP_NAME: '',
         // 专家组类型
         EXPERT_GROUP_TYPE: '',
-
+        EXPERT_GROUP_TYPE_NAME: '',
         // 专家组级别
         EXPERT_GROUP_LEVEL: '',
         // 联系电话
@@ -230,28 +234,24 @@ export default {
         ESTABLISHED_UNIT: '',
         // 组建单位邮编
         ESTABLISHED_UNIT_POSTCODE: '',
-
         // 组建单位地址
         ESTABLISHED_UNIT_ADDRESS: '',
         // 负责人
         RESPONSIBLE_PERSON: '',
         // 负责人办公电话
         RESPONSIBLE_OFFICE_TELEPHONE: '',
-
         // 负责人移动电话
         RESPONSIBLE_MOBILE_TELEPHONE: '',
         // 负责人住宅电话
         RESPONSIBLE_HOME_TELEPHONE: '',
         // 联系人
         CONTACT_PERSON: '',
-
         // 联系人办公电话
         CONTACT_OFFICE_TELEPHONE: '',
         // 联系人移动电话
         CONTACT_MOBILE_TELEPHONE: '',
         // 联系人住宅电话
         CONTACT_HOME_TELEPHONE: '',
-
         // 联系人电子邮箱
         CONTACT_EMAIL: '',
         // 排序号
@@ -260,9 +260,7 @@ export default {
         EXPERT_GROUP_INTRODUCE: '',
         // 备注
         REMARKS: ''
-
       },
-
       yjyjExpertGroupData: [],
       treeData: [],
       DepartmentData: [],
@@ -273,17 +271,15 @@ export default {
           children: node.nodes
         }
       },
-      FFILE: []
+      FFILE: [],
+      expertGroupType: []
     }
   },
   created() {
     this.getList()
-    // this.getyjyjExpertGroupDataList()
-    // this.getDepartmentList()
-    // this.getTreeList()
+    this.getDic()
   },
   methods: {
-
     // **********************文件上传*********************
     handleEditChange(file) {
       file.MATERIALS_ID = Math.random()
@@ -340,22 +336,20 @@ export default {
         console.error('获取树形数据失败', e)
       })
     },
-
     //* ***********************************
     goList(page, CASE_ID, ticketType) {
       this.$parent.activeName = page
       this.$parent.CASE_ID = CASE_ID
       this.$parent.ticketType = ticketType
     },
-
     //* *******************列表查询******************************
-
     getList() {
       this.listISLOADing = true
       requestFN(
         '/yjExpertGroup/list?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          name: this.KEYWORDS
+          name: this.KEYWORDS,
+          EXPERT_GROUP_TYPE: this.EXPERT_GROUP_TYPE
         }
       ).then((data) => {
         this.listISLOADing = false
@@ -389,7 +383,6 @@ export default {
           EXPERT_GROUP_NAME: data.EXPERT_GROUP_NAME,
           // 专家组类型
           EXPERT_GROUP_TYPE: data.EXPERT_GROUP_TYPE,
-
           // 专家组级别
           EXPERT_GROUP_LEVEL: data.EXPERT_GROUP_LEVEL,
           // 联系电话
@@ -402,28 +395,24 @@ export default {
           ESTABLISHED_UNIT: data.ESTABLISHED_UNIT,
           // 组建单位邮编
           ESTABLISHED_UNIT_POSTCODE: data.ESTABLISHED_UNIT_POSTCODE,
-
           // 组建单位地址
           ESTABLISHED_UNIT_ADDRESS: data.ESTABLISHED_UNIT_ADDRESS,
           // 负责人
           RESPONSIBLE_PERSON: data.RESPONSIBLE_PERSON,
           // 负责人办公电话
           RESPONSIBLE_OFFICE_TELEPHONE: data.RESPONSIBLE_OFFICE_TELEPHONE,
-
           // 负责人移动电话
           RESPONSIBLE_MOBILE_TELEPHONE: data.RESPONSIBLE_MOBILE_TELEPHONE,
           // 负责人住宅电话
           RESPONSIBLE_HOME_TELEPHONE: data.RESPONSIBLE_HOME_TELEPHONE,
           // 联系人
           CONTACT_PERSON: data.CONTACT_PERSON,
-
           // 联系人办公电话
           CONTACT_OFFICE_TELEPHONE: data.CONTACT_OFFICE_TELEPHONE,
           // 联系人移动电话
           CONTACT_MOBILE_TELEPHONE: data.CONTACT_MOBILE_TELEPHONE,
           // 联系人住宅电话
           CONTACT_HOME_TELEPHONE: data.CONTACT_HOME_TELEPHONE,
-
           // 联系人电子邮箱
           CONTACT_EMAIL: data.CONTACT_EMAIL,
           // 排序号
@@ -433,7 +422,6 @@ export default {
           // 备注
           REMARKS: data.REMARKS,
           EXPERT_GROUP_ID: data.EXPERT_GROUP_ID
-
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -464,9 +452,9 @@ export default {
         }
       })
     },
-
     dataSave() {
       this.listISLOADing = true
+      this.form.EXPERT_GROUP_TYPE_NAME = this.expertGroupType.find(item => item.DICTIONARIES_ID === this.form.EXPERT_GROUP_TYPE).name
       requestFN(
         '/yjExpertGroup/save', this.form
       ).then((data) => {
@@ -474,6 +462,50 @@ export default {
         this.dialogFormEdit = false
         this.varList = []
         this.listQuery.page = 1
+        this.form = {
+          // 专家组名称
+          EXPERT_GROUP_NAME: '',
+          // 专家组类型
+          EXPERT_GROUP_TYPE: '',
+          // 专家组级别
+          EXPERT_GROUP_LEVEL: '',
+          // 联系电话
+          CONTACT_TELEPHONE: '',
+          // 传真
+          FAX: '',
+          // 人数
+          NUMBER_OF_PEOPLE: '',
+          // 组建单位
+          ESTABLISHED_UNIT: '',
+          // 组建单位邮编
+          ESTABLISHED_UNIT_POSTCODE: '',
+          // 组建单位地址
+          ESTABLISHED_UNIT_ADDRESS: '',
+          // 负责人
+          RESPONSIBLE_PERSON: '',
+          // 负责人办公电话
+          RESPONSIBLE_OFFICE_TELEPHONE: '',
+          // 负责人移动电话
+          RESPONSIBLE_MOBILE_TELEPHONE: '',
+          // 负责人住宅电话
+          RESPONSIBLE_HOME_TELEPHONE: '',
+          // 联系人
+          CONTACT_PERSON: '',
+          // 联系人办公电话
+          CONTACT_OFFICE_TELEPHONE: '',
+          // 联系人移动电话
+          CONTACT_MOBILE_TELEPHONE: '',
+          // 联系人住宅电话
+          CONTACT_HOME_TELEPHONE: '',
+          // 联系人电子邮箱
+          CONTACT_EMAIL: '',
+          // 排序号
+          SORTING_NUMBER: '',
+          // 专家组介绍
+          EXPERT_GROUP_INTRODUCE: '',
+          // 备注
+          REMARKS: ''
+        }
         this.getList()
       }).catch((e) => {
         this.listISLOADing = false
@@ -493,7 +525,7 @@ export default {
             id: id
           }
         ).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
             this.listISLOADing = false
             this.getList()
           }
@@ -507,7 +539,7 @@ export default {
       const _selectData = this.$refs.multipleTable.selection
       console.info('_selectData')
       console.info(_selectData)
-      if (_selectData == null || _selectData.length == 0) {
+      if (_selectData == null || _selectData.length === 0) {
         this.$message({
           message: '请选中要删除的项...',
           type: 'error'
@@ -538,14 +570,28 @@ export default {
         }).catch((e) => {
           this.listISLOADing = false
         })
-      }).catch(() => {
+      }).catch((e) => {
+        console.log(e)
       })
     },
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetQuery() {
+      this.KEYWORDS = ''
+      this.EXPERT_GROUP_TYPE = ''
+    },
+    getDic() {
+      const params = {
+        PARENT_ID: '7dfc8f921db94ed7ad311d322bda0b5d'
+      }
+      requestFN('/dictionaries/listTree', params).then((data) => {
+        this.expertGroupType = JSON.parse(data.zTreeNodes)
+      }).catch((e) => {
+        console.error('获取树形数据失败', e)
+      })
     }
-
   }
 }
 </script>
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 2b15ca7..a6525e9 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
@@ -21,11 +21,11 @@
       <el-table-column prop="OFFICE_TELEPHONE" label="办公电话" />
       <el-table-column prop="MOBILE_TELEPHONE" label="移动电话" />
 
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="250">
         <template slot-scope="{row}">
-          <el-button type="primary" icon="el-icon-document" size="mini" @click="goList('detail', row.EXPERT_ID, '1')">查看</el-button>
-          <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(row.EXPERT_ID)">编辑</el-button>
-          <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_ID,row.EXPERT_NAME)">删除</el-button>
+          <el-button type="text" icon="el-icon-document" size="mini" @click="goList('detail', row.EXPERT_ID, '1')">查看</el-button>
+          <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.EXPERT_ID)">编辑</el-button>
+          <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="handleDelete(row.EXPERT_ID,row.EXPERT_NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -40,7 +40,6 @@
     </div>
     <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="1000px">
       <el-form ref="form" :rules="rules" :model="form" label-width="150px">
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家名称" prop="EXPERT_NAME">
@@ -52,10 +51,8 @@
               <el-radio v-model="form.GENDER" label="0">男</el-radio>
               <el-radio v-model="form.GENDER" label="1">女</el-radio>
             </el-form-item>
-
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="出生日期" prop="BIRTH_DATE">
@@ -68,7 +65,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家类型" prop="EXPERT_TYPE">
@@ -81,7 +77,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="职称" prop="PROFESSIONAL_TITLE">
@@ -94,7 +89,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="民族" prop="ETHNICITY">
@@ -107,7 +101,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="最高学历" prop="HIGHEST_EDUCATION">
@@ -115,13 +108,11 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
             <el-form-item label="参加工作时间" prop="WORK_START_DATE">
               <el-date-picker v-model="form.WORK_START_DATE" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" />
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="办公电话" prop="OFFICE_TELEPHONE">
@@ -134,7 +125,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="移动电话" prop="MOBILE_TELEPHONE">
@@ -147,7 +137,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="电子邮箱" prop="EMAIL">
@@ -160,7 +149,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="行政职务" prop="ADMINISTRATIVE_POSITION">
@@ -173,7 +161,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="家庭住址" prop="HOME_ADDRESS">
@@ -186,7 +173,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="户籍所在地" prop="HOUSEHOLD_REGISTER_LOCATION">
@@ -199,7 +185,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="毕业院校" prop="GRADUATED_COLLEGE">
@@ -212,7 +197,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="单位主管部门" prop="UNIT_SUPERVISOR">
@@ -225,7 +209,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="排序号" prop="SORTING_NUMBER">
@@ -238,7 +221,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="工作简历概述" prop="WORK_RESUME_SUMMARY">
@@ -251,7 +233,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="应急工作经历" prop="EMERGENCY_WORK_EXPERIENCE">
@@ -260,13 +241,11 @@
           </el-col>
           <el-col :span="12"/>
         </el-row>
-
         <el-row :gutter="20">
           <el-form-item label="备注" prop="REMARKS">
             <el-input v-model="form.REMARKS" type="textarea" placeholder="备注..." />
           </el-form-item>
         </el-row>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormEdit = false">取 消</el-button>
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_expert/index.vue b/src/views/emergen_cyrescue/emergency_team/rescue_expert/index.vue
index ac13f74..765f84b 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_expert/index.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_expert/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <list v-show="activeName=='list'" ref="list" />
-    <detail v-if="activeName=='detail'"/>
+    <list v-show="activeName==='list'" ref="list" />
+    <detail v-if="activeName==='detail'"/>
   </div>
 </template>
 <script>
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 97d4707..f7b55c5 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
@@ -28,7 +28,7 @@
       <el-table-column :show-overflow-tooltip="true" prop="RESPONSIBLE_OFFICE_PHONE" label="负责人办公电话"/>
       <el-table-column :show-overflow-tooltip="true" prop="RESPONSIBLE_MOBILE_PHONE" label="负责人移动电话"/>
       <el-table-column :show-overflow-tooltip="true" prop="RESPONSIBLE_HOME_PHONE" label="负责人固定电话"/>
-      <el-table-column :show-overflow-tooltip="true" prop="OPERATETIME" label="修改时间"/>
+      <el-table-column v-if="false" :show-overflow-tooltip="true" prop="OPERATETIME" label="修改时间"/>
       <el-table-column label="操作" align="center" width="300">
         <template slot-scope="{row}">
           <el-row>
@@ -41,12 +41,8 @@
               </el-button>
             </el-col>
             <el-col :span="24">
-              <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">
-                编辑
-              </el-button>
-              <el-button type="text" icon="el-icon-delete" size="mini" @click="handleDelete(row.ID,row.RESCUE_TEAM_NAME)">
-                删除
-              </el-button>
+              <el-button type="text" icon="el-icon-edit" size="mini" @click="handleEdit(row.ID)">编辑</el-button>
+              <el-button type="text" icon="el-icon-delete" size="mini" style="color: red" @click="handleDelete(row.ID,row.RESCUE_TEAM_NAME)">删除</el-button>
             </el-col>
           </el-row>
         </template>
diff --git a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
index 32aeccc..67f1102 100644
--- a/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
+++ b/src/views/emergen_cyrescue/emergency_team/rescue_team/components/peopleList.vue
@@ -35,8 +35,8 @@
       <el-table-column :show-overflow-tooltip="true" prop="COMPANY_POSITION" label="所在单位岗位名称"/>
       <el-table-column label="操作">
         <template slot-scope="{row}">
-          <el-button type="text" size="mini" @click="handleEdit(row)">编辑</el-button>
-          <el-button type="text" style="color: red" size="mini" @click="handleDelete(row)">删除</el-button>
+          <el-button icon="el-icon-edit" type="text" size="mini" @click="handleEdit(row)">编辑</el-button>
+          <el-button icon="el-icon-delete" type="text" style="color: red" size="mini" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -44,7 +44,7 @@
       <div>
         <template>
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新增</el-button>
-          <el-button type="danger" icon="el-icon-delete" plain @click="handleDelete()">删除</el-button>
+          <el-button v-if="false" type="danger" icon="el-icon-delete" plain @click="handleDelete(row)">删除</el-button>
         </template>
       </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
@@ -267,20 +267,17 @@ export default {
       })
     },
     //* *****************************删除********************************
-    handleDelete(id, RESCUE_TEAM_NAME) {
-      this.$confirm('确定要删除[' + RESCUE_TEAM_NAME + ']吗?', {
+    handleDelete(row) {
+      this.$confirm('确定要删除[' + row.NAME + ']吗?', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         this.listLoading = true
         requestFN(
-          '/major/emergency/delete',
-          {
-            id: id
-          }
+          '/major/emergency/deleteTeamUser', { id: row.YJ_EMERGENCY_TEAM_USER_ID }
         ).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
             this.listLoading = false
             this.getList()
           }