Merge branch 'master' of http://116.255.223.226:3000/zhangzl/nsgk_mobile

src/views/homesteadSurvey/add.vue

@@ -27,7 +27,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="checkTz('/homesteadSurvey/add2')" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/add2.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/add3.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>
@@ -74,22 +74,19 @@
             <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:33%;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:33%;display: flex;align-items: center;justify-content:center;border: 1px solid transparent;background: #22B7F2;padding: 3px 0;border-radius: 50px;" @click="showPopupzrz(item)">
+            <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>
-            <p style="width:33%;display: flex;align-items: center;justify-content:center;border: 1px solid #22B7F2;padding: 3px 0;border-radius: 50px;" @click="shownmfwlist(item)">
+            <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="">
               <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="deletezrz(item)"/>
+          <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>
         </template>
       </van-swipe-cell>
     </van-list>

src/views/homesteadSurvey/add4.vue

@@ -30,7 +30,7 @@
           </van-col>
           <van-col span="4"  style="text-align:center;" @click="$router.push({path:'/homesteadSurvey/add2'})" >
             <van-icon :name="require('../../assets/images/housesteadSurvey/nhxx'+(active==2?'A':'D')+'.png')" size="1rem" style="margin-top:0px;"/>
-            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">农户</p>
+            <p :style="{color:(active==2?'rgb(34, 183, 242)':'#000')}">使用权人</p>
           </van-col>
           <van-col span="2">
             <div style="border-top: 2px dashed #b5b4b4;margin-top: 20px;"></div>

src/views/homesteadSurvey/list2.vue

@@ -53,9 +53,11 @@
       <van-search  v-model="nhvalue" placeholder="请输入农户姓名或证件号" show-action @search="onSearchnh">
         <template #action>
           <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClicknh" style="vertical-align:middle;"/>
-          <van-icon name="add" color="rgba(122,201,67,1)" size=".8rem" @click="onClickWcnh" style="vertical-align:middle;"/>
         </template>
       </van-search>
+      <div style="background:#fff;padding:10px 2.5%;display: flex;justify-content: space-between;">
+        <van-button type="primary" style="width:110px;height: 20px;font-size: 12px;" round @click="onClickWcnh">增加外村农户</van-button>
+      </div>
     </van-sticky>
 
 <!--<van-pull-refresh v-model="isLoadingnh" @refresh="onRefreshnh">-->
@@ -89,9 +91,10 @@
         <van-col span="24">
           <van-field  v-model="outsideForm.nhdm" label="外村农户" placeholder="外村农户" input-align="right"  required :rules="[{ required: true }]"  @click="showWcnh = true"/>
           <van-popup  v-model="showWcnh" position="bottom">
+            <van-search placeholder="请输入" v-model="hnncValue" />
             <van-picker
               show-toolbar
-              :columns="wcnhList"
+              :columns="wcnhnewList"
               @confirm="nhChange"
               value-key="nhValue"
               @cancel="showWcnh = false"
@@ -198,6 +201,7 @@
           hzform:{},
           // 权利人列表
           qlrform:[],
+          hnncValue:"",
           // 权利人性质弹出框
           showsuyqxz:false,
           // 代理人证件类型弹出框
@@ -269,6 +273,7 @@
           outsideOpen:false,
           outsideForm:{nhdm:null},
           wcnhList:[],
+          wcnhnewList:[],
           bottomHeight:'0px',
           //搜索---end
           //测面
@@ -310,6 +315,23 @@
       },
       mounted(){
       },
