From d34f9b0a61309034afd912ed0c5207d7a6a767c1 Mon Sep 17 00:00:00 2001
From: xyq <392009588@qq.com>
Date: Mon, 16 Jan 2023 13:32:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sunVillage_info/homestead/application.js  |  4 +--
 .../arbitration/arbitrationDetail.vue         | 17 +++++++----
 .../homeApplication/proposerLite.vue          | 25 ++++++++--------
 .../sunVillage_info/index_code_rights.vue     |  6 +++-
 .../sunVillage_info/paidExit/paidExitAdd.vue  | 30 +++++++++++--------
 .../paidExit/paidExitDetail.vue               |  2 +-
 .../paidExit/paidExitModify.vue               |  2 +-
 .../homestead/supervision/supervisionAdd.vue  |  8 ++---
 .../supervision/supervisionDetail.vue         |  2 +-
 .../supervision/supervisionModify.vue         |  2 +-
 10 files changed, 57 insertions(+), 41 deletions(-)

diff --git a/src/api/sunVillage_info/homestead/application.js b/src/api/sunVillage_info/homestead/application.js
index 3dc3bff5..9f62d6d0 100644
--- a/src/api/sunVillage_info/homestead/application.js
+++ b/src/api/sunVillage_info/homestead/application.js
@@ -159,9 +159,9 @@ export function listHomeapplytype(query) {
   })
 }
 //查询宅地信息
-export function checkDuplicateBuildingQuery(id) {
+export function checkDuplicateBuildingQuery(idcard) {
   return request({
-    url: '/home/mobile/applyDetail/' + id,
+    url: '/home/mobile/applyDetail/' + idcard,
     method: 'get'
   })
 }
diff --git a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
index 190310d7..6b236ce6 100644
--- a/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
+++ b/src/views/sunVillage_info/arbitration/arbitrationDetail.vue
@@ -33,7 +33,7 @@
                     input-align="right"
                   >
                     <template #button>
-                      <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+                      <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
                     </template>
                   </van-field>
                   <field-select
@@ -210,6 +210,12 @@ export default {
     this.id = this.$route.query.id;
     this.type = this.$route.query.type;
     this.getFormIntent();
+    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+      if (response.code == 200) {
+        this.shyqrdmxmChange(response.rows[0]);
+        this.closeMoule(response.rows[0].zjddm);
+      }
+    });
     this.getDetail();
     this.getUserHouseApplyProposer();
   },
@@ -430,14 +436,13 @@ export default {
       }
     },
     shyqrdmxmChange(val){
-      console.info(val);
-      this.$set(this.arbitrationData, "shyqrdbxm", val.sqrxm);
+      this.$set(this.arbitrationData, "shyqrdbxm", val.shyqrdbxm);
       this.$set(this.arbitrationData, "deptId", val.deptId);
       this.$set(this.arbitrationData, "deptName", val.deptId);
-      this.$set(this.arbitrationData, "shyqrzjhm", val.sqrzjhm);
-      this.$set(this.arbitrationData, "shyqrzjlx", val.sqrzjlx);
+      this.$set(this.arbitrationData, "shyqrzjhm", val.shyqrdbzjhm);
+      this.$set(this.arbitrationData, "shyqrzjlx", val.shyqrdbzjlx);
       this.$set(this.arbitrationData, "shyqrdm", val.shyqrdm);
-      this.$set(this.arbitrationData, "shyqrdh", val.sqrdh);
+      this.$set(this.arbitrationData, "shyqrdh", val.dh);
       this.$set(this.arbitrationData, "zjddm", val.zjddm);
       this.getObligeeOptions=[];
       this.showDropList = false;
diff --git a/src/views/sunVillage_info/homeApplication/proposerLite.vue b/src/views/sunVillage_info/homeApplication/proposerLite.vue
index 298e3a3a..a36534cf 100644
--- a/src/views/sunVillage_info/homeApplication/proposerLite.vue
+++ b/src/views/sunVillage_info/homeApplication/proposerLite.vue
@@ -38,7 +38,7 @@
                 <div>
                   <p class="main_title">申请户主信息</p>
                   <div class="main_box">
-                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzxm" label="姓名" placeholder="姓名" input-align="right"    @input="remoteTransfereeMethod" required :rules="[{ required: true }]"/>
+                    <van-field readonly v-model="applicationDetail.sqhhzxm" label="姓名" placeholder="姓名" input-align="right"    @input="remoteTransfereeMethod" required :rules="[{ required: true }]"/>
                     <van-popup v-model="showNhxx" position="bottom">
                       <van-picker
                         show-toolbar
@@ -56,13 +56,13 @@
                       placeholder="选择性别"
                       :rules="[{ required: true }]"
                       required
-                      :readonly="!formEnabled.baseApplyForm.baseFormEnabled"
+                      :readonly="true"
                       remote-url="/system/dict/data/type/sys_user_sex"
                       :on-remote-response="'data'"
                     />
-                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhznl" label="年龄" placeholder="年龄" input-align="right" type="digit" :rules="[{ required: true }]"/>
+                    <van-field required readonly v-model="applicationDetail.sqhhznl" label="年龄" placeholder="年龄" input-align="right" type="digit" :rules="[{ required: true }]"/>
                     <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzlxdh" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
-                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzsfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateUserInfo"/>
+                    <van-field required readonly v-model="applicationDetail.sqhhzsfzh" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]" @input="updateUserInfo"/>
                     <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhhzhkszd" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                     <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.sqhjtzz" label="家庭住址" placeholder="家庭住址" input-align="right" :rules="[{ required: true }]"/>
 <!--                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.familyAddress" label="家庭住址" placeholder="家庭住址" input-align="right" :rules="[{ required: true }]"/>-->
