diff --git a/src/App.vue b/src/App.vue
index d42af001..920f8c81 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -47,10 +47,10 @@
 </template>
 
 <script>
-/*import navFooter from "@/components/common/nav_footer";*/
+import navFooter from "@/components/common/nav_footer";
 export default {
   name: "App",
-  /*components: { navFooter },*/
+  components: { navFooter },
   data: () => {
     return {
       // direction: "",
diff --git a/src/components/common/nav_footer.vue b/src/components/common/nav_footer.vue
index 3e603e7a..d8f9dacf 100644
--- a/src/components/common/nav_footer.vue
+++ b/src/components/common/nav_footer.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tb-toolbar-container">
-    <router-link to="/index" class="tab" active-class="active" exact>
+    <!--<router-link to="/index" class="tab" active-class="active" exact>
       <span class="icon"><van-icon name="wap-home-o" size="25" /></span>
       <p class="text">首页</p>
     </router-link>
@@ -11,7 +11,7 @@
     <router-link to="/user" class="tab" active-class="active">
       <span class="icon"><van-icon name="contact" size="25" /></span>
       <p class="text">我的</p>
-    </router-link>
+    </router-link>-->
 <!--    <router-link to="/addressBook" class="tab" active-class="active">-->
 <!--      <span class="icon"><van-icon name="orders-o" size="20" /></span>-->
 <!--      <p class="text">通讯录</p>-->
diff --git a/src/views/homesteadLogin.vue b/src/views/homesteadLogin.vue
index dec02679..1cc40bd9 100644
--- a/src/views/homesteadLogin.vue
+++ b/src/views/homesteadLogin.vue
@@ -49,6 +49,7 @@
               </template>
             </van-field>
             </div>
+            <van-checkbox style="float: right;margin-top:10px;margin-bottom:10px;margin-left:20px;" v-model="formData.rememberMe" >{{showMessage ? "记住手机号" : "记住密码"}}</van-checkbox>
             <div style="margin: 10px 5px 5px;padding:10px">
               <van-button block round size="large" :color="formData.username!=''&&formData.password!=''?'#7AC943':'#e2e2e2'" :disabled="formData.username==''||formData.password==''" native-type="submit" @click="handleLogin">登录</van-button>
             </div>
@@ -187,10 +188,10 @@ export default {
       const password = Cookies.get("password");
       const rememberMe = Cookies.get("rememberMe");
       this.formData = {
-        username: username === undefined ? this.formData.username : username,
+        username: username === undefined ? this.formData.username : Cookies.get("username"),
         password:
-          password === undefined ? this.formData.password : decrypt(password),
-        rememberMe: rememberMe === undefined ? false : Boolean(rememberMe),
+          password === undefined ? this.formData.password : decrypt(Cookies.get("password")),
+        rememberMe: rememberMe === undefined ? false : Boolean(Cookies.get("rememberMe")),
       };
     },
     getSmsCode() {
@@ -239,6 +240,16 @@ export default {
           });
           return false;
         }
+        // 记住密码
+      if (this.formData.rememberMe) {
+        Cookies.set("username", this.formData.username, { expires: 30 });
+        Cookies.set("password", encrypt(this.formData.password), { expires: 30 });
+        Cookies.set("rememberMe", this.formData.rememberMe, { expires: 30 });
+      } else {
+        Cookies.remove("username");
+        Cookies.remove("password");
+        Cookies.remove("rememberMe");
+      }
         this.$store
           .dispatch("Login", this.formData)
           .then(() => {
@@ -247,6 +258,7 @@ export default {
           .catch((error) => {
             this.loading = false;
             this.getCode();
+            this.formData.code = null
           });
     },
     getRegisterSmsCode(){
@@ -288,6 +300,7 @@ export default {
         }).catch((res)=>{
           if(res=='Error: 验证码已失效'){
             this.getCode()
+            this.formData.code = null
           }
         });
       }
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 8da7f7a0..6e000ef7 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="app-container">
+    <van-sticky>
     <div class="bannerBg">
       <van-nav-bar
         style="background:transparent;border-bottom-width:0;height:150px"
@@ -46,6 +47,7 @@
         </van-col>
       </van-row>
     </div>
+    </van-sticky>
     <div v-if="active==1">
       <div style="margin:20px;">
         <van-form @submit="onSubmitzjd">
@@ -58,21 +60,20 @@
             :rules="[{ required: true, message: '' }]"
           />-->
           <van-field
-            v-model="form.suyqrdm?form.suyqrdm:item.suyqrdm"
+            v-model="form.suyqrdm"
             name="所有权人代码"
             label="所有权人代码"
-            placeholder="所有权人代码"
+            placeholder="自动生成"
             input-align="right"
-            required
-            :rules="[{ required: true, message: '' }]"
+            disabled
           />
           <van-field
             v-model="form.zjddm"
             name="宅基地代码"
             label="宅基地代码"
-            placeholder="宅基地代码"
+            placeholder="自动生成"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            disabled
           />
           <van-field name="radio" label="是否发证" input-align="right">
             <template #input>
@@ -90,6 +91,15 @@
             placeholder="用途"
             readonly
             @click="showyt = true"
+            required
+            :rules="[{ required: true, message: '用途不能为空' }]"
+          />
+          <van-field
+            input-align="right"
+            v-model="form.ytmc"
+            name="用途名称"
+            label="用途名称"
+            placeholder="用途名称"
           />
           <van-field
             v-model="form.yt"
@@ -123,6 +133,8 @@
             name="宗地代码"
             label="宗地代码"
             placeholder="宗地代码"
+            required
+            :rules="[{ required: true, message: '宗地代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -130,6 +142,8 @@
             name="坐落"
             label="坐落"
             placeholder="坐落"
+            required
+            :rules="[{ required: true, message: '坐落不能为空' }]"
           />
           <van-field
             v-model="form.zldwdm"
@@ -137,6 +151,8 @@
             label="坐落单位代码"
             placeholder="坐落单位代码"
             input-align="right"
+            required
+            :rules="[{ required: true, message: '坐落单位代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -144,7 +160,8 @@
             name="宗地四至-东"
             label="宗地四至-东"
             placeholder="宗地四至-东"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '宗地四至-东不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -152,7 +169,8 @@
             name="宗地四至-南"
             label="宗地四至-南"
             placeholder="宗地四至-南"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '宗地四至-南不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -160,7 +178,8 @@
             name="宗地四至-西"
             label="宗地四至-西"
             placeholder="宗地四至-西"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '宗地四至-西不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -168,7 +187,8 @@
             name="宗地四至-北"
             label="宗地四至-北"
             placeholder="宗地四至-北"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '宗地四至-北不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -231,19 +251,13 @@
             </template>
           </van-field>
           <van-field
+            v-if="form.bccjl==1"
             input-align="right"
             v-model="form.bccbz"
             name="被惩处备注"
             label="被惩处备注"
             placeholder="被惩处备注"
           />
-          <!--          <van-field
-                      v-model="form.zjdqdfs"
-                      name="宅基地取得方式"
-                      label="宅基地取得方式"
-                      placeholder="宅基地取得方式"
-                      :rules="[{ required: true, message: '' }]"
-                    />-->
           <van-field name="radio" label="宅基地取得方式" input-align="right">
             <template #input>
               <van-radio-group v-model="form.zjdqdfs" direction="horizontal">
@@ -251,25 +265,11 @@
               </van-radio-group>
             </template>
           </van-field>
-          <!--<van-field
-            v-model="form.zjdxctp"
-            name="宅基地现场照片"
-            label="宅基地现场照片"
-            placeholder="宅基地现场照片"
-            :rules="[{ required: true, message: '' }]"
-          />-->
           <van-field name="uploader" label="宅基地现场照片">
             <template #input>
               <van-uploader v-model="fileListzjd" :after-read="beforeReadzjd" multiple @delete="deleteFilezjd" :max-count="4"></van-uploader>
             </template>
           </van-field>
-          <van-field
-            input-align="right"
-            v-model="form.ytmc"
-            name="用途名称"
-            label="用途名称"
-            placeholder="用途名称"
-          />
           <van-field
             input-align="right"
             v-model="form.djName"
@@ -349,7 +349,7 @@
             v-model="form.jzxg"
             name="建筑限高"
             label="建筑限高"
-            placeholder="建筑限高"
+            placeholder="建筑限高(米)"
             type="number"
           />
           <van-field
@@ -547,19 +547,15 @@
       <div style="margin:20px;">
         <van-form @submit="onSubmitsyqr">
           <p class="title" style="position:relative;padding-left:20px;line-height:32px;">使用权人</p>
-          <van-field
-            input-align="right"
-            v-model="form1.suyqrdm"
-            name="所有权人代码"
-            label="所有权人代码"
-            placeholder="所有权人代码"
-          />
+
           <van-field
             input-align="right"
             v-model="form1.nhdm"
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
+            required
+            :rules="[{ required: true, message: '农户代码不能为空' }]"
             @click="showsyqrnhdmlist = true"
           />
           <van-field
@@ -568,20 +564,24 @@
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
+            required
+            :rules="[{ required: true, message: '宅基地代码不能为空' }]"
           />
-          <!--<van-field
+          <van-field
             input-align="right"
             v-model="form1.nmfwdm"
             name="农民房屋代码"
             label="农民房屋代码"
-            placeholder="农民房屋代码"
-          />-->
+            placeholder="宅基地上有农民房屋时填写"
+          />
           <van-field
             input-align="right"
             v-model="form1.shyqrdbxm"
             name="使用权人代表姓名"
             label="使用权人代表姓名"
             placeholder="使用权人代表姓名"
+            required
+            :rules="[{ required: true, message: '使用权人代表姓名不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -590,6 +590,8 @@
             label="使用权人代表证件类型"
             placeholder="使用权人代表证件类型"
             @click="showshyqrdbzjlx = true"
+            required
+            :rules="[{ required: true, message: '使用权人代表证件类型不能为空' }]"
           />
           <van-field
             v-model="form1.shyqrdbzjlx"
@@ -601,13 +603,15 @@
             name="使用权人代表证件号码"
             label="使用权人代表证件号码"
             placeholder="使用权人代表证件号码"
+            required
+            :rules="[{ required: true, message: '使用权人代表证件号码不能为空' }]"
           />
           <van-field
             input-align="right"
             v-model="form1.bdcdyh"
             name="不动产单元号"
             label="不动产单元号"
-            placeholder="不动产单元号"
+            placeholder="分配了不动长单元号时填写"
           />
           <van-field
             input-align="right"
@@ -615,6 +619,7 @@
             name="不动产权证号"
             label="不动产权证号"
             placeholder="不动产权证号"
+            v-show="form1.bdcdyh!=null&&form1.bdcdyh==''"
           />
           <van-field
             input-align="right"
@@ -673,6 +678,7 @@
             name="电话"
             label="电话"
             placeholder="电话"
+            type="number"
           />
           <van-field
             input-align="right"
@@ -681,13 +687,6 @@
             label="地址"
             placeholder="地址"
           />
-          <van-field
-            input-align="right"
-            v-model="form1.ftzdmj"
-            name="分摊宗地面积"
-            label="分摊宗地面积"
-            placeholder="分摊宗地面积"
-          />
           <van-field name="radio" label="是否使用权人之间共有" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.sfsyqrzjgy" direction="horizontal">
@@ -696,6 +695,14 @@
               </van-radio-group>
             </template>
           </van-field>
+          <van-field
+            v-if="form1.sfsyqrzjgy=='Y'"
+            input-align="right"
+            v-model="form1.ftzdmj"
+            name="分摊宗地面积"
+            label="分摊宗地面积"
+            placeholder="单位：平方米"
+          />
           <van-field
             input-align="right"
             v-model="form1.qlrlxName"
@@ -728,6 +735,13 @@
               </van-radio-group>
             </template>
           </van-field>
+          <van-field
+            input-align="right"
+            v-model="form1.suyqrdm"
+            name="所有权人代码"
+            label="所有权人代码"
+            placeholder="当使用权人是本村集体经济组织成员时必填"
+          />
           <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
               <van-radio-group v-model="form1.hklx" direction="horizontal">
@@ -774,15 +788,18 @@
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
-            :rules="[{ required: true, message: '' }]"
+            readonly
+            required
+            :rules="[{ required: true, message: '宅基地代码不能为空' }]"
+
           />
           <van-field
             input-align="right"
             v-model="form3.nmfwzh"
             name="农民房屋幢号"
             label="农民房屋幢号"
-            placeholder="农民房屋幢号"
-            :rules="[{ required: true, message: '' }]"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             input-align="right"
@@ -790,7 +807,8 @@
             name="自然幢号"
             label="自然幢号"
             placeholder="自然幢号"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '自然幢号不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -812,6 +830,8 @@
             name="幢占地面积"
             label="幢占地面积"
             placeholder="幢占地面积"
+            required
+            :rules="[{ required: true, message: '幢占地面积不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -819,6 +839,8 @@
             name="幢用地面积"
             label="幢用地面积"
             placeholder="幢用地面积"
+            required
+            :rules="[{ required: true, message: '幢用地面积不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -833,6 +855,8 @@
             name="总层数"
             label="总层数"
             placeholder="总层数"
+            required
+            :rules="[{ required: true, message: '总层数不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -856,6 +880,8 @@
             placeholder="房屋结构"
             @click="showzrzfwjg = true"
             readonly
+            required
+            :rules="[{ required: true, message: '房屋结构不能为空' }]"
           />
           <van-field
           v-model="form3.fwjg"
@@ -868,7 +894,8 @@
             label="数据来源"
             placeholder="数据来源"
             readonly
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '数据来源不能为空' }]"
             @click="showzrzsjly=true"
           />
           <van-field
@@ -913,7 +940,7 @@
             :rules="[{ required: true, message: '' }]"
           />-->
           <van-field
-            v-model="nmfwform.deptId?nmfwform.deptId:item.deptId"
+            v-model="nmfwform.deptId"
             name="组织机构代码"
             label="组织机构代码"
             placeholder="组织机构代码"
@@ -922,7 +949,7 @@
           />
           <van-field
             input-align="right"
-            v-model="nmfwform.zjddm?nmfwform.zjddm:item.zjddm"
+            v-model="nmfwform.zjddm"
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
@@ -933,7 +960,8 @@
             v-model="nmfwform.nmfwdm"
             name="农民房屋代码"
             label="农民房屋代码"
-            placeholder="农民房屋代码"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             input-align="right"
@@ -948,13 +976,17 @@
             name="农民房屋面积"
             label="农民房屋面积"
             placeholder="农民房屋面积"
+            required
+            :rules="[{ required: true, message: '农民房屋面积不能为空' }]"
           />
           <van-field
             input-align="right"
             v-model="nmfwform.fwbm"
-            name="房屋代码"
-            label="房屋代码"
-            placeholder="房屋代码"
+            name="房屋编码"
+            label="房屋编码"
+            placeholder="房屋编码"
+            required
+            :rules="[{ required: true, message: '房屋编码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -998,7 +1030,8 @@
             v-model="nmfwform.zl"
             name="坐落"
             label="坐落"
-            placeholder="坐落"
+            placeholder="坐落"required
+            :rules="[{ required: true, message: '坐落不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1228,14 +1261,19 @@
           </van-field>
           <van-field
             input-align="right"
-            v-model="nmfwform.fwzt"
+            v-model="nmfwform.fwztName"
             name="房屋状态"
             label="房屋状态"
             placeholder="房屋状态"
+            @click="shownmfwfwzt = true"
+          />
+          <van-field
+            v-model="nmfwform.fwzt"
+            style="display:none"
           />
           <van-field name="radio" label="是否抵押" input-align="right">
             <template #input>
-              <van-radio-group v-model="nmfwform.sfdy" direction="horizontal">
+              <van-radio-group v-model="nmfwform.isMortgage" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
                 <van-radio name="N">否</van-radio>
               </van-radio-group>
@@ -1243,7 +1281,7 @@
           </van-field>
           <van-field
             input-align="right"
-            v-model="nmfwform.isMortgage"
+            v-model="nmfwform.mortgageMan"
             name="抵押权利人"
             label="抵押权利人"
             placeholder="抵押权利人"
@@ -1738,13 +1776,18 @@
       </div>
       <div style="margin:20px;">
         <van-form @submit="onSubmitfsss">
+          <van-field
+            v-model="form4.deptId"
+            style="display:none"
+          />
           <van-field
             input-align="right"
-            v-model="form4.zjddm?form4.zjddm:form4.zjddm=item.zjddm"
+            v-model="form4.zjddm"
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '宅基地代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1752,7 +1795,8 @@
             name="附属设施类型"
             label="附属设施类型"
             placeholder="附属设施类型"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '附属设施类型不能为空' }]"
             @click="showfssslx = true"
           />
           <van-field
