From 735a4bb09c37b696f862e42fb20f4119f207b547 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Wed, 8 Jun 2022 13:37:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=BF=85=E5=A1=AB=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/FieldSelect.vue           |  2 +
 .../homestead/circulation/circulationAdd.vue  | 47 ++++++----
 .../circulation/circulationModify.vue         | 49 +++++++----
 .../homestead/mortgage/mortgageAdd.vue        | 49 +++++++----
 .../homestead/mortgage/mortgageModify.vue     | 55 ++++++------
 .../homestead/paidExit/paidExitAdd.vue        | 43 ++++++----
 .../homestead/paidExit/paidExitModify.vue     | 38 +++++---
 .../homestead/supervision/supervisionAdd.vue  | 86 +++++++++++++------
 8 files changed, 232 insertions(+), 137 deletions(-)

diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue
index f205df61..7f4a1a0a 100644
--- a/src/components/form/FieldSelect.vue
+++ b/src/components/form/FieldSelect.vue
@@ -117,6 +117,7 @@ export default {
         if(this.getValue(columns[i]) == this.internalValue) {
           this.defaultIndex = i;
           this.visibleValue = this.getLabel(columns[i]);
+          this.onChanged(columns[i]);
           return i;
         }
       }
@@ -124,6 +125,7 @@ export default {
       {
         this.defaultIndex = -1;
         this.visibleValue = this.internalValue;
+        this.onChanged(null);
       }
       return -1;
     },
diff --git a/src/views/onlineHome/homestead/circulation/circulationAdd.vue b/src/views/onlineHome/homestead/circulation/circulationAdd.vue
index 4067a7ae..daffd476 100644
--- a/src/views/onlineHome/homestead/circulation/circulationAdd.vue
+++ b/src/views/onlineHome/homestead/circulation/circulationAdd.vue
@@ -10,6 +10,7 @@
         <p style="font-weight: bold;">添加宅基地使用权流转</p>
       </template>
     </van-nav-bar>
+    <van-form ref="_Form">
     <p class="main_title">转出方信息</p>
     <div class="main_box">
       <van-field
@@ -20,7 +21,7 @@
         placeholder="请选择"
         @click="showZjd = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showZjd" position="bottom">
         <van-picker
@@ -39,7 +40,7 @@
         placeholder="请选择"
         @click="showLzfs = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showLzfs" position="bottom">
         <van-picker
@@ -55,7 +56,7 @@
         label="转出方使用权人代码"
         placeholder="请选择"
         label-width="auto"
-        input-align="right"
+        input-align="right" :rules="[{ required: true }]" required
       />
       <!--          @click="showShyqrdm = true"-->
       <!--          right-icon="arrow-down"-->
@@ -68,7 +69,7 @@
       <!--            />-->
       <!--          </van-popup>-->
 
-      <van-cell title="是否本集体经济组织成员">
+      <van-cell title="是否本集体经济组织成员" required>
         <template #right-icon>
           <van-radio-group v-model="circulation.zcfsfbjtjjzzcy" direction="horizontal">
             <van-radio name="Y">是</van-radio>
@@ -80,9 +81,9 @@
 
     <p class="main_title">流转信息</p>
     <div class="main_box">
-      <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto"/>
-      <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-      <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
+      <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       <van-field
         readonly
         clickable
@@ -91,7 +92,7 @@
         placeholder="请选择起始时间"
         @click="showlzqsrq = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showlzqsrq" position="bottom">
         <van-datetime-picker
@@ -112,7 +113,7 @@
         placeholder="请选择结束时间"
         @click="showlzjsrq = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showlzjsrq" position="bottom">
         <van-datetime-picker
@@ -134,7 +135,7 @@
         @click="showLzqfwyt = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showLzqfwyt" position="bottom">
         <van-picker
@@ -154,7 +155,7 @@
         @click="showLzhfwyt = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showLzhfwyt" position="bottom">
         <van-picker
@@ -173,7 +174,7 @@
         label="转入方代表名称"
         placeholder="请输入转入方代表名称"
         label-width="auto"