@@ -677,7 +677,7 @@
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">宅基地<br/>坐落平<br/>面位置图</van-col>
                     <van-col span="19">
-                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="false" @fileUpdate="fileUpdate"/>
+                      <MultiImageUploadComp :value="applicationDetail.ydjfsp.zjdzlpmwzt" :uploadDisabled="wztUpdate" @fileUpdate="fileUpdate"/>
                       <van-row>
                         <van-col span="12"><van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.ydjfsp.zckcryxm" label="踏勘人" placeholder="现场踏勘人员" input-align="left" label-width="auto"/></van-col>
                         <van-col span="12">
@@ -1814,6 +1814,7 @@ export default {
       activeNames:['1'],
       showNhxx:false,
       showTyt:false,
+      wztUpdate:false,
       tytzName:null,
       //农户信息集合
       nhxxList:[],
@@ -2108,7 +2109,6 @@ export default {
     // 初始化当前数据, 有ID则查询, 否则新增
     getDetail(){
       this.reset();
-
       if(this.id)
       {
         allInformationWLHT(this.id).then(response => {
@@ -2127,7 +2127,7 @@ export default {
       else
       {
         this.init();
-        // this.getApplyerDetail();
+        this.getApplyerDetail(this.sysFarmer);
       }
     },
     // 绘制申请地图
@@ -2712,6 +2712,7 @@ export default {
               this.applicationDetail.ydjfsp.xzzfshpzsj = handlerTime;
               this.applicationDetail.ydjfsp.zjdzlpmwzxctksj = handlerTime;
               this.applicationDetail.ydjfsp.zckcsj = handlerTime;
+              this.wztUpdate = true;
             }
           }
 
@@ -3176,12 +3177,12 @@ export default {
     // 获取申请人信息
     getApplyerDetail(val){
       console.info(val)
-      getHomeMembers({idcard:val.hzzjhm}).then(res => {
+      getHomeMembers({idcard:val.idcard}).then(res => {
         if(res.data)
         {
           this.applicationDetail = res.data;
-          this.$set(this.applicationDetail, 'sqhhzhkszd',  val.hkszd);
-          this.$set(this.applicationDetail, 'sqhjtzz',  val.txdz);
+          this.$set(this.applicationDetail, 'sqhhzhkszd',  val.sqhhzhkszd);
+          this.$set(this.applicationDetail, 'sqhjtzz',  val.sqhjtzz);
           this.$set(this.applicationDetail, 'jflx',  "4");
           this.$set(this.applicationDetail, 'projectName',  "分户新建");
           this.$set(this.applicationDetail, 'nsqzjddldm',  "10");
@@ -3189,11 +3190,11 @@ export default {
           this.$set(this.applicationDetail, 'xzjdczqk',  "1");
           this.$set(this.applicationDetail, 'suyqrdm',  val.suyqrdm);
           this.$set(this.applicationDetail, 'deptName',  val.deptName);
-          this.$set(this.applicationDetail, 'createBy',  this.sysFarmer.memberName);
+          this.$set(this.applicationDetail, 'createBy',  val.memberName);
           if(!this.applicationDetail.sfyyzjd)
             this.applicationDetail.sfyyzjd = 'N';
           this.applicationDetail.applyTime = this.getDate();
-          this.getMemberCurrentSituation(val.id);
+          this.getMemberCurrentSituation(val.idcard);
           console.info(this.applicationDetail.sqrjtcyList);
           if(this.applicationDetail.sqrjtcyList.length > 0)
           {
diff --git a/src/views/sunVillage_info/index_code_rights.vue b/src/views/sunVillage_info/index_code_rights.vue
index 140349fc..c6286f16 100644
--- a/src/views/sunVillage_info/index_code_rights.vue
+++ b/src/views/sunVillage_info/index_code_rights.vue
@@ -28,7 +28,7 @@
               <div class="nav_list">
                 <router-link :to="{name:'sunVillageInfoListVote',query:{type:'code'}}" class="nav_item n_4">投票表决</router-link>
                 <router-link :to="{name:'sunVillageInfoApplicationList',query:{type:'code'}}" class="nav_item n_6">宅基地申请</router-link>
-                <router-link :to="{name:'sunVillageInfoPaidExitList',query:{type:'code'}}" class="nav_item n_6">宅基地退出</router-link>
+                <router-link :to="{name:'sunVillageInfoPaidExitList',query:{type:'code'}}" class="nav_item n_66">宅基地退出</router-link>
               </div>
             </div>
           <div class="nav_box" style="margin-top: 3vh;">
@@ -245,6 +245,10 @@
                  background: url('../../assets/images/sunVillage_info/index_block_06.png') no-repeat center top;
                  background-size: 34.5PX;
                }
+              &.n_66 {
+                 background: url('../../assets/images/sunVillage_info/tcIcon.png') no-repeat center top;
+                 background-size: 44.5PX;
+               }
               &.n_77 {
                  background: url('../../assets/images/sunVillage_info/index_block_77.png') no-repeat center top;
                  background-size: 34.5PX;
diff --git a/src/views/sunVillage_info/paidExit/paidExitAdd.vue b/src/views/sunVillage_info/paidExit/paidExitAdd.vue
index c9eccfee..f07816f0 100644
--- a/src/views/sunVillage_info/paidExit/paidExitAdd.vue
+++ b/src/views/sunVillage_info/paidExit/paidExitAdd.vue
@@ -45,7 +45,7 @@
           input-align="right"
         >
           <template #button>
-            <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
           </template>
         </van-field>
         <van-field
@@ -332,6 +332,12 @@ export default {
   },
   created() {
     this.getDictionaries();
+    getShyqrs({shyqrdbzjhm:this.sysFarmer.idcard,status:1}).then((response) => {
+      if (response.code == 200) {
+        this.shyqrdmxmChange(response.rows[0]);
+        this.closeMoule(response.rows[0].zjddm);
+      }
+    });
   },
   methods: {
     getDictionaries(){
@@ -548,17 +554,17 @@ export default {
         });
     },
     shyqrdmxmChange(val){
-      console.info(val);
-      this.$set(this.circulation, "sqrxm", val.sqrxm);
+      this.$set(this.circulation, "sqrxm", val.shyqrdbxm);
       this.$set(this.circulation, "deptId", val.deptId);
-      this.$set(this.circulation, "deptName", val.deptId);
-      this.$set(this.circulation, "sqrzjhm", val.sqrzjhm);
-      this.$set(this.circulation, "sqrzjlx", val.sqrzjlx);
-      this.$set(this.circulation, "sqrnhdm", val.sqrnhdm);
+      this.$set(this.circulation, "deptName", val.deptName);
+      this.$set(this.circulation, "sqrzjhm", val.shyqrdbzjhm);
+      this.$set(this.circulation, "sqrzjlx", val.shyqrdbzjlx);
+      this.$set(this.circulation, "sqrnhdm", val.nhdm);
       this.$set(this.circulation, "gyqk", val.gyfs);
-      this.$set(this.circulation, "xb", val.sqrxb);
-      this.$set(this.circulation, "lxdh", val.sqrdh);
+      this.$set(this.circulation, "xb", val.xb);
+      this.$set(this.circulation, "lxdh", val.dh);
       this.$set(this.circulation, "hkszd", val.dz);
+      this.$set(this.circulation, "zjddm", val.zjddm);
       this.getObligeeOptions=[];
       this.showDropList = false;
     },
@@ -589,14 +595,14 @@ export default {
         this.$set(this.circulation, "zjdszb", response.data.zdszb);
         this.$set(this.circulation, "theGeomJson", response.data.theGeomJson);
         this.$set(this.circulation, "tcqszsh", response.data.zsh);
-        listHomesteadnmfw({zjddm: data}).then((response) => {
-          response.rows.map(function(item){
+        listHomesteadnmfw({zjddm: data}).then((res) => {
+          res.rows.map(function(item){
             _this.$set(_this.circulation, "jzmj", Number(_this.circulation.jzmj) + Number(item.jzmj));
             _this.$set(_this.circulation, "xjzmj", Number(_this.circulation.xjzmj) + Number(item.jzmj));
           });
         });
         // const baseImgUrl = this.$store.getters.baseRoutingUrl;
-        if(response.rows[0].zdt != null && response.rows[0].zdt !== ""){
+        if(response.data.zdt != null && response.data.zdt !== ""){
           this.$set(this.form, "xzzp", response.rows[0].zdt);
         }
       });
diff --git a/src/views/sunVillage_info/paidExit/paidExitDetail.vue b/src/views/sunVillage_info/paidExit/paidExitDetail.vue
index a67239ba..6c8b5f90 100644
--- a/src/views/sunVillage_info/paidExit/paidExitDetail.vue
+++ b/src/views/sunVillage_info/paidExit/paidExitDetail.vue
@@ -44,7 +44,7 @@
           input-align="right"
         >
           <template #button>
-            <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
           </template>
         </van-field>
         <field-select
diff --git a/src/views/sunVillage_info/paidExit/paidExitModify.vue b/src/views/sunVillage_info/paidExit/paidExitModify.vue
index c5dedb09..787d9d03 100644
--- a/src/views/sunVillage_info/paidExit/paidExitModify.vue
+++ b/src/views/sunVillage_info/paidExit/paidExitModify.vue
@@ -44,7 +44,7 @@
           input-align="right"
         >
           <template #button>
-            <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+            <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
           </template>
         </van-field>
         <field-select
diff --git a/src/views/yinnong/homestead/supervision/supervisionAdd.vue b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
index e0127d63..ea447237 100644
--- a/src/views/yinnong/homestead/supervision/supervisionAdd.vue
+++ b/src/views/yinnong/homestead/supervision/supervisionAdd.vue
@@ -23,7 +23,7 @@
         input-align="right"
       >
         <template #button>
-          <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+          <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
         </template>
       </van-field>
       <field-select
@@ -243,11 +243,11 @@
         }
       },
       shyqrdmxmChange(val){
-        this.$set(this.jgList, "shyqrdbxm", val.sqrxm);
+        this.$set(this.jgList, "shyqrdbxm", val.shyqrdbxm);
         this.$set(this.jgList, "deptId", val.deptId);
         this.$set(this.jgList, "deptName", val.deptId);
-        this.$set(this.jgList, "shyqrzjhm", val.sqrzjhm);
-        this.$set(this.jgList, "shyqrzjlx", val.sqrzjlx);
+        this.$set(this.jgList, "shyqrzjhm", val.shyqrdbzjhm);
+        this.$set(this.jgList, "shyqrzjlx", val.shyqrdbzjlx);
         this.$set(this.jgList, "shyqrdm", val.shyqrdm);
         this.getObligeeOptions=[];
         this.showDropList = false;
diff --git a/src/views/yinnong/homestead/supervision/supervisionDetail.vue b/src/views/yinnong/homestead/supervision/supervisionDetail.vue
index e6d8387e..dffebefd 100644
--- a/src/views/yinnong/homestead/supervision/supervisionDetail.vue
+++ b/src/views/yinnong/homestead/supervision/supervisionDetail.vue
@@ -76,7 +76,7 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="24" align="center">
-            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goBack">取<i style="margin-right: 1em;"></i>消</van-button>
+            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="goBack">返<i style="margin-right: 1em;"></i>回</van-button>
           </van-col>
         </van-row>
         <div class="clear"></div>
diff --git a/src/views/yinnong/homestead/supervision/supervisionModify.vue b/src/views/yinnong/homestead/supervision/supervisionModify.vue
index 92e11de2..ee37fe7a 100644
--- a/src/views/yinnong/homestead/supervision/supervisionModify.vue
+++ b/src/views/yinnong/homestead/supervision/supervisionModify.vue
@@ -23,7 +23,7 @@
         input-align="right"
       >
         <template #button>
-          <van-button size="small" @click="mapLook"  type="primary">选择宅基地</van-button>
+          <van-icon name="../../../static/images/22.png"  color="#539FFD" size="20" @click="mapLook"/>
         </template>
       </van-field>
       <field-select