From 5992e783654d72dcddd9b4c83cc6994f7076cd68 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Tue, 27 Sep 2022 14:36:38 +0800
Subject: [PATCH] bug

---
 .../components/List.vue                       | 19 ++++++++-----------
 .../components/List.vue                       |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/project/pingchang/apps/AppBayonetRegistration/components/List.vue b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
index f3e22815..c2235943 100644
--- a/project/pingchang/apps/AppBayonetRegistration/components/List.vue
+++ b/project/pingchang/apps/AppBayonetRegistration/components/List.vue
@@ -1,6 +1,6 @@
 <template>
   <ai-list class="list">
-    <ai-title slot="title" title="卡口登记" isShowBottomBorder></ai-title>
+    <ai-title slot="title" title="卡口登记" isShowBottomBorder :instance="instance" :hideLevel="disabledLevel" :disabledLevel="disabledLevel" isShowArea v-model="search.arriveAreaId" @change="changeArea"></ai-title>
     <template slot="content">
       <div class="statistics-top">
         <div class="statistics-top__item">
@@ -24,7 +24,7 @@
         <ai-search-bar bottomBorder>
           <template #left>
             <ai-select
-              v-model="search.gatewayName"
+              v-model="search.gatewayId"
               clearable
               placeholder="请选择卡口"
               :selectList="dictList"
@@ -92,8 +92,7 @@
 
     props: {
       instance: Function,
-      dict: Object,
-      areaId: String
+      dict: Object
     },
 
     data () {
@@ -102,8 +101,9 @@
           current: 1,
           size: 10,
           name: '',
-          gatewayName: '',
+          gatewayId: '',
           status: '',
+          arriveAreaId: '',
           createTime: ''
         },
         dictList: [],
@@ -135,15 +135,12 @@
     },
 
     computed: {
-      ...mapState(['user']),
-
-      param () {
-        return this.search
-      }
+      ...mapState(['user'])
     },
 
     created () {
       this.disabledLevel = this.user.info.areaList.length - 1
+      this.search.arriveAreaId = this.user.info.areaId
       this.loading = true
 
       this.getTotalInfo()
@@ -171,7 +168,7 @@
         this.instance.post(`/app/appepidemicpreventionregisterinfo/list`, null, {
           params: {
             ...this.search,
-            arriveAreaId: this.areaId
+            arriveAreaId: this.search.arriveAreaId
           }
         }).then(res => {
           if (res.code == 0) {
diff --git a/project/pingchang/apps/AppCommunityManagement/components/List.vue b/project/pingchang/apps/AppCommunityManagement/components/List.vue
index 60e41910..b0fe7ed1 100644
--- a/project/pingchang/apps/AppCommunityManagement/components/List.vue
+++ b/project/pingchang/apps/AppCommunityManagement/components/List.vue
@@ -134,7 +134,7 @@
       onUserChange (e) {
         if (e.length) {
           this.name = e[0].name
-          this.search.controllerUserId = e[0].openId
+          this.search.controllerUserId = e[0].sysUserId
         } else {
           this.search.controllerUserId = ''
           this.name = ''