+      watch:{
+        hnncValue: {
+          handler() {
+            if (this.hnncValue == '') {
+              this.wcnhnewList = this.wcnhList
+            } else {
+              this.wcnhnewList = [];
+              this.wcnhList.forEach(item => {
+                if (item.nhValue.indexOf(this.hnncValue) > -1) {
+                  this.wcnhnewList.push(item)
+                }
+              })
+            }
+          },
+          immediate:true
+        }
+      },
       created(){
         axios.get('../static/dictyType.json').then(res => {
           this.dictTypeList = res.data
@@ -810,9 +832,11 @@
             sfbccm:"0",
           }).then((resp) => {
             this.wcnhList = resp.rows;
-            this.wcnhList.map(function (item) {
-              item.nhValue = item.xm+" "+item.zjhm;
-            })
+            this.wcnhnewList = resp.rows;
+            for (let i = 0; i < resp.rows.length; i++) {
+              this.wcnhList[i].nhValue = resp.rows[i].xm + " " + resp.rows[i].zjhm;
+              this.wcnhnewList[i].nhValue = resp.rows[i].xm + " " + resp.rows[i].zjhm;
+            }
           });
         },
         nhChange(val){

src/views/homesteadSurvey/list3.vue

@@ -244,22 +244,6 @@
       </div>
     <div style="border-radius: 16px;
         box-shadow: 0px 3px 5px 0px rgba(0,0,0,0.16); width:calc( 100% - 40px);margin:20px;padding:5px;background:#fff;">
-      <van-field
-        autocomplete="off"
-        v-model="qlrform.ncjtjjzzdm"
-        name="农村集体经济组织代码"
-        label="农村集体经济组织代码"
-        placeholder="农村集体经济组织代码"
-        input-align="right"
-      />
-      <van-field
-        autocomplete="off"
-        v-model="qlrform.ncjtjjzzmc"
-        name="农村集体经济组织名称"
-        label="农村集体经济组织名称"
-        placeholder="农村集体经济组织名称"
-        input-align="right"
-      />
       <van-field
         autocomplete="off"
         v-model="qlrform.fbfdm"

src/views/sunVillage_info/list_cbf.vue

@@ -44,12 +44,12 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt !='2'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.cbfqszt =='2'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
               <div class="opera_btn" @click="openPopupGsjg(item.cbfbm)">
-                <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="30">
+                <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>公示结果签名</p>
               </div>
               <!-- <div class="opera_btn">
@@ -118,7 +118,8 @@
         show: false,
         showFile: false,
         htqsShow:false,
-        noticeUrl:false,
+        noticeUrl:"",
+        showGsjgqz:false,
         fileList: [],
         listLength: '0',
         cbfbm:"",

src/views/sunVillage_info/list_cbht.vue

@@ -56,7 +56,7 @@
                 <img src="../../assets/images/sunVillage_info/signature_icon_03.png" alt="" width="35">
                 <p>预览</p>
               </div> -->
-              <div class="opera_btn" v-if="item.signingMode == '线上' && item.fbfqszt !='2'"  @click="contractSign(item)">
+              <div class="opera_btn" v-if="item.signingMode == '线上' && item.fbfqszt !='2' && item.signingStatus !=='合同筹备'"  @click="contractSign(item)">
                 <img src="../../assets/images/sunVillage_info/signature_icon_02.png" alt="" width="35">
                 <p>合同网签</p>
               </div>
@@ -84,9 +84,12 @@
       </van-list>
     </div>
     <van-dialog v-model="htqsShow" title="合同签署" confirmButtonText="关闭" @confirm="confirmn">
-      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>
-    </van-dialog>
-    <!-- 签字弹出层 -->
+<!--      <iframe width="100%" height="600px;" :src="noticeUrl"></iframe>-->
+      <object width="100%" height="600" :data="noticeUrl" type="text/html">
+             Alternative Content-->
+        </object>
+            </van-dialog>
+            <!-- 签字弹出层 -->
     <van-popup v-model="show" closeable position="right" :style="{ height: '100%' }">
       <van-cell-group style="width: 100%;height:100%;overflow: hidden;padding-top: 10px;padding-bottom: 10px;">
         <div class="signature-box" @mousedown="canvasTTdown" @touchstart="canvasTTdown">
@@ -179,7 +182,7 @@
         this.loading = true;
         let wcStatus  = this.$route.query.wcStatus;
         if(wcStatus){
-          this.$set(this.queryParams, 'signingStatus',"9");
+          this.$set(this.queryParams, 'signingStatus',"3");
         }else{
           this.$set(this.queryParams, 'signingStatus',null);
         }

src/views/sunVillage_info/list_contract_signature.vue

@@ -201,7 +201,7 @@
     }
     .list_main_block{
       padding:25px;
-      width: 48%;
+      width: 49%;
       border-radius: 15PX;
       box-shadow: 0PX 2PX 5PX rgba(63, 68, 75, 0.2);
       margin-top: 25px;