@@ -1765,7 +1809,8 @@
             name="建筑面积"
             label="建筑面积"
             placeholder="建筑面积"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '建筑面积不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1773,7 +1818,8 @@
             name="权属来源"
             label="权属来源"
             placeholder="权属来源"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '权属来源不能为空' }]"
             @click="showqsly = true"
           />
           <van-field
@@ -1786,7 +1832,8 @@
             name="房屋状态"
             label="房屋状态"
             placeholder="房屋状态"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '房屋状态不能为空' }]"
             @click="showfwzt = true"
           />
           <van-field
@@ -1815,7 +1862,8 @@
             name="结构类型"
             label="结构类型"
             placeholder="结构类型"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '结构类型不能为空' }]"
             @click="showjglx = true"
           />
           <van-field
@@ -1836,7 +1884,8 @@
             name="建筑物情况"
             label="建筑物情况"
             placeholder="建筑物情况"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '建筑物情况不能为空' }]"
             @click="showjzwqk = true"
           />
           <van-field
@@ -1849,7 +1898,8 @@
             name="审批或建设前土地状况"
             label="审批或建设前土地状况"
             placeholder="审批或建设前土地状况"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '审批或建设前土地状况不能为空' }]"
             @click="showtdzk = true"
           />
           <van-field
@@ -1900,7 +1950,8 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1908,7 +1959,8 @@
             name="姓名"
             label="姓名"
             placeholder="姓名"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '姓名不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1916,11 +1968,12 @@
             name="证件类型"
             label="证件类型"
             placeholder="证件类型"
