From ff38de8d48459d47524ad33083747f9bcc9521cb Mon Sep 17 00:00:00 2001
From: liujun <liujun@zcloudchina.com>
Date: Fri, 23 Aug 2024 14:11:05 +0800
Subject: [PATCH] =?UTF-8?q?521=20=E5=BA=94=E6=80=A5=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=86=85=E6=89=80=E6=9C=89=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=20=E9=83=BD=E5=BA=94=E8=AF=A5=E6=9C=89=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=20509=20=E5=8A=9E=E5=85=AC=E7=94=B5?=
 =?UTF-8?q?=E8=AF=9D=E6=98=AF=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=90=97?=
 =?UTF-8?q?=20=E6=B3=A8=E6=84=8F=E6=89=80=E6=9C=89=E7=94=B5=E8=AF=9D?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20507=20=E6=90=9C=E7=B4=A2=E6=A1=86?=
 =?UTF-8?q?=20=E6=B2=A1=E6=9C=89=E9=87=8D=E7=BD=AE=E6=8C=89=E9=92=AE=20504?=
 =?UTF-8?q?=20=E4=B8=93=E5=AE=B6=E7=BB=84=E6=88=90=E5=91=98=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20500=20=E5=88=A0=E9=99=A4=E6=88=90=E5=8A=9F=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=8F=90=E7=A4=BA=20494=20=E5=88=A0=E9=99=A4=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=20=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=20491=20?=
 =?UTF-8?q?=E5=BA=94=E6=80=A5=E7=AE=A1=E7=90=86=E6=89=80=E6=9C=89=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=20=E5=88=97=E8=A1=A8=E6=9C=89=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=90=97=20=E5=BA=94=E8=AF=A5=E5=8A=A0=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=20=E6=A0=B9=E6=8D=AE=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=88=96=E8=80=85=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E5=85=B6=E4=BB=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/addressbook.vue                | 51 ++++---------------
 .../components/grouplist.vue                  | 19 +++++--
 .../expert_group/components/list.vue          |  3 +-
 .../rescue_expert/components/list.vue         | 12 ++---
 .../rescue_team/components/list.vue           |  4 +-
 .../rescue_team/components/peopleList.vue     | 10 ++--
 6 files changed, 38 insertions(+), 61 deletions(-)

diff --git a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue
index 9558a72..6589775 100644
--- a/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue
+++ b/src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue
@@ -38,7 +38,6 @@
       </el-row>
     </el-form>
     <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="NAME" label="姓名" />
       <el-table-column prop="SEX" width="180" align="center" label="性别" >
@@ -51,10 +50,10 @@
       <el-table-column prop="MOVE_PHONE" label="办公电话" />
       <el-table-column prop="DEPARTMENT" label="所属部门" />
       <el-table-column prop="POSITION" label="职务" />
-      <el-table-column label="操作" align="center" width="300">
+      <el-table-column label="操作" align="center" width="200">
         <template v-slot="{row}">
-          <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.ADDRESS_ID,row.NAME)">删除</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.ADDRESS_ID,row.NAME)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -62,57 +61,30 @@
       <div>
         <template>
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">添加</el-button>
-          <!--          <el-button type="danger" icon="el-icon-delete" plain @click="makeAll('0')">删除</el-button>-->
         </template>
       </div>
       <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-form ref="form" :rules="rules" :model="form" label-width="110px" style="width: 500px;">
-
         <el-form-item label="姓名" prop="NAME">
-          <el-input
-            v-model="form.NAME"
-            :rows="10"
-
-            placeholder="请输入姓名"/>
+          <el-input v-model="form.NAME" :rows="10" placeholder="请输入姓名"/>
         </el-form-item>
-
         <el-form-item label="性别" prop="form.SEX">
           <el-radio v-model="form.SEX" label="0">男</el-radio>
           <el-radio v-model="form.SEX" label="1">女</el-radio>
         </el-form-item>
-
         <el-form-item label="办公电话" prop="OFFICE_PHONE">
-          <el-input
-            v-model="form.OFFICE_PHONE"
-            :rows="10"
-
-            placeholder="请输入办公电话"/>
+          <el-input v-model="form.OFFICE_PHONE" :rows="10" placeholder="请输入办公电话"/>
         </el-form-item>
-
         <el-form-item label="移动电话" prop="MOVE_PHONE">
-          <el-input
-            v-model="form.MOVE_PHONE"
-            :rows="10"
-
-            placeholder="请输入移动电话"/>
+          <el-input v-model="form.MOVE_PHONE" :rows="10" placeholder="请输入移动电话"/>
         </el-form-item>
-
         <el-form-item label="部门" prop="DEPARTMENT">
-          <el-input
-            v-model="form.DEPARTMENT"
-            :rows="10"
-
-            placeholder="请输入部门"/>
+          <el-input v-model="form.DEPARTMENT" :rows="10" placeholder="请输入部门"/>
         </el-form-item>
-
         <el-form-item label="职务" prop="POSITION">
