diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 6e000ef7..3fdf76d9 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -611,7 +611,7 @@
             v-model="form1.bdcdyh"
             name="不动产单元号"
             label="不动产单元号"
-            placeholder="分配了不动长单元号时填写"
+            placeholder="分配了不动产单元号时填写"
           />
           <van-field
             input-align="right"
@@ -687,7 +687,8 @@
             label="地址"
             placeholder="地址"
           />
-          <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="form1.sfsyqrzjgy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -710,6 +711,8 @@
             label="权利人类型"
             placeholder="权利人类型"
             @click="showqlrlx = true"
+            required
+            :rules="[{ required: true, message: '权利人类型不能为空' }]"
           />
           <van-field
             v-model="form1.qlrlx"
@@ -727,7 +730,8 @@
             v-model="form1.gyfs"
             style="display:none"
           />
-          <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="form1.sfbncjtjjzzcy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -741,6 +745,7 @@
             name="所有权人代码"
             label="所有权人代码"
             placeholder="当使用权人是本村集体经济组织成员时必填"
+            readonly
           />
           <van-field name="radio" label="户口类型" input-align="right">
             <template #input>
@@ -953,7 +958,9 @@
             name="宅基地代码"
             label="宅基地代码"
             placeholder="宅基地代码"
-            readonly
+            disabled
+            required
+            :rules="[{ required: true, message: '宅基地代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -962,6 +969,8 @@
             label="农民房屋代码"
             placeholder="自动生成"
             disabled
+            required
+            :rules="[{ required: true, message: '农民房屋代码不能为空' }]"
           />
           <van-field
             input-align="right"
@@ -1002,7 +1011,8 @@
             v-model="nmfwform.nmfwzh"
             name="农民房屋幢号"
             label="农民房屋幢号"
-            placeholder="农民房屋幢号"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             input-align="right"
@@ -1280,6 +1290,7 @@
             </template>
           </van-field>
           <van-field
+            v-if="nmfwform.isMortgage=='Y'"
             input-align="right"
             v-model="nmfwform.mortgageMan"
             name="抵押权利人"
@@ -1287,6 +1298,7 @@
             placeholder="抵押权利人"
           />
           <van-field
+            v-if="nmfwform.isMortgage=='Y'"
             input-align="right"
             v-model="nmfwform.mortgageMoney"
             name="抵押金额"
@@ -1367,12 +1379,24 @@
           </van-field>
           <van-field
             input-align="right"
-            v-model="nmfwform.pzsj"
+            v-model="nmfwform.pzsjName"
             name="批准时间"
             label="批准时间"
             placeholder="批准时间"
             @click="showPickerpzsj=true"
           />
+          <van-field
+            v-model="nmfwform.pzsj"
+            style="display:none"
+          />
+          <van-field name="radio" label="批准单位" input-align="right">
+            <template #input>
+              <van-radio-group v-model="nmfwform.pzdw" direction="horizontal">
+                <van-radio name="1">县政府</van-radio>
+                <van-radio name="2">乡政府</van-radio>
+              </van-radio-group>
+            </template>
+          </van-field>
           <van-field
             input-align="right"
             v-model="nmfwform.tdzkName"
@@ -1398,6 +1422,7 @@
             name="宅基地现场照片"
             label="宅基地现场照片"
             placeholder="宅基地现场照片"
+            style="display:none"
           />
           <van-field name="uploader" label="房屋现场照片">
             <template #input>
@@ -1672,10 +1697,17 @@
         />
       </van-popup>
       <van-popup v-model="showPickerpzsj" position="bottom">
-        <van-datetime-picker
+  <!--      <van-datetime-picker
           type="date"
           @confirm="onConfirmpzsj"
           @cancel="showPickerpzsj = false"
+        />-->
+        <van-picker
+          show-toolbar
+          :columns="pzsjOptions"
+          value-key="dictLabel"
+          @confirm="onConfirmpzsj"
+          @cancel="showPickerpzsj = false"
         />
       </van-popup>
       <van-popup v-model="shownmfwtdzk" position="bottom">
@@ -1950,6 +1982,7 @@
             name="农户代码"
             label="农户代码"
             placeholder="农户代码"
+            readonly
             required
             :rules="[{ required: true, message: '农户代码不能为空' }]"
           />
@@ -2880,7 +2913,7 @@
         this.shownmfwsjly = false
       },
       // 农民房屋房屋状态弹出框
