From 1eb3a43493ebe95fdfc651231f56c7df5f1e7155 Mon Sep 17 00:00:00 2001
From: zhaochengke <beyondk2000@163.com>
Date: Fri, 20 May 2022 17:16:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/form/FieldSelect.vue           |  11 +-
 .../homeApplication/applicationList.vue       |   1 -
 .../homeApplication/proposerLite.vue          | 192 +++++++++---------
 3 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue
index 770d50c1..f205df61 100644
--- a/src/components/form/FieldSelect.vue
+++ b/src/components/form/FieldSelect.vue
@@ -111,16 +111,21 @@ export default {
     syncIndex() {
       let columns = this.getColumns();
       if(!columns)
-        return 0;
+        return -1;
       for(let i in columns)
       {
         if(this.getValue(columns[i]) == this.internalValue) {
           this.defaultIndex = i;
           this.visibleValue = this.getLabel(columns[i]);
-          break;
+          return i;
         }
       }
-      return 0;
+      if(1) // 不存在
+      {
+        this.defaultIndex = -1;
+        this.visibleValue = this.internalValue;
+      }
+      return -1;
     },
     getColumns() {
       return this.columns ? this.columns : this.remoteColumns;
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index f6c0cede..d7a0d0f8 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -158,7 +158,6 @@ export default {
         func(item.id).then((resp) => {
           this.$toast.success("提交成功");
           this.refresh();
-          this.getList();
         }).catch((e) => {
           this.$toast.fail("提交失败!");
         });
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 50e080ae..33c30552 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -27,7 +27,7 @@
                 <div>
                   <p class="main_title">申请户主信息</p>
                   <div class="main_box">
-                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.memberName" label="姓名" placeholder="姓名" input-align="right" required/>
+                    <van-field :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.memberName" label="姓名" placeholder="姓名" input-align="right" required :rules="[{ required: true }]"/>
                     <field-select
                       v-model="applicationDetail.tHouseApplyProposer.sex"
                       label="性别"
@@ -40,11 +40,11 @@
                       remote-url="/system/dict/data/type/sys_user_sex"
                       :on-remote-response="'data'"
                     />
-                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.age" label="年龄" placeholder="年龄" input-align="right" type="digit"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.age" label="年龄" placeholder="年龄" input-align="right" type="digit" :rules="[{ required: true }]"/>
                     <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.phone" label="联系电话" placeholder="联系电话" input-align="right" type="digit" :rules="[{pattern: /(^\d{7}(\d{4})?$)/}]"/>
                     <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.idcard" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]"/>
-                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right"/>
-                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.familyAddress" label="家庭住址" placeholder="家庭住址" input-align="right"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
+                    <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.familyAddress" label="家庭住址" placeholder="家庭住址" input-align="right" :rules="[{ required: true }]"/>
                     <van-field required readonly v-model="applicationDetail.tHouseApplyProposer.members" label="家庭人口数" placeholder="家庭人口数" type="digit" input-align="right"/>
                     <field-radio
                       v-model="applicationDetail.tHouseApplyProposer.existHomestead"
@@ -80,16 +80,16 @@
                   </van-collapse>
 
                   <div v-else>
-                    <van-tabs v-if="applicationDetail.tHouseApplyFamilyMembers && applicationDetail.tHouseApplyFamilyMembers.length > 0" v-model="familyMembersActive">
+                    <van-tabs v-if="applicationDetail.tHouseApplyFamilyMembers && applicationDetail.tHouseApplyFamilyMembers.length > 0" v-model="familyMembersActive" ref="memberTabs">
                       <van-tab :title="(index + 1) + '. ' + item.memberName" v-for="(item , index) in applicationDetail.tHouseApplyFamilyMembers" :key="index" swipeable>
                         <div class="familyList">
                           <div class="main_box" style="margin-bottom: 20px">
                             <van-button icon="minus" size="mini" type="danger" class="deleteFamily" native-type="button" v-if="index!=0" @click="deleteFamily(index)" />
-                            <van-field required v-model="item.memberName" label="姓名" placeholder="姓名" input-align="right"/>
-                            <van-field required v-model="item.age" label="年龄" placeholder="年龄" input-align="right"/>
-                            <van-field required v-model="item.familyStatusName" label="与户主关系" placeholder="与户主关系" input-align="right"/>
+                            <van-field required v-model="item.memberName" label="姓名" placeholder="姓名" input-align="right" :rules="[{ required: true }]"/>
+                            <van-field required v-model="item.age" label="年龄" placeholder="年龄" input-align="right" :rules="[{ required: true }]"/>
+                            <van-field required v-model="item.familyStatusName" label="与户主关系" placeholder="与户主关系" input-align="right" :rules="[{ required: true }]"/>
                             <van-field required v-model="item.idcard" label="身份证号" placeholder="身份证号" input-align="right" :rules="[{pattern: /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/}]"/>
-                            <van-field required v-model="item.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right"/>
+                            <van-field required v-model="item.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                           </div>
                         </div>
                       </van-tab>
@@ -331,10 +331,10 @@
                         remote-url="/system/dict/data/type/rights_type"
                         :on-remote-response="'data'"
                       />
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.east" label="东至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.south" label="南至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.west" label="西至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.north" label="北至" placeholder="请输入" input-align="right"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.east" label="东至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.west" label="西至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.south" label="南至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.north" label="北至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
                       <div class="mapBox">
                         <common-map ref="pointDarwNatureMap" style="height:200px;"
                                     :allowDraw="formEnabled.baseApplyForm.townFormEnabled"
@@ -343,7 +343,7 @@
                         >
                         </common-map>
                       </div>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveNatureOptions.approveOption" rows="2" autosize type="textarea" placeholder="审查意见" :rules="[{ required: true }]"/>
                     </van-col>
                   </van-row>
                 </div>
@@ -379,15 +379,15 @@
                         remote-url="/system/dict/data/type/design_paper"
                         :on-remote-response="'data'"
                       />
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingLandArea" label="建筑占地面积" placeholder="请输入" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingArea" label="建筑面积" placeholder="请输入" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingFloors" label="建筑层数" placeholder="请输入" input-align="right" type="digit"><template #right-icon>层</template></van-field>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingHight" label="建筑高度" placeholder="请输入" input-align="right" type="number"><template #right-icon>m</template></van-field>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.east" label="东至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.south" label="南至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.west" label="西至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.north" label="北至" placeholder="请输入" input-align="right"/>
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingLandArea" label="建筑占地面积" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingArea" label="建筑面积" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingFloors" label="建筑层数" placeholder="请输入" input-align="right" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.buildingHight" label="建筑高度" placeholder="请输入" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.east" label="东至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.west" label="西至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.south" label="南至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.north" label="北至" placeholder="请输入" input-align="right" :rules="[{ required: true }]"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveOtherOptions.approveOption" rows="2" autosize  type="textarea" placeholder="审批意见" :rules="[{ required: true }]"/>
                     </van-col>
                   </van-row>
                 </div>
@@ -399,7 +399,7 @@
                   <van-row type="flex" justify="space-between" align="center">
                     <van-col span="5">镇级<br/>审核<br/>意见</van-col>
                     <van-col span="19">
-                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="同意申请宅基地"/>
+                      <van-field required :readonly="!formEnabled.baseApplyForm.townFormEnabled" v-model="applicationDetail.tHouseApproveTownOptions.approveOption" rows="2" autosize type="textarea" placeholder="同意申请宅基地" :rules="[{ required: true }]"/>
                     </van-col>
                   </van-row>
                 </div>
@@ -511,15 +511,15 @@
                     required
                     :readonly="true"
                   />
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCertificateNo" label="权属证书号（不动产）" placeholder="权属证书号（不动产）" input-align="right" label-width="auto"/>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.landCertificateNo" label="权属证书号（宅基地）" placeholder="权属证书号（宅基地）" input-align="right" label-width="auto"/>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingHight" label="批建高度" placeholder="建筑高度" input-align="right" label-width="auto" type="number"><template #right-icon>m</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingFloors" label="批建层数" placeholder="批建层数" input-align="right" label-width="auto" type="digit"><template #right-icon>层</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualBuildingHight" label="竣工高度" placeholder="竣工高度" input-align="right" label-width="auto" type="number"><template #right-icon>m</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualBuildingFloors" label="竣工层数" placeholder="竣工层数" input-align="right" label-width="auto" type="digit"><template #right-icon>层</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingArea" label="建筑面积" placeholder="建筑面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingHouseArea" label="其中: 房屋建筑面积" placeholder="房屋建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingOtherArea" label="配套附属设施建筑面积" placeholder="配套附属设施建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCertificateNo" label="权属证书号（不动产）" placeholder="权属证书号（不动产）" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.landCertificateNo" label="权属证书号（宅基地）" placeholder="权属证书号（宅基地）" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingHight" label="批建高度" placeholder="批建高度" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingFloors" label="批建层数" placeholder="批建层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualBuildingHight" label="竣工高度" placeholder="竣工高度" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>m</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualBuildingFloors" label="竣工层数" placeholder="竣工层数" input-align="right" label-width="auto" type="digit" :rules="[{ required: true }]"><template #right-icon>层</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingArea" label="建筑面积" placeholder="建筑面积" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingHouseArea" label="其中: 房屋建筑面积" placeholder="房屋建筑面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.buildingOtherArea" label="配套附属设施建筑面积" placeholder="配套附属设施建筑面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
                   <field-select
                     v-model="applicationDetail.tHouseApplyEnd.designPaper"
                     label="建筑风貌"
@@ -544,10 +544,10 @@
                     remote-url="/system/dict/data/type/old_house_status"
                     :on-remote-response="'data'"
                   />
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCost" label="住房造价" placeholder="住房造价" input-align="right" type="number"><template #right-icon>万元</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.facadeColor" label="外立面颜色" placeholder="外立面颜色" input-align="right" label-width="auto"/>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.fangjiArea" label="批准房基占地面积" placeholder="批准房基占地面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
-                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualFangjiArea" label="实际房基占地面积" placeholder="实际房基占地面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.houseCost" label="住房造价" placeholder="住房造价" input-align="right" type="number" :rules="[{ required: true }]"><template #right-icon>万元</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.facadeColor" label="外立面颜色" placeholder="外立面颜色" input-align="right" label-width="auto" :rules="[{ required: true }]"/>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.fangjiArea" label="批准房基占地面积" placeholder="批准房基占地面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
+                  <van-field required :readonly="!formEnabled.acceptingForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyEnd.actualFangjiArea" label="实际房基占地面积" placeholder="实际房基占地面积" input-align="right" label-width="auto" type="number" :rules="[{ required: true }]"><template #right-icon>㎡</template></van-field>
                   <field-radio
                     v-model="applicationDetail.tHouseApplyEnd.isEnjoySubsidy"
                     label="是否享受住房建设补助政策"
@@ -595,7 +595,7 @@
                     <house-location-plan-comp ref="pictureUploadAccepting" :uploadDisabled="!formEnabled.acceptingForm.townFormEnabled" :jsonData="uploadImgAccepting.fileList" :proposer-id="uploadImgAccepting.proposerId" tableName="t_house_apply_end"
                                               @uploadFileChanged="(x) => {this.uploadImgAccepting.uploadFileList = x;}" @removeFileChanged="(x) => {this.uploadImgAccepting.removeFileList = x;}"
                     />
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.cartographer"  placeholder="经办人" label="经办人" input-align="left"/>
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.cartographer"  placeholder="经办人" label="经办人" input-align="left" :rules="[{ required: true }]"/>
                   </van-col>
                 </van-row>
               </div>
@@ -675,7 +675,7 @@
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>农业<br/>农村<br/>部门<br/>意见</van-col>
                   <van-col span="19">
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.nongyeOption" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见"/>
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.nongyeOption" :autosize="true" type="textarea" placeholder="乡镇农业农村部门意见" :rules="[{ required: true }]"/>
                   </van-col>
                 </van-row>
               </div>
@@ -684,7 +684,7 @@
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>自然<br/>资源<br/>部门<br/>意见</van-col>
                   <van-col span="19">
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.natureOption" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见"/>
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.natureOption" :autosize="true" type="textarea" placeholder="乡镇自然资源部门意见" :rules="[{ required: true }]"/>
                   </van-col>
                 </van-row>
               </div>
@@ -693,7 +693,7 @@
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>住建<br/>部门<br/>意见</van-col>
                   <van-col span="19">
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.buildingOption" :autosize="true" type="textarea" placeholder="乡镇住建部门意见"/>
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.buildingOption" :autosize="true" type="textarea" placeholder="乡镇住建部门意见" :rules="[{ required: true }]"/>
                   </van-col>
                 </van-row>
               </div>
@@ -702,12 +702,12 @@
                 <van-row type="flex" justify="space-between" align="center">
                   <van-col span="5">乡镇<br/>政府<br/>验收<br/>意见</van-col>
                   <van-col span="19">
-                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.zhenOption" :autosize="true" type="textarea" placeholder="乡镇政府验收意见"/>
+                    <van-field required :readonly="!formEnabled.acceptingForm.townFormEnabled" rows="2" v-model="applicationDetail.tHouseApplyEnd.zhenOption" :autosize="true" type="textarea" placeholder="乡镇政府验收意见" :rules="[{ required: true }]"/>
                   </van-col>
                 </van-row>
               </div>
 
-              <van-field rows="3" :autosize="true" type="textarea" readonly label="备注" label-width="auto"  placeholder="备注" :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.remark" input-align="left"></van-field>
+              <van-field rows="3" :autosize="true" type="textarea" label="备注" label-width="auto"  placeholder="备注" :readonly="!formEnabled.acceptingForm.townFormEnabled" v-model="applicationDetail.tHouseApplyEnd.remark" input-align="left" :rules="[{ required: true }]"></van-field>
             </template>
           </template>
 
@@ -992,7 +992,7 @@ export default {
       // 当前附件tab
       attachmentActive: 0,
       // 家庭成员tab
-      familyMembersActive: '0',
+      familyMembersActive: 0,
     };
   },
   created() {
@@ -1257,7 +1257,7 @@ export default {
                 this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageLeader', handlerName);
               if(!this.applicationDetail.tHouseApproveVillageOptions.villageTime)
                 this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageTime', handlerTime);
-              if(!this.applicationDetail.tHouseApproveVillageOptions.villageOption)
+              if(!this.applicationDetail.tHouseApproveVillageOptions.villageOption || true) // always generate options
                 this.$set(this.applicationDetail.tHouseApproveVillageOptions, 'villageOption', defaultVillageOption);
             }
           }
@@ -1657,11 +1657,17 @@ export default {
         idcard :'',
         householdRegister:'',
       });
+      this.$nextTick(() => {
+        this.$refs.memberTabs.scrollTo(this.applicationDetail.tHouseApplyFamilyMembers.length - 1);
+      });
     },
     //删除家庭成员
     deleteFamily(index){
       this.applicationDetail.tHouseApplyProposer.members--;
       this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1)
