1.系统管理必填项设计,手机号码正则校验

2.行政区域管理可根据时间段筛选

ruoyi-ui/src/views/ehs/ehsExamples/indexHD.vue

@@ -2,6 +2,37 @@
   <el-dialog title="当月隐患信息查询" :visible.sync="open"   width="1200px"    append-to-body>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="排查时间">
+        <el-date-picker
+          v-model="daterangeCheckTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          unlink-panels
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="整改时间">
+        <el-date-picker
+          v-model="daterangeRectifyTime"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          unlink-panels
+          :picker-options="pickerOptions"
+        ></el-date-picker>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
     </el-form>
     <el-table v-loading="loading" :data="ehsHiddenDangerList" @selection-change="handleSelectionChange" max-height="550" style="width: 100%" :row-class-name="tableRowClassName">
       <el-table-column type="selection" width="55" align="center" />
@@ -161,9 +192,9 @@ export default {
       //所有部门列表字典
       allDeptList: [],
       currEnterpriseInfo:{},//选中的企业信息
-      // 要求整改时间时间范围
+      // 排查时间时间范围
       daterangeCheckTime: [],
-      // 要求整改时间时间范围
+      // 整改时间时间范围
       daterangeRectifyTime: [],
       openAssist:false,//打开协办弹框
       assistDeptList:"",//协办部门
@@ -280,6 +311,8 @@ export default {
     },
     // 取消按钮
     cancel() {
+      this.daterangeCheckTime = [];
+      this.daterangeRectifyTime = [];
       this.open = false;
       this.openAssist = false;
       this.reset();

ruoyi-ui/src/views/system/user/index.vue

@@ -288,7 +288,7 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="岗位">
+            <el-form-item label="岗位" prop="postIds">
               <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
                 <el-option
                   v-for="item in postOptions"
@@ -301,7 +301,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="角色">
+            <el-form-item label="角色" prop="roleIds">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
                 <el-option
                   v-for="item in roleOptions"
@@ -465,12 +465,18 @@ export default {
             trigger: ["blur", "change"]
           }
         ],
+        roleIds: [
+          { required: true, message: "角色不能为空", trigger: "blur" }
+        ],
+        postIds: [
+          { required: true, message: "岗位不能为空", trigger: "blur" }
+        ],
         phonenumber: [
-       /*   {
+         {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
             trigger: "blur"
-          },*/
+          },
           { required: true, message: "手机号不能为空", trigger: "blur" }
         ]
       }