宅基地调查优化

src/views/homesteadSurvey/add2.vue

@@ -74,11 +74,11 @@
           <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
-            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">户主</span>
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnh(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">户主</span>
           </p>
-          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: rgba(34,183,242,0.14);padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
+          <p style="width:32%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupsyqr(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
             <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">使用权人</span>
           </p>
@@ -89,7 +89,7 @@
         </div>
       </div>
       <template #right>
-        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"/>
+        <van-button  v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deleteshyqr(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     </van-list>

src/views/homesteadSurvey/add3.vue

@@ -74,9 +74,9 @@
             <p style="flex:1;text-align:right;">{{item.zcs}}</p>
           </div>
           <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
-              <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-              <span style="font-size: 14px;color: #fff;margin-left: 5px;">自然幢信息</span>
+            <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+              <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+              <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">自然幢信息</span>
             </p>
             <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="shownmfwlist(item)">
               <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
@@ -85,8 +85,14 @@
           </div>
         </div>
         <template #right>
-          <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
-          <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>自然幢附件</van-button>
+          <van-row>
+            <van-col>
+              <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+            </van-col>
+            <van-col>
+              <van-button  v-if="permission == 'true'" square  type="danger" class="delete-button" @click="deletezrz(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+            </van-col>
+          </van-row>
         </template>
       </van-swipe-cell>
     </van-list>
@@ -389,6 +395,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/add4.vue

@@ -74,18 +74,21 @@
           <p style="flex:1;text-align:right;">{{ formatDict(jzwqkList, item.jzwqk) }} </p>
         </div>
         <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;"  @click="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">附件</span>
-          </p>
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
-            <img src="../../assets/images/housesteadSurvey/add01.png" alt="">
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;" >查看附属设施信息</span>
+          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+            <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;" >查看附属设施信息</span>
           </p>
         </div>
       </div>
       <template #right>
-        <van-button v-show="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletefsss(item)"/>
+        <van-row>
+          <van-col>
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col>
+            <van-button v-show="permission == 'true'" square type="danger" class="delete-button" @click="deletefsss(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     </van-list>
@@ -98,6 +101,9 @@
       <p v-if="permission == 'true'" style="width:32%;border: 1px solid transparent;background: #FA5353;padding: 5px 0;border-radius: 50px;">
         <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="ycbj()">异常标记</span>
       </p>
+      <p v-if="zjdzdxx.surveyStatus == '4'" style="width:32%;border: 1px solid transparent;background: #FFA500;padding: 5px 0;border-radius: 50px;">
+        <span style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="bhyyLook()">驳回原因</span>
+      </p>
       <p style="width:32%;border: 1px solid transparent;background: #22B7F2;padding: 5px 0;border-radius: 50px;">
         <span v-if="permission == 'true'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名确认</span>
         <span v-if="permission == 'false'" style="font-size: 14px;color: #fff;margin-left: 5px;"  @click="qmqr()">签名图片</span>
@@ -153,7 +159,7 @@
       <van-form  ref="dcshForm">
         <van-row>
           <van-col span="24">
-            <van-field v-model="zjdzdxx.auditRemark" label="备注" placeholder="审核备注" input-align="right" :rules="[{ required: true }]" required />
+            <van-field v-model="zjdzdxx.auditRemark" label="备注" placeholder="审核备注" input-align="right" />
           </van-col>
           <van-col span="8">
             <p style="margin-left: 10%;color: #646566;    font-size: 0.373333rem;">审核</p>
@@ -280,9 +286,11 @@ export default {
     canvasTTdown() {
       $('#canvasTT').css('display', 'none');
     },
+    bhyyLook(){
+      Dialog({ type: 'success', message: this.zjdzdxx.auditRemark });
+    },
     onBeforeCloseSh(action, done){
       if (action === 'confirm') {
-        this.$refs.dcshForm.validate().then(() => {
           updateZjdzd(this.zjdzdxx).then(response => {
             if(response.code === 200){
               let _this =this
@@ -296,11 +304,7 @@ export default {
                 }
               })
             }
-
           });
-        }).catch(() => {
-          return done(false);
-        });
       } else {
         return done();
       }
@@ -617,6 +621,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }

src/views/homesteadSurvey/hncyList2.vue

@@ -65,8 +65,8 @@
                 <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
                 <span style="line-height: 1;">{{item.xm}}</span>
               </p>
-              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
-              <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+              <p  style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/add02.png" alt="" style="margin-right: 3px;">成员详情</p>
+              <p  style="display: flex;align-items: center;color:#FA5353;font-size:12px;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
 
             </div>
           </template>
@@ -77,9 +77,9 @@
           </template>
         </van-cell>
         <template #right>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
-          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;border-bottom: 1px dashed #22B7F2; height:100%;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;height:100%;" @click="handleFenHu(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">分户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;" @click="handleGuohu(item,index)"><img src="../../assets/images/housesteadSurvey/add03.png" alt="" style="margin-right: 3px;">移户</van-button>
+          <van-button v-if="item.yhzgx != '02'" style="align-items: center;color:#22B7F2;font-size:12px;" @click="handleToHuzhu(item,index)"><img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 3px;">设为户主</van-button>
         </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible"  title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">

src/views/homesteadSurvey/index.vue

@@ -84,13 +84,12 @@
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>
@@ -118,13 +117,12 @@
         <template #default>
 
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>
@@ -150,13 +148,12 @@
         </template>
         <template #default>
           <van-circle
-            v-model="item.reportZrzNumber"
-            :rate="item.reportNhNumber"
+            :current-rate="item.zjdwcsl"
+            rate="item.zjdsl"
             :stroke-width="100"
             :speed="100"
             size="70%"
             layer-color="#ebedf0"
-            :color="chooseColor(item)"
             :text="item.zjdwcsl!=0?(item.zjdwcsl == item.zjdsl?100+'%':(((item.zjdwcsl/item.zjdsl)*100).toFixed(2))+'%'):0+'%'"
           />
         </template>

src/views/homesteadSurvey/list.vue

@@ -78,32 +78,37 @@
           :immediate-check="false"
           @load="onRefreshzjd"
         >
-          <van-cell  v-for="(item,index) in list1" :key="index" size="small" :clickable="true"  style="border-radius: 16px;
-          box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
-            <template #title>
-              <div style="display: flex;align-items: center;">
-                <p style="display: flex;align-items: center;" >
-                  <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-                  <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
-                </p>
-                <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
-<!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
-<!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
-<!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
-                <p v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
-                <p style="margin-right: 3%;color:#22B7F2;font-size:12px;" ><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</p>
-                <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;"  @click="deleteZjd(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+            <van-swipe-cell v-for="(item,index) in list1" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+              <div style="padding:10px;">
+                <div style="display: flex;align-items: center;">
+                  <p style="display: flex;align-items: center;" >
+                    <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+                    <span style="line-height: 1;">{{limitWords(item.shyqrdbxm)}}</span>
+                  </p>
+                  <p v-if="item.surveyStatus == '5' || item.surveyStatus  == '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="queryDetail(item)"><img src="../../assets/images/housesteadSurvey/list06.png" alt="" style="margin-right: 3px;">详情</p>
+  <!--                <p v-if="item.zjdAudit=='0'" style="color:#ff976a;background:rgba(255,151,106,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">待审核</p>-->
+  <!--                <p v-if="item.zjdAudit=='1'" style="color:#7AC943;background:rgba(122,201,67,0.2);font-size:12px;padding: 5px;line-height: 1;border-radius: 5px;">已审核</p>-->
+  <!--                <p v-if="item.zjdAudit=='2'" style="color:#ee0a24;font-size:12px;">已驳回</p>-->
+                  <p v-if="item.surveyStatus != '5' && item.surveyStatus != '3'" style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="setCookies(item)"><img src="../../assets/images/housesteadSurvey/list07.png" alt="" style="margin-right: 3px;">调查</p>
+                </div>
+              <!--<template #default>
+                <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
+                <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
+              </template>-->
+                <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
+                <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
               </div>
+            <template #right>
+              <van-row>
+                <van-col>
+                  <van-button square  type="info" class="delete-button" @click="showUploadList(item.id)"><van-icon  name="photo-o" size=".4rem" style="bottom: -3px;" color="#000000" @click="showUploadList(item.id)"/> 附件</van-button>
+                </van-col>
+                <van-col>
+                  <van-button square  type="danger" class="delete-button" @click="showUploadList(item.id)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">  删除</van-button>
+                </van-col>
+              </van-row>
             </template>
-            <!--<template #default>
-              <van-button v-if="item.houseDataConfirmStatus=='CONFIRMED'" plain round color="#7AC943" size="mini" style="vertical-align:middle;margin-top:15px;">查看详情</van-button>
-              <van-button v-if="item.houseDataConfirmStatus!='CONFIRMED'"plain round color="#FA5353" size="mini" style="vertical-align:middle;margin-top:15px;">开始调查</van-button>
-            </template>-->
-            <template #label>
-              <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">宅基地代码:  {{item.zjddm}} </p>
-              <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">宗地面积: {{item.zdmj}}㎡<span style="margin-left: auto;color: #333333;" v-if="item.surveyStatus != '1'">调查员：{{item.surveyBy}}</span></p>
-            </template>
-          </van-cell>
+            </van-swipe-cell>
         </van-list>
         <!--</van-pull-refresh>-->
       </van-tab>
@@ -927,7 +932,7 @@
             if(response.rows.length>0){
               localStorage.setItem("zjdzdxxItem",JSON.stringify({suyqrdm:response.rows[0].suyqrdm,zjddm:null,zjdlyzk:"1",landStatus:"1"
                 ,houseOwnership:"2",landPhms:"10",isMore:"0",sffz:"0",sfcz:"0"
-                ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"01"}));
+                ,zjdqdfs:"01",sjly:"01",qlsdfs:"1",qllx:"1",qlxz:"203",dj:"1",yt:"072"}));
               this.$router.push({name:'homesteadAdd'});
             }
           });
