From 66eb8cc0949893a8dbbdb65526ef616e46c611a5 Mon Sep 17 00:00:00 2001
From: hbao <ao@dubbo,vip>
Date: Sat, 14 May 2022 17:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=85=E5=9F=BA=E5=9C=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homestead/circulation/circulationAdd.vue  |  3 +-
 .../homeApplication/applicationList.vue       | 16 ++++++-
 .../homeApplication/proposerLite.vue          | 46 +++++++++++--------
 3 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/views/onlineHome/homestead/circulation/circulationAdd.vue b/src/views/onlineHome/homestead/circulation/circulationAdd.vue
index a796acee..3a8143ed 100644
--- a/src/views/onlineHome/homestead/circulation/circulationAdd.vue
+++ b/src/views/onlineHome/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>
@@ -363,6 +363,7 @@
             this.$toast.success('保存成功');
           }
         });
+        this.$router.push({name: this.$router.back(-1)});
       },
       goSubmit(){
         goApply(this.$route.query.id).then(response => {
diff --git a/src/views/onlineHome/homestead/homeApplication/applicationList.vue b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
index 6da2ebcb..f6c0cede 100644
--- a/src/views/onlineHome/homestead/homeApplication/applicationList.vue
+++ b/src/views/onlineHome/homestead/homeApplication/applicationList.vue
@@ -23,10 +23,20 @@
         @load="getList"
       >
         <van-swipe-cell v-for="(item,index) in applicationList" :key="index">
-          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">
+          <van-cell :title="item.ywh" center @click="viewItem(item)">
+<!--          <van-cell :title="item.ywh" :value="item.houseApplyStatusName" center @click="viewItem(item)">-->
+<!--            <template #icon>-->
+<!--              <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />-->
+<!--            </template>-->
+<!--            <template #label>-->
+<!--              <p>{{item.projectName}}</p>-->
+<!--            </template>-->
             <template #icon>
               <van-icon name="../../../static/images/onlineHome/icon_zjd1.png" size="30" color="#539FFD" style="margin-right: 10px;" />
             </template>
+            <span v-if="item.auditStatus === '0'">{{ item.houseApplyStatusName}} </span>
+            <span v-else-if="item.auditStatus !== '0' && item.auditStatus === '2' " style="color: #F56C6C">{{ item.houseApplyStatusName + ' ● 已驳回' }} </span>
+            <span  v-else style="color: #67c23a;">{{item.houseApplyStatusName }} </span>
             <template #label>
               <p>{{item.projectName}}</p>
             </template>
@@ -99,10 +109,12 @@ export default {
           console.log(response)
           for (var i = 0; i < response.rows.length; i++) {
             var houseApplyStatusName = this.selectDictLabel(this.houseApplyStatus, response.rows[i].houseApplyStatus);
+            // if(response.rows[i].auditStatus !== '0' && response.rows[i].auditStatus === '2'){
+            //   houseApplyStatusName = houseApplyStatusName+ ' ● 已驳回';
+            // }
             response.rows[i].houseApplyStatusName = houseApplyStatusName;
             this.applicationList.push(response.rows[i]);
           }
-          console.log(this.applicationList.length >= response.total)
           if(this.applicationList.length >= response.total){
             this.finished = true;
             return;
diff --git a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
index 47efcc2f..03dc5183 100644
--- a/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
+++ b/src/views/onlineHome/homestead/homeApplication/proposerLite.vue
@@ -5,7 +5,7 @@
         left-arrow
         fixed
         placeholder
-        @click-left="$router.back(-1)"
+        @click-left="goBack()"
         z-index="998"
       >
         <template #right>
@@ -104,7 +104,7 @@
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landPerArea" label="人均宅基地面积" placeholder="人均宅基地面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.landCertificateNo" label="不动产单元号" placeholder="不动产单元号" input-align="right"/>
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingArea" label="建筑面积" placeholder="建筑面积㎡" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
-                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" type="number"><template #right-icon>㎡</template></van-field>
+                    <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.buildingPerArea" label="人均建筑面积" placeholder="人均建筑面积" input-align="right" label-width="auto" type="number"><template #right-icon>㎡</template></van-field>
                     <van-field :rules="[{ required: true }]" required :readonly="!formEnabled.baseApplyForm.baseFormEnabled" v-model="applicationDetail.tHouseApplyCurrentSituation.houseCertificateNo" label="宅基地证书号" placeholder="宅基地证书号" input-align="right"/>
                     <field-select
                       v-model="applicationDetail.tHouseApplyCurrentSituation.landIsposal"
@@ -1423,7 +1423,7 @@ export default {
           this.formEnabled.baseApplyForm.groupFormEnabled = hasGroupLevel && this.isProposeStatus(houseApplyStatus, ['32']) && this.isInRoles(role, 'village_group_leader');
           this.formEnabled.baseApplyForm.villageFormEnabled = this.isProposeStatus(houseApplyStatus, ["31"]) && this.isInRoles(role, 'village_leader');
           this.formEnabled.baseApplyForm.townFormEnabled = this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader');
-
+          console.log(this.isProposeStatus(houseApplyStatus, ['8']) && this.isInRoles(role, 'town_leader')+'11111111');
           this.formEnabled.landscopeEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
           this.formEnabled.landscopeForm.baseFormEnabled = this.isProposeStatus(houseApplyStatus, ['10', '12']);
 
@@ -1648,6 +1648,7 @@ export default {
     },
     //添加家庭成员
     addFamily(){
+      this.applicationDetail.tHouseApplyProposer.members++;
       this.applicationDetail.tHouseApplyFamilyMembers.push({
         //applyProposerId: this.applicationDetail.tHouseApplyFamilyMembers[0].applyProposerId,
         memberName:'',
@@ -1659,12 +1660,17 @@ export default {
     },
     //删除家庭成员
     deleteFamily(index){
+      this.applicationDetail.tHouseApplyProposer.members--;
       this.applicationDetail.tHouseApplyFamilyMembers.splice(index,1)
     },
     // 获取户型配置
     getHouseList() {
       return houseList();
     },
+    //返回上一步操作
+    goBack(){
+      this.$router.push({name: this.$router.back(-1)});
+    },
     // 当地图绘制完成时
     onMapDrawFinished(data) {
       this.drawInsert = data;
@@ -2208,9 +2214,6 @@ export default {
       if (this.checkString(this.applicationDetail.tHouseApplyProposer.members)) {
         return "家庭人口数不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyProposer.applyReasion)) {
-        return "申请理由不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposer.existHomestead)) {
         return "是否已有宅基地不能为空";
       }
@@ -2249,6 +2252,9 @@ export default {
         if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.buildingPerArea)) {
           return "人均建筑面积不能为空";
         }
+        if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.landCertificateNo)) {
+          return "不动产单元号不能为空";
+        }
         if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.landIsposal)) {
           return "处置情况不能为空";
         }
@@ -2264,23 +2270,17 @@ export default {
             return "处置情况不能为空";
           }
         }
-        if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.landCertificateNo)) {
-          return "宅基地证书号不能为空";
-        }
         if (this.checkString(this.applicationDetail.tHouseApplyCurrentSituation.houseCertificateNo)) {
-          return "不动产单元号不能为空";
+          return "宅基地证书号不能为空";
         }
       }
 
-      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.landArea)) {
-        return "拟建宅基地面积不能为空";
-      }
-      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingLandArea)) {
-        return "房基占地面积不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.location)) {
         return "拟建位置不能为空";
       }
+      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.landArea)) {
+        return "拟建宅基地面积不能为空";
+      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.east)) {
         return "东至不能为空";
       }
@@ -2296,18 +2296,21 @@ 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 "建筑层数不能为空";
       }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingHight)) {
         return "建筑高度不能为空";
       }
-      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.housingStructure)) {
-        return "土地类型不能为空";
-      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.isAdvice)) {
         return "征求相邻权利人意见不能为空";
       }
+      if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.housingStructure)) {
+        return "房屋构造不能为空";
+      }
       if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.buildingType)) {
         return "建房类型不能为空";
       }
@@ -2317,7 +2320,7 @@ export default {
       if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '10')
       {
         if (this.checkString(this.applicationDetail.tHouseApplyProposedSituation.constructionLandArea)) {
-          return "建设用地不能为空";
+          return "建设用地面积不能为空";
         }
       }
       else if(this.applicationDetail.tHouseApplyProposedSituation.geographicType == '20')
@@ -2341,6 +2344,9 @@ export default {
           return "房屋户型不能为空";
         }
       }
+      if (this.checkString(this.applicationDetail.tHouseApplyProposer.applyReasion)) {
+        return "申请理由不能为空";
+      }
 
       return false;
     },