宅基地bug修改

src/router/index.js

@@ -675,7 +675,7 @@ export const constantRoutes = [
     path: '/circulationAdd',
     name: 'circulationAdd',
     meta: {
-      title: '添加宅基地使用流转权',
+      title: '添加宅基地使用权流转',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationAdd'], resolve)
@@ -856,7 +856,7 @@ export const constantRoutes = [
     path: '/circulationDetail',
     name: 'circulationDetail',
     meta: {
-      title: '查看宅基地使用流转权',
+      title: '查看宅基地使用权流转',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationDetail'], resolve)
@@ -865,7 +865,7 @@ export const constantRoutes = [
     path: '/circulationModify',
     name: 'circulationModify',
     meta: {
-      title: '修改宅基地使用流转权',
+      title: '修改宅基地使用权流转',
       hidden: true,
     },
     component: (resolve) => require(['@/views/onlineHome/homestead/circulation/circulationModify'], resolve)

src/views/onlineHome/done.vue

@@ -75,7 +75,10 @@
           queryParams: {
             pageNum: 1,
             pageSize: 100,
+            isAsc: 'DESC',
           },
+          orderByColumn_todo: 'CREATE_TIME_',
+          orderByColumn_done: 'END_TIME_',
           activityBusinessTypeOptions:[],
           refreshing: false,
           loading: false,
@@ -120,6 +123,7 @@
           else {
             this.queryParams.pageNum = eval(this.queryParams.pageNum + target.toString())
           }
+          this.queryParams.orderByColumn = this.activeName == '1' ? this.orderByColumn_todo : this.orderByColumn_done;
           this.$set(this.queryParams, "systemType", '11'); // 4
           if(this.activeName=='1'){
             ListTodo(this.queryParams).then((response) => {

src/views/onlineHome/homestead/circulation/circulationDetail.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">宅基地使用流转权</p>
+          <p style="font-weight: bold;">宅基地使用权流转</p>
         </template>
       </van-nav-bar>
         <p class="main_title">转出方信息</p>

src/views/onlineHome/homestead/circulation/circulationModify.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">添加宅基地使用流转权</p>
+          <p style="font-weight: bold;">添加宅基地使用权流转</p>
         </template>
       </van-nav-bar>
       <van-form ref="_Form">

src/views/onlineHome/homestead/homeApplication/proposerLite.vue

@@ -42,7 +42,7 @@
                     />
                     <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]$/}]" @change="updateUserInfo"/>
+                    <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]$/}]" @input="updateUserInfo"/>
                     <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"/>-->
@@ -88,7 +88,7 @@
                             <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]$/}]" @change="updateMemberInfo(index)"/>
+                            <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]$/}]" @input="updateMemberInfo(index)"/>
                             <van-field required v-model="item.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                           </div>
                         </div>
@@ -571,7 +571,7 @@
                       />
                       <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]$/}]" @change="updateUserInfo"/>
+                      <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]$/}]" @input="updateUserInfo"/>
                       <van-field required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyProposer.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                     </div>
                   </div>
@@ -604,7 +604,7 @@
                               <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]$/}]" @change="updateMemberInfo(index)"/>
+                              <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]$/}]" @input="updateMemberInfo(index)"/>
                               <van-field required v-model="item.householdRegister" label="户口所在地" placeholder="户口所在地" input-align="right" :rules="[{ required: true }]"/>
                             </div>
                           </div>
@@ -2273,6 +2273,13 @@ export default {
           this.applicationDetail.tHouseApplyProposer.applyTime = this.getDate();
           this.getMemberCurrentSituation();
           this.updateUserInfo();
+          if(this.applicationDetail.tHouseApplyFamilyMembers.length > 0)
+          {
+            for(let i = 0; i < this.applicationDetail.tHouseApplyFamilyMembers.length; i++)
+            {
+              this.updateMemberInfo(i);
+            }
+          }
         }
       });
     },
@@ -2898,11 +2905,14 @@ export default {
         }
       }
 
-      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.location)) {
-        return "拟建地址不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.landArea)) {
-        return "拟建宅基地面积不能为空";
+        return "宅基地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingLandArea)) {
+        return "房基占地面积不能为空";
+      }
+      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.location)) {
+        return "地址不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.east)) {
         return "东至不能为空";
@@ -2919,9 +2929,6 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingArea)) {
         return "住房建筑面积不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingLandArea)) {
-        return "房基占地面积不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingFloors)) {
         return "建筑层数不能为空";
       }

src/views/onlineHome/homestead/homesteadUtilize/homesteadUtilizeAdd.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">宅基地利用情况</p>
+          <p style="font-weight: bold;">添加宅基地利用情况</p>
         </template>
       </van-nav-bar>
       <van-form ref="_Form">

src/views/onlineHome/homestead/mortgage/mortgageAdd.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">使用权抵押</p>
+          <p style="font-weight: bold;">添加使用权抵押</p>
         </template>
       </van-nav-bar>
       <van-form ref="_Form">