+            required
+            :rules="[{ required: true, message: '证件类型不能为空' }]"
             readonly
             @click="showhncyzjlx = true"
           />
           <van-field
-            input-align="right"
             v-model="form5.zjlx"
             style="display:none"
           />
@@ -1930,8 +1983,9 @@
             name="与户主关系"
             label="与户主关系"
             placeholder="与户主关系"
-            readonly
-            @click="showyhzgx = true"
+            required
+            :rules="[{ required: true, message: '与户主关系不能为空' }]"
+            @click="showhncyyhzgx = true"
           />
           <van-field
             v-model="form5.yhzgx"
@@ -1943,9 +1997,11 @@
             name="证件号码"
             label="证件号码"
             placeholder="证件号码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '证件号码不能为空' }]"
           />
-          <van-field name="radio" label="性别" input-align="right">
+          <van-field name="radio" label="性别" input-align="right" required
+                     :rules="[{ required: true, message: '性别不能为空' }]">
             <template #input>
               <van-radio-group v-model="form5.xb" direction="horizontal">
                 <van-radio name="1">男</van-radio>
@@ -1960,7 +2016,6 @@
             name="联系电话"
             label="联系电话"
             placeholder="联系电话"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
@@ -1991,8 +2046,6 @@
             name="成员备注"
             label="成员备注"
             placeholder="成员备注"
