526 删除和批量删除 不好使

525 查看不显示信息
524 编辑报错
516 应急管理所有菜单哪都有 选择框 选择之后显示灰色文字
515 新增和编辑的时候没有传真字段 查看的时候有
514 查看 备注没有回显
513 编辑 备注没有回显
512 删除不好使
511 类型搜索框 不好使

src/views/emergen_cyrescue/emergency_information/emergency_management_agency/emergency_personnel/components/list.vue

@@ -51,7 +51,10 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="性别" prop="GENDER">
-              <el-input v-model="form.GENDER" placeholder="请选择性别" disabled />
+              <el-select v-model="form.GENDER" disabled placeholder="请选择性别" style="width: 100%;">
+                <el-option label="男" value="0" />
+                <el-option label="女" value="1" />
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -105,7 +108,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="用户" prop="USER_ID">
+            <el-form-item label="用户" prop="USER_NAME">
               <el-input v-model="form.USER_NAME" placeholder="请选择用户" @click.native="openSelectUser()"/>
             </el-form-item>
           </el-col>
@@ -199,6 +202,7 @@ export default {
         limit: 10
       },
       rules: {
+        ORG_ID: [{ required: true, message: '请选择机构', trigger: 'blur' }],
         USER_NAME: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
         GENDER: [{ required: true, message: '请输入性别', trigger: 'blur' }],
         ADMINISTRATIVE_POSITION: [{ required: true, message: '请输入行政职务', trigger: 'blur' }],
@@ -321,7 +325,14 @@ export default {
       this.dialogType = 'saveUser'
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          console.log('error submit!!')
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/emergency_information/security_agency/assurance_management/components/list.vue

@@ -5,9 +5,6 @@
         <el-form-item label="机构名称：" prop="KEYWORDS_ORG_NAME">
           <el-input v-model="KEYWORDS_ORG_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="机构类型：" prop="KEYWORDS_ORG_TYPE">
-          <el-input v-model="KEYWORDS_ORG_TYPE" 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>

src/views/emergen_cyrescue/emergency_information/security_agency/institutional_management/components/list.vue

@@ -1,10 +1,16 @@
 <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 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" />
@@ -893,8 +899,11 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
-
   }
 }
 </script>

src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/detail.vue

@@ -116,7 +116,7 @@ export default {
     },
     getDetail(id) {
       const params = {
-        id: id
+        ID: id
       }
       requestFN('/skillInstitutions/detail', params).then((response) => {
         const data = response.data

src/views/emergen_cyrescue/emergency_information/security_agency/technical_management/components/list.vue

@@ -1,10 +1,16 @@
 <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="机构名称:" prop="SKILL_NAME">
-        搜索
+          <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 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" />
@@ -490,9 +496,8 @@ export default {
           ISLOAD: data.ISLOAD,
           // 所用燃料
           FUEL: data.FUEL,
-
           // 备注
-          REMARKSS: data.REMARKSS
+          REMARKS: data.REMARKS
         }
       }).catch((e) => {
         console.error('获取详情数据失败', e)
@@ -594,6 +599,10 @@ export default {
     getQuery() {
       this.$refs.multipleTable.clearSelection()
       this.getList()
+    },
+    resetting() {
+      this.KEYWORDS = ''
+      this.getList()
     }
 
   }

src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/detail.vue

@@ -26,9 +26,7 @@
           </tr>
           <tr>
             <td class="tbg">值班电话</td>
-            <td>{{ form.DUTY_PHONE }}</td>
+            <td colspan="3">{{ form.DUTY_PHONE }}</td>
-            <td class="tbg">传真</td>
-            <td>{{ form.FAX }}</td>
           </tr>
           <tr>
             <td class="tbg">所属区域</td>

src/views/emergen_cyrescue/emergency_information/security_agency/transportation_management/components/list.vue

@@ -5,9 +5,6 @@
         <el-form-item label="机构名称：" prop="KEYWORDS_ORG_NAME">
           <el-input v-model="KEYWORDS_ORG_NAME" placeholder="机构名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
-        <el-form-item label="机构类型：" prop="KEYWORDS_ORG_TYPE">
-          <el-input v-model="KEYWORDS_ORG_TYPE" 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>
@@ -598,13 +595,10 @@ export default {
         lat = this.form.LATITUDE
       }
       var point = new BMap.Point(lng, lat)
-      // var point = new BMap.Point(this.form.LONGITUDE, this.form.LATITUDE)
       const zoom = map.getZoom()
       setTimeout(() => {
         map.centerAndZoom(point, zoom)
       }, 0)
-      // var marker = new BMap.Marker(point) // 创建标注
-      // map.addOverlay(marker) // 将标注添加到地图中
     },
     handleMap() {
       this.dialogFormMap = true