From 71a7347ea9959206c9077d2db4a595a3f741fd09 Mon Sep 17 00:00:00 2001
From: 15036302109 <zhp5211314>
Date: Mon, 11 Mar 2024 13:58:00 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E8=AE=BE=E8=AE=A1,=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E7=A0=81=E6=AD=A3=E5=88=99=E6=A0=A1=E9=AA=8C=202.?=
 =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86=E5=8F=AF?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=B6=E9=97=B4=E6=AE=B5=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/ehs/ehsExamples/indexHD.vue     | 37 ++++++++++++++++++-
 ruoyi-ui/src/views/system/user/index.vue      | 14 +++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/ruoyi-ui/src/views/ehs/ehsExamples/indexHD.vue b/ruoyi-ui/src/views/ehs/ehsExamples/indexHD.vue
index d415501..d179544 100644
--- a/ruoyi-ui/src/views/ehs/ehsExamples/indexHD.vue
+++ b/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();
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index b235f34..427893f 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/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" }
         ]
       }