From 478b4025a703276cd866fa3532c48ac858bac6eb Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 7 Apr 2022 18:46:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppHouseManagement/components/Add.vue     | 37 +++++++++++++------
 .../AppHouseManagement/components/List.vue    |  6 +--
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/project/xiushan/apps/AppHouseManagement/components/Add.vue b/project/xiushan/apps/AppHouseManagement/components/Add.vue
index 8db21c56..7e7e9c49 100644
--- a/project/xiushan/apps/AppHouseManagement/components/Add.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/Add.vue
@@ -16,7 +16,7 @@
                 <el-input v-model="form.useCertificate" placeholder="请输入宅基地使用证书号"></el-input>
               </el-form-item>
               <el-form-item label="所在地区" prop="areaName">
-                <ai-area-select v-model="areaId" provinceAction="/api/area/queryProvinceListContainCity" always-show clearable :instance="$request" :areaLevel="5" @fullname="(name) => (this.formJobWant.employmentAreaName = name)"></ai-area-select>
+                <ai-area-select clearable always-show :instance="instance" v-model="form.areaId" :disabled-level="disabledLevel"></ai-area-select>
               </el-form-item>
               <el-row type="flex">
                 <el-col :span="20">
@@ -74,20 +74,22 @@
       <template slot="content">
         <ai-card title="合同信息">
           <template #right>
-              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span>
             </template>
           <template #content>
             <ai-wrapper>
-              <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.useCertificate" isLine></ai-info-item>
+              <ai-info-item label="所在地区" :value="data.areaName" isLine></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.fileList"></ai-info-item>
+              <ai-info-item label="土地四至" :value="data.landFourTo" isLine></ai-info-item>
+              <ai-info-item label="使用情况" :value="data.useSituation" isLine></ai-info-item>
+              <ai-info-item label="权证照片" isLine>
+                <ai-uploader v-model="data.fileList" :instance="instance" :limit="9" disabled/>
+              </ai-info-item>
             </ai-wrapper>
           </template>
         </ai-card>
@@ -111,17 +113,28 @@ export default {
       id: '',
       form: {
         useCertificate: '',
-
+        areaId: '',
+        areaName: '',
+        usePerson: '',
+        houseNumber: '',
+        idNumber: '',
+        landOwnership: '',
+        landArea: '',
+        landFourTo: '',
+        useSituation: '',
+        fileList: [],
       },
       isEdit: false,
-      radioFrom: ''
+      radioFrom: '',
+      disabledLevel: 3,
+      data: {},
     }
   }, 
   computed: {
     rules() {
       return {
         useCertificate: [{required: true, message: '请输入使用证书', trigger: 'blur'}],
-        areaName: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
+        areaId: [{required: true, message: '请选择所在地区', trigger: 'blur'}],
         usePerson: [{required: true, message: '请输入使用人', trigger: 'blur'}],
         houseNumber: [{required: true, message: '请输入家庭人口', trigger: 'blur'}],
         idNumber: [{required: true, message: '请输入身份证号', trigger: 'blur'}],
@@ -139,7 +152,7 @@ export default {
       this.id = this.params.id
       this.getDetail(this.params.id)
     }
-    this.areaId = this.user.info.areaId
+    this.form.areaId = this.user.info.areaId
   },
   methods: {
     cancel(isRefresh) {
@@ -159,7 +172,7 @@ export default {
       this.$refs.form.validate((valid) => {
         if (valid) {
           this.instance.post(`/apphomesteadinfo/addOrUpdate`, {
-            ...this.forms,
+            ...this.form,
             id: this.params.id || '',
           }).then(res => {
             if (res.code == 0) {
diff --git a/project/xiushan/apps/AppHouseManagement/components/List.vue b/project/xiushan/apps/AppHouseManagement/components/List.vue
index 15e19e27..54d17a69 100644
--- a/project/xiushan/apps/AppHouseManagement/components/List.vue
+++ b/project/xiushan/apps/AppHouseManagement/components/List.vue
@@ -12,10 +12,10 @@
             <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('导入成功!')">
+            <ai-import :instance="instance" :dict="dict" importUrl="/apphomesteadinfo/import" url="/apphomesteadinfo/downloadTemplate" name="宅基地管理信息模板" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <ai-download :instance="instance" url="/appcreditdishonestperson/export" :params="search" fileName="土地流转经营信息"
+            <ai-download :instance="instance" url="/apphomesteadinfo/export" :params="search" fileName="宅基地管理信息"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
@@ -68,7 +68,7 @@ export default {
     }
   },
   created() {
-    this.search.areaId = this.user.info.areaId
+    // this.search.areaId = this.user.info.areaId
     this.getTableData()
   },
   methods: {