宅基地调查

src/views/homesteadSurvey/add.vue

@@ -614,14 +614,16 @@
             required
             :rules="[{ required: true, message: '宅基地代码不能为空' }]"
           />
-          <van-field
+          <!--<van-field
             autocomplete="off"
             input-align="right"
             v-model="form1.nmfwdm"
             name="农民房屋代码"
             label="农民房屋代码"
             placeholder="宅基地上有农民房屋时填写"
-          />
+            readonly
+            @click="showsyqrnmfwdm = true"
+          />-->
           <van-field
             autocomplete="off"
             input-align="right"
@@ -1057,6 +1059,18 @@
             placeholder="自动生成"
             disabled
           />
+          <van-field
+            autocomplete="off"
+            input-align="right"
+            v-model="nmfwform.nhdm"
+            name="农户代码"
+            label="农户代码"
+            placeholder="选择农户代码"
+            @click="shownmfwnhdm = true"
+            readonly
+            required
+            :rules="[{ required: true, message: '农户代码不能为空' }]"
+          />
           <van-field
             autocomplete="off"
             input-align="right"
@@ -2450,6 +2464,26 @@
         @cancel="showhncysjly = false"
       />
     </van-popup>
+    <!--使用权人农民房屋代码列表-->
+    <van-popup v-model="showsyqrnmfwdm" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="fwlist"
+        value-key="nmfwdm"
+        @confirm="onConfirmsyqrnmfwdm"
+        @cancel="showsyqrnmfwdm = false"
+      />
+    </van-popup>
+    <!--农民房屋农户代码列表-->
+    <van-popup v-model="shownmfwnhdm" position="bottom">
+      <van-picker
+        show-toolbar
+        :columns="syqrnhdmlist"
+        value-key="hzxm"
+        @confirm="onConfirmnmfwnhdm"
+        @cancel="shownmfwnhdm = false"
+      />
+    </van-popup>
   </div>
 </template>
 
@@ -2480,6 +2514,8 @@
         resultImg: "", // 最终画布生成的base64图片
         isCrop: false, // 是否裁剪，在画布设定尺寸基础上裁掉四周空白部分
         showdj:false,
+        shownmfwnhdm:false,
+        showsyqrnmfwdm:false,
         showhncysjly:false,
         showhzsjly:false,
         showesign:false,
@@ -3014,6 +3050,11 @@
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url,"")
         this.form5.zjdxctp = this.form5.zjdxctp.replaceAll(url1,"")
       },
+      // 使用权人农民房屋代码弹出框
+      onConfirmsyqrnmfwdm(value){
+        this.form1.nmfwdm = value.nmfwdm
+        this.showsyqrnmfwdm = false
+      },
       // 使用权人农户代码弹出框
       onConfirmsyqrnhdmlist(value){
         this.form1.nhdm = value.nhdm
@@ -3027,6 +3068,11 @@
         })
         this.showsyqrnhdmlist = false
       },
+      // 农名房屋农户代码弹出框
+      onConfirmnmfwnhdm(value){
+        this.nmfwform.nhdm = value.nhdm
+        this.shownmfwnhdm = false
+      },
       // 户内成员数据来源弹出框
       onConfirmhncysjly(value){
         this.form5.sjlyName = value.dictLabel

src/views/homesteadSurvey/list.vue

@@ -557,9 +557,8 @@
             v-model="nhform.nhdm"
             name="农户代码"
             label="农户代码"
-            placeholder="农户代码"
-            required
-            :rules="[{ required: true, message: '农户代码不能为空' }]"
+            placeholder="自动生成"
+            disabled
           />
           <van-field
             autocomplete="off"
@@ -1602,36 +1601,22 @@
             );
           }else{
             this.nhform.deptId = this.item.deptId
-            let params = {
-              deptId:this.item.deptId,
-              nhdm:this.nhform.nhdm
-            }
-            listNh(params).then(res => {
-              if(res.total>0){
+            addNh(this.nhform).then(
+              response => {
+                this.totalR+=1
+                this.totalH+=1
+                let _this =this
                 this.$toast({
-                  icon: 'error', // 找到自己需要的图标
-                  message: '保存失败，系统中已存在此农户代码！',
-                  duration:"1000"
-                })
-              }else{
-                addNh(this.nhform).then(
-                  response => {
-                    this.totalR+=1
-                    this.totalH+=1
-                    let _this =this
-                    this.$toast({
-                      icon: 'success', // 找到自己需要的图标
-                      message: '保存成功',
-                      duration:"1000",
-                      onClose:function(){
-                        _this.shownh = false
-                        _this.getNh()
-                      }
-                    })
+                  icon: 'success', // 找到自己需要的图标
+                  message: '保存成功',
+                  duration:"1000",
+                  onClose:function(){
+                    _this.shownh = false
+                    _this.getNh()
                   }
-                );
+                })
               }
-            })
+            );
           }
         },
         // 所有权人保存

src/views/homesteadSurvey/settle.vue

@@ -13,18 +13,18 @@
         </template>
       </van-nav-bar>
     </div>
-    <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="个人信息" 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;">
       <template #icon>
         <van-icon :name="require('../../assets/images/housesteadSurvey/little1.png')" size="18" color="#fff" style="margin:10px;"/>
       </template>
 
-    </van-cell>
+    </van-cell>-->
     <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>
     </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;">
+    <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>