@@ -5279,6 +5284,15 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
+  /deep/ .van-row{
+    height: 100%;
+  }
+  /deep/ .van-col{
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list2.vue

@@ -68,23 +68,24 @@
       :immediate-check="false"
       @load="onRefreshShyqr"
     >
-    <van-cell  v-for="(item,index) in nhlist" :key="index" size="small" :clickable="true" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:15px auto 0;">
-      <template #title>
-        <div style="display: flex;align-items: center;">
-          <p style="display: flex;align-items: center;">
-            <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
-            <span style="line-height: 1;">{{item.xm}}</span>
-          </p>
-          <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
-          <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;border-bottom: 1px dashed #22B7F2;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
-          <p style="display: flex;align-items: center;color:#FA5353;font-size:12px;border-bottom: 1px dashed #FA5353;" @click="deletenh(item,index)"><img src="../../assets/images/housesteadSurvey/list08.png" alt="" style="margin-right: 3px;">删除</p>
+      <van-swipe-cell v-for="(item,index) in nhlist" :key="index" style="border-radius: 16px;box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:95%;margin:5px auto 0;background:#fff;">
+        <div style="padding:10px;">
+          <div style="display: flex;align-items: center;">
+            <p style="display: flex;align-items: center;">
+              <img src="../../assets/images/housesteadSurvey/list03.png" alt="" style="margin-right: 5px;">
+              <span style="line-height: 1;">{{item.xm}}</span>
+            </p>
+            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-left: auto;margin-right: 10px;" @click="showPopuphncylist(item)"><img src="../../assets/images/housesteadSurvey/list09.png" alt="" style="margin-right: 3px;">成员</p>
+            <p style="display: flex;align-items: center;color:#22B7F2;font-size:12px;margin-right: 10px;" @click="showPopupnh(item)"><img src="../../assets/images/housesteadSurvey/list10.png" alt="" style="margin-right: 3px;">户主</p>
+          </div>
+
+          <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
+          <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
         </div>
-      </template>
-      <template #label>
-        <p style="display: flex;align-items: center;margin-top: 10px;"><img src="../../assets/images/housesteadSurvey/list04.png" alt="" style="margin-right: 5px;">证件号码:<span style="margin-left: auto;">{{item.zjhm}}</span> </p>
-        <p style="display: flex;align-items: center;margin-top: 5px;"><img src="../../assets/images/housesteadSurvey/list05.png" alt="" style="margin-right: 5px;">农户代码:<span style="margin-left: auto;">{{item.nhdm}}</span></p>
-      </template>
-    </van-cell>
+        <template #right>
+          <van-button square  type="danger" class="delete-button" @click="deletenh(item.id)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt=""> 删除</van-button>
+        </template>
+      </van-swipe-cell>
     </van-list>
     <van-dialog v-model="outsideOpen" title="外村农户"  show-cancel-button   confirmButtonText="保存" cancelButtonText="关闭" @confirm="outsideSubmitForm" @cancel="outsideCancel" >
     <wcnhList  style="height: 600px;overflow: auto;"  ref="wcnh"/>
@@ -5012,6 +5013,9 @@
   /deep/ .van-swipe-cell__wrapper{
     margin-right:-3px;
   }
+  /deep/ .delete-button {
+    height: 100%;
+  }
   .hzlxBtn{
     font-size: 0.3rem;
     display: inline-block;

src/views/homesteadSurvey/list4.vue

@@ -5995,7 +5995,7 @@
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1");
               this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203");
-              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01");
+              this.$set(this.mapZjdTeAll.mapZjdAData, "yt","072");
               this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1");
 
               //this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;

src/views/homesteadSurvey/nhcyList.vue

@@ -85,7 +85,7 @@
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"/>
+        <van-button v-if="permission == 'true'"  square text="删除" type="danger" class="delete-button" @click="deletehncy(item.id,index)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
       </template>
     </van-swipe-cell>
     <van-dialog v-model="guohuData.visible" title="成员移户" show-cancel-button  confirmButtonText="确认" cancelButtonText="关闭" @confirm="guohu"  @cancel="show=false">

src/views/homesteadSurvey/nmfwList.vue

@@ -64,19 +64,22 @@
           <p style="flex:1;text-align:left;">农户代码:</p>
           <p style="flex:1;text-align:right;">{{item.nhdm}}</p>
         </div>
-        <div style="text-align:center;overflow:auto;display: flex;justify-content: space-between;margin-top: 10px;">
-          <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;"  @click="showUploadList(item.id)">
-            <van-icon  name="photo-o" size=".4rem" color="#FFFFFF"/>
-            <span style="font-size: 14px;color: #fff;margin-left: 5px;">附件</span>
-          </p>
+        <div style="text-align:center;overflow:auto;display: flex;justify-content: center;margin-top: 10px;">
           <p style="width:49%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupnmfw(item)">
             <img src="../../assets/images/housesteadSurvey/add02.png" alt="">
-            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;">详情</span>
+            <span style="font-size: 14px;color: #22B7F2;margin-left: 5px;" >详情</span>
           </p>
         </div>
       </div>
       <template #right>
-        <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"/>
+        <van-row>
+          <van-col>
+            <van-button  square type="info" class="delete-button" style="position: relative;" @click="showUploadList(item.id)"><van-icon style="bottom: -3px;"  name="photo-o" size=".4rem" color="#FFFFFF"/>附件</van-button>
+          </van-col>
+          <van-col>
+            <van-button v-if="permission == 'true'" square text="删除" type="danger" class="delete-button" @click="deletenmfw(item)"><img width="10px" src="../../assets/images/sunVillage_info/list_icon_7.png" alt="">删除</van-button>
+          </van-col>
+        </van-row>
       </template>
     </van-swipe-cell>
     <van-popup v-model:show="showImageList" position="bottom" style="height:40vh;padding:50px 10px 0" closeable
@@ -338,6 +341,12 @@ export default {
 >>> .delete-button {
   height: 100%;
 }
+>>> .van-row{
+  height: 100%;
+}
+>>> .van-col{
+  height: 100%;
+}
 >>> .van-swipe-cell__wrapper{
   margin-right:-3px;
 }