Merge branch 'bjxz-lk' into bjxz-dev

src/views/projectFront/laborManage/visitRecord.vue

@@ -8,7 +8,7 @@
         ref="searchForm"
       >
         <div style="display: flex; justify-content: space-between;margin-top:15px">
-          <div>
+          <div style="position: relative;">
             <el-form-item label="访客姓名" prop="visitName">
               <el-input
                 v-model="searchForm.visitName"
@@ -69,8 +69,7 @@
               >
               </el-date-picker>
             </el-form-item>
-          </div>
-          <div style="width: 400px">
+            <span style="width: 400px;">
             <el-form-item>
               <el-button type="primary" plain @click="loadCardData">
                 {{ $t('message.personnelPosition.beaconManage.query') }}
@@ -82,7 +81,9 @@
             {{ $t("message.laborDev.add2") }}
           </el-button> -->
             </el-form-item>
+          </span>
           </div>
+
         </div>
       </el-form>
     </div>
@@ -440,8 +441,8 @@ export default {
     },
     resetForm () {
       this.$refs['searchForm'].resetFields()
-      this.searchForm.beginTime = null
-      this.searchForm.endTime = null
+      this.searchForm.beginTime = 0
+      this.searchForm.endTime = 0
       this.loadCardData()
     },