Merge branch 'liujun0703-新项目开发' of http://47.92.113.182:3000/guoyuepeng/qa-prevention-gwj-vue into liujun0703-新项目开发

src/views/emergen_cyrescue/emergency_information/emergency_address_book/components/addressbook.vue

@@ -70,7 +70,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 label="内容" prop="CONTENT">
+        <el-form-item label="姓名" prop="NAME">
           <el-input
             v-model="form.NAME"
             :rows="10"
@@ -168,7 +168,7 @@ export default {
           }
         ],
         NAME: [
-          { required: true, message: '类型不能为空', trigger: 'blur' },
+          { required: true, message: '姓名不能为空', trigger: 'blur' },
           { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         DEPARTMENT: [
           { required: true, message: '部门不能为空', trigger: 'blur' },
@@ -228,7 +228,9 @@ export default {
         ADDRESS_ID: v.ADDRESS_ID,
         SEX: v.SEX,
         OFFICE_PHONE: v.OFFICE_PHONE,
-        MOVE_PHONE: v.MOVE_PHONE
+        MOVE_PHONE: v.MOVE_PHONE,
+        DEPARTMENT: v.DEPARTMENT,
+        POSITION: v.POSITION
       }
       this.dialogType = 'editUser'
     },

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

@@ -266,6 +266,21 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        ORG_NAME: [
+          { required: true, message: '机构名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        DUTY_PHONE: [
+          { required: true, message: '值班电话不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         ORG_NAME: '',
         ORG_TYPE_NAME: '',
@@ -558,7 +573,13 @@ export default {
       this.$refs.upload.clearFiles()
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

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

@@ -41,7 +41,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="250px">
+      <el-form ref="form" :rules="rules" :model="form" label-width="160px">
         <el-form-item label="通信机构名称" prop="ORG_NAME">
           <el-input v-model="form.ORG_NAME" placeholder="请输入通信机构名称..." />
         </el-form-item>
@@ -336,6 +336,24 @@ export default {
         EMERGENCY_CAPACITY_DESCRIPTION: '',
         REMARK: ''
       },
+      rules: {
+        ORG_NAME: [
+          { required: true, message: '通信机构名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        RESPONSIBLE_PERSON: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        RESPONSIBLE_OFFICE_PHONE: [
+          { required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
+        ]
+      },
       // rules: {
       //   ORG_NAME: [
       //     { required: true, message: '通信机构名称不能为空', trigger: 'blur' },
@@ -739,7 +757,13 @@ export default {
       this.$refs.upload.clearFiles()
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

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

@@ -330,6 +330,24 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        INSTITUTION_NAME: [
+          { required: true, message: '机构名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        PERSON_IN_CHARGE: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        PIC_OFFICE_PHONE: [
+          { required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         // 医疗机构名称
         INSTITUTION_NAME: '',

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

@@ -233,6 +233,24 @@ export default {
         // 备注
         REMARKSS: ''
       },
+      rules: {
+        SKILL_NAME: [
+          { required: true, message: '机构名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        CONTACT_OFFICE_PHONE: [
+          { required: true, message: '联系人办公电话不能为空', trigger: 'blur' }
+        ]
+      },
       // rules: {
       //   SKILL_NAME: [
       //     { required: true, message: '医疗机构名称不能为空', trigger: 'blur' },

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

@@ -311,116 +311,128 @@ export default {
         EMERGENCY_CAPACITY_DESCRIPTION: '',
         REMARK: ''
       },
-      // rules: {
+      rules: {
-      //   ORG_NAME: [
+        ORG_NAME: [
-      //     { required: true, message: '运输机构名称不能为空', trigger: 'blur' },
+          { required: true, message: '运输机构名称不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   ORG_TYPE: [
+        LONGITUDE: [
-      //     { required: true, message: '运输机构类型不能为空', trigger: 'blur' },
+          { required: true, message: '经度不能为空', trigger: 'blur' }
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
-      //   ],
+        LATITUDE: [
-      //   ORG_LEVEL: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
-      //     { required: true, message: '运输机构级别不能为空', trigger: 'blur' },
+        ],
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+        RESPONSIBLE_PERSON: [
-      //   ],
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
-      //   ADDRESS: [
+        ],
-      //     { required: true, message: '地址不能为空', trigger: 'blur' },
+        RESPONSIBLE_OFFICE_PHONE: [
-      //     { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
+          { required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
-      //   ],
+        ]/*,
-      //   POSTAL_CODE: [
+        ORG_TYPE: [
-      //     { required: true, message: '邮编不能为空', trigger: 'blur' },
+          { required: true, message: '运输机构类型不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   SECURITY_LEVEL: [
+        ORG_LEVEL: [
-      //     { required: true, message: '机构密级不能为空', trigger: 'blur' },
+          { required: true, message: '运输机构级别不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   DUTY_PHONE: [
+        ADDRESS: [
-      //     { required: true, message: '值班电话不能为空', trigger: 'blur' },
+          { required: true, message: '地址不能为空', trigger: 'blur' },
-      //     { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
+          { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   ADMINISTRATIVE_REGION: [
+        POSTAL_CODE: [
-      //     { required: true, message: '所属区域不能为空', trigger: 'blur' },
+          { required: true, message: '邮编不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   LONGITUDE: [
+        SECURITY_LEVEL: [
-      //     { required: true, message: '经度不能为空', trigger: 'blur' },
+          { required: true, message: '机构密级不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   LATITUDE: [
+        DUTY_PHONE: [
-      //     { required: true, message: '纬度不能为空', trigger: 'blur' },
+          { required: true, message: '值班电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 5, max: 255, message: '长度在 5 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   EMERGENCY_TRANSPORT_MODE: [
+        ADMINISTRATIVE_REGION: [
-      //     { required: true, message: '应急运输方式不能为空', trigger: 'blur' },
+          { required: true, message: '所属区域不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   RESPONSIBLE_PERSON: [
+        LONGITUDE: [
-      //     { required: true, message: '负责人不能为空', trigger: 'blur' },
+          { required: true, message: '经度不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   RESPONSIBLE_OFFICE_PHONE: [
+        LATITUDE: [
-      //     { required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
+          { required: true, message: '纬度不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   RESPONSIBLE_MOBILE_PHONE: [
+        EMERGENCY_TRANSPORT_MODE: [
-      //     { required: true, message: '负责人移动电话不能为空', trigger: 'blur' },
+          { required: true, message: '应急运输方式不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   RESPONSIBLE_HOME_PHONE: [
+        RESPONSIBLE_PERSON: [
-      //     { required: true, message: '负责人住宅电话不能为空', trigger: 'blur' },
+          { required: true, message: '负责人不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CONTACT_PERSON: [
+        RESPONSIBLE_OFFICE_PHONE: [
-      //     { required: true, message: '联系人不能为空', trigger: 'blur' },
+          { required: true, message: '负责人办公电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CONTACT_OFFICE_PHONE: [
+        RESPONSIBLE_MOBILE_PHONE: [
-      //     { required: true, message: '联系人办公电话不能为空', trigger: 'blur' },
+          { required: true, message: '负责人移动电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CONTACT_MOBILE_PHONE: [
+        RESPONSIBLE_HOME_PHONE: [
-      //     { required: true, message: '联系人移动电话不能为空', trigger: 'blur' },
+          { required: true, message: '负责人住宅电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CONTACT_HOME_PHONE: [
+        CONTACT_PERSON: [
-      //     { required: true, message: '联系人住宅电话不能为空', trigger: 'blur' },
+          { required: true, message: '联系人不能为空', trigger: 'blur' },
-      //     { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CONTACT_EMAIL: [
+        CONTACT_OFFICE_PHONE: [
-      //     { required: true, message: '联系人电子邮箱不能为空', trigger: 'blur' },
+          { required: true, message: '联系人办公电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   SUPERVISING_UNIT: [
+        CONTACT_MOBILE_PHONE: [
-      //     { required: true, message: '主管单位不能为空', trigger: 'blur' },
+          { required: true, message: '联系人移动电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   SUPERVISING_UNIT_ADDRESS: [
+        CONTACT_HOME_PHONE: [
-      //     { required: true, message: '主管单位地址不能为空', trigger: 'blur' },
+          { required: true, message: '联系人住宅电话不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   COMPANY_OVERVIEW: [
+        CONTACT_EMAIL: [
-      //     { required: true, message: '企业基本情况不能为空', trigger: 'blur' },
+          { required: true, message: '联系人电子邮箱不能为空', trigger: 'blur' },
-      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   PASSENGER_TRANSPORT_CAPACITY: [
+        SUPERVISING_UNIT: [
-      //     { required: true, message: '客运能力不能为空', trigger: 'blur' },
+          { required: true, message: '主管单位不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   CARGO_TRANSPORT_CAPACITY: [
+        SUPERVISING_UNIT_ADDRESS: [
-      //     { required: true, message: '货运能力不能为空', trigger: 'blur' },
+          { required: true, message: '主管单位地址不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   EMERGENCY_CAPACITY_DESCRIPTION: [
+        COMPANY_OVERVIEW: [
-      //     { required: true, message: '应急能力描述不能为空', trigger: 'blur' },
+          { required: true, message: '企业基本情况不能为空', trigger: 'blur' },
-      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+          { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
-      //   ],
+        ],
-      //   REMARK: [
+        PASSENGER_TRANSPORT_CAPACITY: [
-      //     { required: true, message: '备注不能为空', trigger: 'blur' },
+          { required: true, message: '客运能力不能为空', trigger: 'blur' },
-      //     { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ]
+        ],
-      // },
+        CARGO_TRANSPORT_CAPACITY: [
+          { required: true, message: '货运能力不能为空', trigger: 'blur' },
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+        ],
+        EMERGENCY_CAPACITY_DESCRIPTION: [
+          { required: true, message: '应急能力描述不能为空', trigger: 'blur' },
+          { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+        ],
+        REMARK: [
+          { required: true, message: '备注不能为空', trigger: 'blur' },
+          { min: 1, max: 1000, message: '长度在 1 到 1000 个字符', trigger: 'blur' }
+        ]*/
+      },
       FFILE: [],
       caseSummaryList: [],
       treeData: [],
@@ -697,7 +709,13 @@ export default {
       this.$refs.upload.clearFiles()
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/emergency_map_icon/components/list.vue

@@ -30,7 +30,7 @@
           <el-image
             :src="config.fileUrl + row.FILE_PATH"
             :preview-src-list="[config.fileUrl +row.FILE_PATH]"
-            style="width: 100px; height: 100px"/>
+            style="width: 40px; height: 40px"/>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" width="220">
@@ -98,7 +98,7 @@ export default {
       requestFN('bi/emergency/iconList?showCount=' + this.page.limit + '&currentPage=' + this.page.page, this.form).then((data) => {
         this.loading = false
         this.list = data.varList
-        this.page.total = data.page.totalResult
+        this.total = data.page.totalResult
         this.hasButton()
       }).catch((e) => {
         this.loading = false

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

@@ -73,7 +73,7 @@ export default {
       zhuangjianame: '',
       dialogzhuangjiaShow: false,
       yjzjvarList: [],
-      yjzhuangjiatotal: [],
+      yjzhuangjiatotal: 0,
       zhuanjiaList: [],
       listQueryzj: {
         page: 1,

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

@@ -194,6 +194,10 @@ export default {
           { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
         PLANTYPE: [
           { required: true, message: '预案类型不能为空', trigger: 'blur' }],
+        LON: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }],
+        LAT: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }],
         PLANCODE: [
           { required: true, message: '预案编码不能为空', trigger: 'blur' }],
         PLANGRADE: [

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

@@ -210,7 +210,7 @@ export default {
     renyuanadd() {
       if (this.jigoumainid === '0') {
         this.$message({
-          message: '请选择结构',
+          message: '请选择机构',
           type: 'warning'
         })
         return

src/views/emergen_cyrescue/emergency_report/duty_management/duty_log/components/list.vue

@@ -50,7 +50,7 @@
             v-model="form.START_TIME"
             type="datetime"
             placeholder="请选择接报时间"
-            format="yyyy-MM-dd HH:mm:ss"
+
             value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%;"
           />
@@ -60,7 +60,7 @@
             v-model="form.END_TIME"
             type="datetime"
             placeholder="请选择发生时间"
-            format="yyyy-MM-dd HH:mm:ss"
+
             value-format="yyyy-MM-dd HH:mm:ss"
             style="width: 100%;"
           />
@@ -123,6 +123,32 @@ export default {
       dialogFormShow: false,
       dialogType: 'add',
       UNIT: '',
+      rules: {
+        UNIT: [
+          { required: true, message: '单位不能为空', trigger: 'blur' }
+        ],
+        START_TIME: [
+          { required: true, message: '开始时间不能为空', trigger: 'blur' }
+        ],
+        END_TIME: [
+          { required: true, message: '结束时间不能为空', trigger: 'blur' }
+        ],
+        DUTY_RECORD: [
+          { required: true, message: '值班记录不能为空', trigger: 'blur' }
+        ],
+        HANDLING_SITUATION: [
+          { required: true, message: '处理情况不能为空', trigger: 'blur' }
+        ],
+        HANDOVER_ITEMS: [
+          { required: true, message: '交接事项不能为空', trigger: 'blur' }
+        ],
+        DUTY_PERSONNEL: [
+          { required: true, message: '值班人员不能为空', trigger: 'blur' }
+        ],
+        SHIFT_PERSONNEL: [
+          { required: true, message: '接班人员不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         ID: '',
         UNIT: '',
@@ -225,10 +251,17 @@ export default {
       this.dialogType = 'saveUser'
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true
+
       requestFN('/major/dutylog/save', this.form).then((data) => {
         this.listLoading = false
         this.dialogFormEdit = false

src/views/emergen_cyrescue/emergency_report/incident_report/components/list.vue

@@ -134,13 +134,13 @@
           <el-col :span="12">
             <el-form-item label="是否救援" prop="ISRESCUE">
               <el-radio-group v-model="form.ISRESCUE">
-                <el-radio :label="true">是</el-radio>
+                <el-radio :label="'true'">是</el-radio>
-                <el-radio :label="false">否</el-radio>
+                <el-radio :label="'false'">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row v-if="form.ISRESCUE" :gutter="20">
+        <el-row v-if="form.ISRESCUE==='true'" :gutter="20">
           <el-col :span="12">
             <el-form-item label="应急预案" prop="FIRERESERVEPLAN_ID">
               <el-select v-model="form.FIRERESERVEPLAN_ID" placeholder="请选择应急预案..." @change="handlePlanChange">
@@ -521,7 +521,7 @@ export default {
         CONTACT_PHONE: '',
         OTHER_INFO: '',
         UNIT_NAME: '',
-        REGION: '',
+        REGION: null,
         UNIT_ADDRESS: '',
         INDUSTRY_TYPE: '',
         ECONOMIC_TYPE: '',
@@ -567,7 +567,7 @@ export default {
         CONTACT_PHONE: '',
         OTHER_INFO: '',
         UNIT_NAME: '',
-        REGION: '',
+        REGION: null,
         UNIT_ADDRESS: '',
         INDUSTRY_TYPE: '',
         ECONOMIC_TYPE: '',
@@ -592,6 +592,35 @@ export default {
         BRIEF_PROCESS: '',
         DISPOSAL_SITUATION: ''
       },
+      rules: {
+        ACCESS_MODE: [
+          { required: true, message: '事件标题不能为空', trigger: 'blur' }
+        ],
+        OWNER_NAME: [
+          { required: true, message: '机主姓名不能为空', trigger: 'blur' }
+        ],
+        INCOMING_PHONE: [
+          { required: true, message: '呼入电话不能为空', trigger: 'blur' }
+        ],
+        EVENT_TYPE: [
+          { required: true, message: '事件类型不能为空', trigger: 'blur' }
+        ],
+        REPORT_TIME: [
+          { required: true, message: '接报时间不能为空', trigger: 'blur' }
+        ],
+        OCCURRENCE_TIME: [
+          { required: true, message: '发生时间不能为空', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        ISRESCUE: [
+          { required: true, message: '是否救援不能为空', trigger: 'blur' }
+        ]
+      },
       // rules: {
       //   EVENT_NAME: [
       //     { required: true, message: '事件标题不能为空', trigger: 'blur' }
@@ -742,8 +771,8 @@ export default {
     handleRegionChange(value) {
       const selectedRegion = this.regionData.find(region => region.DICTIONARIES_ID === value)
       if (selectedRegion) {
-        this.form.REGION_NAME = selectedRegion.name
+        // this.form.REGION_NAME = selectedRegion.name
-        this.reportForm.REGION = selectedRegion.name
+        // this.reportForm.REGION = selectedRegion.name
       }
     },
     getQuery() {

src/views/emergen_cyrescue/emergency_team/expert_group/components/list.vue

@@ -48,12 +48,12 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="专家组级别" prop="EXPERT_GROUP_NAME">
+            <el-form-item label="专家组级别" prop="EXPERT_GROUP_LEVEL">
               <el-input v-model="form.EXPERT_GROUP_LEVEL" placeholder="专家组级别..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="EXPERT_GROUP_NAME">
+            <el-form-item label="联系电话" prop="CONTACT_TELEPHONE">
               <el-input v-model="form.CONTACT_TELEPHONE" placeholder="联系电话..." />
             </el-form-item>
           </el-col>
@@ -204,6 +204,14 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        EXPERT_GROUP_NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+        NUMBER_OF_PEOPLE: [
+          { required: true, message: '人数不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         // 专家组名称
         EXPERT_GROUP_NAME: '',

src/views/emergen_cyrescue/emergency_team/rescue_expert/components/list.vue

@@ -48,7 +48,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="性别" prop="form.GENDER">
+            <el-form-item label="性别" prop="GENDER">
               <el-radio v-model="form.GENDER" label="0">男</el-radio>
               <el-radio v-model="form.GENDER" label="1">女</el-radio>
             </el-form-item>
@@ -63,7 +63,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="身份证" prop="EXPERT_NAME">
+            <el-form-item label="身份证" prop="ID_CARD">
               <el-input v-model="form.ID_CARD" placeholder="身份证..." />
             </el-form-item>
           </el-col>
@@ -71,12 +71,12 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="专家类型" prop="EXPERT_NAME">
+            <el-form-item label="专家类型" prop="EXPERT_TYPE">
               <el-input v-model="form.EXPERT_TYPE" placeholder="请输入专家类型..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="专家密级" prop="EXPERT_NAME">
+            <el-form-item label="专家密级" prop="EXPERT_SECRET_LEVEL">
               <el-input v-model="form.EXPERT_SECRET_LEVEL" placeholder="专家密级..." />
             </el-form-item>
           </el-col>
@@ -84,12 +84,12 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="职称" prop="EXPERT_NAME">
+            <el-form-item label="职称" prop="PROFESSIONAL_TITLE">
               <el-input v-model="form.PROFESSIONAL_TITLE" placeholder="请输入职称..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="专业类型" prop="EXPERT_NAME">
+            <el-form-item label="专业类型" prop="PROFESSIONAL_TYPE">
               <el-input v-model="form.PROFESSIONAL_TYPE" placeholder="专业类型..." />
             </el-form-item>
           </el-col>
@@ -97,12 +97,12 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="民族" prop="EXPERT_NAME">
+            <el-form-item label="民族" prop="ETHNICITY">
               <el-input v-model="form.ETHNICITY" placeholder="请输入民族..." />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="政治面貌" prop="EXPERT_NAME">
+            <el-form-item label="政治面貌" prop="POLITICAL_STATUS">
               <el-input v-model="form.POLITICAL_STATUS" placeholder="政治面貌..." />
             </el-form-item>
           </el-col>
@@ -110,7 +110,7 @@
 
         <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="最高学历" prop="EXPERT_NAME">
+            <el-form-item label="最高学历" prop="HIGHEST_EDUCATION">
               <el-input v-model="form.HIGHEST_EDUCATION" placeholder="请输入最高学历..." />
             </el-form-item>
           </el-col>
@@ -298,6 +298,12 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        EXPERT_NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }]
+
+      },
       form: {
         // 名称
         EXPERT_NAME: '',

src/views/emergen_cyrescue/emergency_team/rescue_team/components/list.vue

@@ -413,6 +413,25 @@ export default {
         REQUIRES_BACKUP_SUPPORT: '',
         REMARK: ''
       },
+      rules: {
+        RESCUE_TEAM_NAME: [
+          { required: true, message: '救援队名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        RESPONSIBLE_PERSON: [
+          { required: true, message: '负责人不能为空', trigger: 'blur' }
+        ],
+        RESPONSIBLE_OFFICE_PHONE: [
+          { required: true, message: '负责人办公电话不能为空', trigger: 'blur' }
+        ]
+      },
       // rules: {
       //   RESCUE_TEAM_NAME: [
       //     { required: true, message: '救援队名称不能为空', trigger: 'blur' },
@@ -831,7 +850,13 @@ export default {
       this.$refs.upload.clearFiles()
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/resource_management/closed_bayonet/components/list.vue

@@ -97,29 +97,29 @@ export default {
         CONTACT_PERSON: '',
         CONTACT_PHONE: '',
         DESCRIPTION: ''
+      },
+      rules: {
+        NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        ADDRESS: [
+          { required: true, message: '地址不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        CONTACT_PHONE: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
+        ],
+        DESCRIPTION: [
+          { required: true, message: '描述不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ]
       }
-      // rules: {
-      //   NAME: [
-      //     { required: true, message: '名称不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   ADDRESS: [
-      //     { required: true, message: '地址不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_PERSON: [
-      //     { required: true, message: '联系人不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_PHONE: [
-      //     { required: true, message: '联系电话不能为空', trigger: 'blur' },
-      //     { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   DESCRIPTION: [
-      //     { required: true, message: '描述不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ]
-      // }
     }
   },
   created() {
@@ -174,7 +174,13 @@ export default {
       }
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/resource_management/drainage_well/components/list.vue

@@ -114,6 +114,12 @@ export default {
         CONTACT_PHONE: '',
         DESCRIPTION: ''
       },
+      rules: {
+        NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ]
+      },
       yjTypeData: [],
       normalizer(node) {
         return {
@@ -205,7 +211,13 @@ export default {
       console.log('Form initialized:', this.form)
     },
     confirm() {
-      this.dataSave()
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/resource_management/emergency_shelter/components/list.vue

@@ -83,7 +83,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系人固定电话" prop="CONTACT_OFFICE_PHONE">
+            <el-form-item label="联系人固定电话" prop="CONTACT_TELE_PHONE">
               <el-input v-model="form.CONTACT_TELE_PHONE" placeholder="请输入联系人固定电话..." />
             </el-form-item>
           </el-col>
@@ -92,7 +92,7 @@
         <el-row :gutter="20">
 
           <el-col :span="12">
-            <el-form-item label="联系人移动电话" prop="CONTACT_PERSON">
+            <el-form-item label="联系人移动电话" prop="CONTACT_MOBILE_PHONE">
               <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入联系人移动电话..." />
             </el-form-item>
           </el-col>
@@ -210,6 +210,25 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        SHELTER_NAME: [
+          { required: true, message: '场区名称不能为空', trigger: 'blur' },
+          { min: 2, max: 30, message: '长度在 2 到 30 个字符', trigger: 'blur' }],
+
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        CONTACT_TELE_PHONE: [
+          { required: true, message: '联系人固定电话不能为空', trigger: 'blur' }
+        ]
+
+      },
       form: {
         // 名称
         SHELTER_NAME: '',

src/views/emergen_cyrescue/resource_management/emergency_supplies/components/supplies.vue

@@ -137,7 +137,7 @@
     <!-- 坐标选择 -->
     <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
       <baidu-map
-        v-ISLOADing="ISLOADingMap"
+        v-loading="ISLOADingMap"
         :zoom="zoom"
         :scroll-wheel-zoom="true"
         :style="{height: clientHeight+'px'}"

src/views/emergen_cyrescue/resource_management/equipment_library/components/equipment.vue

@@ -81,7 +81,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责保管人固定电话" prop="CONTACT_OFFICE_PHONE">
+            <el-form-item label="负责保管人固定电话" prop="CONTACT_TELE_PHONE">
               <el-input v-model="form.CONTACT_TELE_PHONE" placeholder="请输入负责保管人固定电话..." />
             </el-form-item>
           </el-col>
@@ -90,7 +90,7 @@
         <el-row :gutter="20">
 
           <el-col :span="12">
-            <el-form-item label="负责保管人移动电话" prop="CONTACT_PERSON">
+            <el-form-item label="负责保管人移动电话" prop="CONTACT_MOBILE_PHONE">
               <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入负责保管人移动电话..." />
             </el-form-item>
           </el-col>
@@ -125,7 +125,7 @@
     <!-- 坐标选择 -->
     <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
       <baidu-map
-        v-ISLOADing="ISLOADingMap"
+        v-loading="ISLOADingMap"
         :zoom="zoom"
         :scroll-wheel-zoom="true"
         :style="{height: clientHeight+'px'}"
@@ -201,6 +201,24 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        EQUIP_NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '负责保管人不能为空', trigger: 'blur' }
+        ],
+        CONTACT_TELE_PHONE: [
+          { required: true, message: '负责保管人固定电话不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         // 名称
         EQUIP_NAME: '',

src/views/emergen_cyrescue/resource_management/equipment_library/components/facilities.vue

@@ -79,7 +79,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="联系人电话" prop="CONTACT_OFFICE_PHONE">
+            <el-form-item label="联系人电话" prop="CONTACT_MOBILE_PHONE">
               <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入联系人电话..." />
             </el-form-item>
           </el-col>
@@ -88,7 +88,7 @@
         <el-row :gutter="20">
 
           <el-col :span="12">
-            <el-form-item label="第二联系人" prop="CONTACT_PERSON">
+            <el-form-item label="第二联系人" prop="CONTACT_PERSON_TOW">
               <el-input v-model="form.CONTACT_PERSON_TOW" placeholder="请输入第二联系人..." />
             </el-form-item>
           </el-col>
@@ -125,7 +125,7 @@
     <!-- 坐标选择 -->
     <el-dialog :visible.sync="dialogFormMap" title="编辑坐标" width="800px" class="dy-dialog">
       <baidu-map
-        v-ISLOADing="ISLOADingMap"
+        v-loading="ISLOADingMap"
         :zoom="zoom"
         :scroll-wheel-zoom="true"
         :style="{height: clientHeight+'px'}"
@@ -198,6 +198,24 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        FAC_NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' }
+        ],
+        CONTACT_MOBILE_PHONE: [
+          { required: true, message: '联系人电话不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         // 医疗名称
         FAC_NAME: '',

src/views/emergen_cyrescue/resource_management/equipment_library/components/list.vue

@@ -134,41 +134,41 @@ export default {
         CONTACT_PHONE: '',
         CONTACT_MOBILE_PHONE: '',
         COMPANY_NAME: ''
+      },
+      rules: {
+        RESOURCE_LIBRARY_NAME: [
+          { required: true, message: '资源库名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        LOCATION: [
+          { required: true, message: '所在地点不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        RESOURCE_CATEGORY: [
+          { required: true, message: '存放资源类别不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        RESOURCE_QUANTITY: [
+          { required: true, message: '资源数量不能为空', trigger: 'blur' },
+          { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '联系人不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        CONTACT_PHONE: [
+          { required: true, message: '联系电话不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+        CONTACT_MOBILE_PHONE: [
+          { required: true, message: '联系人手机号码不能为空', trigger: 'blur' },
+          { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
+        ],
+        COMPANY_NAME: [
+          { required: true, message: '企业名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ]
       }
-      // rules: {
-      //   RESOURCE_LIBRARY_NAME: [
-      //     { required: true, message: '资源库名称不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   LOCATION: [
-      //     { required: true, message: '所在地点不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   RESOURCE_CATEGORY: [
-      //     { required: true, message: '存放资源类别不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   RESOURCE_QUANTITY: [
-      //     { required: true, message: '资源数量不能为空', trigger: 'blur' },
-      //     { min: 1, max: 255, message: '长度在 1 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_PERSON: [
-      //     { required: true, message: '联系人不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_PHONE: [
-      //     { required: true, message: '联系电话不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ],
-      //   CONTACT_MOBILE_PHONE: [
-      //     { required: true, message: '联系人手机号码不能为空', trigger: 'blur' },
-      //     { min: 2, max: 50, message: '长度在 2 到 50 个字符', trigger: 'blur' }
-      //   ],
-      //   COMPANY_NAME: [
-      //     { required: true, message: '企业名称不能为空', trigger: 'blur' },
-      //     { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
-      //   ]
-      // }
     }
   },
   created() {
@@ -235,7 +235,14 @@ export default {
       }
     },
     confirm() {
-      this.dataSave()
+      /* this.dataSave()*/
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          this.dataSave()
+        } else {
+          return false
+        }
+      })
     },
     dataSave() {
       this.listLoading = true

src/views/emergen_cyrescue/resource_management/equipment_library/components/supplies.vue

@@ -81,7 +81,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="负责保管人固定电话" prop="CONTACT_OFFICE_PHONE">
+            <el-form-item label="负责保管人固定电话" prop="CONTACT_TELE_PHONE">
               <el-input v-model="form.CONTACT_TELE_PHONE" placeholder="请输入负责保管人固定电话..." />
             </el-form-item>
           </el-col>
@@ -90,7 +90,7 @@
         <el-row :gutter="20">
 
           <el-col :span="12">
-            <el-form-item label="负责保管人移动电话" prop="CONTACT_PERSON">
+            <el-form-item label="负责保管人移动电话" prop="CONTACT_MOBILE_PHONE">
               <el-input v-model="form.CONTACT_MOBILE_PHONE" placeholder="请输入负责保管人移动电话..." />
             </el-form-item>
           </el-col>
@@ -201,6 +201,25 @@ export default {
       dialogFormEdit: false,
       dialogFormShow: false,
       dialogType: 'add',
+      rules: {
+        SUPPLIES_NAME: [
+          { required: true, message: '名称不能为空', trigger: 'blur' },
+          { min: 2, max: 255, message: '长度在 2 到 255 个字符', trigger: 'blur' }
+        ],
+
+        LONGITUDE: [
+          { required: true, message: '经度不能为空', trigger: 'blur' }
+        ],
+        LATITUDE: [
+          { required: true, message: '纬度不能为空', trigger: 'blur' }
+        ],
+        CONTACT_PERSON: [
+          { required: true, message: '负责保管人不能为空', trigger: 'blur' }
+        ],
+        CONTACT_OFFICE_PHONE: [
+          { required: true, message: '负责保管人固定电话不能为空', trigger: 'blur' }
+        ]
+      },
       form: {
         // 名称
         SUPPLIES_NAME: '',