-          <el-input
-            v-model="form.POSITION"
-            :rows="10"
-
-            placeholder="请输入职务"/>
+          <el-input v-model="form.POSITION" :rows="10" placeholder="请输入职务"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -152,12 +124,7 @@ export default {
       },
       rules: {
         OFFICE_PHONE: [
-          { required: true, message: '办公电话不能为空', trigger: 'blur' },
-          { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
-          {
-            pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
-            message: '请输入正确的手机号码'
-          }
+          { required: true, message: '办公电话不能为空', trigger: 'blur' }
         ],
         MOVE_PHONE: [
           { required: true, message: '移动电话不能为空', trigger: 'blur' },
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 821fe9c..df6dcf4 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,10 +1,15 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
-      <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;"/>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
-        搜索
-      </el-button>
+      <el-form inline>
+        <el-form-item label="组名称:">
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;"/>
+        </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-search" @click="resetting">重置</el-button>
+        </el-form-item>
+      </el-form>
     </div>
 
     <el-table
@@ -43,7 +48,7 @@
     <el-dialog :visible.sync="dialogFormEdit" :title="dialogType==='editUser'?'修改':'新增'" width="600px">
       <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-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="请输入..."/>
@@ -265,6 +270,10 @@ export default {
       this.$refs.multipleTable.clearSelection()
       this.getList()
     },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
+    },
     getDic() {
       requestFN('/dictionaries/listTree', { PARENT_ID: '92f2bdab1c6140618784930d1ab183af' })
         .then((data) => {
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 ad278f3..8927333 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
@@ -50,7 +50,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="专家组名称" prop="EXPERT_GROUP_NAME">
-              <el-input v-model="form.EXPERT_GROUP_NAME" placeholder="请输入场区名称..." />
+              <el-input v-model="form.EXPERT_GROUP_NAME" placeholder="请输入专家组名称..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -581,6 +581,7 @@ export default {
     resetQuery() {
       this.KEYWORDS = ''
       this.EXPERT_GROUP_TYPE = ''
+      this.getList()
     },
     getDic() {
       const params = {
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 41497ea..3ae12d8 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
@@ -19,17 +19,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="EXPERT_NAME" label="名称" width="180" />
-
       <el-table-column prop="GENDER" width="180" align="center" label="性别" >
         <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="250">
         <template slot-scope="{row}">
           <el-button type="text" icon="el-icon-document" size="mini" @click="goList('detail', row.EXPERT_ID, '1')">查看</el-button>
@@ -625,13 +622,11 @@ export default {
       }).then(() => {
         this.listISLOADing = true
         requestFN(
-          '/yjexpert/delete',
-          {
-            id: id
-          }
+          '/yjexpert/delete', { id: id }
         ).then((data) => {
-          if (data.result == 'success') {
+          if (data.result === 'success') {
             this.listISLOADing = false
+            this.$message.success('删除成功')
             this.getList()
           }
         }).catch((e) => {
@@ -672,6 +667,7 @@ export default {
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
           this.getList()
+          this.$message.success('删除成功')
         }).catch((e) => {
           this.listISLOADing = false
         })
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 b208de7..c9f3173 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
@@ -4,7 +4,7 @@
       <el-row gutter="8">
         <el-form label-width="90px">
           <el-col :span="6">
-            <el-form-item label="机构名称：" prop="RESCUE_TEAM_NAME">
+            <el-form-item label="队伍名称：" prop="RESCUE_TEAM_NAME">
               <el-input v-model="RESCUE_TEAM_NAME" placeholder="机构名称" class="filter-item" />
             </el-form-item>
           </el-col>
@@ -793,6 +793,7 @@ export default {
         ).then((data) => {
           if (data.result === 'success') {
             this.listLoading = false
+            this.$message.success('删除成功')
             this.getList()
           }
         }).catch((e) => {
@@ -832,6 +833,7 @@ export default {
           this.varList = []
           this.listQuery.page = 1
           this.$refs.multipleTable.clearSelection()
+          this.$message.success('删除成功')
           this.getList()
         }).catch((e) => {
           this.listLoading = false
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 67f1102..a334bcb 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
@@ -2,8 +2,8 @@
   <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 label="姓名：" prop="RESCUE_TEAM_NAME">
+          <el-input v-model="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>
@@ -165,7 +165,8 @@ export default {
         }
       },
       title: '新增',
-      YJ_EMERGENCY_TEAM_INFO_ID: ''
+      YJ_EMERGENCY_TEAM_INFO_ID: '',
+      NAME: ''
     }
   },
   created() {
@@ -217,7 +218,8 @@ export default {
       requestFN(
         '/major/emergency/getTeamUserList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          YJ_EMERGENCY_TEAM_INFO_ID: this.YJ_EMERGENCY_TEAM_INFO_ID
+          YJ_EMERGENCY_TEAM_INFO_ID: this.YJ_EMERGENCY_TEAM_INFO_ID,
+          NAME: this.NAME
         }
       ).then((data) => {
         this.listLoading = false