-        input-align="right"
+        input-align="right" :rules="[{ required: true }]" required
       />
       <!--          <van-popup v-model="showZrfdbmc" position="bottom">-->
       <!--            <van-picker-->
@@ -193,7 +194,7 @@
         @click="showZrfdbzjlx = true"
         label-width="auto"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showZrfdbzjlx" position="bottom">
         <van-picker
@@ -204,8 +205,8 @@
         />
       </van-popup>
 
-      <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="请输入证件号码" input-align="right" label-width="auto"/>
-      <van-cell title="是否本集体经济组织成员">
+      <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="请输入证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-cell title="是否本集体经济组织成员" required>
         <template #right-icon>
           <van-radio-group  v-model="circulation.zrfsfbjtjjzzcy" direction="horizontal">
             <van-radio name="Y">是</van-radio>
@@ -217,10 +218,11 @@
 
     <p class="main_title">其他</p>
     <div class="main_box">
-      <van-field label="所有权人代表姓名" v-model="circulation.suyqrdbxm" placeholder="请输入姓名" input-align="right" label-width="auto"/>
-      <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto"/>
-      <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto"/>
+      <van-field label="所有权人代表姓名" v-model="circulation.suyqrdbxm" placeholder="请输入姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
     </div>
+    </van-form>
 
     <div style="padding: 16px 0;">
       <van-row>
@@ -238,6 +240,7 @@
 
 <script>
   import { getLz , zjdzd , getByZjddm , edit , goApply,houseAdd } from "@/api/onlineHome/homestead/circulation";
