From 4da06c2b269a2c9dbf02dafd37f882026d13b14e Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sat, 2 Apr 2022 16:32:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=A4=84=E7=BD=9A=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppAdministrativePenalty/components/List.vue   |  3 ++-
 .../apps/AppDishonestExecutee/components/List.vue  | 10 +++++-----
 .../apps/AppHouseManagement/components/Add.vue     | 13 +++++++++++++
 .../apps/AppHouseManagement/components/List.vue    |  8 +++++---
 .../apps/AppRatepayingInfo/components/List.vue     | 14 +++++++-------
 5 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
index 5d506e96..e6db9b67 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
@@ -10,7 +10,8 @@
           <template #right>
             <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.sanctionCode" clearable suffix-icon="iconfont iconSearch" @change="getTableData()"
              @clear="page.current = 1, search.sanctionCode = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
-            <ai-import :instance="instance" :dict="dict" type="" name="行政处罚信息" @success="getTableData(), $message.success('导入成功!')">
+            <ai-import :instance="instance" :dict="dict" importUrl="appcreditadministrativesanction/downloadTemplate" 
+            url="appcreditadministrativesanction/import" name="行政处罚信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import> 
             <ai-download :instance="instance" url="appcreditadministrativesanction/export" :params="search" fileName="行政处罚信息"
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/List.vue b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
index b51c0c1f..57bd0d12 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/List.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
@@ -8,15 +8,15 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable @clear="page.current = 1, searchObj.name = '',getTableData()" 
+            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <ai-import :instance="instance" :dict="dict" importUrl="" url="appcreditadministrativesanction/downloadTemplate" type="appjob" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <!-- <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="失信被执行人信息"
-                         :disabled="tableData.length == 0"> -->
+            <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="失信被执行人信息"
+                         :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
-            <!-- </ai-download> -->
+            </ai-download>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {executionCode: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
     }
diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index e69de29b..17bcab3d 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -0,0 +1,13 @@
+<template>
+  
+</template>
+
+<script>
+export default {
+
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppHouseManagement/components/List.vue b/project/xiushan/apps/AppHouseManagement/components/List.vue
index 14d7c483..d5cecdb1 100644
--- a/project/xiushan/apps/AppHouseManagement/components/List.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/List.vue
@@ -1,14 +1,14 @@
 <template>
   <section class="List">
     <ai-list>
-      <ai-title slot="title" title="宅基地管理" isShowBottomBorder/>
+      <ai-title slot="title" title="宅基地管理" isShowBottomBorder :instance="instance" :disabledLevel="disabledLevel" isShowArea v-model="search.areaId" @change="changeArea"/>
       <template #content>
         <ai-search-bar>
           <template #left>
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="查询证书号/使用人/使用人身份证" v-model="search.name" clearable @clear="page.current = 1, searchObj.name = '',getTableData()" 
+            <el-input size="small" placeholder="查询证书号/使用人/使用人身份证" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
           </template>
         </ai-search-bar>
@@ -27,6 +27,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 export default {
   name: "List",
   props: {
@@ -36,12 +37,13 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {executionCode: "",areaId:''},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
     }
   },
   computed: {
+    ...mapState(['user']),
     colConfigs() {
       return [
         { prop: "executionCode", label: '使用证书号', align: "center", width: "200px", },
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/List.vue b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
index ba353943..d3f5b317 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/List.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
@@ -8,15 +8,15 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable suffix-icon="iconfont iconSearch"
-            @clear="page.current = 1, searchObj.name = '',getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
-            <ai-import :instance="instance" :dict="dict" importUrl="" url="appcreditadministrativesanction/downloadTemplate" type="appjob" name="纳税信息" @success="getTableData(), $message.success('导入成功!')">
+            <el-input size="small" placeholder="纳税主体/纳税人识别号" v-model="search.enterpriseName" clearable suffix-icon="iconfont iconSearch"
+            @clear="page.current = 1, search.enterpriseName = '',getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <ai-import :instance="instance" :dict="dict" importUrl="" url="appcreditadministrativesanction/downloadTemplate" name="纳税信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <!-- <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="纳税信息"
-                         :disabled="tableData.length == 0"> -->
+            <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="纳税信息"
+                         :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
-            <!-- </ai-download> -->
+            </ai-download>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -43,7 +43,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {enterpriseName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
     }