-            readonly
-            :rules="[{ required: true, message: '' }]"
             @click="showhncycybz = true"
           />
           <van-field
@@ -2005,7 +2058,6 @@
             name="成员备注说明"
             label="成员备注说明"
             placeholder="成员备注说明"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field
             input-align="right"
@@ -2014,7 +2066,6 @@
             label="职业"
             placeholder="职业"
             required
-            readonly
             :rules="[{ required: true, message: '' }]"
             @click="showhncyoccupation = true"
           />
@@ -2052,6 +2103,20 @@
               </van-radio-group>
             </template>
           </van-field>
+          <van-field
+            input-align="right"
+            v-model="form5.sjlyName"
+            name="数据来源"
+            label="数据来源"
+            placeholder="数据来源"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhncysjly = true"
+          />
+          <van-field
+            v-model="form5.sjly"
+            style="display:none"
+          />
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -2148,6 +2213,26 @@
         @cancel="showhncyjzqk = false"
       />
     </van-popup>
+    <!--户主数据来源-->
+    <van-popup v-model="showhzsjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzsjly"
+        @cancel="showhzsjly = false"
+      />
+    </van-popup>
+    <!--户内成员数据来源-->
+    <van-popup v-model="showhncysjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncysjly"
+        @cancel="showhncysjly = false"
+      />
+    </van-popup>
   </div>
 </template>
 