@@ -155,7 +155,7 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(false)">保存</van-button>
           </van-col>
           <van-col span="12" align="center">
             <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(true)">提交</van-button>

src/views/onlineHome/homestead/paidExit/paidExitAdd.vue

@@ -150,7 +150,7 @@
       <div style="padding: 16px 0;">
         <van-row>
           <van-col span="12" align="center">
-            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit">保存</van-button>
+            <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(false)">保存</van-button>
           </van-col>
           <van-col span="12" align="center">
             <van-button type="info" native-type="submit" class="submitButton" @click="goSubmit(true)">提交</van-button>

src/views/onlineHome/homestead/supervision/supervisionDetail.vue

@@ -14,6 +14,7 @@
       <div class="main_box">
         <van-field readonly label="是否在建建筑物" v-model="sfzjjzw" input-align="right" label-width="auto" />
         <van-field readonly label="宅基地代码" v-model="jgList.zjddm" input-align="right" label-width="auto" />
+        <van-field label="户主姓名" v-model="jgList.syrxm" input-align="right" label-width="auto" readonly/>
         <van-field readonly label="监管类型" v-model="jglx" input-align="right"/>
         <van-field readonly label="立案时间" v-model="jgList.lasj" input-align="right" />
         <van-field readonly label="巡查人" v-model="jgList.inspector" input-align="right" label-width="auto"/>

src/views/onlineHome/homestead/utilization/utilizationAdd.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">农民房屋利用情况调查</p>
+          <p style="font-weight: bold;">添加农民房屋利用情况调查</p>
         </template>
       </van-nav-bar>
       <van-form ref="_Form">
@@ -171,7 +171,7 @@
               @confirm="onConfirmDcsj"
             />
           </van-popup>
-          <van-field v-model="circulation.nsy" label="年收益" placeholder="年收益" input-align="right" label-width="auto"/>
+          <van-field v-model="circulation.nsy" label="年收益" placeholder="年收益" input-align="right" label-width="auto" type="number"/>
         </div>
 
         <p class="main_title">照片信息</p>

src/views/onlineHome/homestead/utilization/utilizationModify.vue

@@ -171,7 +171,7 @@
             @confirm="onConfirmDcsj"
           />
         </van-popup>
-        <van-field v-model="circulation.nsy" label="年收益" placeholder="年收益" input-align="right" label-width="auto"/>
+        <van-field v-model="circulation.nsy" label="年收益" placeholder="年收益" input-align="right" label-width="auto" type="number"/>
       </div>
 
       <p class="main_title">照片信息</p>

src/views/yinnong/homestead/circulation/circulationAdd.vue

@@ -7,7 +7,7 @@
       @click-left="$router.back(-1)"
     >
       <template #title>
-        <p style="font-weight: bold;">添加宅基地使用流转权</p>
+        <p style="font-weight: bold;">添加宅基地使用权流转</p>
       </template>
     </van-nav-bar>
     <p class="main_title">转出方信息</p>

src/views/yinnong/homestead/circulation/circulationDetail.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">查看宅基地使用流转权</p>
+          <p style="font-weight: bold;">查看宅基地使用权流转</p>
         </template>
       </van-nav-bar>
         <p class="main_title">转出方信息</p>
@@ -116,7 +116,6 @@ export default {
   data() {
     return {
       value: '',
-      circulation:[],
       houseApplyStatus:[],
       circulation:[],
     };

src/views/yinnong/homestead/circulation/circulationModify.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">添加宅基地使用流转权</p>
+          <p style="font-weight: bold;">添加宅基地使用权流转</p>
         </template>
       </van-nav-bar>
         <p class="main_title">转出方信息</p>

src/views/yinnong/homestead/mortgage/mortgageAdd.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">使用抵押权</p>
+          <p style="font-weight: bold;">使用权抵押</p>
         </template>
       </van-nav-bar>
       <div class="main_box">

src/views/yinnong/homestead/mortgage/mortgageDetail.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">使用抵押权</p>
+          <p style="font-weight: bold;">使用权抵押</p>
         </template>
       </van-nav-bar>
         <div class="main_box">

src/views/yinnong/homestead/mortgage/mortgageModify.vue

@@ -7,7 +7,7 @@
         @click-left="$router.back(-1)"
       >
         <template #title>
-          <p style="font-weight: bold;">使用抵押权</p>
+          <p style="font-weight: bold;">使用权抵押</p>
         </template>
       </van-nav-bar>
       <div class="main_box">
@@ -268,13 +268,6 @@ export default {
       this.circulation.djsj = this.getNowFormatDate(data).substr(0,10);
       this.showdjsj = false;
     },
-    goEdit(){
-      dyApply(this.circulation).then(response => {
-        if(response.code = 200){
-          this.$toast.success('保存成功');
-        }
-      });
-    },
     goEdit(){
       dyEdit(this.circulation).then(response => {
         if(response.code = 200){