From 067dd11bda68394aec1ba3542d05a58062159caf Mon Sep 17 00:00:00 2001
From: yujk <990961482@qq.com>
Date: Mon, 28 Feb 2022 15:56:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E8=B0=83=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/homesteadSurvey/add.vue    | 17 +++++----
 src/views/homesteadSurvey/index.vue  |  4 ++
 src/views/homesteadSurvey/list.vue   | 11 +++---
 src/views/homesteadSurvey/settle.vue | 57 +++++++++++++++++++++++++++-
 4 files changed, 75 insertions(+), 14 deletions(-)

diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 1af8dbd4..e429fdf2 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -384,9 +384,10 @@
             autocomplete="off"
             input-align="right"
             v-model="form.jzxg"
-            name="建筑限高"
+            name="建筑限高(m)"
             label="建筑限高(m)"
-            placeholder="建筑限高"
+            placeholder="填写000.00~999.99小数"
+            :rules="[{ validator:validator1, message: '请填写000.00~999.99小数，保留两位小数' }]"
             type="number"
           />
           <van-field
@@ -462,6 +463,8 @@
           </div>
           <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopupsyqr(item)">查看使用权人信息</van-button>
+            <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" @click="showPopuphncylist(item)">查看户内成员信息</van-button>
+
           </div>
         </div>
         <template #right>
@@ -513,7 +516,7 @@
       </div>
       <van-swipe-cell v-for="(item,index) in fwlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px auto;background:#fff;">
         <div style="padding:20px;">
-          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>自然幢号：{{item.zrzh}}</p>
+          <p style="color:#22B7F2;font-size:20px;line-height:30px;"><van-icon name="wap-home" color="#22b7f2" size="20" style="margin-right:10px;"/>第{{index+1}}号</p>
           <div style="display:flex;line-height:20px">
             <p style="flex:1;text-align:left;">农民房屋幢号</p>
             <p  style="flex:1;text-align:right;">{{item.nmfwzh}}</p>
@@ -828,9 +831,9 @@
             label="备注"
             placeholder="备注"
           />
-          <div style="text-align:center;overflow:auto;">
+<!--          <div style="text-align:center;overflow:auto;">
             <van-button plain round color="#7AC943" size="mini" style="margin:0 auto;" native-type="button" @click="showPopuphncylist(form1)">查看户内成员列表</van-button>
-          </div>
+          </div>-->
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -2795,8 +2798,8 @@
         }
       },
       validator1(val){
-        console.log(val.length)
-        if(val>1||val<0||val.length>4){
+        console.log(val)
+        if(val>=1000||val<0||val.length>6){
           return false
         }else{
           return true
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index 3bb78092..93a44b2a 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -111,6 +111,7 @@
       </van-cell>
       </van-pull-refresh>
     </div>
+
   </div>
 </template>
 
@@ -118,6 +119,7 @@
   import {addTask, complete, delTask, exportTask, getTask, listTask, publish, updateTask} from "@/api/homesteadSurvey/index";
   import {getInfo} from "../../api/login";
    import CircleProccess from "@/components/circleProccess.vue";
+  import {updateUserPwd} from "../../api/onlineHome/my";
     export default {
       name: "homesteadIndex",
       components: {
@@ -125,6 +127,7 @@
       },
       data() {
         return {
+
           active: 1,
           show: false,
           loading: false,
@@ -173,6 +176,7 @@
 
       },
       methods: {
+
         onRefreshtask(){
           this.isLoadingtask = false;
           let _this = this
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 18544aee..0103635a 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -151,8 +151,7 @@
     </div>
     <div v-if="activeBtn==3">
       <van-form @submit="onSubmitsyqr">
-        <div style="border-radius: 16px;
-          box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
+        <div style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
           <van-field
             autocomplete="off"
             v-model="qlrform.qydm"
@@ -259,6 +258,7 @@
             placeholder="代表人联系电话"
             type="number"
             input-align="right"
+            required
             :rules="[{ required: true, message: '代表人联系电话不能为空' }]"
           />
           <van-field
@@ -425,8 +425,8 @@
           <van-button round block color="#7AC943" native-type="submit">保存</van-button>
         </div>
       </van-form>
-    </div>
-    <div v-if="activeBtn==4">
+  </div>
+    <div v-if="activeBtn==4" style="overflow:hidden">
       <!--      <van-search placeholder="请输入宅基地号查询" v-if="false">
               <template #action>
               </template>
@@ -1642,6 +1642,7 @@
               }
             );
           }else{
+            this.qlrform.deptId = this.item.deptId
             addSuyqr(this.qlrform).then(
               response => {
                 let _this =this
@@ -1663,7 +1664,7 @@
             "suyqxz":'40',
             "suyqxzName":'集体土地所有权',
             "dbrzjlx":'01',
-            "dbrzjlxName":'代表人证件类型',
+            "dbrzjlxName":'身份证',
             "sfclncjtjjzz":'农村宅基地使用权确权登记发证',
             "sjly":'04',
           }
diff --git a/src/views/homesteadSurvey/settle.vue b/src/views/homesteadSurvey/settle.vue
index dbae9174..757d2283 100644
--- a/src/views/homesteadSurvey/settle.vue
+++ b/src/views/homesteadSurvey/settle.vue
@@ -19,7 +19,7 @@
       </template>
 
     </van-cell>
-    <van-cell title="修改密码" is-link style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
+    <van-cell title="修改密码" @click="showPassword=true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;background:#fff;padding:20px;">
       <template #icon>
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
@@ -29,12 +29,65 @@
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
     </van-cell>
+    <van-popup v-model:show="showPassword" position="bottom" style="width:100%;padding:20px;">
+      <van-cell-group >
+        <van-field v-model="oldPassword" label="原密码" type="password" placeholder="请输入" />
+        <van-field v-model="newPassword" label="新密码" type="password" placeholder="请输入" />
+        <van-field v-model="confirmPassword" label="确认新密码" type="password" placeholder="请输入" />
+        <van-row style="text-align: center;margin-top: 40px">
+          <van-button round block color="#7AC943" @click="submit">保存</van-button>
+        </van-row>
+      </van-cell-group>
+    </van-popup>
   </div>
 </template>
 
 <script>
+    import {updateUserPwd} from "../../api/onlineHome/my";
+
     export default {
-        name: "homesteadSettle"
+        name: "homesteadSettle",
+      data(){
+          return{
+            showPassword:false,
+            oldPassword: "",
+            newPassword: "",
+            confirmPassword: "",
+        }},
+            methods:{
+          submit() {
+            if(this.confirmPassword
+              !=this.newPassword){
+              this.$toast({
+                icon: 'error', // 找到自己需要的图标
+                message: '两次密码不同，请重新输入',
+                duration:"1000",
+                onClose:function(){
+                  this.oldPassword=""
+                  this.newPassword=""
+                  this.confirmPassword=""
+                  return false;
+                }
+              })
+            }else{
+              updateUserPwd(this.oldPassword, this.newPassword).then(
+                response => {
+                  let _this =this
+                  this.$toast({
+                    icon: 'success', // 找到自己需要的图标
+                    message: '修改成功',
+                    duration:"1000",
+                    onClose:function(){
+                      _this.showPassword = false
+                    }
+                  })
+                }
+              );
+            }
+
+          }
+        }
+
     }
 </script>