时间范围

src/views/check/task/index.vue

@@ -23,7 +23,7 @@
         >
           <el-form-item label="任务名称" prop="title">
             <el-input
-              style="width: 200px;"
+              style="width: 200px"
               v-model="queryParams.title"
               placeholder="请输入任务名称"
               clearable
@@ -46,6 +46,40 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="受检机构" prop="orgName">
+            <!-- <el-input
+              v-model="queryParams.orgName"
+              placeholder="请输入受检机构"
+              clearable
+              @keyup.enter.native="handleQuery"
+              :maxlength="50" @input="inputRestriction"
+            /> -->
+            <div style="width: 200px; height: 30px">
+              <org-tree-select
+                size="mini"
+                v-model="queryParams.checkOrgIds"
+                ref="checkorgTreeSelect"
+                :disable="true"
+                @change="getList"
+              >
+              </org-tree-select>
+            </div>
+          </el-form-item>
+          <el-form-item label="任务进度" prop="status">
+            <el-select
+              style="width: 200px"
+              v-model="queryParams.status"
+              placeHolder="请选择任务进度"
+              clearable
+            >
+              <el-option
+                v-for="item in dict.type.safety_check_status"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <!-- <el-form-item label="检查周期" prop="executeCycle">
             <el-select
               v-model="queryParams.executeCycle"
@@ -61,7 +95,7 @@
             </el-select>
           </el-form-item> -->
 
-          <el-form-item
+          <!-- <el-form-item
             class="searchTitle"
             label="开始日期"
             prop="planStartTime"
@@ -76,53 +110,37 @@
               @change="updatePlanStartTime"
             >
             </el-date-picker>
-          </el-form-item>
-          <el-form-item label="检查状态" prop="status">
-            <el-select
-              style="width: 200px;"
-              v-model="queryParams.status"
-              placeHolder="请选择"
-              clearable
+          </el-form-item> -->
+          <el-form-item
+            class="searchTitle"
+            label="任务时间"
+            prop="planStartTime"
+          >
+            <el-date-picker
+              type="daterange"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              :default-time="['00:00:00', '23:59:59']"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              v-model="queryParams.range"
+              :picker-options="pickerOptions"
             >
-              <el-option
-                v-for="item in dict.type.safety_check_status"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </el-select>
+            </el-date-picker>
           </el-form-item>
-          <el-form-item label="受检机构" prop="orgName">
-            <!-- <el-input
-              v-model="queryParams.orgName"
-              placeholder="请输入受检机构"
-              clearable
-              @keyup.enter.native="handleQuery"
-              :maxlength="50" @input="inputRestriction"
-            /> -->
-            <div style="width: 200px;height: 30px;">
-              <org-tree-select
+          <el-row>
+            <el-form-item style="margin-left: 35px">
+              <el-button
+                type="primary"
+                icon="el-icon-search"
                 size="mini"
-                v-model="queryParams.checkOrgIds"
-                ref="checkorgTreeSelect"
-                :disable="true"
-                @change="getList"
+                @click="getList"
+                >搜索</el-button
               >
-              </org-tree-select>
-            </div>
-          </el-form-item>
-          <el-form-item style="margin-left: 35px">
-            <el-button
-              type="primary"
-              icon="el-icon-search"
-              size="mini"
-              @click="getList"
-            >搜索</el-button
-            >
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-            >重置</el-button
-            >
-          </el-form-item>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                >重置</el-button
+              >
+            </el-form-item>
+          </el-row>
         </el-form>
         <!--    按纽    -->
         <el-row :gutter="10" class="mb8">
@@ -325,7 +343,7 @@ import * as api from "@/api/safetycheck/task.js";
 import { getLabel } from "@/views/commonOption.js";
 import OrgTreeSelect from "@/components/orgTreeSelect";
 import { checkPermi } from "@/utils/permission.js";
-import dayjs from 'dayjs';
+import dayjs from "dayjs";
 
 export default {
   name: "checkTaskList",
@@ -345,7 +363,7 @@ export default {
       timeClearable: false,
       options: [],
       roleOptions: [],
-      selectRoleOptions:[],
+      selectRoleOptions: [],
       planList: [],
 
       queryParams: {
@@ -359,6 +377,7 @@ export default {
         planStartTime: null,
         title: null,
         checkOrgIds: null,
+        range:[],
       },
       selectedOrgName: null,
       pageData: [],
@@ -468,6 +487,7 @@ export default {
     },
     resetQuery() {
       this.queryParams.checkOrgIds = [];
+      this.queryParams.range=[];
       this.resetForm("queryParams");
       this.getList();
     },
@@ -495,8 +515,7 @@ export default {
         .then((r) => (this.roleOptions = r.data));
     },
     selectLoadRoles() {
-      allRole()
-        .then((r) => (this.selectRoleOptions = r.data));
+      allRole().then((r) => (this.selectRoleOptions = r.data));
     },
     // loadPlanList() {
     //   api