+  import {Notify} from "vant";
 
   export default {
     name: "circulationAdd",
@@ -363,14 +366,19 @@
       }, //流转结束时间
       goEdit(){
         console.log(this.circulation)
+        this.$refs._Form.validate().then(() => {
         houseAdd(this.circulation).then(response => {
           if(response.code = 200){
             this.$toast.success('保存成功');
             this.$router.back(-1);
           }
+        })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
       goSubmit(){
+        this.$refs._Form.validate().then(() => {
         houseAdd(this.circulation).then(response => {
           if(response.code = 200){
             goApply(response.data).then(response => {
@@ -380,6 +388,9 @@
               }
             });
           }
+        })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
     },
diff --git a/src/views/onlineHome/homestead/circulation/circulationModify.vue b/src/views/onlineHome/homestead/circulation/circulationModify.vue
index 29e2465a..d9604646 100644
--- a/src/views/onlineHome/homestead/circulation/circulationModify.vue
+++ b/src/views/onlineHome/homestead/circulation/circulationModify.vue
@@ -10,6 +10,7 @@
           <p style="font-weight: bold;">添加宅基地使用流转权</p>
         </template>
       </van-nav-bar>
+      <van-form ref="_Form">
         <p class="main_title">转出方信息</p>
         <div class="main_box">
           <van-field
@@ -20,7 +21,7 @@
             placeholder="请选择"
             @click="showZjd = true"
             input-align="right"
-            right-icon="arrow-down"
+            right-icon="arrow-down" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showZjd" position="bottom">
             <van-picker
@@ -39,7 +40,7 @@
             placeholder="请选择"
             @click="showLzfs = true"
             input-align="right"
-            right-icon="arrow-down"
+            right-icon="arrow-down" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showLzfs" position="bottom">
             <van-picker
@@ -55,7 +56,7 @@
             label="转出方使用权人代码"
             placeholder="请选择"
             label-width="auto"
-            input-align="right"
+            input-align="right" :rules="[{ required: true }]" required
           />
 <!--          @click="showShyqrdm = true"-->
 <!--          right-icon="arrow-down"-->
@@ -68,7 +69,7 @@
 <!--            />-->
 <!--          </van-popup>-->
 
-          <van-cell title="是否本集体经济组织成员">
+          <van-cell title="是否本集体经济组织成员" required>
             <template #right-icon>
               <van-radio-group v-model="circulation.zcfsfbjtjjzzcy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -80,9 +81,9 @@
 
         <p class="main_title">流转信息</p>
         <div class="main_box">
-          <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto"/>
-          <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto"/>
-          <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto"/>
+          <van-field label="流转面积(㎡)" v-model="circulation.lzmj" placeholder="请输入流转面积(㎡)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+          <van-field label="流转单价(元)" v-model="circulation.lzdj" placeholder="请输入流转单价(元)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+          <van-field label="流转费用(元)" v-model="circulation.lzfy" placeholder="请输入流转费用(元)" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
           <van-field
             readonly
             clickable
@@ -91,7 +92,7 @@
             placeholder="请选择起始时间"
             @click="showlzqsrq = true"
             input-align="right"
-            right-icon="arrow-down"
+            right-icon="arrow-down" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showlzqsrq" position="bottom">
             <van-datetime-picker
@@ -112,7 +113,7 @@
             placeholder="请选择结束时间"
             @click="showlzjsrq = true"
             input-align="right"
-            right-icon="arrow-down"
+            right-icon="arrow-down" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showlzjsrq" position="bottom">
             <van-datetime-picker
@@ -134,7 +135,7 @@
             @click="showLzqfwyt = true"
             input-align="right"
             right-icon="arrow-down"
-            label-width="auto"
+            label-width="auto" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showLzqfwyt" position="bottom">
             <van-picker
@@ -154,7 +155,7 @@
             @click="showLzhfwyt = true"
             input-align="right"
             right-icon="arrow-down"
-            label-width="auto"
+            label-width="auto" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showLzhfwyt" position="bottom">
             <van-picker
@@ -173,7 +174,7 @@
             label="转入方代表名称"
             placeholder="请输入转入方代表名称"
             label-width="auto"
-            input-align="right"
+            input-align="right" :rules="[{ required: true }]" required
           />
 <!--          <van-popup v-model="showZrfdbmc" position="bottom">-->
 <!--            <van-picker-->
@@ -193,7 +194,7 @@
             @click="showZrfdbzjlx = true"
             label-width="auto"
             input-align="right"
-            right-icon="arrow-down"
+            right-icon="arrow-down" :rules="[{ required: true }]" required
           />
           <van-popup v-model="showZrfdbzjlx" position="bottom">
             <van-picker
@@ -204,8 +205,8 @@
             />
           </van-popup>
 
-          <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="请输入证件号码" input-align="right" label-width="auto"/>
-          <van-cell title="是否本集体经济组织成员">
+          <van-field label="转入方代表证件号码" v-model="circulation.zrfdbzjhm" placeholder="请输入证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+          <van-cell title="是否本集体经济组织成员" required>
             <template #right-icon>
               <van-radio-group  v-model="circulation.zrfsfbjtjjzzcy" direction="horizontal">
                 <van-radio name="Y">是</van-radio>
@@ -217,10 +218,11 @@
 
         <p class="main_title">其他</p>
         <div class="main_box">
-          <van-field label="所有权人代表姓名" v-model="circulation.suyqrdbxm" placeholder="请输入姓名" input-align="right" label-width="auto"/>
-          <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto"/>
-          <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto"/>
+          <van-field label="所有权人代表姓名" v-model="circulation.suyqrdbxm" placeholder="请输入姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+          <van-field label="所有权人意见" v-model="circulation.suyqryj" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+          <van-field label="备注" v-model="circulation.bz" placeholder="请输入备注" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         </div>
+      </van-form>
 
         <div style="padding: 16px 0;">
           <van-row>
@@ -238,6 +240,7 @@
 
 <script>
 import { getLz , zjdzd , getByZjddm , edit , goApply } from "@/api/onlineHome/homestead/circulation";
+import {Notify} from "vant";
 export default {
     name: "circulationModify",
   data() {
@@ -361,14 +364,19 @@ export default {
       this.showlzjsrq = false;
     }, //流转结束时间
     goEdit(){
+      this.$refs._Form.validate().then(() => {
       edit(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
           this.$router.back(-1);
         }
-      });
+      })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
+        });
     },
     goSubmit(){
+      this.$refs._Form.validate().then(() => {
       goApply(this.$route.query.id).then(response => {
         if(response.code = 200){
           this.$toast.success('提交成功');
@@ -376,6 +384,9 @@ export default {
             window.location.replace("circulationList")
           },1000)
         }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
       });
     },
   },
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
index ad66b60b..3b1d0871 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageAdd.vue
@@ -10,6 +10,7 @@
           <p style="font-weight: bold;">使用抵押权</p>
         </template>
       </van-nav-bar>
+      <van-form ref="_Form">
       <div class="main_box">
         <van-field
           readonly
@@ -20,7 +21,7 @@
           placeholder="请选择"
           @click="showzjddm = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showzjddm" position="bottom">
           <van-picker
@@ -30,11 +31,11 @@
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -44,7 +45,7 @@
           placeholder="请选择权属状态"
           @click="showqszt = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showqszt" position="bottom">
           <van-picker
@@ -67,7 +68,7 @@
           @click="showdybdclx = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdybdclx" position="bottom">
           <van-picker
@@ -77,7 +78,7 @@
             @cancel="showdybdclx = false"
           />
         </van-popup>
-        <van-field v-model="circulation.dyr" label="抵押人" placeholder="请输入抵押人" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.dyr" label="抵押人" placeholder="请输入抵押人" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -88,7 +89,7 @@
           @click="showdyfs = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdyfs" position="bottom">
           <van-picker
@@ -111,7 +112,7 @@
           @click="showdjlx = true"
           label-width="auto"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdjlx" position="bottom">
           <van-picker
@@ -121,9 +122,9 @@
             @cancel="showdjlx = false"
           />
         </van-popup>
-        <van-field v-model="circulation.djyy" label="登记原因" placeholder="请输入登记原因" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.djjg" label="登记机构" placeholder="请输入登记机构" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.dbr" label="登薄人" placeholder="请输入登薄人" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.djyy" label="登记原因" placeholder="请输入登记原因" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.djjg" label="登记机构" placeholder="请输入登记机构" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.dbr" label="登薄人" placeholder="请输入登薄人" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -133,7 +134,7 @@
           placeholder="选择登记时间"
           @click="showdjsj = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdjsj" position="bottom">
           <van-datetime-picker
@@ -148,14 +149,15 @@
       </div>
 
       <div class="main_box">
-        <van-field label="附记" v-model="circulation.fj" placeholder="请输入内容" input-align="right" label-width="auto"/>
-        <van-field label="备注" v-model="circulation.bz" placeholder="请输入内容" input-align="right" label-width="auto"/>
+        <van-field label="附记" v-model="circulation.fj" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field label="备注" v-model="circulation.bz" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       </div>
+      </van-form>
 
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton">关闭</van-button>
+            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="back">关闭</van-button>
           </van-col>
           <van-col span="12" align="center">
             <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
@@ -169,6 +171,7 @@
 <script>
 import { dyAdd } from "@/api/onlineHome/homestead/mortgage";
 import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
+import {Notify} from "vant";
 export default {
     name: "mortgageAdd",
   data() {
@@ -271,12 +274,20 @@ export default {
       this.showdjsj = false;
     },
     goSubmit(){
+      this.$refs._Form.validate().then(() => {
       dyAdd(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
+          this.back();
         }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
       });
-    }
+    },
+    back() {
+      this.$router.back(-1);
+    },
   },
 }
 </script>
diff --git a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
index 6f43261b..478d7780 100644
--- a/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
+++ b/src/views/onlineHome/homestead/mortgage/mortgageModify.vue
@@ -10,6 +10,7 @@
           <p style="font-weight: bold;">使用抵押权</p>
         </template>
       </van-nav-bar>
+      <van-form ref="_Form">
       <div class="main_box">
         <van-field
           readonly
@@ -20,7 +21,7 @@
           placeholder="请选择"
           @click="showzjddm = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showzjddm" position="bottom">
           <van-picker
@@ -30,11 +31,11 @@
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bdcdyh" label="不动产单元号" placeholder="请输入不动产单元号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bdcqzh" label="不动产权证号" placeholder="请输入不动产权证号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bdcdydjywh" label="不动产抵押登记业务号" placeholder="请输入不动产抵押登记业务号" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjjzwzl" label="在建建筑物坐落" placeholder="请输入在建建筑物坐落" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.zjjzwdyfw" label="在建建筑物抵押范围" placeholder="请输入在建建筑物抵押范围" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -44,7 +45,7 @@
           placeholder="请选择权属状态"
           @click="showqszt = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showqszt" position="bottom">
           <van-picker
@@ -67,7 +68,7 @@
           @click="showdybdclx = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdybdclx" position="bottom">
           <van-picker
@@ -77,7 +78,7 @@
             @cancel="showdybdclx = false"
           />
         </van-popup>
-        <van-field v-model="circulation.dyr" label="抵押人" placeholder="请输入抵押人" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.dyr" label="抵押人" placeholder="请输入抵押人" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -88,7 +89,7 @@
           @click="showdyfs = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdyfs" position="bottom">
           <van-picker
@@ -111,7 +112,7 @@
           @click="showdjlx = true"
           label-width="auto"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdjlx" position="bottom">
           <van-picker
@@ -121,9 +122,9 @@
             @cancel="showdjlx = false"
           />
         </van-popup>
-        <van-field v-model="circulation.djyy" label="登记原因" placeholder="请输入登记原因" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.djjg" label="登记机构" placeholder="请输入登记机构" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.dbr" label="登薄人" placeholder="请输入登薄人" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.djyy" label="登记原因" placeholder="请输入登记原因" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.djjg" label="登记机构" placeholder="请输入登记机构" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.dbr" label="登薄人" placeholder="请输入登薄人" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -133,7 +134,7 @@
           placeholder="选择登记时间"
           @click="showdjsj = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showdjsj" position="bottom">
           <van-datetime-picker
@@ -148,9 +149,10 @@
       </div>
 
       <div class="main_box">
-        <van-field label="附记" v-model="circulation.fj" placeholder="请输入内容" input-align="right" label-width="auto"/>
-        <van-field label="备注" v-model="circulation.bz" placeholder="请输入内容" input-align="right" label-width="auto"/>
+        <van-field label="附记" v-model="circulation.fj" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field label="备注" v-model="circulation.bz" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       </div>
+      </van-form>
 
       <div style="padding: 16px 0;">
         <van-row>
@@ -169,6 +171,7 @@
 <script>
 import { dyApply , getDy , dyEdit } from "@/api/onlineHome/homestead/mortgage";
 import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
+import {Notify} from "vant";
 export default {
     name: "mortgageModify",
   data() {
@@ -276,20 +279,19 @@ export default {
       this.showdjsj = false;
     },
     goEdit(){
-      dyApply(this.circulation).then(response => {
-        if(response.code = 200){
-          this.$toast.success('保存成功');
-        }
-      });
-    },
-    goEdit(){
-      dyEdit(this.circulation).then(response => {
+      this.$refs._Form.validate().then(() => {
+        dyEdit(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
+          this.$router.back(-1);
         }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
       });
     },
     goSubmit(){
+      this.$refs._Form.validate().then(() => {
       dyApply(this.$route.query.id).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
@@ -297,6 +299,9 @@ export default {
             window.location.replace("mortgageList")
           },1000)
         }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
       });
     }
   },
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
index bd99b4e2..14e5d3d1 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitAdd.vue
@@ -10,6 +10,7 @@
           <p style="font-weight: bold;">添加有偿退出</p>
         </template>
       </van-nav-bar>
+      <van-form ref="_Form">
       <div class="main_box">
         <van-field
           readonly
@@ -19,7 +20,7 @@
           placeholder="请选择"
           @click="showzjddm = true"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showzjddm" position="bottom">
           <van-picker
@@ -29,7 +30,7 @@
             @cancel="showzjddm = false"
           />
         </van-popup>
-        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
         <van-field
           readonly
           clickable
@@ -39,7 +40,7 @@
           @click="showzjlx = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showzjlx" position="bottom">
           <van-picker
@@ -49,7 +50,7 @@
             @cancel="showzjlx = false"
           />
         </van-popup>
-        <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       </div>
 
       <p class="main_title">退出信息</p>
@@ -63,7 +64,7 @@
           @click="showtcqllx = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showtcqllx" position="bottom">
           <van-picker
@@ -83,7 +84,7 @@
           @click="showtclx = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showtclx" position="bottom">
           <van-picker
@@ -103,7 +104,7 @@
           @click="showtcfs = true"
           input-align="right"
           right-icon="arrow-down"
-          label-width="auto"
+          label-width="auto" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showtcfs" position="bottom">
           <van-picker
@@ -113,8 +114,8 @@
             @cancel="showtcfs = false"
           />
         </van-popup>
-        <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
       </div>
 
       <p class="main_title">补偿信息</p>
@@ -128,7 +129,7 @@
           @click="showbcfs = true"
           label-width="auto"
           input-align="right"
-          right-icon="arrow-down"
+          right-icon="arrow-down" :rules="[{ required: true }]" required
         />
         <van-popup v-model="showbcfs" position="bottom">
           <van-picker
@@ -138,17 +139,18 @@
             @cancel="showbcfs = false"
           />
         </van-popup>
-        <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto"/>
-        <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+        <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+        <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
 
       </div>
+      </van-form>
 
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton">关闭</van-button>
+            <van-button type="info" color="#B4B0B0" native-type="submit" class="submitButton" @click="back">关闭</van-button>
           </van-col>
           <van-col span="12" align="center">
             <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
@@ -162,6 +164,7 @@
 <script>
 import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
 import { dyAdd } from "@/api/onlineHome/homestead/paidExit";
+import {Notify} from "vant";
 export default {
   name: "paidExitAdd",
   data() {
@@ -280,12 +283,20 @@ export default {
     },
     goSubmit(){
       console.log(this.circulation);
+      this.$refs._Form.validate().then(() => {
       dyAdd(this.circulation).then(response => {
         if(response.code = 200){
           this.$toast.success('保存成功');
+          this.back();
         }
+      })
+      }).catch((e) => {
+        Notify({ type: 'danger', message: '请填写完整的表单项' });
       });
-    }
+    },
+    back() {
+      this.$router.back(-1);
+    },
   },
 }
 </script>
diff --git a/src/views/onlineHome/homestead/paidExit/paidExitModify.vue b/src/views/onlineHome/homestead/paidExit/paidExitModify.vue
index 6965c01a..7ed74c1a 100644
--- a/src/views/onlineHome/homestead/paidExit/paidExitModify.vue
+++ b/src/views/onlineHome/homestead/paidExit/paidExitModify.vue
@@ -10,6 +10,7 @@
         <p style="font-weight: bold;">添加有偿退出</p>
       </template>
     </van-nav-bar>
+    <van-form ref="_Form">
     <div class="main_box">
       <van-field
         readonly
@@ -19,7 +20,7 @@
         placeholder="请选择"
         @click="showzjddm = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showzjddm" position="bottom">
         <van-picker
@@ -29,7 +30,7 @@
           @cancel="showzjddm = false"
         />
       </van-popup>
-      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.sqrxm" label="申请人姓名" placeholder="申请人姓名" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field
         readonly
         clickable
@@ -49,7 +50,7 @@
           @cancel="showzjlx = false"
         />
       </van-popup>
-      <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.sqrzjhm" label="申请人证件号码" placeholder="申请人证件号码" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
     </div>
 
     <p class="main_title">退出信息</p>
@@ -63,7 +64,7 @@
         @click="showtcqllx = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showtcqllx" position="bottom">
         <van-picker
@@ -83,7 +84,7 @@
         @click="showtclx = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showtclx" position="bottom">
         <van-picker
@@ -103,7 +104,7 @@
         @click="showtcfs = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showtcfs" position="bottom">
         <van-picker
@@ -113,8 +114,8 @@
           @cancel="showtcfs = false"
         />
       </van-popup>
-      <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.tcmj" label="退出面积" placeholder="请输入退出面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.tcnx" label="退出年限" placeholder="请输入退出年限" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
     </div>
 
     <p class="main_title">补偿信息</p>
@@ -128,7 +129,7 @@
         @click="showbcfs = true"
         label-width="auto"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showbcfs" position="bottom">
         <van-picker
@@ -138,12 +139,13 @@
           @cancel="showbcfs = false"
         />
       </van-popup>
-      <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto"/>
-      <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto"/>
+      <van-field v-model="circulation.bcje" label="补偿金额" placeholder="请输入补偿金额 元" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.zhfwmj" label="置换房屋面积" placeholder="请输入房屋面积㎡" input-align="right" label-width="auto" :rules="[{ required: true }]" required type="number"/>
+      <van-field v-model="circulation.zhfwzl" label="置换房屋坐落" placeholder="请输入房屋坐落" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="circulation.bz" label="备注" placeholder="请输入内容" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
 
     </div>
+    </van-form>
 
     <div style="padding: 16px 0;">
       <van-row>
@@ -162,6 +164,7 @@
 <script>
   import { zjdzd, getByZjddm } from "@/api/onlineHome/homestead/circulation";
   import { zyyctcEdit , getZyyctc , zyyctcApply } from "@/api/onlineHome/homestead/paidExit";
+  import {Notify} from "vant";
   export default {
     name: "paidExitModify",
     data() {
@@ -286,13 +289,19 @@
       },
       goEdit(){
         console.log(this.circulation);
+        this.$refs._Form.validate().then(() => {
         zyyctcEdit(this.circulation).then(response => {
           if(response.code = 200){
             this.$toast.success('保存成功');
+            this.$router.back(-1);
           }
+        })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
       goSubmit(){
+        this.$refs._Form.validate().then(() => {
         zyyctcApply(this.$route.query.id).then(response => {
           if(response.code = 200){
             this.$toast.success('提交成功');
@@ -300,6 +309,9 @@
               window.location.replace("paidExit")
             },1000)
           }
+        })
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       }
     },
diff --git a/src/views/onlineHome/homestead/supervision/supervisionAdd.vue b/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
index 0f1d8fec..900e2261 100644
--- a/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
+++ b/src/views/onlineHome/homestead/supervision/supervisionAdd.vue
@@ -10,7 +10,22 @@
         <p style="font-weight: bold;">添加违法监管</p>
       </template>
     </van-nav-bar>
+    <van-form ref="_Form">
+    <p class="main_title">基本信息</p>
     <div class="main_box">
+      <field-select
+        v-model="jgList.zjddm"
+        label="宅基地代码"
+        value-key="zjddm"
+        data-key="zjddm"
+        placeholder="请选择宅基地代码"
+        :rules="[{ required: true }]"
+        required
+        :readonly="!allowCUD"
+        :columns="zjdDictionaries"
+        @change="onZjddmChanged"
+      />
+      <van-field label="户主姓名" v-model="jgList.syrxm" placeholder="请填写户主姓名" input-align="right" label-width="auto" readonly :rules="[{ required: true }]" required/>
       <van-field
         readonly
         clickable
@@ -20,7 +35,7 @@
         @click="showSys = true"
         input-align="right"
         right-icon="arrow-down"
-        label-width="auto"
+        label-width="auto" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showSys" position="bottom">
         <van-picker
@@ -30,13 +45,6 @@
           @cancel="showSys = false"
         />
       </van-popup>
-      <van-field label="宅基地代码" v-model="jgList.zjddm" placeholder="请输入宅基地代码" input-align="right" />
-      <!--        <van-popup v-model="showZjd" position="bottom">-->
-      <!--          <van-picker-->
-      <!--            show-toolbar-->
-      <!--            @cancel="showZjd = false"-->
-      <!--          />-->
-      <!--        </van-popup>-->
       <van-field
         readonly
         clickable
@@ -45,7 +53,7 @@
         v-model="jglx"
         @click="showjglx = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showjglx" position="bottom">
         <van-picker
@@ -63,7 +71,7 @@
         placeholder="请选择立案时间"
         @click="showlasj = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showlasj" position="bottom">
         <van-datetime-picker
@@ -75,7 +83,7 @@
           @confirm="onConfirmLasj"
         />
       </van-popup>
-      <van-field label="巡查人" v-model="jgList.inspector" placeholder="请输入巡查人" input-align="right" label-width="auto"/>
+      <van-field label="巡查人" v-model="jgList.inspector" placeholder="请输入巡查人" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field
         readonly
         clickable
@@ -84,7 +92,7 @@
         placeholder="请选择巡查时间"
         @click="showinspectorTime = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showinspectorTime" position="bottom">
         <van-datetime-picker
@@ -96,7 +104,7 @@
           @confirm="onConfirmInspectorTime"
         />
       </van-popup>
-      <van-field label="备注" v-model="jgList.bz" placeholder="填写备注" input-align="right" label-width="auto"/>
+      <van-field label="备注" v-model="jgList.bz" placeholder="填写备注" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
     </div>
 
     <p class="main_title">违法信息</p>
@@ -109,7 +117,7 @@
         v-model="wfydlx"
         @click="showwfydlx = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showwfydlx" position="bottom">
         <van-picker
@@ -119,10 +127,10 @@
           @cancel="showwfydlx = false"
         />
       </van-popup>
-      <van-field v-model="jgList.wfydmj" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.msmj" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
-      <van-field v-model="jgList.ccmj" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto"/>
+      <van-field v-model="jgList.wfydmj" type="number" label="违法用地面积" placeholder="请输入面积" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="jgList.fmkje" label="罚没款金额" placeholder="请输入金额" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]" required/>
+      <van-field v-model="jgList.msmj" type="number" label="没收面积" placeholder="请输入面积" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
+      <van-field v-model="jgList.ccmj" type="number" label="拆除面积" placeholder="请输入面积" input-align="right" label-width="auto" :rules="[{ required: true }]" required/>
       <van-field
         readonly
         clickable
@@ -131,7 +139,7 @@
         v-model="jgList.reformDeadline"
         @click="showReformDeadline = true"
         input-align="right"
-        right-icon="arrow-down"
+        right-icon="arrow-down" :rules="[{ required: true }]" required
       />
       <van-popup v-model="showReformDeadline" position="bottom">
         <van-datetime-picker
@@ -144,6 +152,7 @@
         />
       </van-popup>
     </div>
+    </van-form>
     <div style="padding: 16px 0;" v-if="allowCUD">
       <van-row>
         <van-col span="12" align="center">
@@ -160,8 +169,13 @@
 
 <script>
   import { jgAdd } from "@/api/onlineHome/homestead/reporting";
+  import { zjdzd , getByZjddm } from "@/api/onlineHome/homestead/circulation";
+  import FieldSelect from "@/components/form/FieldSelect";
+  import {Notify} from "vant";
   export default {
     name: "supervisionAdd",
+    components: {
+      FieldSelect},
     data() {
       return {
         showSys:false,
@@ -183,7 +197,7 @@
         wfydlxDictionaries:[],
         jglxDictionaries:[],
         sysDictionaries:[],
-
+        zjdDictionaries: [],
       };
     },
     created() {
@@ -214,7 +228,12 @@
             this.sysDictionaries.push({text:res.data[i].dictLabel,value:res.data[i].dictValue});
           }
         });
-
+        //宅基地代码
+        zjdzd().then(zjdRes => {
+          this.zjdDictionaries = zjdRes.rows;
+          if(this.zjdDictionaries.length > 0)
+            this.jgList.zjddm = this.zjdDictionaries[0].zjddm;
+        });
       },
       onConfirmSys(data){
         this.sfzjjzw = data.text;
@@ -245,16 +264,29 @@
       },
       goAdd(){
         console.log(this.jgList)
-        jgAdd(this.jgList).then(response => {
-          console.log(response);
-          this.$toast.success('保存成功');
-          setTimeout(function(){
-            history.go(-1)
-          },2000)
+        this.$refs._Form.validate().then(() => {
+          jgAdd(this.jgList).then(response => {
+            console.log(response);
+            this.$toast.success('保存成功');
+            setTimeout(function(){
+              history.go(-1)
+            },2000)
+          });
+        }).catch((e) => {
+          Notify({ type: 'danger', message: '请填写完整的表单项' });
         });
       },
       goBack(){
         window.history.go(-1)
+      },
+      onZjddmChanged(data) {
+        let zjddm = data.zjddm;
+        getByZjddm({zjddm: zjddm,}).then(qlrRes => {
+          let data = qlrRes.data;
+          console.log(data)
+          this.jgList.syrxm = data.shyqrdbxm;
+          this.$forceUpdate();
+        });
       }
     },
   }