From d671d5fc8b8f5bc4476d4767840c1af8321b73ce Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Tue, 12 Apr 2022 17:48:12 +0800
Subject: [PATCH] 29066  28996

---
 .../apps/AppGroupShareholders/components/List.vue      |  4 ++--
 .../xiushan/apps/AppLandTransfer/components/List.vue   | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/project/xiushan/apps/AppGroupShareholders/components/List.vue b/project/xiushan/apps/AppGroupShareholders/components/List.vue
index 81913ade..9b44c932 100644
--- a/project/xiushan/apps/AppGroupShareholders/components/List.vue
+++ b/project/xiushan/apps/AppGroupShareholders/components/List.vue
@@ -9,7 +9,7 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="组织名称/持证人/身份证号/股权证编号" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" 
+            <el-input size="small" placeholder="组织名称/持证人/身份证号/股权证编号" v-model="search.organizationName" clearable @clear="page.current = 1, search.organizationName = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <!-- 导入导出 -->
             <ai-import :instance="instance" :dict="dict" importUrl="/appcollectiveeconomyequity/import" url="/appcollectiveeconomyequity/downloadTemplate" name="集体经济组织股权管理信息" @success="getTableData(), $message.success('导入成功!')">
@@ -45,7 +45,7 @@ export default {
   },
   data() {
     return {
-      search: {executionCode: "",areaId:''},
+      search: {organizationName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       areaId: '',
diff --git a/project/xiushan/apps/AppLandTransfer/components/List.vue b/project/xiushan/apps/AppLandTransfer/components/List.vue
index 66b05fdc..2d4c2ea4 100644
--- a/project/xiushan/apps/AppLandTransfer/components/List.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/List.vue
@@ -15,7 +15,7 @@
             <ai-import :instance="instance" :dict="dict" importUrl="/applandcirculateinfo/import" url="/applandcirculateinfo/downloadTemplate" name="土地流转经营信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <ai-download :instance="instance" url="/applandcirculateinfo/export" :params="search" fileName="土地流转经营信息"
+            <ai-download :instance="instance" url="/applandcirculateinfo/export" :params="param" fileName="土地流转经营信息"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
@@ -67,7 +67,13 @@ export default {
         { slot: "options" ,},
       ]
     },
-    ...mapState(['user'])
+    ...mapState(['user']),
+    param() {
+      return {
+        ...this.select,
+        ...this.search,
+      }
+    }
   },
   created() {
     this.$dict.load('landCirculateType')