From ab6ba477c2419c50eed67910f1860ee1c58500b0 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Fri, 22 May 2026 17:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/gate/visitlist.vue            |   4 +-
 src/views/visit/component/showVisit.vue | 269 ++++++++++++------------
 2 files changed, 142 insertions(+), 131 deletions(-)

diff --git a/src/views/gate/visitlist.vue b/src/views/gate/visitlist.vue
index 3717c5c..3333e74 100644
--- a/src/views/gate/visitlist.vue
+++ b/src/views/gate/visitlist.vue
@@ -136,7 +136,9 @@
         this.data = res.data
         if (this.data.length > 0) {
           for (var k of this.data) {
-            if (k.audit_status == 1 || k.audit_status == 3) {
+            // 待进厂/已进厂可核销；长期访客已离厂后允许再次核销进厂（与后端多日门岗流水一致）
+            const longTermLeave = Number(k.long_time) === 1 && k.audit_status == 4
+            if (k.audit_status == 1 || k.audit_status == 3 || longTermLeave) {
               this.$refs['showVisit'].form = k
               this.$refs['showVisit'].formDataType = 'coderecord'
               this.$refs['showVisit'].gateAdminId = this.gateAdminId
diff --git a/src/views/visit/component/showVisit.vue b/src/views/visit/component/showVisit.vue
index 40ffef7..29e8f0e 100644
--- a/src/views/visit/component/showVisit.vue
+++ b/src/views/visit/component/showVisit.vue
@@ -28,11 +28,11 @@
             核销状态：
           </div>
           <div class="xy-table-item-content">
-            <div style="font-size: 32px;padding: 25px;width:400px">
-              <div v-for="item in codeTypeList">
-                <div v-if="item.id == codeForm.type">
-                  {{item.value}}
-                </div>
+            <div style="font-size: 32px;padding: 25px;width:400px">
+              <div v-for="item in codeTypeList">
+                <div v-if="item.id == codeForm.type">
+                  {{item.value}}
+                </div>
               </div>
               <!-- <el-radio-group v-model="codeForm.type">
                 <el-radio :label="item.id" >{{item.value}}</el-radio>
@@ -50,11 +50,11 @@
           <div class="xy-table-item-content">
 
             <!-- <el-input style="font-size: 32px;padding: 25px;width:400px" v-model="codeForm.person_no"
-              placeholder="请输入入场牌"></el-input> -->
-              <xy-table style="width: 600px" :height="260" :is-page="false" :list="codeForm.person_no"
-                :table-item="codefollowTable">
-                <template v-slot:btns>
-                </template>
+              placeholder="请输入入场牌"></el-input> -->
+              <xy-table style="width: 600px" :height="260" :is-page="false" :list="codeForm.person_no"
+                :table-item="codefollowTable">
+                <template v-slot:btns>
+                </template>
               </xy-table>
           </div>
         </div>
@@ -67,12 +67,12 @@
           <div class="xy-table-item-content">
 
             <!-- <el-input style="font-size: 32px;padding: 25px;width:400px" v-model="codeForm.car_no"
-              placeholder="请输入停车牌"></el-input> -->
-
-              <xy-table style="width: 600px" :height="260" :is-page="false" :list="codeForm.car_no"
-                :table-item="carfollowTable">
-                <template v-slot:btns>
-                </template>
+              placeholder="请输入停车牌"></el-input> -->
+
+              <xy-table style="width: 600px" :height="260" :is-page="false" :list="codeForm.car_no"
+                :table-item="carfollowTable">
+                <template v-slot:btns>
+                </template>
               </xy-table>
           </div>
         </div>
@@ -208,16 +208,16 @@
             {{form.company_name}}
           </div>
         </div>
-      </template>
-      <template v-slot:cda v-if="form.type==1 && form.visit_area && form.visit_area.name=='生产区'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            CDA编号：
-          </div>
-          <div class="xy-table-item-content">
-            {{form.cda}}
-          </div>
-        </div>
+      </template>
+      <template v-slot:cda v-if="form.type==1 && form.visit_area && form.visit_area.name=='生产区'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            CDA编号：
+          </div>
+          <div class="xy-table-item-content">
+            {{form.cda}}
+          </div>
+        </div>
       </template>
       <template v-slot:cars>
         <div class="xy-table-item">
@@ -258,40 +258,40 @@
             </div>
           </div>
         </div>
-      </template>
-      <template v-slot:visitorinfos>
-        <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:400px">
-            被访人信息：
-          </div>
-        </div>
-      </template> -->
-      <template v-slot:accept_admin_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
-          </div>
-          <div class="xy-table-item-content">
-            {{form.accept_admin?form.accept_admin.name:''}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:visitorinfos1 v-if="form.visit_area && form.visit_area.name=='生产区'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-content" style="width:400px">
-            陪同人信息：
-          </div>
-        </div>
-      </template>
-      <template v-slot:accompany_id  v-if="form.visit_area && form.visit_area.name=='生产区'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
-          </div>
-          <div class="xy-table-item-content">
-            {{form.accompany?form.accompany.name:''}}
-          </div>
-        </div>
+      </template>
+      <template v-slot:visitorinfos>
+        <div class="xy-table-item">
+          <div class="xy-table-item-content" style="width:400px">
+            被访人信息：
+          </div>
+        </div>
+      </template> -->
+      <template v-slot:accept_admin_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
+          </div>
+          <div class="xy-table-item-content">
+            {{form.accept_admin?form.accept_admin.name:''}}
+          </div>
+        </div>
+      </template>
+      <template v-slot:visitorinfos1 v-if="form.visit_area && form.visit_area.name=='生产区'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-content" style="width:400px">
+            陪同人信息：
+          </div>
+        </div>
+      </template>
+      <template v-slot:accompany_id  v-if="form.visit_area && form.visit_area.name=='生产区'">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>人员：
+          </div>
+          <div class="xy-table-item-content">
+            {{form.accompany?form.accompany.name:''}}
+          </div>
+        </div>
       </template>
 
       <template v-slot:accept_goods_admin_id v-if="form.type==3">
@@ -382,7 +382,7 @@
         formDataType: '',
         formData: {
           checkcode: '',
-          codeType: "",
+          codeType: "",
           person_no: '',
           car_no: '',
 
@@ -399,14 +399,14 @@
           mobile: "",
           credent: 1,
           idcard: "",
-          company_name: "",
+          company_name: "",
           cda:'',
           cars: "",
           follw_people: [],
           long_time: 0,
-          longrange: "",
-          visitorinfos: "",
-          accpet_department_id: "",
+          longrange: "",
+          visitorinfos: "",
+          accpet_department_id: "",
           accept_admin_id: "",
           visitorinfos1: "",
           accompany_id:"",
@@ -425,9 +425,9 @@
           car_no: [],
           person_no: []
         }, // 核验
-        codeTypeList: [{
-          id:0,
-          value:'请提醒陪同人签字'
+        codeTypeList: [{
+          id:0,
+          value:'请提醒陪同人签字'
         },{
           id: 1,
           value: '入场'
@@ -436,36 +436,36 @@
           value: '离场'
         }],
         gateAdminId: '',
-        check_admin_name: "",
-        carfollowTable: [{
-          label: "车牌",
-          prop: "car",
-          width: 200
-        },{
-          label: "停车牌",
-          prop: "car_no",
-          width: 400,
-          customFn: (row, scope) => {
-            return (<el-input type="text" placeholder = "请填写停车牌"
-              v-model={row.car_no}>
-              </el-input>
-            )
-          }
-        }],
-        codefollowTable: [{
-          label: "姓名",
-          prop: "name",
-          width: 200
-        },{
-          label: "入场牌",
-          prop: "person_no",
-          width: 400,
-          customFn: (row, scope) => {
-            return (<el-input type="text" placeholder = "请填写入场牌"
-              v-model={row.person_no}>
-              </el-input>
-            )
-          }
+        check_admin_name: "",
+        carfollowTable: [{
+          label: "车牌",
+          prop: "car",
+          width: 200
+        },{
+          label: "停车牌",
+          prop: "car_no",
+          width: 400,
+          customFn: (row, scope) => {
+            return (<el-input type="text" placeholder = "请填写停车牌"
+              v-model={row.car_no}>
+              </el-input>
+            )
+          }
+        }],
+        codefollowTable: [{
+          label: "姓名",
+          prop: "name",
+          width: 200
+        },{
+          label: "入场牌",
+          prop: "person_no",
+          width: 400,
+          customFn: (row, scope) => {
+            return (<el-input type="text" placeholder = "请填写入场牌"
+              v-model={row.person_no}>
+              </el-input>
+            )
+          }
         }],
         followTable: [{
             label: "姓名",
@@ -530,24 +530,33 @@
           if (this.formDataType == 'coderecord') {
             this.codeForm.code = this.form.code
             this.codeForm.admin_id = parseInt(this.gateAdminId)
-            this.codeForm.type = this.form.audit_status == 1 ? 1 : (this.form.audit_status == 3 && this.form.accept_admin_sign ? 2 : 0)
-            if(this.codeForm.type==1){
-              this.codeForm.person_no.push({name:this.form.name,person_no:''})
-              for(var k of this.form.follw_people){
-                this.codeForm.person_no.push({name:k.name,person_no:''})
-              }
-              for(var m of this.form.cars){
-                this.codeForm.car_no.push({car:m,car_no:''})
-              }
-            }else{
-              for(var k of this.form.person_no){
-                this.codeForm.person_no.push(JSON.parse(k))
-              }
-              for(var m of this.form.car_no){
-                this.codeForm.car_no.push(JSON.parse(m))
-              }
-
-            }
+            // 待进厂→入场；生产区陪同签字要求下已进厂→离场；长期访客当日已离场→仍可再次核销入场（新一天或再次进场）
+            if (Number(this.form.audit_status) === 1) {
+              this.codeForm.type = 1
+            } else if (Number(this.form.audit_status) === 3 && this.form.accept_admin_sign) {
+              this.codeForm.type = 2
+            } else if (Number(this.form.audit_status) === 4 && Number(this.form.long_time) === 1) {
+              this.codeForm.type = 1
+            } else {
+              this.codeForm.type = 0
+            }
+            if(this.codeForm.type==1){
+              this.codeForm.person_no.push({name:this.form.name,person_no:''})
+              for(var k of this.form.follw_people){
+                this.codeForm.person_no.push({name:k.name,person_no:''})
+              }
+              for(var m of this.form.cars){
+                this.codeForm.car_no.push({car:m,car_no:''})
+              }
+            }else{
+              for(var k of this.form.person_no){
+                this.codeForm.person_no.push(JSON.parse(k))
+              }
+              for(var m of this.form.car_no){
+                this.codeForm.car_no.push(JSON.parse(m))
+              }
+
+            }
 
           }
         } else {
@@ -584,13 +593,13 @@
               that.checkForm.audit_admin_id = item.audit_admin_id
               that.isCheck = true
               return
-            } else {
+            } else {
               that.checkText = "请等待"+item.audit_admin.name+"审核"
               // that.checkLevel.map(item1 => {
               //   if (item.level == item1.id) {
               //     that.checkText = item1.value
-              //   }else{
-
+              //   }else{
+
               //   }
               // })
               that.isCheck = false
@@ -607,10 +616,10 @@
         this.formDataType = ''
         this.checkForm = {}
         this.check_admin_name = ''
-        this.codeForm = {
-          type: 1,
-          car_no: [],
-          person_no: []
+        this.codeForm = {
+          type: 1,
+          car_no: [],
+          person_no: []
         }
         this.codeType = ''
         this.gateAdminId = ''
@@ -632,12 +641,12 @@
       },
       codeSubmit() {
         let that = this
-        console.log(this.codeForm)
-        console.log(this.codeForm.person_no)
-        if(this.codeForm.type==0){
-          this.$successMessage('请提醒陪同人签字','','warning')
-          this.isShow = false
-          return
+        console.log(this.codeForm)
+        console.log(this.codeForm.person_no)
+        if(this.codeForm.type==0){
+          this.$successMessage('请提醒陪同人签字','','warning')
+          this.isShow = false
+          return
         }
         cancelCode({
           ...that.codeForm
@@ -677,4 +686,4 @@
   /deep/ .el-radio__label {
     font-size: 32px;
   }
-</style>
+</style>