521 应急管理系统内所有搜索框 都应该有重置按钮

509 办公电话是手机号码吗 注意所有电话输入框
507 搜索框 没有重置按钮
504 专家组成员新增按钮位置调整
500 删除成功 没有提示
494 删除成功 没有提示
491 应急管理所有的菜单 列表有排序吗 应该加排序 根据创建时间或者修改时间或者其他逻辑

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="text" 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" 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
+          <el-input v-model="form.NAME" :rows="10" placeholder="请输入姓名"/>
-            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
+          <el-input v-model="form.OFFICE_PHONE" :rows="10" placeholder="请输入办公电话"/>
-            v-model="form.OFFICE_PHONE"
-            :rows="10"
-
-            placeholder="请输入办公电话"/>
         </el-form-item>
-
         <el-form-item label="移动电话" prop="MOVE_PHONE">
-          <el-input
+          <el-input v-model="form.MOVE_PHONE" :rows="10" placeholder="请输入移动电话"/>
-            v-model="form.MOVE_PHONE"
-            :rows="10"
-
-            placeholder="请输入移动电话"/>
         </el-form-item>
-
         <el-form-item label="部门" prop="DEPARTMENT">
-          <el-input
+          <el-input v-model="form.DEPARTMENT" :rows="10" placeholder="请输入部门"/>
-            v-model="form.DEPARTMENT"
-            :rows="10"
-
-            placeholder="请输入部门"/>
         </el-form-item>
-
         <el-form-item label="职务" prop="POSITION">
-          <el-input
+          <el-input v-model="form.POSITION" :rows="10" placeholder="请输入职务"/>
-            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' },
+          { 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: '请输入正确的手机号码'
-          }
         ],
         MOVE_PHONE: [
           { required: true, message: '移动电话不能为空', trigger: 'blur' },

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-form inline>
-      <el-button class="filter-item" type="primary" icon="el-icon-search" @click="getQuery">
+        <el-form-item label="组名称:">
-        搜索
+          <el-input v-model="KEYWORDS" placeholder="搜索" class="filter-item" style="width: 200px;margin-right: 10px;"/>
-      </el-button>
+        </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) => {

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 = {

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',
+          '/yjexpert/delete', { id: id }
-          {
-            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
         })

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

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-form-item label="姓名：" prop="RESCUE_TEAM_NAME">
-          <el-input v-model="RESCUE_TEAM_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;"/>
+          <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