出入管理bug修改

src/router/router.config.js

@@ -272,7 +272,7 @@ export let routers = [
         path: '/visitRegister',
         name: 'visitRegister',
         component: () => import('@/views/menu/visitRegister/index.vue'),
-        meta: { title: '出入事项申请', keepAlive: true ,hideTabBar:false}
+        meta: { title: '来访申请', keepAlive: true ,hideTabBar:false}
       },
       {
         path: '/visitAdd',
@@ -290,7 +290,7 @@ export let routers = [
         path: '/visitCheck',
         name: 'visitCheck',
         component: () => import('@/views/menu/visitCheck/index.vue'),
-        meta: { title: '出入审批', keepAlive: true ,hideTabBar:false}
+        meta: { title: '来访审批', keepAlive: true ,hideTabBar:false}
       },
       {
         path: '/visitCheckDetail',
@@ -302,7 +302,7 @@ export let routers = [
         path: '/visitRecord',
         name: 'visitRecord',
         component: () => import('@/views/menu/visitRecord/index.vue'),
-        meta: { title: '出入登记', keepAlive: true ,hideTabBar:false}
+        meta: { title: '来访核验登记', keepAlive: true ,hideTabBar:false}
       },
       {
         path: '/visitRecordDetail',

src/views/menu/NFCmanage/index.vue

@@ -86,12 +86,15 @@ export default {
       flag:false,
     }
   },
-  destroyed(){
+  beforeDestroy(){
     window.openNFCScanCallBack = null;
   },
   computed:{
     ...mapGetters(['orgId']),
   },
+  mounted(){
+    window.openNFCScanCallBack = null;
+  },
   methods:{
     //自定义nfc回调
     openNFCScanCallBack(nfcStr){

src/views/menu/securityCheckRegister/add.vue

@@ -222,12 +222,12 @@ export default {
     },
   },
   mounted() {
-    this.id = this.$route.query.id
-    this.getData()
+    this.id = this.$route.query.id;
+    this.getData();
   },
   beforeDestroy() {
-    window.openCameraCallBack = null
-    window.openNFCScanCallBack = null
+    window.openCameraCallBack = null;
+    window.openNFCScanCallBack = null;
   },
   methods: {
     //长度校验

src/views/menu/visitCheck/index.vue

@@ -2,7 +2,7 @@
   <div class="visitCheck">
     <NavBar />
     <div class="page-container">
-      <van-search v-model="query.reasons" class="van-hairline--bottom" placeholder="请输入出入事由"  @change="refreshData"/>
+      <van-search v-model="query.reasons" class="van-hairline--bottom" placeholder="请输入出入事由" @clear="refreshData" @change="refreshData"/>
       <div class="search-flex">
         <select-cell
           style="border-right: 1px solid #f5f5f5;"

src/views/menu/visitRecord/add.vue

@@ -60,6 +60,7 @@
               v-model="formData.accompanyingPerson"
               rows="1"
               autosize
+              required
               :maxlength="200"
               placeholder="请输入人员姓名"
               label="陪同人员"></van-field>
@@ -126,6 +127,10 @@ export default {
         this.$toast('请选择来访人员');
         return
       }
+      if(!this.formData.accompanyingPerson){
+        this.$toast('请输入陪同人员');
+        return
+      }
       if(!this.formData.checkImage){
         this.$toast('请上传审核结果');
         return

src/views/menu/visitRecord/detail.vue

@@ -53,7 +53,7 @@
             <van-cell title="到达时间" v-if="selectedUser.arrivalTime" :value="selectedUser.arrivalTime"></van-cell>
             <date-cell v-else required title="到达时间" :max-date="maxData" :is-row="true"  v-model="formData.arrivalTime" date-type="datetime" />
             <van-cell title="离开时间" v-if="selectedUser.departureTime" :value="selectedUser.departureTime"></van-cell>
-            <date-cell v-else required title="离开时间" :max-date="maxData" :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
+            <date-cell v-else required title="离开时间" :max-date="maxData" :min-date='minDate' :is-row="true"  v-model="formData.departureTime" date-type="datetime" />
           </div>
           <div v-if="!selectedUser.departureTime" class="big-btn-box" >
             <van-button  type="info" size="large" @click="onSubmit">确认登记</van-button>
@@ -74,11 +74,13 @@ import {mapGetters} from "vuex";
 import {imgUrl} from "@/utils";
 import { ImagePreview } from 'vant'
 import {userDetails, userDepart} from './api'
+import dayjs from 'dayjs'
 export default {
   components: {Uploader, DateCell},
   data(){
     return {
       maxData:new Date(),
+      minDate:null,
       visitId:null,
       userList:[],
       selectedUser:{},
@@ -94,9 +96,9 @@ export default {
     }
   },
   computed:{
-    ...mapGetters(['orgId','id','dictionary'])
+    ...mapGetters(['orgId','id','dictionary']),
   },
-  mounted(){
+  created(){
     this.visitId = this.$route.query.id;
     this.getUserInfo();
   },
@@ -137,6 +139,9 @@ export default {
         this.selectedUser.checkImage = checkImage;
         this.selectedUser.imgFile = imgFile;
         this.selectedUser.letterFile = letterFile;
+        //设置最小时间
+        let minDate = this.selectedUser.arrivalTime;
+        this.minDate = new Date(minDate);
       })
     },
     previewFile(file){

src/views/menu/visitRecord/index.vue

@@ -2,7 +2,7 @@
   <div class="visitRecord">
     <NavBar/>
     <div class="page-container">
-      <van-search v-model="query.userName" class="van-hairline--bottom" placeholder="请输入人员姓名"  @change="refreshData"/>
+      <van-search v-model="query.userName" class="van-hairline--bottom" placeholder="请输入人员姓名" @clear="refreshData"  @change="refreshData"/>
       <div class="search-flex">
         <select-cell
           style="border-right: 1px solid #f5f5f5;"

src/views/menu/visitRegister/index.vue

@@ -2,7 +2,7 @@
   <div class="visitRegister">
     <NavBar />
     <div class="page-container">
-      <van-search v-model="query.reasons" class="van-hairline--bottom" placeholder="请输入来访事由" @change="refreshData" />
+      <van-search v-model="query.reasons" class="van-hairline--bottom" placeholder="请输入来访事由" @clear="refreshData" @change="refreshData" />
       <select-cell
         style="border-right: 1px solid #f5f5f5;"
         title="介绍信类型"
@@ -26,8 +26,8 @@
                 :title="`介绍信类型: ${getDictLabel(v.type,'out_in_type')}`"
                 @click="clickItem(v.id)">
                 <template #right-icon>
-                  <span :style="{color:getState(getDictLabel(v.status,'out_in_approve_status'))}">
-                    {{getDictLabel(v.status,'out_in_approve_status') }}
+                  <span :style="{color:getState(getDictLabel(v.approveStatus,'out_in_approve_status'))}">
+                    {{getDictLabel(v.approveStatus,'out_in_approve_status') }}
                   </span>
                 </template>
                 <template #label>
@@ -152,6 +152,7 @@ export default {
       }
       let data = {
         ...this.query,
+        orgId:this.orgId
       }
       dataList(data).then(res=>{
         if(res.total === '0'){