547 提示语不正确

548 菜单内素有的编辑按钮 编辑也会提示添加成功
546 输入框内 文字不正确
545 搜索框 加标题 加重置
557 搜索框不好使
549 菜单内所有的删除按钮 删除没有二次提示

src/views/emergen_cyrescue/emergency_plan/company_plan-check/components/yvanfujian.vue

@@ -46,7 +46,7 @@
             placeholder="备注"/>
         </el-form-item>
 
-        <el-form-item label="附件地址">
+        <el-form-item label="附件">
           <el-upload
             ref="upload"
             :on-change="handleEditChange"

src/views/emergen_cyrescue/emergency_plan/company_plan/components/addfrom.vue

@@ -11,7 +11,7 @@
               <el-row :gutter="15">
                 <el-col :span="8">
                   <el-form-item label="预案名称" prop="PLANNAME">
-                    <el-input v-model="form.PLANNAME" placeholder="请输入资源名称..." />
+                    <el-input v-model="form.PLANNAME" placeholder="请输入预案名称..." />
                   </el-form-item>
                 </el-col>
                 <el-col :span="8">
@@ -147,9 +147,9 @@
       </baidu-map>
       <div slot="footer" class="dialog-footer">
         <span>经度：</span>
-        <el-input v-model="LON" style="width: 200px" placeholder="请输入内容" disabled />
+        <el-input v-model="LON" style="width: 200px" placeholder="请选择" disabled />
         <span>纬度：</span>
-        <el-input v-model="LAT" style="width: 200px" placeholder="请输入内容" disabled />
+        <el-input v-model="LAT" style="width: 200px" placeholder="请选择" disabled />
         <el-button @click="dialogFormMap = false">取 消</el-button>
         <el-button type="primary" @click="setPosition">确 定</el-button>
       </div>

src/views/emergen_cyrescue/emergency_plan/company_plan/components/check-yvanfujian.vue

@@ -43,7 +43,7 @@
             placeholder="备注"/>
         </el-form-item>
 
-        <el-form-item label="附件地址">
+        <el-form-item label="附件">
           <el-upload
             ref="upload"
             :on-change="handleEditChange"

src/views/emergen_cyrescue/emergency_plan/company_plan/components/yingjizhuangjia.vue