@@ -2177,6 +2262,8 @@
         resultImg: "", // 最终画布生成的base64图片
         isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         showdj:false,
+        showhncysjly:false,
+        showhzsjly:false,
         showesign:false,
         showsyqrnhdmlist:false,
         showzrzfwjg:false,
@@ -2648,6 +2735,18 @@
         })
         this.showsyqrnhdmlist = false
       },
+      // 户内成员数据来源弹出框
+      onConfirmhncysjly(value){
+        this.form5.sjlyName = value.dictLabel
+        this.form5.sjly = value.dictValue
+        this.showhncysjly= false
+      },
+      // 户主数据来源弹出框
+      onConfirmhzsjly(value){
+        this.nhform.sjlyName = value.dictLabel
+        this.nhform.sjly = value.dictValue
+        this.showhzsjly= false
+      },
       // 宅基地等级弹出框
       onConfirmdj(value){
         this.form.djName = value.dictLabel
@@ -3014,17 +3113,10 @@
           listZrz(params).then(response => {
             this.zrzlist = response.rows;
             this.fwlist = []
-            this.zrzlist.map(res => {
-              let par = {
-                "zrzh":res.zrzh
-              }
-              listNmfw(par).then(r => {
-                r.rows.map(rr => {
-                  this.fwlist.push(rr)
-                })
-              })
-            })
           });
+          listNmfw(params).then(r => {
+            this.fwlist = r.rows
+          })
         }
       },
       getFsssList() {
@@ -3220,6 +3312,7 @@
           });
         } else {
           addZjdzd(this.form).then(response => {
+            this.form = response.data
             let _this =this
             this.$toast({
               icon: 'success', // 找到自己需要的图标
@@ -3302,6 +3395,11 @@
               this.form5.cybzName = res.dictLabel
             }
           })
+          this.sjlyOptions.map(res => {
+            if(res.dictValue == item.sjly){
+              this.form5.sjlyName = res.dictLabel
+            }
+          })
         }
         this.showhncy = true
       },
