From 5a9b8d8857d7b25b8df42224b3c09c5086c35376 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 26 Apr 2023 16:24:07 +0800
Subject: [PATCH] baifang

---
 src/views/visit/blacklist.vue           | 2 +-
 src/views/visit/check.vue               | 2 +-
 src/views/visit/component/addCommon.vue | 9 ++++++---
 src/views/visit/longterm.vue            | 2 +-
 src/views/visit/record.vue              | 7 ++++---
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/visit/blacklist.vue b/src/views/visit/blacklist.vue
index f38c38a..8e843ea 100644
--- a/src/views/visit/blacklist.vue
+++ b/src/views/visit/blacklist.vue
@@ -42,7 +42,7 @@
       return {
         select: {
           page: 1,
-          rows: 10,
+          page_size: 10,
           keyword: ""
         },
         total: 0,
diff --git a/src/views/visit/check.vue b/src/views/visit/check.vue
index 6a98d91..d0e4bdb 100644
--- a/src/views/visit/check.vue
+++ b/src/views/visit/check.vue
@@ -99,7 +99,7 @@
         visible: false,
         select: {
           page: 1,
-          rows: 10,
+          page_size: 10,
           keyword: "",
           audit_status: 0,
           my_accept_admin: 0,
diff --git a/src/views/visit/component/addCommon.vue b/src/views/visit/component/addCommon.vue
index 3202a29..9df1b18 100644
--- a/src/views/visit/component/addCommon.vue
+++ b/src/views/visit/component/addCommon.vue
@@ -187,7 +187,7 @@
         </div>
       </div>
     </template>
-    <template v-slot:carsno v-if="visitType==1||visitType==2">
+    <template v-slot:carsno v-else>
        <div class="xy-table-item">
          <div class="xy-table-item-label">
            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>到访车辆：
@@ -570,7 +570,8 @@
           credent: res?.credent,
           idcard: res?.idcard,
           company_name: res?.company_name,
-          cars: res?.cars,
+          cars:[],
+          carsno: [],
           follw_people: res?.follw_people,
           long_time: res?.long_time,
           longrange: res.start_date?[res.start_date,res.end_date]:"",
@@ -582,7 +583,8 @@
         this.followList = res?.follw_people
         for(var k of res?.cars){
           this.carsList.push({car:k})
-        }
+        }
+        console.log(this.followList,this.carsList)
       },
       async getLabel() {
         const res = await getTimeList()
@@ -665,6 +667,7 @@
     watch: {
       isShow(newVal) {
         if (newVal) {
+          console.log("this.visitType",this.visitType)
           this.form.type = this.visitType
           this.form.audit_status = 1
           if (this.type === 'editor') {
diff --git a/src/views/visit/longterm.vue b/src/views/visit/longterm.vue
index 722961f..ce6c70c 100644
--- a/src/views/visit/longterm.vue
+++ b/src/views/visit/longterm.vue
@@ -53,7 +53,7 @@
       return {
         select: {
           page: 1,
-          rows: 10,
+          page_size: 10,
           keyword: "",
           audit_status: "",
           start_date: "",
diff --git a/src/views/visit/record.vue b/src/views/visit/record.vue
index e3724d8..ebdf048 100644
--- a/src/views/visit/record.vue
+++ b/src/views/visit/record.vue
@@ -72,7 +72,7 @@
         visible: false,
         select: {
           page: 1,
-          rows: 10,
+          page_size: 10,
           keyword: "",
           audit_status: "",
           start_date: "",
@@ -141,7 +141,7 @@
             prop: 'follw_people',
             width: 80,
             formatter:(cell, data, value)=>{
-              return value?'是':'否'
+              return value.length>0?'是':'否'
             }
           },
           {
@@ -284,8 +284,9 @@
       editorStudy(row) {
         // let addWhat = row.type == 1 ? "addCommon" : (row.type == 2 ? "addBuild" : (row.type == 3 ? "addPark" : ""))
         let addWhat = "addCommon"
+        console.log(row)
         this.$refs[addWhat].id = row.id
-        this.$refs[addWhat].visitType=row.type
+        this.$refs[addWhat].visitType= parseInt(row.type)
         this.$refs[addWhat].type = 'editor'
         this.$refs[addWhat].isShow = true
       }