Merge branch '3.3.4-kdyh' into web-v2

src/views/comprehensive/laboratoryManagement/record_my/index.vue

@@ -22,16 +22,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="时间类型" prop="inOutType">
-        <el-select v-model="queryParams.inOutType" placeholder="请选择时间类型" style="width:180px;">
-          <el-option
-            v-for="item in inOutTypeOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
       <el-form-item label="进入时间" prop="subjectId" label-width="80px">
         <el-date-picker
           :clearable="false"

src/views/secureAccess/approval/passed.vue

@@ -2,9 +2,9 @@
 <template>
   <div class="passed">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="实验室" prop="releaseDescribe">
+      <el-form-item label="关键字" prop="releaseDescribe">
         <el-input
-          v-model="queryParams.subjectName"
+          v-model="queryParams.searchValue"
           placeholder="请输入实验室名称"
           clearable
           size="small"
@@ -274,10 +274,11 @@ import {
       },
       /** 重置按钮操作 */
       resetQuery() {
-        this.queryParams.subjectName='';
-        this.queryParams.beginTime='';
-        this.queryParams.endTime='';
-        this.queryParams.userMajorId='';
+        this.$set(this,'queryParams',{
+          pageNum:1,
+          searchValue:"",
+          userMajorId:""
+        })
         this.dateRange=[];
         this.handleQuery();
       },