@@ -3331,13 +3429,16 @@
         }
       },
       showPopupfw(item) {
-        if(this.zrzlist.length==0){
-          Notify({ type: 'danger', message: '请先添加自然幢信息' });
+        if(this.form.id==null||this.form.id==""){
+          Notify({ type: 'danger', message: '请先保存宅基地信息' });
         }else{
         this.showfw = true;
         if(item==""){
           this.nmfwform={}
           this.nmfwform.zrzh = this.item.zrzh
+          this.nmfwform.deptId = this.item.deptId
+          this.nmfwform.zjddm = this.item.zjddm
+          this.nmfwform.nmfwzh = this.item.nmfwzh
         }else{
           this.nmfwform = item
           /*this.sjlyOptions.map(res => {
@@ -3372,6 +3473,8 @@
       }else{
         if(item==""){
           this.form4={}
+          this.form4.deptId = this.item.deptId
+          this.form4.zjddm = this.item.zjddm
         }else{
           this.form4=item
           this.fssslxOptions.map(res => {
diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 030ab6ac..a099018a 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -139,19 +139,17 @@
             v-model="qlrform.qydm"
             name="区域代码"
             label="区域代码"
-            required
-            placeholder="区域代码"
+            placeholder="禁止修改"
+            disabled
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field
             v-model="qlrform.suyqrdm"
             name="所有权人代码"
             label="所有权人代码"
-            required
-            placeholder="所有权人代码"
+            disabled
+            placeholder="自动生成"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field
             v-model="qlrform.suyqrmc"
@@ -160,7 +158,7 @@
             required
             placeholder="所有权人名称"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '所有权人名称不能为空' }]"
           />
           <van-field
             v-model="qlrform.suyqxzName"
@@ -169,7 +167,7 @@
             required
             placeholder="所有权性质"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '所有权性质不能为空' }]"
             @click="showsuyqxz = true"
           />
           <van-field
@@ -192,7 +190,7 @@
             required
             placeholder="代表人姓名"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '代表人姓名不能为空' }]"
           />
           <van-field
             v-model="qlrform.dbrzjlx"
@@ -205,7 +203,7 @@
             required
             placeholder="代表人证件类型"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '代表人证件类型不能为空' }]"
             @click="showdbrzjlx = true"
           />
           <van-popup v-model="showdbrzjlx" position="bottom" input-align="right">
@@ -232,7 +230,7 @@
             label="代表人联系电话"
             placeholder="代表人联系电话"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '代表人联系电话不能为空' }]"
           />
           <van-field
             v-model="qlrform.dbrtxdz"
@@ -241,7 +239,7 @@
             required
             placeholder="代表人通讯地址"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '代表人通讯地址不能为空' }]"
           />
           <van-field
             v-model="qlrform.dbryzbm"
@@ -250,7 +248,7 @@
             required
             placeholder="代表人邮政编码"
             input-align="right"
-            :rules="[{ required: true, message: '' }]"
+            :rules="[{ required: true, message: '代表人邮政编码不能为空' }]"
           />
           <van-field name="radio" label="是否成立农村集体经济组织" required input-align="right">
             <template #input>
@@ -354,6 +352,8 @@
           placeholder="数据来源"
           input-align="right"
           @click="showsjly = true"
+          required
+          :rules="[{ required: true, message: '数据来源不能为空' }]"
         />
         <van-field
           v-model="qlrform.sjly"
@@ -547,7 +547,8 @@
             name="所有权人代码"
             label="所有权人代码"
             placeholder="所有权人代码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '所有权人代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -555,7 +556,8 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -563,7 +565,8 @@
             name="户主姓名"
             label="户主姓名"
             placeholder="户主姓名"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '户主姓名不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -572,7 +575,8 @@
             label="户主证件类型"
             placeholder="户主证件类型"
             required
-            :rules="[{ required: true, message: '' }]"
+            readonly
+            :rules="[{ required: true, message: '户主证件类型不能为空' }]"
             @click="showhzzjlx = true"
           />
           <van-field
@@ -585,7 +589,8 @@
             name="户主证件号码"
             label="户主证件号码"
             placeholder="户主证件号码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '户主证件号码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -593,6 +598,8 @@
             name="通讯地址"
             label="通讯地址"
             placeholder="通讯地址"
+            required
+            :rules="[{ required: true, message: '通讯地址不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -600,6 +607,8 @@
             name="户内成员数量"
             label="户内成员数量"
             placeholder="户内成员数量"
+            required
+            :rules="[{ required: true, message: '户内成员数量不能为空' }]"
           />
           <van-field name="radio" label="婚姻状况" input-align="right">
             <template #input>
@@ -608,7 +617,6 @@
               </van-radio-group>
             </template>
           </van-field>
-
           <van-field
             input-align="right"
             v-model="nhform.phone"
@@ -623,7 +631,8 @@
             label="职业"
             placeholder="职业"
             required
-            :rules="[{ required: true, message: '' }]"
+            readonly
+            :rules="[{ required: true, message: '职业不能为空' }]"
             @click="showhzoccupation = true"
           />
           <van-field
@@ -637,7 +646,8 @@
             label="居住情况"
             placeholder="居住情况"
             required
-            :rules="[{ required: true, message: '' }]"
+            readonly
+            :rules="[{ required: true, message: '居住情况不能为空' }]"
             @click="showhzjzqk = true"
           />
           <van-field
@@ -651,7 +661,8 @@
             label="在集镇或城市是否有住房"
             placeholder="在集镇或城市是否有住房"
             required
-            :rules="[{ required: true, message: '' }]"
+            readonly
+            :rules="[{ required: true, message: '在集镇或城市是否有住房不能为空' }]"
             @click="showhzjzhcssfyzf = true"
           />
           <van-field
@@ -690,6 +701,21 @@
               </van-radio-group>
             </template>
           </van-field>
+          <van-field
+            input-align="right"
+            v-model="nhform.sjlyName"
+            name="数据来源"
+            label="数据来源"
+            placeholder="数据来源"
+            required
+            readonly
+            :rules="[{ required: true, message: '能为空' }]"
+            @click="showhzsjly = true"
+          />
+          <van-field
+            v-model="nhform.sjly"
+            style="display:none"
+          />
           <van-field
             input-align="right"
             v-model="nhform.bz"
@@ -706,6 +732,26 @@
         </van-form>
       </div>
     </van-popup>
+    <!--户主数据来源-->
+    <van-popup v-model="showhzsjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhzsjly"
+        @cancel="showhzsjly = false"
+      />
+    </van-popup>
+    <!--户内成员数据来源-->
+    <van-popup v-model="showhncysjly" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="sjlyOptions"
+        value-key="dictLabel"
+        @confirm="onConfirmhncysjly"
+        @cancel="showhncysjly = false"
+      />
+    </van-popup>
     <!--集市或城市是否有住房-->
     <van-popup v-model="showhzjzhcssfyzf" position="bottom">
       <van-picker
@@ -856,7 +902,8 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -864,7 +911,8 @@
             name="姓名"
             label="姓名"
             placeholder="姓名"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '姓名不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -872,7 +920,9 @@
             name="证件类型"
             label="证件类型"
             placeholder="证件类型"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '证件类型不能为空' }]"
+            readonly
             @click="showhncyzjlx = true"
           />
           <van-field
@@ -885,7 +935,8 @@
             name="与户主关系"
             label="与户主关系"
             placeholder="与户主关系"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '与户主关系不能为空' }]"
             @click="showhncyyhzgx = true"
           />
           <van-field
@@ -898,9 +949,11 @@
             name="证件号码"
             label="证件号码"
             placeholder="证件号码"
-            :rules="[{ required: true, message: '' }]"
+            required
+            :rules="[{ required: true, message: '证件号码不能为空' }]"
           />
-          <van-field name="radio" label="性别" input-align="right">
+          <van-field name="radio" label="性别" input-align="right" required
+                     :rules="[{ required: true, message: '性别不能为空' }]">
             <template #input>
               <van-radio-group v-model="form5.xb" direction="horizontal">
                 <van-radio name="1">男</van-radio>
@@ -915,7 +968,6 @@
             name="联系电话"
             label="联系电话"
             placeholder="联系电话"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
@@ -946,7 +998,6 @@
             name="成员备注"
             label="成员备注"
             placeholder="成员备注"
-            :rules="[{ required: true, message: '' }]"
             @click="showhncycybz = true"
           />
           <van-field
@@ -959,7 +1010,6 @@
             name="成员备注说明"
             label="成员备注说明"
             placeholder="成员备注说明"
-            :rules="[{ required: true, message: '' }]"
           />
           <van-field
             input-align="right"
@@ -1005,6 +1055,20 @@
               </van-radio-group>
             </template>
           </van-field>
+          <van-field
+            input-align="right"
+            v-model="form5.sjlyName"
+            name="数据来源"
+            label="数据来源"
+            placeholder="数据来源"
+            required
+            :rules="[{ required: true, message: '' }]"
+            @click="showhncysjly = true"
+          />
+          <van-field
+            v-model="form5.sjly"
+            style="display:none"
+          />
           <div style="margin: 16px;">
             <van-button round block color="#7AC943" native-type="submit">保存</van-button>
           </div>
@@ -1057,6 +1121,8 @@
       name: "homesteadList",
       data() {
         return {
+          showhncysjly:false,
+          showhzsjly:false,
           showhncycybz:false,
           showhncyzjlx:false,
           showhncyyhzgx:false,
@@ -1301,6 +1367,16 @@
         onClickLeft(){
           this.$router.push('/homesteadSurvey/index');
         },
+        onConfirmhncysjly(value){
+          this.form5.sjlyName = value.dictLabel
+          this.form5.sjly = value.dictValue
+          this.showhncysjly= false
+        },
+        onConfirmhzsjly(value){
+          this.nhform.sjlyName = value.dictLabel
+          this.nhform.sjly = value.dictValue
+          this.showhzsjly= false
+        },
         onConfirmhncycybz(value){
           this.form5.cybzName = value.dictLabel
           this.form5.cybz = value.dictValue
@@ -1375,7 +1451,11 @@
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标
                   message: '修改成功',
-                  duration:"1000"
+                  duration:"1000",
+                  onClose:function(){
+                    _this.shownh = false
+                    _this.getNh()
+                  }
                 })
               }
             );
@@ -1387,7 +1467,11 @@
                 this.$toast({
                   icon: 'success', // 找到自己需要的图标
                   message: '保存成功',
-                  duration:"1000"
+                  duration:"1000",
+                  onClose:function(){
+                    _this.shownh = false
+                    _this.getNh()
+                  }
                 })
               }
             );
@@ -1512,7 +1596,9 @@
             this.form5 = {}
             this.form5.nhdm = this.nhform.nhdm
           }else{
+            let _this = this
             this.form5 = item
+            console.log(item.sjly)
             this.jzhcssfyzfOptions.map(res => {
               if(res.dictValue == item.jzhcssfyzf){
                 this.form5.jzhcssfyzfName = res.dictLabel
@@ -1543,6 +1629,11 @@
                 this.form5.cybzName = res.dictLabel
               }
             })
+            this.sjlyOptions.map(res => {
+              if(res.dictValue == item.sjly){
+                this.form5.sjlyName = res.dictLabel
+              }
+            })
           }
         },
         // 户内成员列表
@@ -1581,6 +1672,11 @@
               this.nhform.jzqkName = res.dictLabel
             }
           })
+          this.sjlyOptions.map(res => {
+            if(res.dictValue == item.sjly){
+              this.nhform.sjlyName = res.dictLabel
+            }
+          })
         },
         getZjdList(){
            if(this.active==1){
diff --git a/src/views/homesteadSurvey/settle.vue b/src/views/homesteadSurvey/settle.vue
index 61fb48c6..dbae9174 100644
--- a/src/views/homesteadSurvey/settle.vue
+++ b/src/views/homesteadSurvey/settle.vue
@@ -24,6 +24,11 @@
         <van-icon :name="require('../../assets/images/housesteadSurvey/little2.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
     </van-cell>
+    <van-cell title="切换账号" is-link to="/homesteadLogin" 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>
+    </van-cell>
   </div>
 </template>