+      this.$nextTick(() => {
+        this.$refs.memberTabs.scrollTo(Math.max(index - 1, 0));
+      });
     },
     // 获取户型配置
     getHouseList() {
@@ -2455,14 +2461,18 @@ export default {
     },
     validateAcceptingFormBase() {
       if(!this.applicationDetail.tHouseApplyEnd) return '请填写验收数据';
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.location)) {
-        return "用地建房位置不能为空";
+
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCertificateNo)) {
+        return "权属证书号（不动产）不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.landCertificateNo)) {
+        return "权属证书号（宅基地）不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.startDate)) {
-        return "开工日期不能为空";
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHight)) {
+        return "批建高度不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.endDate)) {
-        return "竣工日期不能为空";
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingFloors)) {
+        return "批建层数不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.actualBuildingHight)) {
         return "竣工高度不能为空";
@@ -2473,37 +2483,21 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingArea)) {
         return "建筑面积不能为空";
       }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHouseArea)) {
+        return "房屋建筑面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOtherArea)) {
+        return "配套附属设施建筑面积不能为空";
+      }
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.designPaper)) {
         return "建筑风貌不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.oldHouseStatus)) {
         return "旧宅基地退还情况不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingArea)) {
-        return "建筑面积不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCertificateNo)) {
-        return "权属证书号（不动产）不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.landCertificateNo)) {
-        return "权属证书号（宅基地）不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy)) {
-        return "是否享受住房建设补助政策不能为空";
-      }
-      if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
-        return "享受住房建设补助政策不能为空";
-      }
-
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.houseCost)) {
         return "住房造价不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingHouseArea)) {
-        return "房屋建筑面积不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.buildingOtherArea)) {
-        return "配套附属设施建筑面积不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.facadeColor)) {
         return "外立面颜色不能为空";
       }