-      onConfirmnmfwfwzt(){
+      onConfirmnmfwfwzt(value){
         this.nmfwform.fwztName = value.dictLabel
         this.nmfwform.fwzt = value.dictValue
         this.shownmfwfwzt = false
@@ -2960,13 +2993,9 @@
         this.showPickerzwlxsj2= false
       },
       // 农民房屋批准时间弹出框
-      onConfirmpzsj(val){
-        let year = val.getFullYear()
-        let month = val.getMonth() + 1
-        let day = val.getDate()
-        if (month >= 1 && month <= 9) { month = `0${month}` }
-        if (day >= 1 && day <= 9) { day = `0${day}` }
-        this.nmfwform.pzsj = year+"-"+month+"-"+day
+      onConfirmpzsj(value){
+        this.nmfwform.pzsjName = value.dictLabel
+        this.nmfwform.pzsj = value.dictValue
         this.showPickerpzsj= false
       },
 
@@ -3045,10 +3074,13 @@
           listZjdzd(params).then(response => {
             this.form = response.rows[0];
             this.fileListzjd = []
-            let li = this.form.zjdxctp.split(",");
-            li.map(res => {
-              this.fileListzjd.push({"url":location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+res,"baseUrl":res})
-            })
+            if(this.form.zjdxctp!=null&&this.form.zjdxctp.length>0){
+              let li = this.form.zjdxctp.split(",");
+              li.map(res => {
+                this.fileListzjd.push({"url":location.protocol+"//"+location.host+process.env.VUE_APP_BASE_API+res,"baseUrl":res})
+              })
+            }
+
             this.sjlyOptions.map(res => {
               if(res.dictValue == this.form.sjly){
                 this.form.sjlyName = res.dictLabel
@@ -3074,6 +3106,7 @@
                 this.form.qlsdfsName = res.dictLabel
               }
             })
+            console.log(this.form)
             this.ytOptions.map(res => {
               if(res.dictValue == this.form.yt){
                 this.form.ytName = res.dictLabel
@@ -3331,8 +3364,14 @@
         }else{
           if(item==""){
             this.form1={}
-            this.form1.zjddm = this.item.zjddm
+            this.form1.zjddm = this.form.zjddm
             this.form1.suyqrdm = this.form.suyqrdm
+            // 使用权人默认值
+            this.form1.deptId = this.form.deptId
+            this.form1.gj = '1'
+            this.form1.hklx = '1'
+            this.form1.sfbncjtjjzzcy = 'Y'
+            this.form1.sfsyqrzjgy = 'Y'
           }else{
             this.form1 = item
             this.sjlyOptions.map(res => {
@@ -3362,7 +3401,9 @@
       showPopuphncy(item){
         if(item==""){
           this.form5={}
-          this.form5.nhdm = item.nhdm
+          this.form5.nhdm = this.form1.nhdm
+          this.form5.hklx = '1'
+          this.form5.sfbncjtjjzzcy = 'Y'
         }else{
           this.form5 = item
           this.jzhcssfyzfOptions.map(res => {
@@ -3439,17 +3480,68 @@
           this.nmfwform.deptId = this.item.deptId
           this.nmfwform.zjddm = this.item.zjddm
           this.nmfwform.nmfwzh = this.item.nmfwzh
+          this.nmfwform.pzdw = '1'
         }else{
           this.nmfwform = item
-          /*this.sjlyOptions.map(res => {
-            if(res.dictValue == this.form3.sjly){
+          console.log(item)
+          this.sjlyOptions.map(res => {
+            if(res.dictValue == item.sjly){
               this.nmfwform.sjlyName = res.dictLabel
             }
-          })*/
+          })
+          this.hxjgOptions.map(res => {
+            if(res.dictValue == item.hxjg){
+              this.nmfwform.hxjgName = res.dictLabel
+            }
+          })
+          this.fwjgOptions.map(res => {
+            if(res.dictValue == item.fwjg){
+              this.nmfwform.fwjgName = res.dictLabel
+            }
+          })
+          this.fwytOptions.map(res => {
+            if(res.dictValue == item.fwyt){
+              this.nmfwform.fwytName = res.dictLabel
+            }
+          })
+          this.tdzkOptions.map(res => {
+            if(res.dictValue == item.tdzk){
+              this.nmfwform.tdzkName = res.dictLabel
+            }
+          })
+          this.pzsjOptions.map(res => {
+            if(res.dictValue == item.pzsj){
+              this.nmfwform.pzsjName = res.dictLabel
+            }
+          })
+          this.phlymsOptions.map(res => {
+            if(res.dictValue == item.phlyms){
+              this.nmfwform.phlymsName = res.dictLabel
+            }
+          })
+          this.fwlxOptions.map(res => {
+            if(res.dictValue == item.fwlx){
+              this.nmfwform.fwlxName = res.dictLabel
+            }
+          })
+          this.lyzkOptions.map(res => {
+            if(res.dictValue == item.lyzk){
+              this.nmfwform.lyzkName = res.dictLabel
+            }
+          })
+          this.fwztOptions.map(res => {
+            if(res.dictValue == item.fwzt){
+              this.nmfwform.fwztName = res.dictLabel
+            }
+          })
+          this.qslyOptions.map(res => {
+            if(res.dictValue == item.qsly){
+              this.nmfwform.qslyName = res.dictLabel
+            }
+          })
         }}
       },
       showPopuphncylist(item){
-        console.log(item)
         if(item.nhdm==null||item.nhdm==""){
           Notify({ type: 'danger', message: '使用权人农户代码不能为空' });
         }else{
@@ -3478,32 +3570,32 @@
         }else{
           this.form4=item
           this.fssslxOptions.map(res => {
-            if(res.dictValue == this.form4.fssslx){
+            if(res.dictValue == item.fssslx){
               this.form4.fssslxName = res.dictLabel
             }
           })
           this.qslyOptions.map(res => {
-            if(res.dictValue == this.form4.qsly){
+            if(res.dictValue == item.qsly){
               this.form4.qslyName = res.dictLabel
             }
           })
           this.fwztOptions.map(res => {
-            if(res.dictValue == this.form4.fwzt){
+            if(res.dictValue == item.fwzt){
               this.form4.fwztName = res.dictLabel
             }
           })
           this.jglxOptions.map(res => {
-            if(res.dictValue == this.form4.jglx){
+            if(res.dictValue == item.jglx){
               this.form4.jglxName = res.dictLabel
             }
           })
           this.jzwqkOptions.map(res => {
-            if(res.dictValue == this.form4.jzwqk){
+            if(res.dictValue == item.jzwqk){
               this.form4.jzwqkName = res.dictLabel
             }
           })
           this.tdzkOptions.map(res => {
-            if(res.dictValue == this.form4.tdzk){
+            if(res.dictValue == item.tdzk){
               this.form4.tdzkName = res.dictLabel
             }
           })