From cbd022aed3bf619ece273fcf68a28374dd1edb56 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 7 Apr 2022 15:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHouseManagement/components/Add.vue     | 66 +++++++++----------
 .../AppHouseManagement/components/List.vue    | 30 +++++----
 .../apps/AppLandTransfer/components/List.vue  |  1 +
 3 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index 1904d37b..0fc6f882 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -11,7 +11,6 @@
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>
-            <!-- <ai-bar :title="params.id ? '编辑宅基地所有权信息' : '宅基地所有权信息'"></ai-bar> -->
             <el-form ref="form" :model="form" :rules="rules" size="small"  label-width="150px">
               <el-form-item label="使用证书" prop="unifiedCode">
                 <el-input v-model="form.unifiedCode" placeholder="请输入宅基地使用证书号"></el-input>
@@ -76,16 +75,16 @@
             </template>
           <template #content>
             <ai-wrapper>
-              <ai-info-item label="使用证书" :value="data.taxpayer"></ai-info-item>
-              <ai-info-item label="所在地区" :value="data.taxpayerNumber"></ai-info-item>
-              <ai-info-item label="使用人" :value="data.taxpayerNumber"></ai-info-item>
-              <ai-info-item label="家庭人口" :value="data.taxYear"></ai-info-item>
-              <ai-info-item label="身份证号" :value="data.taxpayerNumber"></ai-info-item>
-              <ai-info-item label="土地所有权">{{ dict.getLabel('taxInfoLevel', data.taxLevel) }}</ai-info-item>
-              <ai-info-item label="土地面积/㎡" :value="data.unifiedCode"></ai-info-item>
-              <ai-info-item label="土地四至" :value="data.unifiedCode"></ai-info-item>
-              <ai-info-item label="土地面积" :value="data.unifiedCode"></ai-info-item>
-              <ai-info-item label="使用情况" :value="data.unifiedCode"></ai-info-item>
+              <ai-info-item label="使用证书" :value="data.useCertificate"></ai-info-item>
+              <ai-info-item label="所在地区" :value="data.areaName"></ai-info-item>
+              <ai-info-item label="使用人" :value="data.usePerson"></ai-info-item>
+              <ai-info-item label="家庭人口" :value="data.houseNumber"></ai-info-item>
+              <ai-info-item label="身份证号" :value="data.idNumber"></ai-info-item>
+              <ai-info-item label="土地所有权" :value="data.landOwnership">{{ dict.getLabel('landOwnership', data.landOwnership) }}</ai-info-item>
+              <ai-info-item label="土地面积/㎡" :value="data.landArea"></ai-info-item>
+              <ai-info-item label="土地四至" :value="data.landFourTo"></ai-info-item>
+              <ai-info-item label="使用情况" :value="data.useSituation"></ai-info-item>
+              <ai-info-item label="权证照片" :value="data.unifiedCode"></ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -108,7 +107,8 @@ export default {
     return { 
       id: '',
       form: {
-        unifiedCode: '',
+        useCertificate: '',
+
       },
       isEdit: false,
       radioFrom: ''
@@ -117,7 +117,7 @@ export default {
   computed: {
     rules() {
       return {
-        unifiedCode: [{required: true, message: '请输入', trigger: 'blur'}]
+        useCertificate: [{required: true, message: '请输入', trigger: 'blur'}]
       }
     },
     ...mapState(['user'])
@@ -137,28 +137,28 @@ export default {
       })
     },
     getDetail(id) {
-      // this.instance.post(`/appcreditadminstrativelicense/queryDetailById?id=${id}`).then(res => {
-      //   if (res.code === 0) {
-      //     this.data = res.data
-      //   }
-      // })
+      this.instance.post(`/apphomesteadinfo/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
     },
     confirm() {
-      // this.$refs.form.validate((valid) => {
-      //   if (valid) {
-      //     this.instance.post(`/appcreditadminstrativelicense/addOrUpdate`, {
-      //       ...this.forms,
-      //       id: this.params.id || '',
-      //     }).then(res => {
-      //       if (res.code == 0) {
-      //         this.$message.success('提交成功')
-      //         setTimeout(() => {
-      //           this.cancel(true)
-      //         }, 600)
-      //       }
-      //     })
-      //   }
-      // })
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/apphomesteadinfo/addOrUpdate`, {
+            ...this.forms,
+            id: this.params.id || '',
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
     },
   },
 }
diff --git a/project/xiushan/apps/AppHouseManagement/components/List.vue b/project/xiushan/apps/AppHouseManagement/components/List.vue
index 9bddbd7b..15e19e27 100644
--- a/project/xiushan/apps/AppHouseManagement/components/List.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/List.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="List">
     <ai-list>
-      <!--  :disabledLevel="disabledLevel" -->
-      <ai-title slot="title" title="宅基地管理" isShowBottomBorder :instance="instance" isShowArea v-model="search.areaId" @change="changeArea"/>
+      <!-- :instance="instance" isShowArea v-model="search.areaId" @change="changeArea" -->
+      <ai-title slot="title" title="宅基地管理" isShowBottomBorder />
       <template #content>
         <ai-search-bar>
           <template #left>
@@ -11,6 +11,14 @@
           <template #right>
             <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="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
+              <el-button size="small">导入</el-button>
+            </ai-import>
+            <ai-download :instance="instance" url="/appcreditdishonestperson/export" :params="search" fileName="土地流转经营信息"
+                         :disabled="tableData.length == 0">
+              <el-button size="small">导出</el-button>
+            </ai-download>
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -48,13 +56,13 @@ export default {
     ...mapState(['user']),
     colConfigs() {
       return [
-        { prop: "executionCode", label: '使用证书号', align: "center", width: "200px", },
-        { prop: "executionTime", label: '使用人', align: "center", width: "200px", },
-        { prop: "enterpriseName", label: '身份证号', align: "center", width: "200px", },
-        { prop: "unifiedCode", label: '家庭人口', align: "center", width: "200px", },
-        { prop: "dishonestFact", label: '面积/㎡', align: "center", width: "200px", },
-        { prop: "createTime", label: '土地四至', align: "center", width: "200px", },
-        { prop: "createUserName", label: '土地所有权', align: "center", width: "200px", },
+        { prop: "useCertificate", label: '使用证书号', align: "center", width: "200px", },
+        { prop: "usePerson", label: '使用人', align: "center", width: "200px", },
+        { prop: "idNumber", label: '身份证号', align: "center", width: "200px", },
+        { prop: "houseNumber", label: '家庭人口', align: "center", width: "200px", },
+        { prop: "landArea", label: '面积/㎡', align: "center", width: "200px", },
+        { prop: "landFourTo", label: '土地四至', align: "center", width: "200px", },
+        { prop: "landOwnership", label: '土地所有权', align: "center", width: "200px", },
         { slot: "options" ,},
       ]
     }
@@ -66,7 +74,7 @@ export default {
   methods: {
     changeArea() {},
     getTableData() {
-      this.instance.post("/appcreditdishonestperson/list", null, {
+      this.instance.post("/apphomesteadinfo/list", null, {
         params: {...this.page, ...this.search,...this.select}
       }).then(res => {
         if (res?.data) {
@@ -85,7 +93,7 @@ export default {
     },
     handleDelete(id) {
       this.$confirm("是否要删除？").then(() => {
-        this.instance.post(`/appcreditdishonestperson/delete?ids=${id}`).then(res => {
+        this.instance.post(`/apphomesteadinfo/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success("删除成功")
               this.getTableData()
diff --git a/project/xiushan/apps/AppLandTransfer/components/List.vue b/project/xiushan/apps/AppLandTransfer/components/List.vue
index 4eee6637..e8435550 100644
--- a/project/xiushan/apps/AppLandTransfer/components/List.vue
+++ b/project/xiushan/apps/AppLandTransfer/components/List.vue
@@ -11,6 +11,7 @@
           <template #right>
             <el-input size="small" placeholder="查询合同编号/流出方/承接方/证件号码" v-model="search.name" clearable @clear="page.current = 1, searchObj.name = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <!-- 导入导出 -->
             <ai-import :instance="instance" :dict="dict" importUrl="/appcreditdishonestperson/import" url="/appcreditdishonestperson/downloadTemplate" name="失信被执行人信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>