@@ -2513,6 +2507,13 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.actualFangjiArea)) {
         return "实际房基占地面积不能为空";
       }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy)) {
+        return "是否享受住房建设补助政策不能为空";
+      }
+      if (this.applicationDetail.tHouseApplyEnd.isEnjoySubsidy === 'Y' && this.checkString(this.applicationDetail.tHouseApplyEnd.enjoySubsidyContent)) {
+        return "享受住房建设补助政策不能为空";
+      }
+
       return false;
     },
     validateAcceptingFormTown(pass) {
@@ -2520,6 +2521,29 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.cartographer)) {
         return "竣工平面简图经办人不能为空";
       }
+
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
+        return "是否已完成工程设计和合同约定的各项内容不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
+        return "承揽人对完工住房质量自查是否合格不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
+        return "是否有施工记录资料不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
+        return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
+        return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
+        return "建筑风貌是否与设计图基本一致不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
+        return "法律、法规规定的其他验收条件完成情况不能为空";
+      }
+
       if (this.checkString(this.applicationDetail.tHouseApplyEnd.nongyeOption)) {
         return "乡镇农业农村部门意见不能为空";
       }
@@ -2557,28 +2581,6 @@ export default {
         return "乡镇政府验收时间不能为空";
       }
 
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isProjectFinished)) {
-        return "是否已完成工程设计和合同约定的各项内容不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isQualifiedQuality)) {
-        return "承揽人对完工住房质量自查是否合格不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.hasBuildingRecord)) {
-        return "是否有施工记录资料不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isSignWarranty)) {
-        return "建房村民和承揽人是否已经共同签署农村住房质量保修书不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isHandleProblem)) {
-        return "住房城乡建设行政主管部门或乡（镇）人民政府责令整改的问题是否全部整改完毕不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isDesignPaperSame)) {
-        return "建筑风貌是否与设计图基本一致不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyEnd.isOtherAcceptanceFinished)) {
-        return "法律、法规规定的其他验收条件完成情况不能为空";
-      }
-
       // 通过时检查打勾, 农业部门
       if(pass)
       {