@@ -101,6 +101,11 @@ export default {
       this.dialogzhuangjiaShow = false
     },
     deletezhuangjiaPeople(row) {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.listISLOADing = true
         requestFN(
           '/plan/fractional/delete', { id: row.HIERARCHICALRESPONSE_ID }
@@ -116,6 +121,12 @@ export default {
         }).catch((e) => {
           this.listISLOADing = false
         })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     confirm() {
       this.zhuangjiafrom.FIRERESERVEPLAN_ID = this.planid
@@ -126,7 +137,7 @@ export default {
             '/plan/fractional/save', this.zhuangjiafrom
           ).then((data) => {
             this.$message({
-              message: '添加成功',
+              message: '操作成功',
               type: 'success'
             })
             this.dialogzhuangjiaShow = false

src/views/emergen_cyrescue/emergency_plan/company_plan/components/yvanfujian.vue

@@ -54,7 +54,7 @@
             placeholder="备注"/>
         </el-form-item>
 
-        <el-form-item label="附件地址">
+        <el-form-item label="附件">
           <el-upload
             ref="upload"
             :on-change="handleEditChange"

src/views/emergen_cyrescue/emergency_plan/company_plan/components/zuzhijiagou.vue

@@ -2,18 +2,9 @@
 <template>
   <div>
     <div class="filter-container">
-      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="jigouAdd">
+      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="jigouAdd">新增机构</el-button>
-        新增机构
+      <el-button class="filter-item" type="danger" icon="el-icon-delete" @click="jigoudelete">删除机构</el-button>
-      </el-button>
+      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="renyuanadd">新增人员</el-button>
-      <el-button class="filter-item" type="danger" icon="el-icon-delete" @click="jigoudelete">
-        删除机构
-      </el-button>
-      <el-button class="filter-item" type="primary" icon="el-icon-plus" @click="renyuanadd">
-        新增人员
-      </el-button>
-      <!--      <el-button class="filter-item" type="danger" icon="el-icon-delete" @click="renyuandelete">
-        批量删除
-      </el-button>-->
     </div>
     <el-container>
       <el-aside width="300px" style="background-color:#fff">
@@ -28,7 +19,6 @@
           @node-click="handleNodeClick"/>
       </el-aside>
       <el-main>
-
         <el-table
           v-loading="listLoading"
           ref="multipleTable"
@@ -42,7 +32,6 @@
           fit
           highlight-current-row
         >
-
           <el-table-column label="姓名" prop="NAME" />
           <el-table-column prop="DUTIES" label="职务"/>
           <el-table-column prop="POSITION" label="组内岗位"/>
@@ -51,8 +40,8 @@
           <el-table-column prop="PLANNINGDEPARTMENT_NAME" label="组织机构"/>
           <el-table-column label="操作" align="center" width="150px">
             <template slot-scope="{row}">
-              <el-button type="text" icon="el-icon-delete" size="mini" @click="deleterenyuanPeople(row.PLANNINGPERSONNEL_ID)">删除</el-button>
+              <el-button type="text" icon="el-icon-setting" size="mini" @click="updaterenyuanPeople(row)">编辑</el-button>
-              <el-button type="text" style="color: red" icon="el-icon-setting" size="mini" @click="updaterenyuanPeople(row)">编辑</el-button>
+              <el-button type="text" style="color: red" icon="el-icon-delete" size="mini" @click="deleterenyuanPeople(row.PLANNINGPERSONNEL_ID)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -67,7 +56,6 @@
       <el-tag class="mark_up" size="medium">上级菜单：{{ jigoumainid === '0' ?'(无) 此项为顶级分组':jigouname }}</el-tag>
       <div style="height: 10px"/>
       <el-form ref="form" :rules="rules" :model="jigoufrom" label-width="110px" style="width: 500px;">
-
         <el-form-item label="名称" prop="NAME">
           <el-input v-model="jigoufrom.NAME" placeholder="这里名称..." />
         </el-form-item>
@@ -77,7 +65,6 @@
         <el-form-item label="编码" prop="BIANMA">
           <el-input v-model="jigoufrom.BIANMA" placeholder="这里编码..." />
         </el-form-item>
-
         <el-form-item label="负责人" prop="HEADMAN">
           <el-input v-model="jigoufrom.HEADMAN" placeholder="这里负责人..." />
         </el-form-item>
@@ -87,28 +74,25 @@
         <el-form-item label="部门职能" prop="FUNCTIONS">
           <el-input v-model="jigoufrom.FUNCTIONS" placeholder="这里部门职能..." />
         </el-form-item>
-
         <el-form-item label="地址" prop="ADDRESS">
           <el-input v-model="jigoufrom.ADDRESS" placeholder="这里地址..." />
         </el-form-item>
         <el-form-item label="备注" prop="BZ">
           <el-input v-model="jigoufrom.BZ" placeholder="这里备注..." />
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogjigouShow = false">取 消</el-button>
         <el-button type="primary" @click="jigouconfirm">确 定</el-button>
       </div>
     </el-dialog>
-
     <el-dialog :visible.sync="dialogrenyuanShow" title="人员" width="600px" >
-      <el-tag class="mark_up" size="medium">所属机构：{{ jigoumainid == '0' ?'(无) 此项为顶级分组':jigouname }}</el-tag>
-      <div style="height: 10px"/>
       <el-form ref="form2" :rules="rules2" :model="renyuanfrom" label-width="110px" style="width: 500px;">
-
+        <el-form-item prop="title" label="">
+          <el-tag class="mark_up" size="medium">所属机构：{{ jigoumainid === '0' ?'(无) 此项为顶级分组':jigouname }}</el-tag>
+        </el-form-item>
         <el-form-item label="姓名" prop="NAME">
-          <el-input v-model="renyuanfrom.NAME" placeholder="这里姓名..." />
+          <el-input v-model="renyuanfrom.NAME" placeholder="这里姓名..." @click.native="openSelectUser()" />
         </el-form-item>
         <el-form-item label="职务" prop="DUTIES">
           <el-input v-model="renyuanfrom.DUTIES" placeholder="这里职务..." />
@@ -116,31 +100,30 @@
         <el-form-item label="组内岗位" prop="POSITION">
           <el-input v-model="renyuanfrom.POSITION" placeholder="这里组内岗位..." />
         </el-form-item>
-
         <el-form-item label="联系电话" prop="LINKPHONE">
           <el-input v-model="renyuanfrom.LINKPHONE" placeholder="这里联系电话..." />
         </el-form-item>
         <el-form-item label="紧急联系电话" prop="URGENTLINKPHONE">
           <el-input v-model="renyuanfrom.URGENTLINKPHONE" placeholder="这里紧急联系电话..." />
         </el-form-item>
-
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogrenyuanShow = false">取 消</el-button>
         <el-button type="primary" @click="renyuanconfirm">确 定</el-button>
       </div>
     </el-dialog>
-
+    <select-zhi-ban-user ref="selectZhiBanUser" @selectPeople="selectPeople"/>
   </div>
-
 </template>
 <script>
 import { requestFN } from '@/utils/request'
 import Pagination from '@/components/Pagination'
 import { Treeselect } from '@riophae/vue-treeselect'
+import SelectZhiBanUser
+  from '../../../emergency_report/duty_management/duty_log/components/selectZhiBanUser.vue'
 export default {
   name: 'Yingjizhuangjia',
-  components: { Pagination, Treeselect },
+  components: { SelectZhiBanUser, Pagination, Treeselect },
   props: {
     planid: {
       type: String,
@@ -196,9 +179,20 @@ export default {
       jigoumainid: '0',
       jigouname: '',
       dialogjigouShow: false,
-      jigoufrom: { NAME: '' },
+      jigoufrom: {
+        NAME: '',
+        USER_ID: ''
+      },
       //* ******人员*********
-      renyuanfrom: { NAME: '' },
+      renyuanfrom: {
+        PLANNINGPERSONNEL_ID: '',
+        NAME: '',
+        USER_ID: '',
+        DUTIES: '',
+        POSITION: '',
+        LINKPHONE: '',
+        URGENTLINKPHONE: ''
+      },
       dialogrenyuanShow: false
     }
   },
@@ -215,9 +209,16 @@ export default {
         })
         return
       }
-
       this.dialogrenyuanShow = true
-      this.renyuanfrom = {}
+      this.renyuanfrom = {
+        PLANNINGPERSONNEL_ID: '',
+        NAME: '',
+        USER_ID: '',
+        DUTIES: '',
+        POSITION: '',
+        LINKPHONE: '',
+        URGENTLINKPHONE: ''
+      }
     },
     updaterenyuanPeople(row) {
       this.dialogrenyuanShow = true
@@ -225,7 +226,7 @@ export default {
       this.renyuanfrom = {
         PLANNINGPERSONNEL_ID: row.PLANNINGPERSONNEL_ID,
         NAME: row.NAME,
-
+        USER_ID: row.USER_ID,
         DUTIES: row.DUTIES,
         POSITION: row.POSITION,
         LINKPHONE: row.LINKPHONE,
@@ -234,6 +235,11 @@ export default {
       }
     },
     deleterenyuanPeople(id) {
+      this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         this.listISLOADing = true
         requestFN(
           '/plan/planningDepartment/deletePersonnel', { id: id }
@@ -242,12 +248,17 @@ export default {
             message: '移除成功',
             type: 'success'
           })
-
           this.listISLOADing = false
           this.getDEPARTMENTList()
         }).catch((e) => {
           this.listISLOADing = false
         })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
     },
     renyuanconfirm() {
       this.$refs.form2.validate(valid => {
@@ -307,13 +318,6 @@ export default {
       })
     },
     jigouconfirm() {
-      /* if (this.jigoufrom.NAME === undefined) {
-        this.$message({
-          message: '名称不能为空',
-          type: 'warning'
-        })
-        return
-      }*/
       this.$refs.form.validate(valid => {
         if (valid) {
           this.listISLOADing = true
@@ -380,6 +384,13 @@ export default {
       }).catch((e) => {
         this.listLoading = false
       })
+    },
+    selectPeople(row) {
+      this.renyuanfrom.USER_ID = row.USER_ID
+      this.renyuanfrom.NAME = row.NAME
+    },
+    openSelectUser() {
+      this.$refs.selectZhiBanUser.init()
     }
   }
 }